Merge #360 [stable-3.16] nmc/2025/2244-Activity_List_Changes

Author: memurats

src/gui/nmcgui/nmcsortedactivitylistmodel.cpp

@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) by Eugen Fischer
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#include "nmcsortedactivitylistmodel.h"
+
+namespace OCC {
+
+NMCSortedActivityListModel::NMCSortedActivityListModel(QObject *parent)
+    : SortedActivityListModel(parent)
+{
+    setSortRole(Qt::DescendingOrder);  // Qt6-konforme Sortierung
+}
+
+bool NMCSortedActivityListModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
+{
+    Q_UNUSED(sourceParent)
+    return sourceRow < _maxEntries;  // Vereinfachte Rückgabelogik
+}
+
+} // namespace OCC

src/gui/nmcgui/nmcsortedactivitylistmodel.h

@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) by Eugen Fischer
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#pragma once
+
+#include "tray/sortedactivitylistmodel.h"
+
+namespace OCC {
+
+class NMCSortedActivityListModel : public SortedActivityListModel
+{
+    Q_OBJECT
+
+public:
+    explicit NMCSortedActivityListModel(QObject *parent = nullptr);
+    ~NMCSortedActivityListModel() override = default;
+
+protected:
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
+
+private:
+    int _maxEntries{30};  // Standardwert direkt setzen
+};
+
+} // namespace OCC

src/gui/owncloudgui.cpp

@@ -42,6 +42,7 @@
 #include "tray/syncstatussummary.h"
 #include "tray/unifiedsearchresultslistmodel.h"
 #include "filesystem.h"
+#include "nmcgui/nmcsortedactivitylistmodel.h"
 
 #ifdef WITH_LIBCLOUDPROVIDERS
 #include "cloudproviders/cloudprovidermanager.h"
@@ -142,6 +143,7 @@ ownCloudGui::ownCloudGui(Application *parent)
     qmlRegisterType<ShareeModel>("com.nextcloud.desktopclient", 1, 0, "ShareeModel");
     qmlRegisterType<SortedShareModel>("com.nextcloud.desktopclient", 1, 0, "SortedShareModel");
     qmlRegisterType<SyncConflictsModel>("com.nextcloud.desktopclient", 1, 0, "SyncConflictsModel");
+    qmlRegisterType<NMCSortedActivityListModel>("com.nextcloud.desktopclient", 1, 0, "NMCSortedActivityListModel");
 
     qmlRegisterUncreatableType<QAbstractItemModel>("com.nextcloud.desktopclient", 1, 0, "QAbstractItemModel", "QAbstractItemModel");
     qmlRegisterUncreatableType<Activity>("com.nextcloud.desktopclient", 1, 0, "Activity", "Activity");

src/gui/tray/ActivityList.qml

@@ -77,7 +77,7 @@ ScrollView {
         preferredHighlightBegin: 0
         preferredHighlightEnd: controlRoot.height
 
-        model: NC.SortedActivityListModel {
+        model: NC.NMCSortedActivityListModel {
             id: sortedActivityList
         }