Merge pull request #232 from ioriayane/Relase/v0.32.0

Release/v0.32.0
ioriayane · Jun 5, 2024 · b33e3d5 · b33e3d5
2 parents ee732e0 + af78cb5
commit b33e3d5
Show file tree

Hide file tree

Showing 65 changed files with 797 additions and 93 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,6 +30,7 @@ ui_*.h
 Makefile*
 *build-*
 *.prl
+build/
 
 # Qt unit tests
 target_wrapper.*

diff --git a/app/app.pro b/app/app.pro
@@ -1,4 +1,7 @@
 QT += quick network quickcontrols2
+greaterThan(QT_MAJOR_VERSION, 5) {
+QT += core5compat
+}
 
 TARGET = Hagoromo
 
@@ -11,6 +14,10 @@ HEADERS += \
 
 QML_FILES = \
     qml/main.qml \
+    qml/compat/ColorOverlayC.qml \
+    qml/compat/GlowC.qml \
+    qml/compat/OpacityMaskC.qml \
+    qml/compat/SettingsC.qml \
     qml/controls/ClickableFrame.qml \
     qml/controls/ComboBoxEx.qml \
     qml/controls/ProgressCircle.qml \
@@ -81,6 +88,7 @@ QML_FILES = \
     qml/parts/TagLabelLayout.qml \
     qml/parts/VersionInfomation.qml \
     qml/view/AnyProfileListView.qml \
+    qml/view/BlogEntryListView.qml \
     qml/view/ChatListView.qml \
     qml/view/ChatMessageListView.qml \
     qml/view/ColumnView.qml \

diff --git a/app/main.cpp b/app/main.cpp
@@ -54,6 +54,8 @@
 #include "qtquick/chat/chatlistmodel.h"
 #include "qtquick/chat/chatmessagelistmodel.h"
 #include "qtquick/moderation/labelerlistmodel.h"
+#include "qtquick/blog/blogentrylistmodel.h"
+
 #include "tools/translatorchanger.h"
 
 void setAppFont(QGuiApplication &app)
@@ -85,7 +87,7 @@ int main(int argc, char *argv[])
     app.setOrganizationName(QStringLiteral("relog"));
     app.setOrganizationDomain(QStringLiteral("hagoromo.relog.tech"));
     app.setApplicationName(QStringLiteral("Hagoromo"));
-    app.setApplicationVersion(QStringLiteral("0.31.0"));
+    app.setApplicationVersion(QStringLiteral("0.32.0"));
 #ifndef HAGOROMO_RELEASE_BUILD
     app.setApplicationVersion(app.applicationVersion() + "d");
 #endif
@@ -175,6 +177,9 @@ int main(int argc, char *argv[])
     qmlRegisterType<LabelerListModel>("tech.relog.hagoromo.moderation.labelerlistmodel", 1, 0,
                                       "LabelerListModel");
 
+    qmlRegisterType<BlogEntryListModel>("tech.relog.hagoromo.blog.blogentrylistmodel", 1, 0,
+                                        "BlogEntryListModel");
+
     qmlRegisterSingletonType(QUrl("qrc:/Hagoromo/qml/data/AdjustedValues.qml"),
                              "tech.relog.hagoromo.singleton", 1, 0, "AdjustedValues");
 

diff --git a/app/qml/compat/ColorOverlayC.qml b/app/qml/compat/ColorOverlayC.qml
@@ -0,0 +1,6 @@
+import QtGraphicalEffects 1.15
+// import Qt5Compat.GraphicalEffects
+
+ColorOverlay {
+
+}
diff --git a/app/qml/compat/GlowC.qml b/app/qml/compat/GlowC.qml
@@ -0,0 +1,6 @@
+import QtGraphicalEffects 1.15
+// import Qt5Compat.GraphicalEffects
+
+Glow {
+
+}
diff --git a/app/qml/compat/OpacityMaskC.qml b/app/qml/compat/OpacityMaskC.qml
@@ -0,0 +1,6 @@
+import QtGraphicalEffects 1.15
+// import Qt5Compat.GraphicalEffects
+
+OpacityMask {
+
+}
diff --git a/app/qml/compat/SettingsC.qml b/app/qml/compat/SettingsC.qml
@@ -0,0 +1,5 @@
+import Qt.labs.settings 1.0
+// import QtCore
+
+Settings {
+}
diff --git a/app/qml/controls/IconButton.qml b/app/qml/controls/IconButton.qml
@@ -2,10 +2,11 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls.Material 2.15
-import QtGraphicalEffects 1.15
 
 import tech.relog.hagoromo.singleton 1.0
 
+import "../compat"
+
 Button {
     id: button
 
@@ -47,7 +48,7 @@ Button {
             Layout.leftMargin: 5
             Layout.rightMargin: 5
             layer.enabled: true
-            layer.effect: ColorOverlay {
+            layer.effect: ColorOverlayC {
                 color: button.foreground
             }
         }

diff --git a/app/qml/controls/IconLabelFrame.qml b/app/qml/controls/IconLabelFrame.qml
@@ -2,10 +2,11 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls.Material 2.15
-import QtGraphicalEffects 1.15
 
 import tech.relog.hagoromo.singleton 1.0
 
+import "../compat"
+
 Frame {
     property alias iconSource: iconImage.source
     property alias labelText: label.text
@@ -34,7 +35,7 @@ Frame {
             Layout.preferredWidth: AdjustedValues.i16
             Layout.preferredHeight: AdjustedValues.i16
             layer.enabled: true
-            layer.effect: ColorOverlay {
+            layer.effect: ColorOverlayC {
                 color: Material.foreground
             }
         }

diff --git a/app/qml/dialogs/AccountDialog.qml b/app/qml/dialogs/AccountDialog.qml
@@ -2,13 +2,13 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls.Material 2.15
-import QtGraphicalEffects 1.15
 
 import tech.relog.hagoromo.accountlistmodel 1.0
 import tech.relog.hagoromo.singleton 1.0
 
 import "../controls"
 import "../parts"
+import "../compat"
 
 Dialog {
     id: accountDialog
@@ -78,7 +78,7 @@ Dialog {
                     height: AdjustedValues.i24
                     source: "../images/add_user.png"
                     layer.enabled: true
-                    layer.effect: ColorOverlay {
+                    layer.effect: ColorOverlayC {
                         color: Material.accentColor // Material.color(Material.Grey)
                     }
                 }

diff --git a/app/qml/dialogs/AddColumnDialog.qml b/app/qml/dialogs/AddColumnDialog.qml
@@ -2,14 +2,14 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls.Material 2.15
-import QtGraphicalEffects 1.15
 
 import tech.relog.hagoromo.accountlistmodel 1.0
 import tech.relog.hagoromo.feedtypelistmodel 1.0
 import tech.relog.hagoromo.singleton 1.0
 
 import "../controls"
 import "../parts"
+import "../compat"
 
 Dialog {
     id: addColumnDialog
@@ -84,7 +84,7 @@ Dialog {
                 Layout.preferredWidth: AdjustedValues.i24
                 Layout.preferredHeight: AdjustedValues.i24
                 layer.enabled: true
-                layer.effect: ColorOverlay {
+                layer.effect: ColorOverlayC {
                     color: Material.color(Material.Grey)
                 }
             }

diff --git a/app/qml/dialogs/AddListDialog.qml b/app/qml/dialogs/AddListDialog.qml
@@ -2,7 +2,7 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls.Material 2.15
-import QtGraphicalEffects 1.15
+
 import Qt.labs.platform 1.1 as P
 
 import tech.relog.hagoromo.recordoperator 1.0

diff --git a/app/qml/dialogs/AddMutedWordDialog.qml b/app/qml/dialogs/AddMutedWordDialog.qml
@@ -2,7 +2,6 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls.Material 2.15
-import QtGraphicalEffects 1.15
 
 import tech.relog.hagoromo.mutedwordlistmodel 1.0
 import tech.relog.hagoromo.singleton 1.0

diff --git a/app/qml/dialogs/AddToListDialog.qml b/app/qml/dialogs/AddToListDialog.qml
@@ -2,14 +2,14 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls.Material 2.15
-import QtGraphicalEffects 1.15
 
 import tech.relog.hagoromo.listslistmodel 1.0
 import tech.relog.hagoromo.singleton 1.0
 
 import "../controls"
 import "../data"
 import "../parts"
+import "../compat"
 
 Dialog {
     id: addToListDialog
@@ -178,7 +178,7 @@ Dialog {
                         width: AdjustedValues.i18
                         height: AdjustedValues.i18
                         layer.enabled: true
-                        layer.effect: ColorOverlay {
+                        layer.effect: ColorOverlayC {
                             color: saveButton.foreground
                         }
                         property color foreground: Material.foreground

diff --git a/app/qml/dialogs/ColumnSettingDialog.qml b/app/qml/dialogs/ColumnSettingDialog.qml
@@ -2,7 +2,6 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls.Material 2.15
-import Qt.labs.settings 1.0
 
 import tech.relog.hagoromo.singleton 1.0
 

diff --git a/app/qml/dialogs/DiscoverFeedsDialog.qml b/app/qml/dialogs/DiscoverFeedsDialog.qml
@@ -2,7 +2,6 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls.Material 2.15
-import QtGraphicalEffects 1.15
 
 import tech.relog.hagoromo.feedgeneratorlistmodel 1.0
 import tech.relog.hagoromo.singleton 1.0

diff --git a/app/qml/dialogs/EditProfileDialog.qml b/app/qml/dialogs/EditProfileDialog.qml
@@ -2,7 +2,7 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls.Material 2.15
-import QtGraphicalEffects 1.15
+
 import Qt.labs.platform 1.1 as P
 
 import tech.relog.hagoromo.recordoperator 1.0

diff --git a/app/qml/dialogs/SettingDialog.qml b/app/qml/dialogs/SettingDialog.qml
@@ -2,13 +2,13 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls.Material 2.15
-import Qt.labs.settings 1.0
 
 import tech.relog.hagoromo.encryption 1.0
 import tech.relog.hagoromo.systemtool 1.0
 import tech.relog.hagoromo.singleton 1.0
 
 import "../controls"
+import "../compat"
 
 Dialog {
     id: settingDialog
@@ -27,7 +27,7 @@ Dialog {
         id: systemTool
     }
 
-    Settings {
+    SettingsC {
         id: settings
         // General
         property int theme: Material.Light

diff --git a/app/qml/main.qml b/app/qml/main.qml
@@ -2,8 +2,6 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls.Material 2.15
-import QtGraphicalEffects 1.15
-import Qt.labs.settings 1.1
 
 import tech.relog.hagoromo.accountlistmodel 1.0
 import tech.relog.hagoromo.columnlistmodel 1.0
@@ -15,6 +13,7 @@ import "controls"
 import "dialogs"
 import "view"
 import "parts"
+import "compat"
 
 ApplicationWindow {
     id: appWindow
@@ -64,7 +63,7 @@ ApplicationWindow {
         }
     }
 
-    Settings {
+    SettingsC {
         //        property alias x: appWindow.x
         //        property alias y: appWindow.y
         property alias width: appWindow.width
@@ -922,7 +921,7 @@ ApplicationWindow {
                 border.width: 1
                 border.color: Material.color(Material.LightBlue)
                 layer.enabled: true
-                layer.effect: Glow {
+                layer.effect: GlowC {
                     radius: 8
                     samples: 17
                     color: Material.color(Material.LightBlue)

diff --git a/app/qml/parts/AggregatedAvatarImages.qml b/app/qml/parts/AggregatedAvatarImages.qml
@@ -2,10 +2,11 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls.Material 2.15
-import QtGraphicalEffects 1.15
 
 import tech.relog.hagoromo.singleton 1.0
 
+import "../compat"
+
 Item {
     id: aggregatedAavatarImages
     property var avatars: []
@@ -78,7 +79,7 @@ Item {
                 fillMode: Image.PreserveAspectFit
                 source: "../images/expand_more.png"
                 layer.enabled: true
-                layer.effect: ColorOverlay {
+                layer.effect: ColorOverlayC {
                     color: Material.foreground
                 }
             }
@@ -104,7 +105,7 @@ Item {
                     fillMode: Image.PreserveAspectFit
                     source: "../images/expand_less.png"
                     layer.enabled: true
-                    layer.effect: ColorOverlay {
+                    layer.effect: ColorOverlayC {
                         color: Material.foreground
                     }
                 }

diff --git a/app/qml/parts/AvatarImage.qml b/app/qml/parts/AvatarImage.qml
@@ -1,9 +1,9 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Controls.Material 2.15
-import QtGraphicalEffects 1.15
 
 import "../controls"
+import "../compat"
 
 MouseArea {
     clip: true
@@ -21,7 +21,7 @@ MouseArea {
         source: "../images/icon_mask.png"
         visible: false
     }
-    OpacityMask {
+    OpacityMaskC {
         anchors.fill: parent
         source: avatorImage
         maskSource: mask
@@ -40,7 +40,7 @@ MouseArea {
         anchors.fill: parent
         fillMode: Image.PreserveAspectCrop
         layer.enabled: true
-        layer.effect: ColorOverlay {
+        layer.effect: ColorOverlayC {
             color: Material.color(Material.Grey)
         }
         source: "../images/account_icon.png"

diff --git a/app/qml/parts/FeedGeneratorLinkCard.qml b/app/qml/parts/FeedGeneratorLinkCard.qml
@@ -2,11 +2,11 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls.Material 2.15
-import QtGraphicalEffects 1.15
 
 import tech.relog.hagoromo.singleton 1.0
 
 import "../controls"
+import "../compat"
 
 ClickableFrame {
     property alias avatarImage: feedGeneratorAvatarImage
@@ -44,7 +44,7 @@ ClickableFrame {
                 Layout.preferredHeight: AdjustedValues.i16
                 source: "../images/like.png"
                 layer.enabled: true
-                layer.effect: ColorOverlay {
+                layer.effect: ColorOverlayC {
                     color: Material.color(Material.Pink)
                 }
             }

diff --git a/app/qml/parts/ListLinkCard.qml b/app/qml/parts/ListLinkCard.qml
@@ -2,7 +2,6 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls.Material 2.15
-import QtGraphicalEffects 1.15
 
 import tech.relog.hagoromo.singleton 1.0