More widgets can use the color picker now.

This commit is contained in:
dfighter1985 2014-06-19 17:21:11 +02:00
parent 4af4bb1fa4
commit 879a332d6d
32 changed files with 49 additions and 77 deletions

View file

@ -11,7 +11,7 @@
<property> <property>
<name>button_type</name> <name>button_type</name>
<type>string</type> <type>string</type>
<default>push_button</default> <default>toggle_button</default>
</property> </property>
<property> <property>
<name>pushed</name> <name>pushed</name>
@ -30,17 +30,17 @@
</property> </property>
<property> <property>
<name>color</name> <name>color</name>
<type>string</type> <type>color</type>
<default>255 255 255 255</default> <default>255 255 255 255</default>
</property> </property>
<property> <property>
<name>col_pushed</name> <name>col_pushed</name>
<type>string</type> <type>color</type>
<default>255 255 255 255</default> <default>255 255 255 255</default>
</property> </property>
<property> <property>
<name>col_over</name> <name>col_over</name>
<type>string</type> <type>color</type>
<default>255 255 255 255</default> <default>255 255 255 255</default>
</property> </property>
<property> <property>

View file

@ -2,7 +2,6 @@
<header> <header>
<name>CtrlButton</name> <name>CtrlButton</name>
<guiname>CCtrlButton</guiname> <guiname>CCtrlButton</guiname>
<classname>button</classname>
<ancestor>CtrlBaseButton</ancestor> <ancestor>CtrlBaseButton</ancestor>
<description></description> <description></description>
<abstract>false</abstract> <abstract>false</abstract>
@ -12,17 +11,17 @@
<property> <property>
<name>tx_normal</name> <name>tx_normal</name>
<type>string</type> <type>string</type>
<default>log_but_r.tga</default> <default></default>
</property> </property>
<property> <property>
<name>tx_pushed</name> <name>tx_pushed</name>
<type>string</type> <type>string</type>
<default>log_but_r.tga</default> <default></default>
</property> </property>
<property> <property>
<name>tx_over</name> <name>tx_over</name>
<type>string</type> <type>string</type>
<default>log_but_over_r.tga</default> <default></default>
</property> </property>
<property> <property>
<name>scale</name> <name>scale</name>

View file

@ -2,7 +2,6 @@
<header> <header>
<name>CtrlColPick</name> <name>CtrlColPick</name>
<guiname>CCtrlColPick</guiname> <guiname>CCtrlColPick</guiname>
<classname>colpick</classname>
<ancestor>CtrlBase</ancestor> <ancestor>CtrlBase</ancestor>
<description></description> <description></description>
<abstract>false</abstract> <abstract>false</abstract>

View file

@ -2,7 +2,6 @@
<header> <header>
<name>CtrlScroll</name> <name>CtrlScroll</name>
<guiname>CCtrlScroll</guiname> <guiname>CCtrlScroll</guiname>
<classname>scroll</classname>
<ancestor>CtrlBase</ancestor> <ancestor>CtrlBase</ancestor>
<description></description> <description></description>
<abstract>false</abstract> <abstract>false</abstract>

View file

@ -2,7 +2,6 @@
<header> <header>
<name>DBGroupSelectNumber</name> <name>DBGroupSelectNumber</name>
<guiname>CDBGroupSelectNumber</guiname> <guiname>CDBGroupSelectNumber</guiname>
<classname>select_number</classname>
<ancestor>InterfaceGroup</ancestor> <ancestor>InterfaceGroup</ancestor>
<description></description> <description></description>
<abstract>false</abstract> <abstract>false</abstract>

View file

@ -2,7 +2,6 @@
<header> <header>
<name>DBViewBar</name> <name>DBViewBar</name>
<guiname>CDBViewBar</guiname> <guiname>CDBViewBar</guiname>
<classname>bar</classname>
<ancestor>ViewBitmap</ancestor> <ancestor>ViewBitmap</ancestor>
<description></description> <description></description>
<abstract>false</abstract> <abstract>false</abstract>
@ -26,7 +25,7 @@
</property> </property>
<property> <property>
<name>color_negative</name> <name>color_negative</name>
<type>string</type> <type>color</type>
<default>0 0 0 0</default> <default>0 0 0 0</default>
</property> </property>
<property> <property>

View file

@ -2,7 +2,6 @@
<header> <header>
<name>DBViewBar3</name> <name>DBViewBar3</name>
<guiname>CDBViewBar3</guiname> <guiname>CDBViewBar3</guiname>
<classname>bar3</classname>
<ancestor>ViewBitmap</ancestor> <ancestor>ViewBitmap</ancestor>
<description></description> <description></description>
<abstract>false</abstract> <abstract>false</abstract>
@ -41,32 +40,32 @@
</property> </property>
<property> <property>
<name>color1</name> <name>color1</name>
<type>string</type> <type>color</type>
<default>255 255 255 255</default> <default>255 255 255 255</default>
</property> </property>
<property> <property>
<name>color2</name> <name>color2</name>
<type>string</type> <type>color</type>
<default>255 255 255 255</default> <default>255 255 255 255</default>
</property> </property>
<property> <property>
<name>color3</name> <name>color3</name>
<type>string</type> <type>color</type>
<default>255 255 255 255</default> <default>255 255 255 255</default>
</property> </property>
<property> <property>
<name>color1_negative</name> <name>color1_negative</name>
<type>string</type> <type>color</type>
<default>0 0 0 0</default> <default>0 0 0 0</default>
</property> </property>
<property> <property>
<name>color2_negative</name> <name>color2_negative</name>
<type>string</type> <type>color</type>
<default>0 0 0 0</default> <default>0 0 0 0</default>
</property> </property>
<property> <property>
<name>color3_negative</name> <name>color3_negative</name>
<type>string</type> <type>color</type>
<default>0 0 0 0</default> <default>0 0 0 0</default>
</property> </property>
<property> <property>

View file

@ -2,7 +2,6 @@
<header> <header>
<name>DBViewDigit</name> <name>DBViewDigit</name>
<guiname>CDBViewDigit</guiname> <guiname>CDBViewDigit</guiname>
<classname>digit</classname>
<ancestor>CtrlBase</ancestor> <ancestor>CtrlBase</ancestor>
<description></description> <description></description>
<abstract>false</abstract> <abstract>false</abstract>
@ -12,7 +11,7 @@
<property> <property>
<name>value</name> <name>value</name>
<type>string</type> <type>string</type>
<default>0</default> <default></default>
</property> </property>
<property> <property>
<name>numdigit</name> <name>numdigit</name>
@ -26,7 +25,7 @@
</property> </property>
<property> <property>
<name>color</name> <name>color</name>
<type>string</type> <type>color</type>
<default>255 255 255 255</default> <default>255 255 255 255</default>
</property> </property>
</properties> </properties>

View file

@ -2,7 +2,6 @@
<header> <header>
<name>DBViewNumber</name> <name>DBViewNumber</name>
<guiname>CDBViewNumber</guiname> <guiname>CDBViewNumber</guiname>
<classname>text_number</classname>
<ancestor>ViewText</ancestor> <ancestor>ViewText</ancestor>
<description></description> <description></description>
<abstract>false</abstract> <abstract>false</abstract>
@ -12,7 +11,7 @@
<property> <property>
<name>value</name> <name>value</name>
<type>string</type> <type>string</type>
<default>0</default> <default></default>
</property> </property>
<property> <property>
<name>positive</name> <name>positive</name>

View file

@ -2,7 +2,6 @@
<header> <header>
<name>DBViewQuantity</name> <name>DBViewQuantity</name>
<guiname>CDBViewQuantity</guiname> <guiname>CDBViewQuantity</guiname>
<classname>text_quantity</classname>
<ancestor>ViewText</ancestor> <ancestor>ViewText</ancestor>
<description></description> <description></description>
<abstract>false</abstract> <abstract>false</abstract>
@ -12,17 +11,17 @@
<property> <property>
<name>value</name> <name>value</name>
<type>string</type> <type>string</type>
<default>0</default> <default></default>
</property> </property>
<property> <property>
<name>valuemax</name> <name>valuemax</name>
<type>string</type> <type>string</type>
<default>100</default> <default></default>
</property> </property>
<property> <property>
<name>emptytext</name> <name>emptytext</name>
<type>string</type> <type>string</type>
<default>empty text</default> <default></default>
</property> </property>

View file

@ -30,7 +30,7 @@
</property> </property>
<property> <property>
<name>bgcolor</name> <name>bgcolor</name>
<type>string</type> <type>color</type>
<default>0 0 0 0</default> <default>0 0 0 0</default>
</property> </property>
<property> <property>

View file

@ -2,7 +2,6 @@
<header> <header>
<name>GroupContainer</name> <name>GroupContainer</name>
<guiname>CGroupContainer</guiname> <guiname>CGroupContainer</guiname>
<classname>container</classname>
<ancestor>InterfaceGroup</ancestor> <ancestor>InterfaceGroup</ancestor>
<description></description> <description></description>
<abstract>false</abstract> <abstract>false</abstract>
@ -46,7 +45,7 @@
</property> </property>
<property> <property>
<name>header_color</name> <name>header_color</name>
<type>string</type> <type>color</type>
<default>255 255 255 255</default> <default>255 255 255 255</default>
</property> </property>
<property> <property>

View file

@ -2,7 +2,6 @@
<header> <header>
<name>GroupEditBox</name> <name>GroupEditBox</name>
<guiname>CGroupEditBox</guiname> <guiname>CGroupEditBox</guiname>
<classname>edit_box</classname>
<ancestor>InterfaceGroup</ancestor> <ancestor>InterfaceGroup</ancestor>
<description></description> <description></description>
<abstract>false</abstract> <abstract>false</abstract>

View file

@ -15,7 +15,7 @@
</property> </property>
<property> <property>
<name>color</name> <name>color</name>
<type>string</type> <type>color</type>
<default>255 255 255 255</default> <default>255 255 255 255</default>
</property> </property>
<property> <property>

View file

@ -2,7 +2,6 @@
<header> <header>
<name>GroupHTML</name> <name>GroupHTML</name>
<guiname>CGroupHTML</guiname> <guiname>CGroupHTML</guiname>
<classname>html</classname>
<ancestor>GroupScrollText</ancestor> <ancestor>GroupScrollText</ancestor>
<description></description> <description></description>
<abstract>false</abstract> <abstract>false</abstract>
@ -21,47 +20,47 @@
</property> </property>
<property> <property>
<name>background_color</name> <name>background_color</name>
<type>string</type> <type>color</type>
<default>0 0 0 255</default> <default>0 0 0 255</default>
</property> </property>
<property> <property>
<name>error_color</name> <name>error_color</name>
<type>string</type> <type>color</type>
<default>255 0 0 255</default> <default>255 0 0 255</default>
</property> </property>
<property> <property>
<name>link_color</name> <name>link_color</name>
<type>string</type> <type>color</type>
<default>0 0 255 255</default> <default>0 0 255 255</default>
</property> </property>
<property> <property>
<name>h1_color</name> <name>h1_color</name>
<type>string</type> <type>color</type>
<default>255 255 255 255</default> <default>255 255 255 255</default>
</property> </property>
<property> <property>
<name>h2_color</name> <name>h2_color</name>
<type>string</type> <type>color</type>
<default>255 255 255 255</default> <default>255 255 255 255</default>
</property> </property>
<property> <property>
<name>h3_color</name> <name>h3_color</name>
<type>string</type> <type>color</type>
<default>255 255 255 255</default> <default>255 255 255 255</default>
</property> </property>
<property> <property>
<name>h4_color</name> <name>h4_color</name>
<type>string</type> <type>color</type>
<default>255 255 255 255</default> <default>255 255 255 255</default>
</property> </property>
<property> <property>
<name>h5_color</name> <name>h5_color</name>
<type>string</type> <type>color</type>
<default>255 255 255 255</default> <default>255 255 255 255</default>
</property> </property>
<property> <property>
<name>h6_color</name> <name>h6_color</name>
<type>string</type> <type>color</type>
<default>255 255 255 255</default> <default>255 255 255 255</default>
</property> </property>
<property> <property>

View file

@ -2,7 +2,6 @@
<header> <header>
<name>GroupHeader</name> <name>GroupHeader</name>
<guiname>CGroupHeader</guiname> <guiname>CGroupHeader</guiname>
<classname>header</classname>
<ancestor>GroupList</ancestor> <ancestor>GroupList</ancestor>
<description></description> <description></description>
<abstract>false</abstract> <abstract>false</abstract>

View file

@ -2,7 +2,6 @@
<header> <header>
<name>GroupList</name> <name>GroupList</name>
<guiname>CGroupList</guiname> <guiname>CGroupList</guiname>
<classname>list</classname>
<ancestor>InterfaceGroup</ancestor> <ancestor>InterfaceGroup</ancestor>
<description></description> <description></description>
<abstract>false</abstract> <abstract>false</abstract>
@ -41,7 +40,7 @@
</property> </property>
<property> <property>
<name>col_over</name> <name>col_over</name>
<type>string</type> <type>color</type>
<default>255 255 255 32</default> <default>255 255 255 32</default>
</property> </property>
<property> <property>

View file

@ -2,7 +2,6 @@
<header> <header>
<name>GroupMenu</name> <name>GroupMenu</name>
<guiname>CGroupMenu</guiname> <guiname>CGroupMenu</guiname>
<classname>menu</classname>
<ancestor>GroupModal</ancestor> <ancestor>GroupModal</ancestor>
<description></description> <description></description>
<abstract>false</abstract> <abstract>false</abstract>
@ -16,7 +15,7 @@
</property> </property>
<property> <property>
<name>color</name> <name>color</name>
<type>string</type> <type>color</type>
<default>255 255 255 255</default> <default>255 255 255 255</default>
</property> </property>
<property> <property>
@ -26,32 +25,32 @@
</property> </property>
<property> <property>
<name>shadow_color</name> <name>shadow_color</name>
<type>string</type> <type>color</type>
<default>0 0 0 255</default> <default>0 0 0 255</default>
</property> </property>
<property> <property>
<name>color_over</name> <name>color_over</name>
<type>string</type> <type>color</type>
<default>255 255 255 255</default> <default>255 255 255 255</default>
</property> </property>
<property> <property>
<name>shadow_color_over</name> <name>shadow_color_over</name>
<type>string</type> <type>color</type>
<default>0 0 0 255</default> <default>0 0 0 255</default>
</property> </property>
<property> <property>
<name>highlight_over</name> <name>highlight_over</name>
<type>string</type> <type>color</type>
<default>128 0 0 255</default> <default>128 0 0 255</default>
</property> </property>
<property> <property>
<name>color_grayed</name> <name>color_grayed</name>
<type>string</type> <type>color</type>
<default>128 128 128 255</default> <default>128 128 128 255</default>
</property> </property>
<property> <property>
<name>shadow_color_grayed</name> <name>shadow_color_grayed</name>
<type>string</type> <type>color</type>
<default>0 0 0 255</default> <default>0 0 0 255</default>
</property> </property>
<property> <property>

View file

@ -2,7 +2,6 @@
<header> <header>
<name>GroupModal</name> <name>GroupModal</name>
<guiname>CGroupModal</guiname> <guiname>CGroupModal</guiname>
<classname>modal</classname>
<ancestor>GroupFrame</ancestor> <ancestor>GroupFrame</ancestor>
<description></description> <description></description>
<abstract>false</abstract> <abstract>false</abstract>

View file

@ -30,7 +30,7 @@
</property> </property>
<property> <property>
<name>col_over</name> <name>col_over</name>
<type>string</type> <type>color</type>
<default>255 255 255 32</default> <default>255 255 255 32</default>
</property> </property>
<property> <property>

View file

@ -2,7 +2,6 @@
<header> <header>
<name>GroupScrollText</name> <name>GroupScrollText</name>
<guiname>CGroupScrollText</guiname> <guiname>CGroupScrollText</guiname>
<classname>scroll_text</classname>
<ancestor>InterfaceGroup</ancestor> <ancestor>InterfaceGroup</ancestor>
<description></description> <description></description>
<abstract>false</abstract> <abstract>false</abstract>

View file

@ -2,7 +2,6 @@
<header> <header>
<name>GroupTab</name> <name>GroupTab</name>
<guiname>CGroupTab</guiname> <guiname>CGroupTab</guiname>
<classname>tab</classname>
<ancestor>InterfaceGroup</ancestor> <ancestor>InterfaceGroup</ancestor>
<description></description> <description></description>
<abstract>false</abstract> <abstract>false</abstract>

View file

@ -2,7 +2,6 @@
<header> <header>
<name>GroupTable</name> <name>GroupTable</name>
<guiname>CGroupTable</guiname> <guiname>CGroupTable</guiname>
<classname>table</classname>
<ancestor>InterfaceGroup</ancestor> <ancestor>InterfaceGroup</ancestor>
<description></description> <description></description>
<abstract>false</abstract> <abstract>false</abstract>
@ -26,7 +25,7 @@
</property> </property>
<property> <property>
<name>bgcolor</name> <name>bgcolor</name>
<type>string</type> <type>color</type>
<default>0 0 0 255</default> <default>0 0 0 255</default>
</property> </property>
<property> <property>

View file

@ -2,7 +2,6 @@
<header> <header>
<name>GroupTree</name> <name>GroupTree</name>
<guiname>CGroupTree</guiname> <guiname>CGroupTree</guiname>
<classname>tree</classname>
<ancestor>InterfaceGroup</ancestor> <ancestor>InterfaceGroup</ancestor>
<description></description> <description></description>
<abstract>false</abstract> <abstract>false</abstract>
@ -11,17 +10,17 @@
<properties> <properties>
<property> <property>
<name>col_over</name> <name>col_over</name>
<type>string</type> <type>color</type>
<default>255 255 255 128</default> <default>255 255 255 128</default>
</property> </property>
<property> <property>
<name>col_select</name> <name>col_select</name>
<type>string</type> <type>color</type>
<default>255 128 128 128</default> <default>255 128 128 128</default>
</property> </property>
<property> <property>
<name>col_over_back</name> <name>col_over_back</name>
<type>string</type> <type>color</type>
<default>64 64 64 255</default> <default>64 64 64 255</default>
</property> </property>
<property> <property>

View file

@ -2,7 +2,6 @@
<header> <header>
<name>InterfaceGroup</name> <name>InterfaceGroup</name>
<guiname>CInterfaceGroup</guiname> <guiname>CInterfaceGroup</guiname>
<classname>interface_group</classname>
<ancestor>CtrlBase</ancestor> <ancestor>CtrlBase</ancestor>
<description></description> <description></description>
<abstract>false</abstract> <abstract>false</abstract>

View file

@ -2,7 +2,6 @@
<header> <header>
<name>InterfaceGroupWheel</name> <name>InterfaceGroupWheel</name>
<guiname>CInterfaceGroupWheel</guiname> <guiname>CInterfaceGroupWheel</guiname>
<classname>group_wheel</classname>
<ancestor>InterfaceGroup</ancestor> <ancestor>InterfaceGroup</ancestor>
<description></description> <description></description>
<abstract>false</abstract> <abstract>false</abstract>

View file

@ -2,7 +2,6 @@
<header> <header>
<name>ViewBitmap</name> <name>ViewBitmap</name>
<guiname>CViewBitmap</guiname> <guiname>CViewBitmap</guiname>
<classname>bitmap</classname>
<ancestor>CtrlBase</ancestor> <ancestor>CtrlBase</ancestor>
<description></description> <description></description>
<abstract>false</abstract> <abstract>false</abstract>

View file

@ -2,7 +2,6 @@
<header> <header>
<name>ViewBitmapCombo</name> <name>ViewBitmapCombo</name>
<guiname>CViewBitmapCombo</guiname> <guiname>CViewBitmapCombo</guiname>
<classname>bitmap_combo</classname>
<ancestor>CtrlBase</ancestor> <ancestor>CtrlBase</ancestor>
<description></description> <description></description>
<abstract>false</abstract> <abstract>false</abstract>

View file

@ -2,7 +2,6 @@
<header> <header>
<name>ViewText</name> <name>ViewText</name>
<guiname>CViewText</guiname> <guiname>CViewText</guiname>
<classname>text</classname>
<ancestor>InterfaceElement</ancestor> <ancestor>InterfaceElement</ancestor>
<description></description> <description></description>
<abstract>false</abstract> <abstract>false</abstract>
@ -11,7 +10,7 @@
<properties> <properties>
<property> <property>
<name>color</name> <name>color</name>
<type>string</type> <type>color</type>
<default>255 255 255 255</default> <default>255 255 255 255</default>
</property> </property>
<property> <property>
@ -31,7 +30,7 @@
</property> </property>
<property> <property>
<name>shadow_color</name> <name>shadow_color</name>
<type>string</type> <type>color</type>
<default>0 0 0 255</default> <default>0 0 0 255</default>
</property> </property>
<property> <property>
@ -47,7 +46,7 @@
<property> <property>
<name>line_maxw</name> <name>line_maxw</name>
<type>int</type> <type>int</type>
<default>100</default> <default>0</default>
</property> </property>
<property> <property>
<name>multi_line_space</name> <name>multi_line_space</name>
@ -102,7 +101,7 @@
<property> <property>
<name>hardtext</name> <name>hardtext</name>
<type>string</type> <type>string</type>
<default>some text</default> <default></default>
</property> </property>
<property> <property>
<name>hardtext_format</name> <name>hardtext_format</name>

View file

@ -2,7 +2,6 @@
<header> <header>
<name>ViewTextFormated</name> <name>ViewTextFormated</name>
<guiname>CViewTextFormated</guiname> <guiname>CViewTextFormated</guiname>
<classname>text_formated</classname>
<ancestor>ViewText</ancestor> <ancestor>ViewText</ancestor>
<description></description> <description></description>
<abstract>false</abstract> <abstract>false</abstract>

View file

@ -2,7 +2,6 @@
<header> <header>
<name>ViewTextID</name> <name>ViewTextID</name>
<guiname>CViewTextID</guiname> <guiname>CViewTextID</guiname>
<classname>text_id</classname>
<ancestor>ViewText</ancestor> <ancestor>ViewText</ancestor>
<description></description> <description></description>
<abstract>false</abstract> <abstract>false</abstract>

View file

@ -2,7 +2,6 @@
<header> <header>
<name>ViewTextIDFormated</name> <name>ViewTextIDFormated</name>
<guiname>CViewTextIDFormated</guiname> <guiname>CViewTextIDFormated</guiname>
<classname>text_id_formated</classname>
<ancestor>ViewTextID</ancestor> <ancestor>ViewTextID</ancestor>
<description></description> <description></description>
<abstract>false</abstract> <abstract>false</abstract>