From c9f52b7223685d2e7fca925594171f94dd8c6e3b Mon Sep 17 00:00:00 2001
From: TrickyLeifa <date.epoch@gmail.com>
Date: Wed, 15 May 2024 00:00:17 +0200
Subject: Ported to CMake, ...

* Ported the project to CMake
  * Android and Mac support dropped for the time
being.
  * Tests, BASS and Discord-RPC are now options
* Restructured and reformated the project.
  * Merged `include` and `src`
  * Renamed `resource` to `data`
  * Renamed various files
  * External libraries headers are no longer included in `src`
  * Replaced header guards with #pragma once
  * Multiple refactors (keywords, headers)
  * Added Qt6 compatibility
* Removed various unused functions and headers
* Reworked AOPacket
  * When content is passed to AOPacket, it should be ensured that the content is already decoded.
  * Encoding/decoding are now static methods.
* Fixed various memory leaks
* Removed animation code for AOImage
  * AOImage is always using static images
* Simplified ChatLogPiece
---
 src/aoimage.cpp | 59 ++++++++++++++++++---------------------------------------
 1 file changed, 18 insertions(+), 41 deletions(-)

(limited to 'src/aoimage.cpp')

diff --git a/src/aoimage.cpp b/src/aoimage.cpp
index e737ffb3..85f127ef 100644
--- a/src/aoimage.cpp
+++ b/src/aoimage.cpp
@@ -5,56 +5,33 @@
 
 #include <QBitmap>
 
-AOImage::AOImage(QWidget *parent, AOApplication *p_ao_app, bool make_static) : QLabel(parent)
+AOImage::AOImage(AOApplication *p_ao_app, QWidget *parent)
+    : QLabel(parent)
+    , ao_app(p_ao_app)
+{}
+
+AOImage::~AOImage()
+{}
+
+QString AOImage::file_name()
 {
-  m_parent = parent;
-  ao_app = p_ao_app;
-  is_static = make_static;
-  if (!is_static) // Only create the QMovie if we're non-static
-  {
-    movie = new QMovie(this);
-    connect(movie, &QMovie::frameChanged, [this]{
-      QPixmap f_pixmap = movie->currentPixmap();
-      f_pixmap =
-          f_pixmap.scaled(this->size(), Qt::IgnoreAspectRatio);
-      this->setPixmap(f_pixmap);
-      if (masked) {
-        this->setMask(f_pixmap.mask());
-      }
-    });
-  }
+  return m_file_name;
 }
 
-AOImage::~AOImage() {}
-
 bool AOImage::set_image(QString p_image, QString p_misc)
 {
-  QString p_image_resolved = ao_app->get_image(p_image, Options::getInstance().theme(), Options::getInstance().subTheme(),
-                                               ao_app->default_theme, p_misc, "", "",
-                                               is_static || !Options::getInstance().animatedThemeEnabled());
+  QString p_image_resolved = ao_app->get_image(p_image, Options::getInstance().theme(), Options::getInstance().subTheme(), ao_app->default_theme, p_misc, "", "", false);
 
-  if (!file_exists(p_image_resolved)) {
+  if (!file_exists(p_image_resolved))
+  {
     qWarning() << "could not find image" << p_image;
     return false;
   }
 
-  path = p_image_resolved;
-  if (!is_static) {
-    movie->stop();
-    movie->setFileName(path);
-    if (Options::getInstance().animatedThemeEnabled() && movie->frameCount() > 1) {
-      movie->start();
-    }
-  }
-  if (is_static || !Options::getInstance().animatedThemeEnabled() || movie->frameCount() <= 1) {
-    QPixmap f_pixmap(path);
-
-    f_pixmap =
-        f_pixmap.scaled(this->size(), Qt::IgnoreAspectRatio);
-    this->setPixmap(f_pixmap);
-    if (masked) {
-      this->setMask(f_pixmap.mask());
-    }
-  }
+  m_file_name = p_image_resolved;
+  QPixmap f_pixmap(m_file_name);
+  f_pixmap = f_pixmap.scaled(size(), Qt::IgnoreAspectRatio);
+  setPixmap(f_pixmap);
+
   return true;
 }
-- 
cgit 


From 39e4354b1dae5d8487ea5b84be9f304b1950a61a Mon Sep 17 00:00:00 2001
From: TrickyLeifa <date.epoch@gmail.com>
Date: Thu, 16 May 2024 03:09:21 +0200
Subject: 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`
---
 src/aoimage.cpp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'src/aoimage.cpp')

diff --git a/src/aoimage.cpp b/src/aoimage.cpp
index 85f127ef..062efbae 100644
--- a/src/aoimage.cpp
+++ b/src/aoimage.cpp
@@ -5,26 +5,23 @@
 
 #include <QBitmap>
 
-AOImage::AOImage(AOApplication *p_ao_app, QWidget *parent)
+AOImage::AOImage(AOApplication *ao_app, QWidget *parent)
     : QLabel(parent)
-    , ao_app(p_ao_app)
+    , ao_app(ao_app)
 {}
 
-AOImage::~AOImage()
-{}
-
-QString AOImage::file_name()
+QString AOImage::image()
 {
   return m_file_name;
 }
 
-bool AOImage::set_image(QString p_image, QString p_misc)
+bool AOImage::setImage(QString fileName, QString miscellaneous)
 {
-  QString p_image_resolved = ao_app->get_image(p_image, Options::getInstance().theme(), Options::getInstance().subTheme(), ao_app->default_theme, p_misc, "", "", false);
+  QString p_image_resolved = ao_app->get_image(fileName, Options::getInstance().theme(), Options::getInstance().subTheme(), ao_app->default_theme, miscellaneous, "", "", false);
 
   if (!file_exists(p_image_resolved))
   {
-    qWarning() << "could not find image" << p_image;
+    qWarning() << "could not find image" << fileName;
     return false;
   }
 
@@ -35,3 +32,8 @@ bool AOImage::set_image(QString p_image, QString p_misc)
 
   return true;
 }
+
+bool AOImage::setImage(QString fileName)
+{
+  return setImage(fileName, QString());
+}
-- 
cgit