From d805b904b6fe706443ef86810100153cf1d396b1 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 17 Jun 2017 21:52:39 +0300 Subject: Add skin xml for server info window. New file: serverinfo.xml --- data/graphics/gui/CMakeLists.txt | 1 + data/graphics/gui/Makefile.am | 1 + data/themes/enchilado/CMakeLists.txt | 1 + data/themes/enchilado/Makefile.am | 1 + data/themes/enchilado/serverinfo.xml | 23 ++++++++++++++++++++ data/themes/golden-delicious/CMakeLists.txt | 1 + data/themes/golden-delicious/Makefile.am | 1 + data/themes/golden-delicious/serverinfo.xml | 33 +++++++++++++++++++++++++++++ data/themes/jewelry/CMakeLists.txt | 1 + data/themes/jewelry/Makefile.am | 1 + data/themes/jewelry/serverinfo.xml | 32 ++++++++++++++++++++++++++++ data/themes/pink/CMakeLists.txt | 1 + data/themes/pink/Makefile.am | 1 + data/themes/pink/serverinfo.xml | 23 ++++++++++++++++++++ data/themes/unity/CMakeLists.txt | 1 + data/themes/unity/Makefile.am | 1 + data/themes/unity/serverinfo.xml | 24 +++++++++++++++++++++ data/themes/wood/CMakeLists.txt | 1 + data/themes/wood/Makefile.am | 1 + data/themes/wood/serverinfo.xml | 25 ++++++++++++++++++++++ src/gui/windows/serverinfowindow.cpp | 2 +- 21 files changed, 175 insertions(+), 1 deletion(-) create mode 100644 data/themes/enchilado/serverinfo.xml create mode 100644 data/themes/golden-delicious/serverinfo.xml create mode 100644 data/themes/jewelry/serverinfo.xml create mode 100644 data/themes/pink/serverinfo.xml create mode 100644 data/themes/unity/serverinfo.xml create mode 100644 data/themes/wood/serverinfo.xml 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 @@ + + + + + + + + + + + + + + + + + + + + + + + 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 @@ + + + + + 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 @@ + + + + + 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 @@ + + + + + + + + + + + + + + + + + + + + + + + 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 @@ + + + + + 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 @@ + + + + + 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, -- cgit v1.2.3-70-g09d2