summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-05-16 18:56:53 +0300
committerAndrei Karas <akaras@inbox.ru>2011-05-16 19:08:38 +0300
commite9a8a46fc92669236e37dd096f5a849aed74ca6a (patch)
treedabe2fe49420aebdcaab1c6babf880f13102c073
parent3c77e0831772782a9452ff82e0e87e2e172ce295 (diff)
downloadManaVerse-e9a8a46fc92669236e37dd096f5a849aed74ca6a.tar.gz
ManaVerse-e9a8a46fc92669236e37dd096f5a849aed74ca6a.tar.bz2
ManaVerse-e9a8a46fc92669236e37dd096f5a849aed74ca6a.tar.xz
ManaVerse-e9a8a46fc92669236e37dd096f5a849aed74ca6a.zip
Replaced default theme by classic. Moving default theme to theme mana.
-rwxr-xr-xconfigure.ac1
-rw-r--r--data/graphics/gui/CMakeLists.txt6
-rw-r--r--data/graphics/gui/Makefile.am6
-rw-r--r--data/graphics/gui/colors.xml10
-rw-r--r--data/graphics/gui/target-cursor-blue-l.png (renamed from data/themes/classic/target-cursor-blue-l.png)bin23803 -> 23803 bytes
-rw-r--r--data/graphics/gui/target-cursor-blue-m.png (renamed from data/themes/classic/target-cursor-blue-m.png)bin18439 -> 18439 bytes
-rw-r--r--data/graphics/gui/target-cursor-blue-s.png (renamed from data/themes/classic/target-cursor-blue-s.png)bin8353 -> 8353 bytes
-rw-r--r--data/graphics/gui/target-cursor-red-l.png (renamed from data/themes/classic/target-cursor-red-l.png)bin25586 -> 25586 bytes
-rw-r--r--data/graphics/gui/target-cursor-red-m.png (renamed from data/themes/classic/target-cursor-red-m.png)bin17950 -> 17950 bytes
-rw-r--r--data/graphics/gui/target-cursor-red-s.png (renamed from data/themes/classic/target-cursor-red-s.png)bin8361 -> 8361 bytes
-rw-r--r--data/themes/CMakeLists.txt1
-rw-r--r--data/themes/Makefile.am2
-rw-r--r--data/themes/classic/CMakeLists.txt50
-rw-r--r--data/themes/classic/Makefile.am51
-rw-r--r--data/themes/classic/bubble.pngbin407 -> 0 bytes
-rw-r--r--data/themes/classic/button.pngbin374 -> 0 bytes
-rw-r--r--data/themes/classic/button_disabled.pngbin313 -> 0 bytes
-rw-r--r--data/themes/classic/buttonhi.pngbin374 -> 0 bytes
-rw-r--r--data/themes/classic/buttonpress.pngbin377 -> 0 bytes
-rw-r--r--data/themes/classic/checkbox.pngbin802 -> 0 bytes
-rw-r--r--data/themes/classic/circle-gray.pngbin300 -> 0 bytes
-rw-r--r--data/themes/classic/circle-green.pngbin328 -> 0 bytes
-rw-r--r--data/themes/classic/close_button.pngbin650 -> 0 bytes
-rw-r--r--data/themes/classic/deepbox.pngbin219 -> 0 bytes
-rw-r--r--data/themes/classic/hscroll_left_default.pngbin358 -> 0 bytes
-rw-r--r--data/themes/classic/hscroll_left_highlight.pngbin364 -> 0 bytes
-rw-r--r--data/themes/classic/hscroll_left_pressed.pngbin349 -> 0 bytes
-rw-r--r--data/themes/classic/hscroll_right_default.pngbin340 -> 0 bytes
-rw-r--r--data/themes/classic/hscroll_right_highlight.pngbin359 -> 0 bytes
-rw-r--r--data/themes/classic/hscroll_right_pressed.pngbin350 -> 0 bytes
-rw-r--r--data/themes/classic/item_shortcut_bgr.pngbin284 -> 0 bytes
-rw-r--r--data/themes/classic/mouse.pngbin6193 -> 0 bytes
-rw-r--r--data/themes/classic/progress-indicator.pngbin5533 -> 0 bytes
-rw-r--r--data/themes/classic/radioin.pngbin454 -> 0 bytes
-rw-r--r--data/themes/classic/radioin_highlight.pngbin485 -> 0 bytes
-rw-r--r--data/themes/classic/radioout.pngbin380 -> 0 bytes
-rw-r--r--data/themes/classic/radioout_highlight.pngbin434 -> 0 bytes
-rw-r--r--data/themes/classic/resize.pngbin443 -> 0 bytes
-rw-r--r--data/themes/classic/selection.pngbin740 -> 0 bytes
-rw-r--r--data/themes/classic/slider.pngbin485 -> 0 bytes
-rw-r--r--data/themes/classic/slider_hilight.pngbin444 -> 0 bytes
-rw-r--r--data/themes/classic/speechbubble.xml18
-rw-r--r--data/themes/classic/sticky_button.pngbin526 -> 0 bytes
-rw-r--r--data/themes/classic/tab.pngbin329 -> 0 bytes
-rw-r--r--data/themes/classic/tab_hilight.pngbin316 -> 0 bytes
-rw-r--r--data/themes/classic/tabselected.pngbin313 -> 0 bytes
-rw-r--r--data/themes/classic/unknown-item.pngbin540 -> 0 bytes
-rw-r--r--data/themes/classic/vscroll_down_default.pngbin367 -> 0 bytes
-rw-r--r--data/themes/classic/vscroll_down_highlight.pngbin382 -> 0 bytes
-rw-r--r--data/themes/classic/vscroll_down_pressed.pngbin376 -> 0 bytes
-rw-r--r--data/themes/classic/vscroll_grey.pngbin338 -> 0 bytes
-rw-r--r--data/themes/classic/vscroll_highlight.pngbin338 -> 0 bytes
-rw-r--r--data/themes/classic/vscroll_up_default.pngbin377 -> 0 bytes
-rw-r--r--data/themes/classic/vscroll_up_highlight.pngbin376 -> 0 bytes
-rw-r--r--data/themes/classic/vscroll_up_pressed.pngbin364 -> 0 bytes
-rw-r--r--data/themes/classic/window.pngbin3410 -> 0 bytes
-rw-r--r--data/themes/classic/window.xml18
-rw-r--r--data/themes/mana/CMakeLists.txt5
-rw-r--r--data/themes/mana/Makefile.am9
-rw-r--r--data/themes/mana/colors.xml (renamed from data/themes/classic/colors.xml)10
-rw-r--r--packaging/windows/setup.nsi6
61 files changed, 43 insertions, 150 deletions
diff --git a/configure.ac b/configure.ac
index c7f0b462f..f79cecb1d 100755
--- a/configure.ac
+++ b/configure.ac
@@ -171,6 +171,7 @@ data/themes/Makefile
data/themes/blackwood/Makefile
data/themes/classic/Makefile
data/themes/enchilado/Makefile
+data/themes/mana/Makefile
data/themes/pink/Makefile
data/themes/redandblack/Makefile
data/themes/wood/Makefile
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index 92a1e3efa..a7c21e5ea 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -32,6 +32,12 @@ SET (FILES
tab.png
tab_hilight.png
tabselected.png
+ target-cursor-blue-l.png
+ target-cursor-blue-m.png
+ target-cursor-blue-s.png
+ target-cursor-red-l.png
+ target-cursor-red-m.png
+ target-cursor-red-s.png
unknown-item.png
vscroll_down_default.png
vscroll_down_highlight.png
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index 04f957b7f..6d04666a5 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -35,6 +35,12 @@ gui_DATA = \
tab.png \
tab_hilight.png \
tabselected.png \
+ target-cursor-blue-l.png \
+ target-cursor-blue-m.png \
+ target-cursor-blue-s.png \
+ target-cursor-red-l.png \
+ target-cursor-red-m.png \
+ target-cursor-red-s.png \
unknown-item.png \
vscroll_down_default.png \
vscroll_down_highlight.png \
diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml
index 85ed2b414..151451de6 100644
--- a/data/graphics/gui/colors.xml
+++ b/data/graphics/gui/colors.xml
@@ -7,11 +7,11 @@
<color id="BUTTON_DISABLED" color="#333333" />
<color id="TAB" color="#000000" />
<color id="PARTY_CHAT_TAB" color="#f48055" />
- <color id="PARTY_SOCIAL_TAB" color="#ff00d8" />
- <color id="GUILD_CHAT_TAB" color="#ff00d8" />
- <color id="GUILD_SOCIAL_TAB" color="#ff00d8" />
+ <color id="PARTY_SOCIAL_TAB" color="#f48055" />
+ <color id="GUILD_CHAT_TAB" color="#f48055" />
+ <color id="GUILD_SOCIAL_TAB" color="#f48055" />
<color id="BACKGROUND" color="#ffffff" />
- <color id="HIGHLIGHT" color="#c0c0c0" />
+ <color id="HIGHLIGHT" color="#ebc873" />
<color id="TAB_FLASH" color="#ff0000" effect="pulse" />
<color id="TAB_PLAYER_FLASH" color="#00ff00" effect="pulse" />
<color id="SHOP_WARNING" color="#910000" />
@@ -21,7 +21,7 @@
<color id="PLAYER" color="#003000" />
<color id="WHISPER" color="#0000ff" />
<color id="WHISPER_OFFLINE" color="#000050" />
- <color id="IS" color="#a08527" />
+ <color id="IS" color="#705000" />
<color id="SERVER" color="#8415e2" />
<color id="LOGGER" color="#919191" />
<color id="HYPERLINK" color="#e50d0d" />
diff --git a/data/themes/classic/target-cursor-blue-l.png b/data/graphics/gui/target-cursor-blue-l.png
index 77cdf4b6d..77cdf4b6d 100644
--- a/data/themes/classic/target-cursor-blue-l.png
+++ b/data/graphics/gui/target-cursor-blue-l.png
Binary files differ
diff --git a/data/themes/classic/target-cursor-blue-m.png b/data/graphics/gui/target-cursor-blue-m.png
index c0107357a..c0107357a 100644
--- a/data/themes/classic/target-cursor-blue-m.png
+++ b/data/graphics/gui/target-cursor-blue-m.png
Binary files differ
diff --git a/data/themes/classic/target-cursor-blue-s.png b/data/graphics/gui/target-cursor-blue-s.png
index 3e81c75de..3e81c75de 100644
--- a/data/themes/classic/target-cursor-blue-s.png
+++ b/data/graphics/gui/target-cursor-blue-s.png
Binary files differ
diff --git a/data/themes/classic/target-cursor-red-l.png b/data/graphics/gui/target-cursor-red-l.png
index 76d2101b1..76d2101b1 100644
--- a/data/themes/classic/target-cursor-red-l.png
+++ b/data/graphics/gui/target-cursor-red-l.png
Binary files differ
diff --git a/data/themes/classic/target-cursor-red-m.png b/data/graphics/gui/target-cursor-red-m.png
index e2ab79c29..e2ab79c29 100644
--- a/data/themes/classic/target-cursor-red-m.png
+++ b/data/graphics/gui/target-cursor-red-m.png
Binary files differ
diff --git a/data/themes/classic/target-cursor-red-s.png b/data/graphics/gui/target-cursor-red-s.png
index 09195f440..09195f440 100644
--- a/data/themes/classic/target-cursor-red-s.png
+++ b/data/graphics/gui/target-cursor-red-s.png
Binary files differ
diff --git a/data/themes/CMakeLists.txt b/data/themes/CMakeLists.txt
index ac659af33..b6a7282df 100644
--- a/data/themes/CMakeLists.txt
+++ b/data/themes/CMakeLists.txt
@@ -1,6 +1,7 @@
ADD_SUBDIRECTORY(blackwood)
ADD_SUBDIRECTORY(classic)
ADD_SUBDIRECTORY(enchilado)
+ADD_SUBDIRECTORY(mana)
ADD_SUBDIRECTORY(pink)
ADD_SUBDIRECTORY(redandblack)
ADD_SUBDIRECTORY(wood)
diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 1f2009067..8bdaf492c 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = blackwood classic enchilado pink redandblack wood
+SUBDIRS = blackwood classic enchilado mana pink redandblack wood
diff --git a/data/themes/classic/CMakeLists.txt b/data/themes/classic/CMakeLists.txt
index bee9d4157..1ca5c128c 100644
--- a/data/themes/classic/CMakeLists.txt
+++ b/data/themes/classic/CMakeLists.txt
@@ -1,54 +1,4 @@
SET (FILES
- bubble.png
- button.png
- button_disabled.png
- buttonhi.png
- buttonpress.png
- checkbox.png
- circle-gray.png
- circle-green.png
- close_button.png
- colors.xml
- deepbox.png
- hscroll_left_default.png
- hscroll_left_highlight.png
- hscroll_left_pressed.png
- hscroll_right_default.png
- hscroll_right_highlight.png
- hscroll_right_pressed.png
- item_shortcut_bgr.png
- mouse.png
- progress-indicator.png
- radioin.png
- radioin_highlight.png
- radioout.png
- radioout_highlight.png
- resize.png
- selection.png
- slider.png
- slider_hilight.png
- speechbubble.xml
- sticky_button.png
- tab.png
- tab_hilight.png
- tabselected.png
- target-cursor-blue-l.png
- target-cursor-blue-m.png
- target-cursor-blue-s.png
- target-cursor-red-l.png
- target-cursor-red-m.png
- target-cursor-red-s.png
- unknown-item.png
- vscroll_down_default.png
- vscroll_down_highlight.png
- vscroll_down_pressed.png
- vscroll_grey.png
- vscroll_highlight.png
- vscroll_up_default.png
- vscroll_up_highlight.png
- vscroll_up_pressed.png
- window.png
- window.xml
)
INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/themes/classic)
diff --git a/data/themes/classic/Makefile.am b/data/themes/classic/Makefile.am
index 6be1a154a..70f2f089e 100644
--- a/data/themes/classic/Makefile.am
+++ b/data/themes/classic/Makefile.am
@@ -1,56 +1,7 @@
guidir = $(pkgdatadir)/data/themes/classic
-gui_DATA = \
- bubble.png \
- button.png \
- button_disabled.png \
- buttonhi.png \
- buttonpress.png \
- checkbox.png \
- circle-gray.png \
- circle-green.png \
- close_button.png \
- colors.xml \
- deepbox.png \
- window.xml \
- hscroll_left_default.png \
- hscroll_left_highlight.png \
- hscroll_left_pressed.png \
- hscroll_right_default.png \
- hscroll_right_highlight.png \
- hscroll_right_pressed.png \
- item_shortcut_bgr.png \
- mouse.png \
- radioin.png \
- radioin_highlight.png \
- radioout.png \
- radioout_highlight.png \
- resize.png \
- selection.png \
- slider.png \
- slider_hilight.png \
- speechbubble.xml \
- sticky_button.png \
- tab.png \
- tab_hilight.png \
- tabselected.png \
- target-cursor-blue-l.png \
- target-cursor-blue-m.png \
- target-cursor-blue-s.png \
- target-cursor-red-l.png \
- target-cursor-red-m.png \
- target-cursor-red-s.png \
- unknown-item.png \
- vscroll_down_default.png \
- vscroll_down_highlight.png \
- vscroll_down_pressed.png \
- vscroll_grey.png \
- vscroll_highlight.png \
- vscroll_up_default.png \
- vscroll_up_highlight.png \
- vscroll_up_pressed.png \
- window.png
+gui_DATA =
EXTRA_DIST = \
$(gui_DATA)
diff --git a/data/themes/classic/bubble.png b/data/themes/classic/bubble.png
deleted file mode 100644
index 45322eb2e..000000000
--- a/data/themes/classic/bubble.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/button.png b/data/themes/classic/button.png
deleted file mode 100644
index 9ebbea639..000000000
--- a/data/themes/classic/button.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/button_disabled.png b/data/themes/classic/button_disabled.png
deleted file mode 100644
index 0ce3aa6ff..000000000
--- a/data/themes/classic/button_disabled.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/buttonhi.png b/data/themes/classic/buttonhi.png
deleted file mode 100644
index c47726346..000000000
--- a/data/themes/classic/buttonhi.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/buttonpress.png b/data/themes/classic/buttonpress.png
deleted file mode 100644
index e9cd17653..000000000
--- a/data/themes/classic/buttonpress.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/checkbox.png b/data/themes/classic/checkbox.png
deleted file mode 100644
index 29b64100a..000000000
--- a/data/themes/classic/checkbox.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/circle-gray.png b/data/themes/classic/circle-gray.png
deleted file mode 100644
index 3e884f405..000000000
--- a/data/themes/classic/circle-gray.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/circle-green.png b/data/themes/classic/circle-green.png
deleted file mode 100644
index 2c98e9ef1..000000000
--- a/data/themes/classic/circle-green.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/close_button.png b/data/themes/classic/close_button.png
deleted file mode 100644
index f87cc2a91..000000000
--- a/data/themes/classic/close_button.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/deepbox.png b/data/themes/classic/deepbox.png
deleted file mode 100644
index 084b5f618..000000000
--- a/data/themes/classic/deepbox.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/hscroll_left_default.png b/data/themes/classic/hscroll_left_default.png
deleted file mode 100644
index 2f763d302..000000000
--- a/data/themes/classic/hscroll_left_default.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/hscroll_left_highlight.png b/data/themes/classic/hscroll_left_highlight.png
deleted file mode 100644
index 6be5ae259..000000000
--- a/data/themes/classic/hscroll_left_highlight.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/hscroll_left_pressed.png b/data/themes/classic/hscroll_left_pressed.png
deleted file mode 100644
index b8ebcb463..000000000
--- a/data/themes/classic/hscroll_left_pressed.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/hscroll_right_default.png b/data/themes/classic/hscroll_right_default.png
deleted file mode 100644
index 33fdddd0a..000000000
--- a/data/themes/classic/hscroll_right_default.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/hscroll_right_highlight.png b/data/themes/classic/hscroll_right_highlight.png
deleted file mode 100644
index e9e633eac..000000000
--- a/data/themes/classic/hscroll_right_highlight.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/hscroll_right_pressed.png b/data/themes/classic/hscroll_right_pressed.png
deleted file mode 100644
index 53972f2bb..000000000
--- a/data/themes/classic/hscroll_right_pressed.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/item_shortcut_bgr.png b/data/themes/classic/item_shortcut_bgr.png
deleted file mode 100644
index 0543e38ac..000000000
--- a/data/themes/classic/item_shortcut_bgr.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/mouse.png b/data/themes/classic/mouse.png
deleted file mode 100644
index df460e49c..000000000
--- a/data/themes/classic/mouse.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/progress-indicator.png b/data/themes/classic/progress-indicator.png
deleted file mode 100644
index 907f334eb..000000000
--- a/data/themes/classic/progress-indicator.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/radioin.png b/data/themes/classic/radioin.png
deleted file mode 100644
index 12e027fec..000000000
--- a/data/themes/classic/radioin.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/radioin_highlight.png b/data/themes/classic/radioin_highlight.png
deleted file mode 100644
index b193d3e30..000000000
--- a/data/themes/classic/radioin_highlight.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/radioout.png b/data/themes/classic/radioout.png
deleted file mode 100644
index 5eb67bd85..000000000
--- a/data/themes/classic/radioout.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/radioout_highlight.png b/data/themes/classic/radioout_highlight.png
deleted file mode 100644
index dd31e6e30..000000000
--- a/data/themes/classic/radioout_highlight.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/resize.png b/data/themes/classic/resize.png
deleted file mode 100644
index 6b31ac64b..000000000
--- a/data/themes/classic/resize.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/selection.png b/data/themes/classic/selection.png
deleted file mode 100644
index 78827dafa..000000000
--- a/data/themes/classic/selection.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/slider.png b/data/themes/classic/slider.png
deleted file mode 100644
index 465ad0e88..000000000
--- a/data/themes/classic/slider.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/slider_hilight.png b/data/themes/classic/slider_hilight.png
deleted file mode 100644
index 37c780cd1..000000000
--- a/data/themes/classic/slider_hilight.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/speechbubble.xml b/data/themes/classic/speechbubble.xml
deleted file mode 100644
index 84b6557b3..000000000
--- a/data/themes/classic/speechbubble.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<skinset name="SpeechBubble" image="bubble.png">
- <widget type="Window">
- <!-- Top Row -->
- <part type="top-left-corner" xpos="0" ypos="0" width="5" height="5" />
- <part type="top-edge" xpos="5" ypos="0" width="5" height="5" />
- <part type="top-right-corner" xpos="10" ypos="0" width="5" height="5" />
-
- <!-- Middle Row -->
- <part type="left-edge" xpos="0" ypos="5" width="5" height="5" />
- <part type="bg-quad" xpos="5" ypos="5" width="5" height="5" />
- <part type="right-edge" xpos="10" ypos="5" width="5" height="5" />
-
- <!-- Bottom Row -->
- <part type="bottom-left-corner" xpos="0" ypos="10" width="5" height="5" />
- <part type="bottom-edge" xpos="5" ypos="10" width="5" height="5" />
- <part type="bottom-right-corner" xpos="10" ypos="10" width="5" height="5" />
- </widget>
-</skinset>
diff --git a/data/themes/classic/sticky_button.png b/data/themes/classic/sticky_button.png
deleted file mode 100644
index 8c5705736..000000000
--- a/data/themes/classic/sticky_button.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/tab.png b/data/themes/classic/tab.png
deleted file mode 100644
index 91eadf08f..000000000
--- a/data/themes/classic/tab.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/tab_hilight.png b/data/themes/classic/tab_hilight.png
deleted file mode 100644
index f6b39942d..000000000
--- a/data/themes/classic/tab_hilight.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/tabselected.png b/data/themes/classic/tabselected.png
deleted file mode 100644
index e2983060c..000000000
--- a/data/themes/classic/tabselected.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/unknown-item.png b/data/themes/classic/unknown-item.png
deleted file mode 100644
index 9201d688e..000000000
--- a/data/themes/classic/unknown-item.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/vscroll_down_default.png b/data/themes/classic/vscroll_down_default.png
deleted file mode 100644
index c4292489e..000000000
--- a/data/themes/classic/vscroll_down_default.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/vscroll_down_highlight.png b/data/themes/classic/vscroll_down_highlight.png
deleted file mode 100644
index ac88f7c73..000000000
--- a/data/themes/classic/vscroll_down_highlight.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/vscroll_down_pressed.png b/data/themes/classic/vscroll_down_pressed.png
deleted file mode 100644
index 9dcc89f6f..000000000
--- a/data/themes/classic/vscroll_down_pressed.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/vscroll_grey.png b/data/themes/classic/vscroll_grey.png
deleted file mode 100644
index f99da4676..000000000
--- a/data/themes/classic/vscroll_grey.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/vscroll_highlight.png b/data/themes/classic/vscroll_highlight.png
deleted file mode 100644
index 2e0fcbfc1..000000000
--- a/data/themes/classic/vscroll_highlight.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/vscroll_up_default.png b/data/themes/classic/vscroll_up_default.png
deleted file mode 100644
index 1cecc3512..000000000
--- a/data/themes/classic/vscroll_up_default.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/vscroll_up_highlight.png b/data/themes/classic/vscroll_up_highlight.png
deleted file mode 100644
index 7b5009f39..000000000
--- a/data/themes/classic/vscroll_up_highlight.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/vscroll_up_pressed.png b/data/themes/classic/vscroll_up_pressed.png
deleted file mode 100644
index 2320ec42f..000000000
--- a/data/themes/classic/vscroll_up_pressed.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/window.png b/data/themes/classic/window.png
deleted file mode 100644
index f0ef1af4b..000000000
--- a/data/themes/classic/window.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/classic/window.xml b/data/themes/classic/window.xml
deleted file mode 100644
index f27dbc7f3..000000000
--- a/data/themes/classic/window.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<skinset name="Default" image="window.png">
- <widget type="Window">
- <!-- Top Row -->
- <part type="top-left-corner" xpos="0" ypos="0" width="4" height="4" />
- <part type="top-edge" xpos="4" ypos="0" width="32" height="4" />
- <part type="top-right-corner" xpos="36" ypos="0" width="4" height="4" />
-
- <!-- Middle Row -->
- <part type="left-edge" xpos="0" ypos="4" width="4" height="216" />
- <part type="bg-quad" xpos="4" ypos="4" width="32" height="216" />
- <part type="right-edge" xpos="36" ypos="4" width="4" height="216" />
-
- <!-- Bottom Row -->
- <part type="bottom-left-corner" xpos="0" ypos="220" width="4" height="4" />
- <part type="bottom-edge" xpos="4" ypos="220" width="32" height="4" />
- <part type="bottom-right-corner" xpos="36" ypos="220" width="4" height="4" />
- </widget>
-</skinset>
diff --git a/data/themes/mana/CMakeLists.txt b/data/themes/mana/CMakeLists.txt
new file mode 100644
index 000000000..6103cebe6
--- /dev/null
+++ b/data/themes/mana/CMakeLists.txt
@@ -0,0 +1,5 @@
+SET (FILES
+ colors.xml
+ )
+
+INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/themes/mana)
diff --git a/data/themes/mana/Makefile.am b/data/themes/mana/Makefile.am
new file mode 100644
index 000000000..53253d93e
--- /dev/null
+++ b/data/themes/mana/Makefile.am
@@ -0,0 +1,9 @@
+
+guidir = $(pkgdatadir)/data/themes/mana
+
+gui_DATA = \
+ colors.xml
+
+EXTRA_DIST = \
+ $(gui_DATA) \
+ CMakeLists.txt
diff --git a/data/themes/classic/colors.xml b/data/themes/mana/colors.xml
index 151451de6..85ed2b414 100644
--- a/data/themes/classic/colors.xml
+++ b/data/themes/mana/colors.xml
@@ -7,11 +7,11 @@
<color id="BUTTON_DISABLED" color="#333333" />
<color id="TAB" color="#000000" />
<color id="PARTY_CHAT_TAB" color="#f48055" />
- <color id="PARTY_SOCIAL_TAB" color="#f48055" />
- <color id="GUILD_CHAT_TAB" color="#f48055" />
- <color id="GUILD_SOCIAL_TAB" color="#f48055" />
+ <color id="PARTY_SOCIAL_TAB" color="#ff00d8" />
+ <color id="GUILD_CHAT_TAB" color="#ff00d8" />
+ <color id="GUILD_SOCIAL_TAB" color="#ff00d8" />
<color id="BACKGROUND" color="#ffffff" />
- <color id="HIGHLIGHT" color="#ebc873" />
+ <color id="HIGHLIGHT" color="#c0c0c0" />
<color id="TAB_FLASH" color="#ff0000" effect="pulse" />
<color id="TAB_PLAYER_FLASH" color="#00ff00" effect="pulse" />
<color id="SHOP_WARNING" color="#910000" />
@@ -21,7 +21,7 @@
<color id="PLAYER" color="#003000" />
<color id="WHISPER" color="#0000ff" />
<color id="WHISPER_OFFLINE" color="#000050" />
- <color id="IS" color="#705000" />
+ <color id="IS" color="#a08527" />
<color id="SERVER" color="#8415e2" />
<color id="LOGGER" color="#919191" />
<color id="HYPERLINK" color="#e50d0d" />
diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index 2ab0d9e14..7ac3649ed 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -195,6 +195,7 @@ Section "Core files (required)" SecCore
CreateDirectory "$INSTDIR\data\themes\blackwood"
CreateDirectory "$INSTDIR\data\themes\classic"
CreateDirectory "$INSTDIR\data\themes\enchilado"
+ CreateDirectory "$INSTDIR\data\themes\mana"
CreateDirectory "$INSTDIR\data\themes\pink"
CreateDirectory "$INSTDIR\data\themes\redandblack"
CreateDirectory "$INSTDIR\data\themes\wood"
@@ -243,9 +244,8 @@ Section "Core files (required)" SecCore
SetOutPath "$INSTDIR\data\themes\blackwood"
File "${SRCDIR}\data\themes\blackwood\*.png"
File "${SRCDIR}\data\themes\blackwood\*.xml"
- SetOutPath "$INSTDIR\data\themes\classic"
- File "${SRCDIR}\data\themes\classic\*.png"
- File "${SRCDIR}\data\themes\classic\*.xml"
+ SetOutPath "$INSTDIR\data\themes\mana"
+ File "${SRCDIR}\data\themes\mana\*.xml"
SetOutPath "$INSTDIR\data\themes\enchilado"
File "${SRCDIR}\data\themes\enchilado\*.png"
File "${SRCDIR}\data\themes\enchilado\*.xml"