diff options
| author | Socapex <philippe_groarke@yahoo.ca> | 2013-01-19 21:02:01 -0500 |
|---|---|---|
| committer | Socapex <philippe_groarke@yahoo.ca> | 2013-01-19 21:02:01 -0500 |
| commit | df606ace309acaf0c78f52e1f98eabed6c844ae2 (patch) | |
| tree | d9799b0e4a507d9eacbbafc1755eecea03f0b373 /data/themes | |
| parent | d0169223b889a115b486e974e5b287c3ccb00d85 (diff) | |
| parent | 678d4e70999ade5a36862039875aa5564291d09d (diff) | |
| download | manaverse-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.gz manaverse-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.bz2 manaverse-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.xz manaverse-df606ace309acaf0c78f52e1f98eabed6c844ae2.zip | |
Merge remote-tracking branch 'upstream/master' into osx
Diffstat (limited to 'data/themes')
| -rw-r--r-- | data/themes/jewelry/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | data/themes/jewelry/Makefile.am | 2 | ||||
| -rw-r--r-- | data/themes/jewelry/listbox.xml | 1 | ||||
| -rw-r--r-- | data/themes/jewelry/ministatus.xml | 11 | ||||
| -rw-r--r-- | data/themes/jewelry/window.png | bin | 28543 -> 28535 bytes | |||
| -rw-r--r-- | data/themes/jewelry/windowmenu.xml | 8 |
6 files changed, 24 insertions, 0 deletions
diff --git a/data/themes/jewelry/CMakeLists.txt b/data/themes/jewelry/CMakeLists.txt index 3d6622bad..41826c02c 100644 --- a/data/themes/jewelry/CMakeLists.txt +++ b/data/themes/jewelry/CMakeLists.txt @@ -37,6 +37,7 @@ SET (FILES listbox.xml login.xml map.xml + ministatus.xml mouse.png npc.xml ok.xml @@ -68,6 +69,7 @@ SET (FILES textfield.xml window.png window.xml + windowmenu.xml world.xml ) diff --git a/data/themes/jewelry/Makefile.am b/data/themes/jewelry/Makefile.am index 328173e7d..70234a5f0 100644 --- a/data/themes/jewelry/Makefile.am +++ b/data/themes/jewelry/Makefile.am @@ -40,6 +40,7 @@ gui_DATA = \ listbox.xml \ login.xml \ map.xml \ + ministatus.xml \ mouse.png \ npc.xml \ ok.xml \ @@ -71,6 +72,7 @@ gui_DATA = \ textfield.xml \ window.png \ window.xml \ + windowmenu.xml \ world.xml EXTRA_DIST = \ diff --git a/data/themes/jewelry/listbox.xml b/data/themes/jewelry/listbox.xml index aae6fd337..c18750726 100644 --- a/data/themes/jewelry/listbox.xml +++ b/data/themes/jewelry/listbox.xml @@ -4,6 +4,7 @@ <option name="padding" value="8" /> <option name="textPadding" value="48" /> <option name="imagePadding" value="2" /> + <option name="itemPadding" value="1" /> <option name="spacing" value="0" /> </widget> diff --git a/data/themes/jewelry/ministatus.xml b/data/themes/jewelry/ministatus.xml new file mode 100644 index 000000000..7db6eda92 --- /dev/null +++ b/data/themes/jewelry/ministatus.xml @@ -0,0 +1,11 @@ +<skinset name="Default" image="window.png"> + <widget type="Window"> + + <option name="padding" value="5" /> + <option name="spacing" value="3" /> + + <option name="iconPadding" value="3" /> + <option name="iconSpacing" value="2" /> + + </widget> +</skinset> diff --git a/data/themes/jewelry/window.png b/data/themes/jewelry/window.png Binary files differindex e18b47f4f..f8f091225 100644 --- a/data/themes/jewelry/window.png +++ b/data/themes/jewelry/window.png diff --git a/data/themes/jewelry/windowmenu.xml b/data/themes/jewelry/windowmenu.xml new file mode 100644 index 000000000..06f20bf2f --- /dev/null +++ b/data/themes/jewelry/windowmenu.xml @@ -0,0 +1,8 @@ +<skinset name="Default" image="window.png"> + <widget type="Window"> + + <option name="padding" value="4" /> + <option name="spacing" value="3" /> + + </widget> +</skinset> |
