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/graphics/gui/popupbrowserbox.xml8
-rw-r--r--data/themes/jewelry/CMakeLists.txt4
-rw-r--r--data/themes/jewelry/Makefile.am4
-rw-r--r--data/themes/jewelry/browserbox.xml1
-rw-r--r--data/themes/jewelry/popupbrowserbox.xml8
-rw-r--r--data/themes/jewelry/popupbrowserbox_high.xml8
-rw-r--r--data/themes/jewelry/popupbrowserbox_medium.xml8
-rw-r--r--data/themes/jewelry/popupbrowserbox_xhigh.xml8
-rw-r--r--data/themes/jewelry/popupbrowserbox_xxhigh.xml8
-rw-r--r--src/gui/popups/popupmenu.cpp2
12 files changed, 60 insertions, 1 deletions
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index afb414b4c..de2a9b109 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -45,6 +45,7 @@ SET (FILES
playerbox.xml
playerboxselected.xml
popup.xml
+ popupbrowserbox.xml
progress-indicator.png
progressbar.xml
quests.xml
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index c3c8f5990..0b82339be 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -48,6 +48,7 @@ gui_DATA = \
playerbox.xml \
playerboxselected.xml \
popup.xml \
+ popupbrowserbox.xml \
progress-indicator.png \
progressbar.xml \
quests.xml \
diff --git a/data/graphics/gui/popupbrowserbox.xml b/data/graphics/gui/popupbrowserbox.xml
new file mode 100644
index 000000000..0e61ff0e9
--- /dev/null
+++ b/data/graphics/gui/popupbrowserbox.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<skinset name="Default" image="window.png">
+ <widget type="Window">
+ <option name="padding" value="1" />
+ <option name="newLinePadding" value="15" />
+ <option name="itemPadding" value="1" />
+ </widget>
+</skinset>
diff --git a/data/themes/jewelry/CMakeLists.txt b/data/themes/jewelry/CMakeLists.txt
index 171d7b08e..89f3e31ea 100644
--- a/data/themes/jewelry/CMakeLists.txt
+++ b/data/themes/jewelry/CMakeLists.txt
@@ -63,6 +63,10 @@ SET (FILES
popup_high.xml
popup_xhigh.xml
popup_xxhigh.xml
+ popupbrowserbox.xml
+ popupbrowserbox_high.xml
+ popupbrowserbox_xhigh.xml
+ popupbrowserbox_xxhigh.xml
popuplist.xml
popupmenu.xml
popupmenu_high.xml
diff --git a/data/themes/jewelry/Makefile.am b/data/themes/jewelry/Makefile.am
index 0ba198b67..09b90e1f5 100644
--- a/data/themes/jewelry/Makefile.am
+++ b/data/themes/jewelry/Makefile.am
@@ -66,6 +66,10 @@ gui_DATA = \
popup_high.xml \
popup_xhigh.xml \
popup_xxhigh.xml \
+ popupbrowserbox.xml \
+ popupbrowserbox_high.xml \
+ popupbrowserbox_xhigh.xml \
+ popupbrowserbox_xxhigh.xml \
popuplist.xml \
popupmenu.xml \
popupmenu_high.xml \
diff --git a/data/themes/jewelry/browserbox.xml b/data/themes/jewelry/browserbox.xml
index 35c99e548..403dd839f 100644
--- a/data/themes/jewelry/browserbox.xml
+++ b/data/themes/jewelry/browserbox.xml
@@ -3,5 +3,6 @@
<widget type="Window">
<option name="padding" value="4" />
<option name="newLinePadding" value="15" />
+ <option name="itemPadding" value="0" />
</widget>
</skinset>
diff --git a/data/themes/jewelry/popupbrowserbox.xml b/data/themes/jewelry/popupbrowserbox.xml
new file mode 100644
index 000000000..d80203ea3
--- /dev/null
+++ b/data/themes/jewelry/popupbrowserbox.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<skinset name="Default" image="window.png">
+ <widget type="Window">
+ <option name="padding" value="4" />
+ <option name="newLinePadding" value="15" />
+ <option name="itemPadding" value="1" />
+ </widget>
+</skinset>
diff --git a/data/themes/jewelry/popupbrowserbox_high.xml b/data/themes/jewelry/popupbrowserbox_high.xml
new file mode 100644
index 000000000..44a2d3abf
--- /dev/null
+++ b/data/themes/jewelry/popupbrowserbox_high.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<skinset name="Default" image="window.png">
+ <widget type="Window">
+ <option name="padding" value="4" />
+ <option name="newLinePadding" value="15" />
+ <option name="itemPadding" value="10" />
+ </widget>
+</skinset>
diff --git a/data/themes/jewelry/popupbrowserbox_medium.xml b/data/themes/jewelry/popupbrowserbox_medium.xml
new file mode 100644
index 000000000..0104efde0
--- /dev/null
+++ b/data/themes/jewelry/popupbrowserbox_medium.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<skinset name="Default" image="window.png">
+ <widget type="Window">
+ <option name="padding" value="4" />
+ <option name="newLinePadding" value="15" />
+ <option name="itemPadding" value="5" />
+ </widget>
+</skinset>
diff --git a/data/themes/jewelry/popupbrowserbox_xhigh.xml b/data/themes/jewelry/popupbrowserbox_xhigh.xml
new file mode 100644
index 000000000..44a2d3abf
--- /dev/null
+++ b/data/themes/jewelry/popupbrowserbox_xhigh.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<skinset name="Default" image="window.png">
+ <widget type="Window">
+ <option name="padding" value="4" />
+ <option name="newLinePadding" value="15" />
+ <option name="itemPadding" value="10" />
+ </widget>
+</skinset>
diff --git a/data/themes/jewelry/popupbrowserbox_xxhigh.xml b/data/themes/jewelry/popupbrowserbox_xxhigh.xml
new file mode 100644
index 000000000..b2da8ede2
--- /dev/null
+++ b/data/themes/jewelry/popupbrowserbox_xxhigh.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<skinset name="Default" image="window.png">
+ <widget type="Window">
+ <option name="padding" value="4" />
+ <option name="newLinePadding" value="15" />
+ <option name="itemPadding" value="15" />
+ </widget>
+</skinset>
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index a0096e17c..1674c5eeb 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -90,7 +90,7 @@ std::string tradePartnerName;
PopupMenu::PopupMenu() :
Popup("PopupMenu", "popupmenu.xml"),
mBrowserBox(new BrowserBox(this, BrowserBox::AUTO_SIZE, true,
- "browserbox.xml")),
+ "popupbrowserbox.xml")),
mScrollArea(nullptr),
mBeingId(0),
mFloorItemId(0),