Merge pull request #217 from AttorneyOnline/kfo-ao2

Final mega-merge with the Killing Fever Online client, along with other associated bugfixes and feature additions.

This commit is release-ready.

1 files changed, 20 insertions, 5 deletions

diff --git a/src/aobutton.cpp b/src/aobutton.cpp
index fee946a4..dc2d8817 100644
--- a/src/aobutton.cpp
+++ b/src/aobutton.cpp
@@ -13,11 +13,26 @@ AOButton::~AOButton() {}
 
 void AOButton::set_image(QString p_image)
 {
-  QString image_path = ao_app->get_theme_path(p_image);
-  QString default_image_path = ao_app->get_default_theme_path(p_image);
+  QString image_path =
+      ao_app->get_static_image_suffix(ao_app->get_theme_path(p_image));
+  QString default_image_path =
+      ao_app->get_static_image_suffix(ao_app->get_default_theme_path(p_image));
 
-  if (file_exists(image_path))
-    this->setStyleSheet("border-image:url(\"" + image_path + "\")");
+  if (file_exists(image_path)) {
+    this->setText("");
+    this->setStyleSheet("QPushButton { border-image: url(\"" + image_path +
+                        "\") 0 0 0 0 stretch stretch; }"
+                        "QToolTip { background-image: url(); color: #000000; "
+                        "background-color: #ffffff; border: 0px; }");
+  }
+  else if (file_exists(default_image_path)) {
+    this->setText("");
+    this->setStyleSheet("QPushButton { border-image: url(\"" +
+                        default_image_path +
+                        "\"); }"
+                        "QToolTip { background-image: url(); color: #000000; "
+                        "background-color: #ffffff; border: 0px; }");
+  }
   else
-    this->setStyleSheet("border-image:url(\"" + default_image_path + "\")");
+    return;
 }