summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/graphics/gui/CMakeLists.txt1
-rw-r--r--data/graphics/gui/Makefile.am1
-rw-r--r--data/themes/enchilado/CMakeLists.txt1
-rw-r--r--data/themes/enchilado/Makefile.am1
-rw-r--r--data/themes/enchilado/serverinfo.xml23
-rw-r--r--data/themes/golden-delicious/CMakeLists.txt1
-rw-r--r--data/themes/golden-delicious/Makefile.am1
-rw-r--r--data/themes/golden-delicious/serverinfo.xml33
-rw-r--r--data/themes/jewelry/CMakeLists.txt1
-rw-r--r--data/themes/jewelry/Makefile.am1
-rw-r--r--data/themes/jewelry/serverinfo.xml32
-rw-r--r--data/themes/pink/CMakeLists.txt1
-rw-r--r--data/themes/pink/Makefile.am1
-rw-r--r--data/themes/pink/serverinfo.xml23
-rw-r--r--data/themes/unity/CMakeLists.txt1
-rw-r--r--data/themes/unity/Makefile.am1
-rw-r--r--data/themes/unity/serverinfo.xml24
-rw-r--r--data/themes/wood/CMakeLists.txt1
-rw-r--r--data/themes/wood/Makefile.am1
-rw-r--r--data/themes/wood/serverinfo.xml25
-rw-r--r--src/gui/windows/serverinfowindow.cpp2
21 files changed, 175 insertions, 1 deletions
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index 949865b36..61151ab03 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -68,6 +68,7 @@ SET (FILES
scrollbuttons_pressed.xml
sell.xml
server.xml
+ serverinfo.xml
shop.xml
skillrectanglelistbox.xml
slider.xml
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index 0118a87fa..8a07b77e6 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -71,6 +71,7 @@ gui_DATA = \
scrollbuttons_pressed.xml\
sell.xml \
server.xml \
+ serverinfo.xml \
shop.xml \
skillrectanglelistbox.xml \
slider.xml \
diff --git a/data/themes/enchilado/CMakeLists.txt b/data/themes/enchilado/CMakeLists.txt
index 171b45fd0..3c7a967c1 100644
--- a/data/themes/enchilado/CMakeLists.txt
+++ b/data/themes/enchilado/CMakeLists.txt
@@ -14,6 +14,7 @@ SET (FILES
quests.xml
sell.xml
server.xml
+ serverinfo.xml
shop.xml
window.png
window.xml
diff --git a/data/themes/enchilado/Makefile.am b/data/themes/enchilado/Makefile.am
index dfe3ae5a0..de96c7d62 100644
--- a/data/themes/enchilado/Makefile.am
+++ b/data/themes/enchilado/Makefile.am
@@ -17,6 +17,7 @@ gui_DATA = \
quests.xml \
sell.xml \
server.xml \
+ serverinfo.xml \
shop.xml \
window.png \
window.xml \
diff --git a/data/themes/enchilado/serverinfo.xml b/data/themes/enchilado/serverinfo.xml
new file mode 100644
index 000000000..c4e12e15c
--- /dev/null
+++ b/data/themes/enchilado/serverinfo.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<skinset name="Default" image="window.png">
+ <widget type="Window" xpos="190" ypos="30">
+ <!-- Top Row -->
+ <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+ <part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
+ <part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
+
+ <!-- Middle Row -->
+ <part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
+ <part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
+ <part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
+
+ <!-- Bottom Row -->
+ <part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
+ <part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
+ <part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
+
+ <part type="closeImage" xpos="-60" ypos="-30" width="15" height="15" />
+ <part type="stickyImageUp" xpos="-60" ypos="21" width="15" height="15" />
+ <part type="stickyImageDown" xpos="-45" ypos="21" width="15" height="15" />
+ </widget>
+</skinset>
diff --git a/data/themes/golden-delicious/CMakeLists.txt b/data/themes/golden-delicious/CMakeLists.txt
index 0bee77ba7..22d589ce1 100644
--- a/data/themes/golden-delicious/CMakeLists.txt
+++ b/data/themes/golden-delicious/CMakeLists.txt
@@ -95,6 +95,7 @@ SET (FILES
sell.xml
serverslistbox.xml
server.xml
+ serverinfo.xml
shoplistbox.xml
shop.xml
skilllistbox.xml
diff --git a/data/themes/golden-delicious/Makefile.am b/data/themes/golden-delicious/Makefile.am
index c95d6c8ae..d1726b522 100644
--- a/data/themes/golden-delicious/Makefile.am
+++ b/data/themes/golden-delicious/Makefile.am
@@ -96,6 +96,7 @@ gui_DATA = \
scrollbuttons_pressed.xml \
sell.xml \
server.xml \
+ serverinfo.xml \
serverslistbox.xml \
shop.xml \
shoplistbox.xml \
diff --git a/data/themes/golden-delicious/serverinfo.xml b/data/themes/golden-delicious/serverinfo.xml
new file mode 100644
index 000000000..5efa4c5ee
--- /dev/null
+++ b/data/themes/golden-delicious/serverinfo.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<skinset name="Default" image="window.png">
+ <widget type="Window" xpos="260" ypos="0">
+ <option name="captionoffsetx" value="20" />
+ <option name="captionoffsety" value="8" />
+ <option name="titlebarHeight" value="27" />
+ <option name="titlebarBold" value="1" />
+ <option name="padding" value="10" />
+ <option name="stickySpacing" value="6" />
+ <option name="childPalette" value="2" />
+
+ <!-- Top Row -->
+ <part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
+ <part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
+ <part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
+
+ <!-- Middle Row -->
+ <part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
+ <part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
+ <part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
+
+ <!-- Bottom Row -->
+ <part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
+ <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
+ <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
+
+ <!-- Buttons -->
+ <part type="closeImage" xpos="-163" ypos="2" width="22" height="27" />
+ <part type="closeImageHighlighted" xpos="-138" ypos="2" width="22" height="27" />
+ <part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" />
+ <part type="stickyImageDown" xpos="-99" ypos="51" width="19" height="22" />
+ </widget>
+</skinset>
diff --git a/data/themes/jewelry/CMakeLists.txt b/data/themes/jewelry/CMakeLists.txt
index fa12f16aa..193a2ea3e 100644
--- a/data/themes/jewelry/CMakeLists.txt
+++ b/data/themes/jewelry/CMakeLists.txt
@@ -93,6 +93,7 @@ SET (FILES
scrollbuttons_pressed.xml
sell.xml
server.xml
+ serverinfo.xml
serverslistbox.xml
shop.xml
shoplistbox.xml
diff --git a/data/themes/jewelry/Makefile.am b/data/themes/jewelry/Makefile.am
index 9588a9be1..3e4921af6 100644
--- a/data/themes/jewelry/Makefile.am
+++ b/data/themes/jewelry/Makefile.am
@@ -96,6 +96,7 @@ gui_DATA = \
scrollbuttons_pressed.xml \
sell.xml \
server.xml \
+ serverinfo.xml \
serverslistbox.xml \
shop.xml \
shoplistbox.xml \
diff --git a/data/themes/jewelry/serverinfo.xml b/data/themes/jewelry/serverinfo.xml
new file mode 100644
index 000000000..88c64c222
--- /dev/null
+++ b/data/themes/jewelry/serverinfo.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<skinset name="Default" image="window.png">
+ <widget type="Window" xpos="260" ypos="0">
+ <option name="captionoffsetx" value="20" />
+ <option name="captionoffsety" value="7" />
+ <option name="titlebarHeight" value="35" />
+ <option name="titlebarBold" value="1" />
+ <option name="padding" value="10" />
+ <option name="stickySpacing" value="6" />
+ <option name="childPalette" value="2" />
+
+ <!-- Top Row -->
+ <part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
+ <part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
+ <part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
+
+ <!-- Middle Row -->
+ <part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
+ <part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
+ <part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
+
+ <!-- Bottom Row -->
+ <part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
+ <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
+ <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
+
+ <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
+ <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
+ <part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" />
+ <part type="stickyImageDown" xpos="-99" ypos="51" width="19" height="22" />
+ </widget>
+</skinset>
diff --git a/data/themes/pink/CMakeLists.txt b/data/themes/pink/CMakeLists.txt
index 7e5496bf6..e40902c46 100644
--- a/data/themes/pink/CMakeLists.txt
+++ b/data/themes/pink/CMakeLists.txt
@@ -16,6 +16,7 @@ SET (FILES
quests.xml
sell.xml
server.xml
+ serverinfo.xml
shop.xml
unknown-item.png
window.png
diff --git a/data/themes/pink/Makefile.am b/data/themes/pink/Makefile.am
index f887fe5ca..a0b9b526a 100644
--- a/data/themes/pink/Makefile.am
+++ b/data/themes/pink/Makefile.am
@@ -19,6 +19,7 @@ gui_DATA = \
quests.xml \
sell.xml \
server.xml \
+ serverinfo.xml \
shop.xml \
unknown-item.png \
window.xml \
diff --git a/data/themes/pink/serverinfo.xml b/data/themes/pink/serverinfo.xml
new file mode 100644
index 000000000..dbfa79ad0
--- /dev/null
+++ b/data/themes/pink/serverinfo.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<skinset name="Default" image="window.png">
+ <widget type="Window" xpos="250" ypos="0">
+ <!-- Top Row -->
+ <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+ <part type="top-edge" xpos="0" ypos="10" width="10" height="10" />
+ <part type="top-right-corner" xpos="0" ypos="20" width="10" height="10" />
+
+ <!-- Middle Row -->
+ <part type="left-edge" xpos="0" ypos="30" width="10" height="10" />
+ <part type="bg-quad" xpos="0" ypos="40" width="10" height="10" />
+ <part type="right-edge" xpos="0" ypos="50" width="10" height="10" />
+
+ <!-- Bottom Row -->
+ <part type="bottom-left-corner" xpos="0" ypos="60" width="10" height="10" />
+ <part type="bottom-edge" xpos="0" ypos="70" width="10" height="10" />
+ <part type="bottom-right-corner" xpos="10" ypos="0" width="132" height="134" />
+
+ <part type="closeImage" xpos="-120" ypos="0" width="15" height="15" />
+ <part type="stickyImageUp" xpos="-120" ypos="51" width="15" height="15" />
+ <part type="stickyImageDown" xpos="-105" ypos="51" width="15" height="15" />
+ </widget>
+</skinset>
diff --git a/data/themes/unity/CMakeLists.txt b/data/themes/unity/CMakeLists.txt
index d27d0d38e..72c1445f8 100644
--- a/data/themes/unity/CMakeLists.txt
+++ b/data/themes/unity/CMakeLists.txt
@@ -15,6 +15,7 @@ SET (FILES
quests.xml
sell.xml
server.xml
+ serverinfo.xml
shop.xml
social.xml
window.png
diff --git a/data/themes/unity/Makefile.am b/data/themes/unity/Makefile.am
index 7e5540591..1aa75fa15 100644
--- a/data/themes/unity/Makefile.am
+++ b/data/themes/unity/Makefile.am
@@ -18,6 +18,7 @@ gui_DATA = \
quests.xml \
sell.xml \
server.xml \
+ serverinfo.xml \
shop.xml \
social.xml \
window.png \
diff --git a/data/themes/unity/serverinfo.xml b/data/themes/unity/serverinfo.xml
new file mode 100644
index 000000000..e59c22879
--- /dev/null
+++ b/data/themes/unity/serverinfo.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<skinset name="Default" image="window.png">
+ <widget type="Window" xpos="260" ypos="0">
+ <option name="padding" value="10" />
+ <!-- Top Row -->
+ <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+ <part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
+ <part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
+
+ <!-- Middle Row -->
+ <part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
+ <part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
+ <part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
+
+ <!-- Bottom Row -->
+ <part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
+ <part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
+ <part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
+
+ <part type="closeImage" xpos="-130" ypos="0" width="15" height="15" />
+ <part type="stickyImageUp" xpos="-130" ypos="51" width="15" height="15" />
+ <part type="stickyImageDown" xpos="-115" ypos="51" width="15" height="15" />
+ </widget>
+</skinset>
diff --git a/data/themes/wood/CMakeLists.txt b/data/themes/wood/CMakeLists.txt
index 613d76f42..2630909dd 100644
--- a/data/themes/wood/CMakeLists.txt
+++ b/data/themes/wood/CMakeLists.txt
@@ -16,6 +16,7 @@ SET (FILES
quests.xml
sell.xml
server.xml
+ serverinfo.xml
shop.xml
window.png
window.xml
diff --git a/data/themes/wood/Makefile.am b/data/themes/wood/Makefile.am
index be81be8e8..2bd446b29 100644
--- a/data/themes/wood/Makefile.am
+++ b/data/themes/wood/Makefile.am
@@ -19,6 +19,7 @@ gui_DATA = \
quests.xml \
sell.xml \
server.xml \
+ serverinfo.xml \
shop.xml \
window.png \
window.xml \
diff --git a/data/themes/wood/serverinfo.xml b/data/themes/wood/serverinfo.xml
new file mode 100644
index 000000000..38b016fca
--- /dev/null
+++ b/data/themes/wood/serverinfo.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<skinset name="Default" image="window.png">
+ <widget type="Window" xpos="260" ypos="0">
+ <option name="padding" value="6" />
+
+ <!-- Top Row -->
+ <part type="top-left-corner" width="10" height="10" />
+ <part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
+ <part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
+
+ <!-- Middle Row -->
+ <part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
+ <part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
+ <part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
+
+ <!-- Bottom Row -->
+ <part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
+ <part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
+ <part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
+
+ <part type="closeImage" xpos="-130" ypos="0" width="15" height="15" />
+ <part type="stickyImageUp" xpos="-130" ypos="51" width="15" height="15" />
+ <part type="stickyImageDown" xpos="-115" ypos="51" width="15" height="15" />
+ </widget>
+</skinset>
diff --git a/src/gui/windows/serverinfowindow.cpp b/src/gui/windows/serverinfowindow.cpp
index c0099d356..989411da6 100644
--- a/src/gui/windows/serverinfowindow.cpp
+++ b/src/gui/windows/serverinfowindow.cpp
@@ -37,7 +37,7 @@ ServerInfoWindow *serverInfoWindow = nullptr;
ServerInfoWindow::ServerInfoWindow(ServerInfo &serverInfo) :
// TRANSLATORS: servers dialog name
- Window(_("Server info"), Modal_false, nullptr, "server_info.xml"),
+ Window(_("Server info"), Modal_false, nullptr, "serverinfo.xml"),
LinkHandler(),
mServerInfo(serverInfo),
mBrowserBox(new BrowserBox(this, BrowserBoxMode::AUTO_SIZE, Opaque_true,