diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-11-30 15:33:58 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-11-30 15:33:58 +0300 |
commit | 7e64ede79a741b7dc1c63d73301a58f4e510278d (patch) | |
tree | 77e97b91817eef81c4255898c17beb74c71d3dae | |
parent | 48ae2e7b91b0e340c91bd7c5b69a39a66c0e68ca (diff) | |
download | manaplus-7e64ede79a741b7dc1c63d73301a58f4e510278d.tar.gz manaplus-7e64ede79a741b7dc1c63d73301a58f4e510278d.tar.bz2 manaplus-7e64ede79a741b7dc1c63d73301a58f4e510278d.tar.xz manaplus-7e64ede79a741b7dc1c63d73301a58f4e510278d.zip |
Add new theme color TABLE_BACKGROUND.
It used in background of table headers.
-rw-r--r-- | data/graphics/gui/colors.xml | 1 | ||||
-rw-r--r-- | data/themes/blacknblack/colors.xml | 1 | ||||
-rw-r--r-- | data/themes/blackwood/colors.xml | 1 | ||||
-rw-r--r-- | data/themes/enchilado/colors.xml | 1 | ||||
-rw-r--r-- | data/themes/jewelry/colors.xml | 3 | ||||
-rw-r--r-- | data/themes/mana/colors.xml | 1 | ||||
-rw-r--r-- | data/themes/pink/colors.xml | 1 | ||||
-rw-r--r-- | data/themes/unity/colors.xml | 1 | ||||
-rw-r--r-- | data/themes/wood/colors.xml | 1 | ||||
-rw-r--r-- | src/gui/theme.cpp | 3 | ||||
-rw-r--r-- | src/gui/theme.h | 1 | ||||
-rw-r--r-- | src/gui/widgets/tabs/setup_relations.cpp | 4 |
12 files changed, 16 insertions, 3 deletions
diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml index e3ed8ba0d..d9a2f46c7 100644 --- a/data/graphics/gui/colors.xml +++ b/data/graphics/gui/colors.xml @@ -97,6 +97,7 @@ <color id="BROWN" color="#8e4c17" /> <color id="STATUSBAR_ON" color="#646464" /> <color id="STATUSBAR_OFF" color="#ffff00" /> + <color id="TABLE_BACKGROUND" color="#ffffff" /> </palette> <progressbar id="DEFAULT" color="#969696" /> diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml index a1e48ff71..ff89683c8 100644 --- a/data/themes/blacknblack/colors.xml +++ b/data/themes/blacknblack/colors.xml @@ -87,6 +87,7 @@ <color id="BUBBLE_TEXT" color="#ffffff" /> <color id="STATUSBAR_ON" color="#646464" /> <color id="STATUSBAR_OFF" color="#ffff00" /> + <color id="TABLE_BACKGROUND" color="#bfbfbf" /> <color id="BLACK" color="#ffffff" /> <color id="RED" color="#ffffff" /> diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml index c9203cf71..e464a3231 100644 --- a/data/themes/blackwood/colors.xml +++ b/data/themes/blackwood/colors.xml @@ -86,6 +86,7 @@ <color id="BUBBLE_TEXT" color="#000000" /> <color id="STATUSBAR_ON" color="#646464" /> <color id="STATUSBAR_OFF" color="#ffff00" /> + <color id="TABLE_BACKGROUND" color="#bfbfbf" /> <color id="BLACK" color="#7a7972" /> <color id="RED" color="#ff0000" /> diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml index 4691e2aa3..59395e504 100644 --- a/data/themes/enchilado/colors.xml +++ b/data/themes/enchilado/colors.xml @@ -87,6 +87,7 @@ <color id="BUBBLE_TEXT" color="#ffffff" /> <color id="STATUSBAR_ON" color="#646464" /> <color id="STATUSBAR_OFF" color="#ffff00" /> + <color id="TABLE_BACKGROUND" color="#bfbfbf" /> <color id="BLACK" color="#000000" /> <color id="RED" color="#ff0000" /> diff --git a/data/themes/jewelry/colors.xml b/data/themes/jewelry/colors.xml index 94295bee1..c113e5d21 100644 --- a/data/themes/jewelry/colors.xml +++ b/data/themes/jewelry/colors.xml @@ -84,6 +84,7 @@ <color id="BROWN" color="#774217" /> <color id="STATUSBAR_ON" color="#646464" /> <color id="STATUSBAR_OFF" color="#ffff00" /> + <color id="TABLE_BACKGROUND" color="#bfbfbf" /> </palette> <palette id="1"> @@ -245,6 +246,7 @@ <color id="BROWN_OUTLINE" color="#271802" /> <color id="STATUSBAR_ON" color="#646464" /> <color id="STATUSBAR_OFF" color="#ffff00" /> + <color id="TABLE_BACKGROUND" color="#bfbfbf" /> </palette> <palette id="2"> @@ -330,6 +332,7 @@ <color id="BROWN" color="#8e4c17" /> <color id="STATUSBAR_ON" color="#646464" /> <color id="STATUSBAR_OFF" color="#ffff00" /> + <color id="TABLE_BACKGROUND" color="#bfbfbf" /> </palette> <progressbar id="DEFAULT" color="#969696" /> diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml index 2326c07b2..f38d761b3 100644 --- a/data/themes/mana/colors.xml +++ b/data/themes/mana/colors.xml @@ -87,6 +87,7 @@ <color id="BUBBLE_TEXT" color="#ffffff" /> <color id="STATUSBAR_ON" color="#646464" /> <color id="STATUSBAR_OFF" color="#ffff00" /> + <color id="TABLE_BACKGROUND" color="#bfbfbf" /> <color id="BLACK" color="#000000" /> <color id="RED" color="#ff0000" /> diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml index 9d4e06a86..08b2d0450 100644 --- a/data/themes/pink/colors.xml +++ b/data/themes/pink/colors.xml @@ -87,6 +87,7 @@ <color id="BUBBLE_TEXT" color="#000000" /> <color id="STATUSBAR_ON" color="#646464" /> <color id="STATUSBAR_OFF" color="#ffff00" /> + <color id="TABLE_BACKGROUND" color="#bfbfbf" /> <color id="BLACK" color="#000000" /> <color id="RED" color="#ff0000" /> diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml index 22db3e328..688d634f5 100644 --- a/data/themes/unity/colors.xml +++ b/data/themes/unity/colors.xml @@ -86,6 +86,7 @@ <color id="BUBBLE_TEXT" color="#ffffff" /> <color id="STATUSBAR_ON" color="#646464" /> <color id="STATUSBAR_OFF" color="#ffff00" /> + <color id="TABLE_BACKGROUND" color="#bfbfbf" /> <color id="BLACK" color="#0E0E0E" /> <color id="RED" color="#FFA8A8" /> diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml index 983c68e96..95dbca358 100644 --- a/data/themes/wood/colors.xml +++ b/data/themes/wood/colors.xml @@ -87,6 +87,7 @@ <color id="BUBBLE_TEXT" color="#ffffff" /> <color id="STATUSBAR_ON" color="#646464" /> <color id="STATUSBAR_OFF" color="#ffff00" /> + <color id="TABLE_BACKGROUND" color="#bfbfbf" /> <color id="BLACK" color="#000000" /> <color id="RED" color="#ff0000" /> diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 3381b156a..95e35f2aa 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -948,7 +948,8 @@ static int readColorType(const std::string &type) "BROWN", "BROWN_OUTLINE", "STATUSBAR_ON", - "STATUSBAR_OFF" + "STATUSBAR_OFF", + "TABLE_BACKGROUND" }; if (type.empty()) diff --git a/src/gui/theme.h b/src/gui/theme.h index 3ccd35265..bbc6ae06f 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -392,6 +392,7 @@ class Theme final : public Palette, public ConfigListener BROWN_OUTLINE, STATUSBAR_ON, STATUSBAR_OFF, + TABLE_BACKGROUND, THEME_COLORS_END }; diff --git a/src/gui/widgets/tabs/setup_relations.cpp b/src/gui/widgets/tabs/setup_relations.cpp index c06ec6c49..c1b6cc1ed 100644 --- a/src/gui/widgets/tabs/setup_relations.cpp +++ b/src/gui/widgets/tabs/setup_relations.cpp @@ -268,8 +268,8 @@ Setup_Relations::Setup_Relations(const Widget2 *const widget) : mPlayerTableTitleModel->fixColumnWidth(NAME_COLUMN, NAME_COLUMN_WIDTH); mPlayerTableTitleModel->fixColumnWidth(RELATION_CHOICE_COLUMN, RELATION_CHOICE_COLUMN_WIDTH); - mPlayerTitleTable->setBackgroundColor(gcn::Color(0xbf, 0xbf, 0xbf)); - + mPlayerTitleTable->setBackgroundColor(getThemeColor( + Theme::TABLE_BACKGROUND)); for (int i = 0; i < COLUMNS_NR; i++) { |