Merge pull request #31 from Blackmane/horizontal-channel-icons

Add guild view direction
Coding-Bunker · Apr 17, 2021 · 156612e · 156612e
2 parents 4cbbe24 + 83b217c
commit 156612e
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 8 deletions.
diff --git a/src/app/Application.cpp b/src/app/Application.cpp
@@ -13,6 +13,7 @@ Application::Application(QQmlContext *ctx, QObject *parent) : QObject(parent)
     ctx->setContextProperty("settingsModel", &m_settingsModel);
 
     qmlRegisterUncreatableType<GuildsModel>("ui", 1, 0, "ViewMode", {});
+    qmlRegisterUncreatableType<GuildsModel>("ui", 1, 0, "ViewIconDirection", {});
 
     connect(&m_auth, &Authenticator::authenticationSuccess, this,
             &Application::handleLoginSuccess);
@@ -118,4 +119,7 @@ void Application::updateUI()
     m_guildsModel->setViewMode(m_settings.guildsViewAsIcon()
                                    ? GuildsModel::ViewMode::Icon
                                    : GuildsModel::ViewMode::Text);
+    m_guildsModel->setViewIconDirection(m_settings.guildsIconsAsHorizontalDirection()
+                                   ? GuildsModel::ViewIconDirection::Horizontal
+                                   : GuildsModel::ViewIconDirection::Vertical);
 }
diff --git a/src/core/Settings.cpp b/src/core/Settings.cpp
@@ -7,7 +7,8 @@ namespace SettingsCategory
 const QString token  = "auth/token";
 const QString meInfo = "auth/meInfo";
 
-const QString guidsView = "UI/guildsView";
+const QString guildsView = "UI/guildsView";
+const QString guildsViewIconDirection = "UI/guildsViewIconDirection";
 
 } // namespace SettingsCategory
 
@@ -18,8 +19,15 @@ Settings::Settings(QObject *parent) : QObject(parent)
         { "text", "icon" },
         0,
         UserSettingPOD::ComboBox,
-        SettingsCategory::guidsView,
+        SettingsCategory::guildsView,
     });
+    m_parameters.push_back({
+       "Set guilds icons direction:",
+       { "vertical", "horizontal" },
+       0,
+       UserSettingPOD::ComboBox,
+       SettingsCategory::guildsViewIconDirection,
+   });
 }
 
 void Settings::loadSettings()
@@ -32,7 +40,8 @@ void Settings::loadSettings()
         m_meInfo = settings.value(SettingsCategory::meInfo).toByteArray();
     }
 
-    m_parameters[0].value = settings.value(SettingsCategory::guidsView).toInt();
+    m_parameters[0].value = settings.value(SettingsCategory::guildsView).toInt();
+    m_parameters[1].value = settings.value(SettingsCategory::guildsViewIconDirection).toInt();
 }
 
 void Settings::save() const
@@ -80,3 +89,8 @@ bool Settings::guildsViewAsIcon() const noexcept
 {
     return m_parameters[0].value == 1; // TODO: Fix magic numbers.
 }
+
+bool Settings::guildsIconsAsHorizontalDirection() const noexcept
+{
+    return m_parameters[1].value == 1; // TODO: Fix magic numbers.
+}
diff --git a/src/core/Settings.hpp b/src/core/Settings.hpp
@@ -34,6 +34,7 @@ class Settings : public QObject
     void setParameter(int indexOfParam, int valueOfChoices);
 
     bool guildsViewAsIcon() const noexcept;
+    bool guildsIconsAsHorizontalDirection() const noexcept;
 
   private:
     const QString m_settingsFilename = "unofficial-discord-client";

diff --git a/src/gui/GuildsModel.cpp b/src/gui/GuildsModel.cpp
@@ -76,6 +76,17 @@ GuildsModel::ViewMode GuildsModel::viewMode() const noexcept
     return m_viewMode;
 }
 
+void GuildsModel::setViewIconDirection(GuildsModel::ViewIconDirection vdir)
+{
+    m_viewIconDirection = vdir;
+    emit viewIconDirectionChanged();
+}
+
+GuildsModel::ViewIconDirection GuildsModel::viewIconDirection () const noexcept
+{
+    return m_viewIconDirection;
+}
+
 void GuildsModel::updateGuildIcon()
 {
     if (m_viewMode == ViewMode::Icon) {

diff --git a/src/gui/GuildsModel.hpp b/src/gui/GuildsModel.hpp
@@ -12,7 +12,9 @@ class GuildsModel : public QAbstractListModel
     Q_PROPERTY(int selected READ selected NOTIFY selectedChanged)
     Q_PROPERTY(ChannelsModel *channelsModel READ channelsModel CONSTANT)
     Q_PROPERTY(ViewMode viewMode READ viewMode NOTIFY viewModeChanged)
+    Q_PROPERTY(ViewIconDirection viewIconDirection READ viewIconDirection NOTIFY viewIconDirectionChanged)
     Q_ENUMS(ViewMode)
+    Q_ENUMS(ViewIconDirection)
     // clang-format on
 
   public:
@@ -38,11 +40,17 @@ class GuildsModel : public QAbstractListModel
     void setViewMode(ViewMode vm);
     ViewMode viewMode() const noexcept;
 
+    enum class ViewIconDirection { Horizontal, Vertical};
+
+    void setViewIconDirection(ViewIconDirection vdir);
+    ViewIconDirection viewIconDirection () const noexcept;
+
     void updateGuildIcon();
 
   signals:
     void selectedChanged();
     void viewModeChanged();
+    void viewIconDirectionChanged();
 
   public slots:
     void updateMessages();
@@ -52,4 +60,5 @@ class GuildsModel : public QAbstractListModel
     int m_selected{ -1 };
     ChannelsModel m_channelsModel;
     ViewMode m_viewMode;
+    ViewIconDirection m_viewIconDirection;
 };
diff --git a/src/qml/GuildsBar.qml b/src/qml/GuildsBar.qml
@@ -21,6 +21,8 @@ Rectangle {
             visible: hmi.guildModelVisible
             clip: true
             boundsBehavior: ListView.StopAtBounds
+            layoutDirection: Qt.LeftToRight
+            orientation: hmi.guildsModel.viewIconDirection === ViewIconDirection.Horizontal ? ListView.Horizontal : ListView.Vertical
 
             delegate: Item {
                 height: txt.visible ? txt.height : img.height

diff --git a/src/qml/Settings.qml b/src/qml/Settings.qml
@@ -24,21 +24,25 @@ Rectangle {
     }
 
     ListView {
+        id: lw
+
         anchors {
             top: title.bottom
             bottom: okButton.top
         }
 
         model: settingsModel
 
-        DelegateChooser {
+        delegate: DelegateChooser {
             id: chooser
 
             role: "typeRole"
 
             DelegateChoice {
                 roleValue: 0
+
                 Row {
+                    readonly property int listIdx: index
                     spacing: 5
 
                     Text {
@@ -52,13 +56,11 @@ Rectangle {
                         anchors.verticalCenter: parent.verticalCenter
                         currentIndex: startValueRole
                         onActivated: settingsModel.setParameter(
-                            settingsModel.currentIndex, index)
+                            parent.listIdx, index)
                     }
                 }
             }
         }
-
-        delegate: chooser
     }
 
     Button {
@@ -79,4 +81,4 @@ Rectangle {
             stackview.pop()
         }
     }
-}
+}