Reimplemented favorite server widget, ...

* Reworked favorite server widget
* Renamed `server_type` to `ServerInfo`
* Renamed `connection_type` to `ServerConnectionType`
* Refactored `AOCharButton`
* Reimplemented `AOButton`
* Partially reimplemented `AOEmoteButton`
* Refactored `AOEvidenceButton`

1 files changed, 28 insertions, 41 deletions

diff --git a/src/aocharbutton.cpp b/src/aocharbutton.cpp
index cab7fddd..d446cca3 100644
--- a/src/aocharbutton.cpp
+++ b/src/aocharbutton.cpp
@@ -2,46 +2,31 @@
 
 #include "file_functions.h"
 
-AOCharButton::AOCharButton(AOApplication *p_ao_app, int x_pos, int y_pos, bool is_taken, QWidget *parent)
+AOCharButton::AOCharButton(AOApplication *ao_app, QWidget *parent)
     : QPushButton(parent)
-    , ao_app(p_ao_app)
-    , m_taken(is_taken)
+    , ao_app(ao_app)
 {
   int size = 60 * Options::getInstance().themeScalingFactor();
   int selector_size = 62 * Options::getInstance().themeScalingFactor();
 
-  this->resize(size, size);
-  this->move(x_pos, y_pos);
+  resize(size, size);
 
   ui_taken = new AOImage(ao_app, this);
-  ui_taken->resize(size, size);
-  ui_taken->set_image("char_taken");
   ui_taken->setAttribute(Qt::WA_TransparentForMouseEvents);
+  ui_taken->resize(size, size);
+  ui_taken->setImage("char_taken");
   ui_taken->hide();
 
   ui_selector = new AOImage(ao_app, parent);
-  ui_selector->resize(selector_size, selector_size);
-  int offset = Options::getInstance().themeScalingFactor();
-  ui_selector->move(x_pos - offset, y_pos - offset);
-  ui_selector->set_image("char_selector");
   ui_selector->setAttribute(Qt::WA_TransparentForMouseEvents);
+  ui_selector->resize(selector_size, selector_size);
+  ui_selector->setImage("char_selector");
   ui_selector->hide();
 }
 
-void AOCharButton::reset()
-{
-  ui_taken->hide();
-  ui_selector->hide();
-}
-
-void AOCharButton::set_taken(bool is_taken)
+void AOCharButton::setTaken(bool enabled)
 {
-  m_taken = is_taken;
-}
-
-void AOCharButton::apply_taken_image()
-{
-  if (m_taken)
+  if (enabled)
   {
     ui_taken->move(0, 0);
     ui_taken->show();
@@ -52,45 +37,47 @@ void AOCharButton::apply_taken_image()
   }
 }
 
-void AOCharButton::set_image(QString p_character)
+void AOCharButton::setCharacter(QString character)
 {
-  QString image_path = ao_app->get_image_suffix(ao_app->get_character_path(p_character, "char_icon"), true);
+  QString image_path = ao_app->get_image_suffix(ao_app->get_character_path(character, "char_icon"), true);
 
-  this->setText("");
+  setText(QString());
 
   if (file_exists(image_path))
   {
-    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; }");
+    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
   {
-    this->setStyleSheet("QPushButton { border-image: url(); }"
-                        "QToolTip { background-image: url(); color: #000000; "
-                        "background-color: #ffffff; border: 0px; }");
-    this->setText(p_character);
+    setStyleSheet("QPushButton { border-image: url(); }"
+                  "QToolTip { background-image: url(); color: #000000; "
+                  "background-color: #ffffff; border: 0px; }");
+    setText(character);
   }
 }
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-void AOCharButton::enterEvent(QEvent *e)
+void AOCharButton::enterEvent(QEvent *event)
 #else
-void AOCharButton::enterEvent(QEnterEvent *e)
+void AOCharButton::enterEvent(QEnterEvent *event)
 #endif
 {
   int offset = Options::getInstance().themeScalingFactor();
-  ui_selector->move(this->x() - offset, this->y() - offset);
+  ui_selector->move(x() - offset, y() - offset);
   ui_selector->raise();
   ui_selector->show();
 
   setFlat(false);
-  QPushButton::enterEvent(e);
+
+  QPushButton::enterEvent(event);
 }
 
-void AOCharButton::leaveEvent(QEvent *e)
+void AOCharButton::leaveEvent(QEvent *event)
 {
   ui_selector->hide();
-  QPushButton::leaveEvent(e);
+
+  QPushButton::leaveEvent(event);
 }