From b9ffe12154b5b20121bd1c29459ead4de49ff01d Mon Sep 17 00:00:00 2001 From: James Graham Date: Sun, 13 Apr 2025 10:11:54 +0000 Subject: [PATCH] Move locationhelper, linemodel and mediasizehelper to Timeline --- autotests/mediasizehelpertest.cpp | 2 ++ src/CMakeLists.txt | 6 ------ src/controller.cpp | 9 +++++++++ src/timeline/CMakeLists.txt | 3 +++ src/{ => timeline}/locationhelper.cpp | 0 src/{ => timeline}/locationhelper.h | 0 src/{ => timeline}/mediasizehelper.cpp | 17 ++++++++++++----- src/{ => timeline}/mediasizehelper.h | 5 +++++ src/{ => timeline}/models/linemodel.cpp | 0 src/{ => timeline}/models/linemodel.h | 0 10 files changed, 31 insertions(+), 11 deletions(-) rename src/{ => timeline}/locationhelper.cpp (100%) rename src/{ => timeline}/locationhelper.h (100%) rename src/{ => timeline}/mediasizehelper.cpp (90%) rename src/{ => timeline}/mediasizehelper.h (96%) rename src/{ => timeline}/models/linemodel.cpp (100%) rename src/{ => timeline}/models/linemodel.h (100%) diff --git a/autotests/mediasizehelpertest.cpp b/autotests/mediasizehelpertest.cpp index 0f662d832..66e23ae0a 100644 --- a/autotests/mediasizehelpertest.cpp +++ b/autotests/mediasizehelpertest.cpp @@ -25,6 +25,7 @@ private Q_SLOTS: void MediaSizeHelperTest::uninitialized() { MediaSizeHelper mediasizehelper; + mediasizehelper.setMaxSize(540, 540); QCOMPARE(mediasizehelper.currentSize(), QSize(540, qRound(qreal(NeoChatConfig::self()->mediaMaxWidth()) / qreal(16.0) * qreal(9.0)))); } @@ -60,6 +61,7 @@ void MediaSizeHelperTest::limits() QFETCH(QSize, currentSize); MediaSizeHelper mediasizehelper; + mediasizehelper.setMaxSize(540, 540); mediasizehelper.setMediaWidth(mediaWidth); mediasizehelper.setMediaHeight(mediaHeight); mediasizehelper.setContentMaxWidth(contentMaxWidth); diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8084e5c23..57996b81d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -67,19 +67,13 @@ add_library(neochat STATIC models/livelocationsmodel.h models/locationsmodel.cpp models/locationsmodel.h - locationhelper.cpp - locationhelper.h registration.cpp jobs/neochatgetcommonroomsjob.cpp jobs/neochatgetcommonroomsjob.h - mediasizehelper.cpp - mediasizehelper.h models/notificationsmodel.cpp models/notificationsmodel.h proxycontroller.cpp proxycontroller.h - models/linemodel.cpp - models/linemodel.h enums/neochatroomtype.h models/sortfilterroomtreemodel.cpp models/sortfilterroomtreemodel.h diff --git a/src/controller.cpp b/src/controller.cpp index 034d548b6..ebbeb197b 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -19,6 +19,7 @@ #include #include +#include "mediasizehelper.h" #include "models/actionsmodel.h" #include "models/messagemodel.h" #include "models/pushrulemodel.h" @@ -92,6 +93,14 @@ Controller::Controller(QObject *parent) return false; }); + MediaSizeHelper::setMaxSize(NeoChatConfig::mediaMaxWidth(), NeoChatConfig::mediaMaxHeight()); + connect(NeoChatConfig::self(), &NeoChatConfig::MediaMaxWidthChanged, this, []() { + MediaSizeHelper::setMaxSize(NeoChatConfig::mediaMaxWidth(), NeoChatConfig::mediaMaxHeight()); + }); + connect(NeoChatConfig::self(), &NeoChatConfig::MediaMaxHeightChanged, this, []() { + MediaSizeHelper::setMaxSize(NeoChatConfig::mediaMaxWidth(), NeoChatConfig::mediaMaxHeight()); + }); + ProxyController::instance().setApplicationProxy(); #ifndef Q_OS_ANDROID diff --git a/src/timeline/CMakeLists.txt b/src/timeline/CMakeLists.txt index d2ff99d12..335592ee7 100644 --- a/src/timeline/CMakeLists.txt +++ b/src/timeline/CMakeLists.txt @@ -56,11 +56,14 @@ ecm_add_qml_module(Timeline GENERATE_PLUGIN_SOURCE VideoComponent.qml SOURCES contentprovider.cpp + locationhelper.cpp + mediasizehelper.cpp messageattached.cpp pollhandler.cpp timelinedelegate.cpp enums/delegatetype.h models/itinerarymodel.cpp + models/linemodel.cpp models/mediamessagefiltermodel.cpp models/messagecontentmodel.cpp models/messagecontentfiltermodel.cpp diff --git a/src/locationhelper.cpp b/src/timeline/locationhelper.cpp similarity index 100% rename from src/locationhelper.cpp rename to src/timeline/locationhelper.cpp diff --git a/src/locationhelper.h b/src/timeline/locationhelper.h similarity index 100% rename from src/locationhelper.h rename to src/timeline/locationhelper.h diff --git a/src/mediasizehelper.cpp b/src/timeline/mediasizehelper.cpp similarity index 90% rename from src/mediasizehelper.cpp rename to src/timeline/mediasizehelper.cpp index 225f82976..1726c15e5 100644 --- a/src/mediasizehelper.cpp +++ b/src/timeline/mediasizehelper.cpp @@ -3,7 +3,8 @@ #include "mediasizehelper.h" -#include "neochatconfig.h" +int MediaSizeHelper::m_mediaMaxWidth = 0; +int MediaSizeHelper::m_mediaMaxHeight = 0; MediaSizeHelper::MediaSizeHelper(QObject *parent) : QObject(parent) @@ -128,17 +129,17 @@ bool MediaSizeHelper::limitWidth() const qreal MediaSizeHelper::widthLimit() const { if (m_contentMaxWidth < 0.0) { - return NeoChatConfig::self()->mediaMaxWidth(); + return m_mediaMaxWidth; } - return std::min(m_contentMaxWidth, qreal(NeoChatConfig::self()->mediaMaxWidth())); + return std::min(m_contentMaxWidth, qreal(m_mediaMaxWidth)); } qreal MediaSizeHelper::heightLimit() const { if (m_contentMaxHeight < 0.0) { - return NeoChatConfig::self()->mediaMaxHeight(); + return m_mediaMaxHeight; } - return std::min(m_contentMaxHeight, qreal(NeoChatConfig::self()->mediaMaxHeight())); + return std::min(m_contentMaxHeight, qreal(m_mediaMaxHeight)); } QSize MediaSizeHelper::currentSize() const @@ -160,4 +161,10 @@ QSize MediaSizeHelper::currentSize() const } } +void MediaSizeHelper::setMaxSize(int width, int height) +{ + MediaSizeHelper::m_mediaMaxWidth = width; + MediaSizeHelper::m_mediaMaxHeight = height; +} + #include "moc_mediasizehelper.cpp" diff --git a/src/mediasizehelper.h b/src/timeline/mediasizehelper.h similarity index 96% rename from src/mediasizehelper.h rename to src/timeline/mediasizehelper.h index 68a2bd2c4..e45f75bfd 100644 --- a/src/mediasizehelper.h +++ b/src/timeline/mediasizehelper.h @@ -83,6 +83,8 @@ public: QSize currentSize() const; + static void setMaxSize(int width, int height); + Q_SIGNALS: void contentMaxWidthChanged(); void contentMaxHeightChanged(); @@ -102,4 +104,7 @@ private: bool limitWidth() const; qreal widthLimit() const; qreal heightLimit() const; + + static int m_mediaMaxWidth; + static int m_mediaMaxHeight; }; diff --git a/src/models/linemodel.cpp b/src/timeline/models/linemodel.cpp similarity index 100% rename from src/models/linemodel.cpp rename to src/timeline/models/linemodel.cpp diff --git a/src/models/linemodel.h b/src/timeline/models/linemodel.h similarity index 100% rename from src/models/linemodel.h rename to src/timeline/models/linemodel.h