diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-01-30 01:34:16 +0100 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 20:00:07 +0100 |
commit | 1b1050da1c7b84cc72b7efbb2229294975be9e10 (patch) | |
tree | 68d15ccb015d58aeb5797ffd06efca3e55997c24 /data/graphics | |
parent | 0d4142a891cd228da24ee3aa3bbd7dc622da5b75 (diff) | |
parent | 955a7613d1fe116fe5e1da07a222b6849b3c885c (diff) | |
download | mana-client-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.gz mana-client-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.bz2 mana-client-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.xz mana-client-1b1050da1c7b84cc72b7efbb2229294975be9e10.zip |
Merged with Aethyra master as of 2009-01-27
Conflicts:
Almost everywhere.
Diffstat (limited to 'data/graphics')
-rw-r--r-- | data/graphics/gui/CMakeLists.txt | 11 | ||||
-rw-r--r-- | data/graphics/gui/Makefile.am | 12 | ||||
-rw-r--r-- | data/graphics/gui/default.png | bin | 0 -> 1461 bytes | |||
-rw-r--r-- | data/graphics/gui/emotions.png | bin | 19386 -> 0 bytes | |||
-rw-r--r-- | data/graphics/gui/fixedfont.png | bin | 1895 -> 0 bytes | |||
-rw-r--r-- | data/graphics/gui/gui.xml | 18 | ||||
-rw-r--r-- | data/graphics/gui/hits_blue.png | bin | 589 -> 884 bytes | |||
-rw-r--r-- | data/graphics/gui/hits_red.png | bin | 561 -> 813 bytes | |||
-rw-r--r-- | data/graphics/gui/hits_yellow.png | bin | 894 -> 907 bytes | |||
-rw-r--r-- | data/graphics/gui/menuitemD.png | bin | 1329 -> 0 bytes | |||
-rw-r--r-- | data/graphics/gui/menuitemF.png | bin | 1530 -> 0 bytes | |||
-rw-r--r-- | data/graphics/gui/menuitemN.png | bin | 1310 -> 0 bytes | |||
-rw-r--r-- | data/graphics/gui/menuitemP.png | bin | 1436 -> 0 bytes | |||
-rw-r--r-- | data/graphics/gui/rpgfont_wider.png | bin | 4382 -> 0 bytes | |||
-rw-r--r-- | data/graphics/gui/speech_bubble.png | bin | 0 -> 2031 bytes | |||
-rw-r--r-- | data/graphics/gui/speechbubble.xml | 18 | ||||
-rw-r--r-- | data/graphics/gui/thickborder.png | bin | 530 -> 0 bytes |
17 files changed, 44 insertions, 15 deletions
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt index 3d617696..6351d5ba 100644 --- a/data/graphics/gui/CMakeLists.txt +++ b/data/graphics/gui/CMakeLists.txt @@ -8,7 +8,8 @@ SET (FILES checkbox.png close_button.png deepbox.png - fixedfont.png + default.png + gui.xml hits_blue.png hits_red.png hits_yellow.png @@ -20,16 +21,13 @@ SET (FILES hscroll_right_pressed.png item_shortcut_bgr.png mouse.png - menuitemD.png - menuitemF.png - menuitemN.png - menuitemP.png radioin.png radioout.png resize.png - rpgfont_wider.png selection.png slider.png + speech_bubble.png + speech_bubble.xml tab.png tabselected.png target-cursor-blue-l.png @@ -38,7 +36,6 @@ SET (FILES target-cursor-red-l.png target-cursor-red-m.png target-cursor-red-s.png - thickborder.png unknown-item.png vscroll_blue.png vscroll_down_default.png diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am index 33abf521..eb4c7365 100644 --- a/data/graphics/gui/Makefile.am +++ b/data/graphics/gui/Makefile.am @@ -11,8 +11,8 @@ gui_DATA = \ checkbox.png \ close_button.png \ deepbox.png \ - emotions.png \ - fixedfont.png \ + default.png \ + gui.xml \ hits_blue.png \ hits_red.png \ hits_yellow.png \ @@ -24,16 +24,13 @@ gui_DATA = \ hscroll_right_pressed.png \ item_shortcut_bgr.png \ mouse.png \ - menuitemD.png \ - menuitemF.png \ - menuitemN.png \ - menuitemP.png \ radioin.png \ radioout.png \ resize.png \ - rpgfont_wider.png \ selection.png \ slider.png \ + speech_bubble.png \ + speechbubble.xml \ tab.png \ tabselected.png \ target-cursor-blue-l.png \ @@ -42,7 +39,6 @@ gui_DATA = \ target-cursor-red-l.png \ target-cursor-red-m.png \ target-cursor-red-s.png \ - thickborder.png \ unknown-item.png \ vscroll_blue.png \ vscroll_down_default.png \ diff --git a/data/graphics/gui/default.png b/data/graphics/gui/default.png Binary files differnew file mode 100644 index 00000000..29353df8 --- /dev/null +++ b/data/graphics/gui/default.png diff --git a/data/graphics/gui/emotions.png b/data/graphics/gui/emotions.png Binary files differdeleted file mode 100644 index 146f2d24..00000000 --- a/data/graphics/gui/emotions.png +++ /dev/null diff --git a/data/graphics/gui/fixedfont.png b/data/graphics/gui/fixedfont.png Binary files differdeleted file mode 100644 index 10319291..00000000 --- a/data/graphics/gui/fixedfont.png +++ /dev/null diff --git a/data/graphics/gui/gui.xml b/data/graphics/gui/gui.xml new file mode 100644 index 00000000..fe62528e --- /dev/null +++ b/data/graphics/gui/gui.xml @@ -0,0 +1,18 @@ +<skinset name="Default" image="default.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="3" height="4" /> + <part type="top-right-corner" xpos="7" ypos="0" width="4" height="4" /> + + <!-- Middle Row --> + <part type="left-edge" xpos="0" ypos="4" width="4" height="10" /> + <part type="bg-quad" xpos="11" ypos="0" width="32" height="32" /> + <part type="right-edge" xpos="7" ypos="4" width="4" height="10" /> + + <!-- Bottom Row --> + <part type="bottom-left-corner" xpos="0" ypos="15" width="4" height="4" /> + <part type="bottom-edge" xpos="4" ypos="15" width="3" height="4" /> + <part type="bottom-right-corner" xpos="7" ypos="15" width="4" height="4" /> + </widget> +</skinset>
\ No newline at end of file diff --git a/data/graphics/gui/hits_blue.png b/data/graphics/gui/hits_blue.png Binary files differindex 59458485..cfb04ab8 100644 --- a/data/graphics/gui/hits_blue.png +++ b/data/graphics/gui/hits_blue.png diff --git a/data/graphics/gui/hits_red.png b/data/graphics/gui/hits_red.png Binary files differindex da765dc4..150f1c1e 100644 --- a/data/graphics/gui/hits_red.png +++ b/data/graphics/gui/hits_red.png diff --git a/data/graphics/gui/hits_yellow.png b/data/graphics/gui/hits_yellow.png Binary files differindex d77b7c05..6975dfd5 100644 --- a/data/graphics/gui/hits_yellow.png +++ b/data/graphics/gui/hits_yellow.png diff --git a/data/graphics/gui/menuitemD.png b/data/graphics/gui/menuitemD.png Binary files differdeleted file mode 100644 index a9fe2222..00000000 --- a/data/graphics/gui/menuitemD.png +++ /dev/null diff --git a/data/graphics/gui/menuitemF.png b/data/graphics/gui/menuitemF.png Binary files differdeleted file mode 100644 index 84142a16..00000000 --- a/data/graphics/gui/menuitemF.png +++ /dev/null diff --git a/data/graphics/gui/menuitemN.png b/data/graphics/gui/menuitemN.png Binary files differdeleted file mode 100644 index bf25dd61..00000000 --- a/data/graphics/gui/menuitemN.png +++ /dev/null diff --git a/data/graphics/gui/menuitemP.png b/data/graphics/gui/menuitemP.png Binary files differdeleted file mode 100644 index 060d5a34..00000000 --- a/data/graphics/gui/menuitemP.png +++ /dev/null diff --git a/data/graphics/gui/rpgfont_wider.png b/data/graphics/gui/rpgfont_wider.png Binary files differdeleted file mode 100644 index 55ccbbd6..00000000 --- a/data/graphics/gui/rpgfont_wider.png +++ /dev/null diff --git a/data/graphics/gui/speech_bubble.png b/data/graphics/gui/speech_bubble.png Binary files differnew file mode 100644 index 00000000..3e678099 --- /dev/null +++ b/data/graphics/gui/speech_bubble.png diff --git a/data/graphics/gui/speechbubble.xml b/data/graphics/gui/speechbubble.xml new file mode 100644 index 00000000..1b11ea85 --- /dev/null +++ b/data/graphics/gui/speechbubble.xml @@ -0,0 +1,18 @@ +<skinset name="SpeechBubble" image="speech_bubble.png"> + <widget type="Window"> + <!-- Top Row --> + <part type="top-left-corner" xpos="0" ypos="0" width="14" height="14" /> + <part type="top-edge" xpos="15" ypos="0" width="1" height="14" /> + <part type="top-right-corner" xpos="17" ypos="0" width="17" height="14" /> + + <!-- Middle Row --> + <part type="left-edge" xpos="0" ypos="15" width="14" height="1" /> + <part type="bg-quad" xpos="34" ypos="0" width="32" height="32" /> + <part type="right-edge" xpos="17" ypos="15" width="17" height="1" /> + + <!-- Bottom Row --> + <part type="bottom-left-corner" xpos="0" ypos="17" width="14" height="17" /> + <part type="bottom-edge" xpos="15" ypos="17" width="1" height="17" /> + <part type="bottom-right-corner" xpos="17" ypos="17" width="17" height="17" /> + </widget> +</skinset>
\ No newline at end of file diff --git a/data/graphics/gui/thickborder.png b/data/graphics/gui/thickborder.png Binary files differdeleted file mode 100644 index da72c92f..00000000 --- a/data/graphics/gui/thickborder.png +++ /dev/null |