fix: rename IssuesWidget to SyncErrorWidget

DeepDiver1975 · DeepDiver1975 · commit 5a09f21f080d · 2025-09-12T17:59:56.000+02:00
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -9,7 +9,7 @@ set(client_UI_SRCS
     ignorelisteditor.ui
     networksettings.ui
     localactivitywidget.ui
-    issueswidget.ui
+    syncerrorwidget.ui
     settingsdialog.ui
     sharedialog.ui
     sharelinkwidget.ui
@@ -47,7 +47,7 @@ set(client_SRCS
     owncloudgui.cpp
     localactivitywidget.cpp
     protocolitem.cpp
-    issueswidget.cpp
+    syncerrorwidget.cpp
     activitysettings.cpp
     selectivesyncwidget.cpp
     settingsdialog.cpp
diff --git a/src/gui/activitysettings.cpp b/src/gui/activitysettings.cpp
@@ -14,9 +14,9 @@
 
 
 #include "activitysettings.h"
-#include "issueswidget.h"
 #include "localactivitywidget.h"
 #include "resources.h"
+#include "syncerrorwidget.h"
 
 #include <QHBoxLayout>
 #include <QTabWidget>
@@ -36,10 +36,10 @@ ActivitySettings::ActivitySettings(QWidget *parent)
     _localActivityWidget = new LocalActivityWidget(this);
     _tab->addTab(_localActivityWidget, Resources::getCoreIcon(QStringLiteral("states/sync")), tr("Local Activity"));
 
-    _issuesWidget = new IssuesWidget(this);
-    _syncIssueTabId = _tab->addTab(_issuesWidget, Resources::getCoreIcon(QStringLiteral("states/warning")), QString());
+    _issuesWidget = new SyncErrorWidget(this);
+    _syncErrorTabId = _tab->addTab(_issuesWidget, Resources::getCoreIcon(QStringLiteral("states/warning")), QString());
     slotShowIssueItemCount(0); // to display the label.
-    connect(_issuesWidget, &IssuesWidget::issueCountUpdated, this, &ActivitySettings::slotShowIssueItemCount);
+    connect(_issuesWidget, &SyncErrorWidget::issueCountUpdated, this, &ActivitySettings::slotShowIssueItemCount);
 
     // We want the local activity tab to be the default
     _tab->setCurrentIndex(_localActivityTabId);
@@ -56,6 +56,6 @@ void ActivitySettings::slotShowIssueItemCount(const int cnt)
         //: %1 is the number of not synced files.
         cntText = tr("Not Synced (%1)").arg(cnt);
     }
-    _tab->setTabText(_syncIssueTabId, cntText);
+    _tab->setTabText(_syncErrorTabId, cntText);
 }
 }
diff --git a/src/gui/activitysettings.h b/src/gui/activitysettings.h
@@ -21,7 +21,7 @@ class QTabWidget;
 namespace OCC {
 
 class LocalActivityWidget;
-class IssuesWidget;
+class SyncErrorWidget;
 
 /**
  * @brief The ActivitySettings class
@@ -41,10 +41,10 @@ private Q_SLOTS:
 
 private:
     QTabWidget *_tab = nullptr;
-    int _syncIssueTabId = -1;
+    int _syncErrorTabId = -1;
     int _localActivityTabId = -1;
 
     LocalActivityWidget *_localActivityWidget = nullptr;
-    IssuesWidget *_issuesWidget = nullptr;
+    SyncErrorWidget *_issuesWidget = nullptr;
 };
 }
diff --git a/src/gui/folder.h b/src/gui/folder.h
@@ -437,9 +437,9 @@ private Q_SLOTS:
 
     void slotLogPropagationStart();
 
-    /** Adjust sync result based on conflict data from IssuesWidget.
+    /** Adjust sync result based on conflict data from SyncErrorWidget.
      *
-     * This is pretty awkward, but IssuesWidget just keeps better track
+     * This is pretty awkward, but SyncErrorWidget just keeps better track
      * of conflicts across partial local discovery.
      */
     void slotFolderConflicts(Folder *folder, const QStringList &conflictPaths);
diff --git a/src/gui/syncerrorwidget.cpp b/src/gui/syncerrorwidget.cpp
@@ -13,13 +13,13 @@
  */
 
 
-#include "issueswidget.h"
 #include "account.h"
 #include "accountmanager.h"
 #include "commonstrings.h"
 #include "expandingheaderview.h"
 #include "folder.h"
 #include "folderman.h"
+#include "syncerrorwidget.h"
 #include "libsync/configfile.h"
 #include "models/models.h"
 #include "localactivitywidget.h"
@@ -30,7 +30,7 @@
 #include <QActionGroup>
 #include <QTimer>
 
-#include "ui_issueswidget.h"
+#include "ui_syncerrorwidget.h"
 
 namespace {
 bool persistsUntilLocalDiscovery(const OCC::ProtocolItem &data)
@@ -185,16 +185,16 @@ class SyncFileItemStatusSetSortFilterProxyModel : public Models::SignalledQSortF
  * to avoid performance issues around sorting this many issues.
  */
 
-IssuesWidget::IssuesWidget(QWidget *parent)
+SyncErrorWidget::SyncErrorWidget(QWidget *parent)
     : QWidget(parent)
-    , _ui(new Ui::IssuesWidget)
+    , _ui(new Ui::SyncErrorWidget)
 {
     _ui->setupUi(this);
 
     connect(ProgressDispatcher::instance(), &ProgressDispatcher::progressInfo,
-        this, &IssuesWidget::slotProgressInfo);
+        this, &SyncErrorWidget::slotProgressInfo);
     connect(ProgressDispatcher::instance(), &ProgressDispatcher::itemCompleted,
-        this, &IssuesWidget::slotItemCompleted);
+        this, &SyncErrorWidget::slotItemCompleted);
     connect(ProgressDispatcher::instance(), &ProgressDispatcher::syncError,
         this, [this](Folder *folder, const QString &message, ErrorCategory) {
             auto item = SyncFileItemPtr::create();
@@ -213,10 +213,10 @@ IssuesWidget::IssuesWidget(QWidget *parent)
 
     _model = new ProtocolItemModel(20000, true, this);
     _sortModel = new Models::SignalledQSortFilterProxyModel(this);
-    connect(_sortModel, &Models::SignalledQSortFilterProxyModel::filterChanged, this, &IssuesWidget::filterDidChange);
+    connect(_sortModel, &Models::SignalledQSortFilterProxyModel::filterChanged, this, &SyncErrorWidget::filterDidChange);
     _sortModel->setSourceModel(_model);
     _statusSortModel = new SyncFileItemStatusSetSortFilterProxyModel(this); // Note: this will restore a previously set filter, if there was one.
-    connect(_statusSortModel, &Models::SignalledQSortFilterProxyModel::filterChanged, this, &IssuesWidget::filterDidChange);
+    connect(_statusSortModel, &Models::SignalledQSortFilterProxyModel::filterChanged, this, &SyncErrorWidget::filterDidChange);
     _statusSortModel->setSourceModel(_sortModel);
     _statusSortModel->setSortRole(Qt::DisplayRole); // Sorting should be done based on the text in the column cells, but...
     _statusSortModel->setFilterRole(Models::UnderlyingDataRole); // ... filtering should be done on the underlying enum value.
@@ -229,7 +229,7 @@ IssuesWidget::IssuesWidget(QWidget *parent)
     header->setExpandingColumn(static_cast<int>(ProtocolItemModel::ProtocolItemRole::Action));
     header->setSortIndicator(static_cast<int>(ProtocolItemModel::ProtocolItemRole::Time), Qt::DescendingOrder);
 
-    connect(_ui->_tableView, &QTableView::customContextMenuRequested, this, &IssuesWidget::slotItemContextMenu);
+    connect(_ui->_tableView, &QTableView::customContextMenuRequested, this, &SyncErrorWidget::slotItemContextMenu);
     _ui->_tableView->horizontalHeader()->setContextMenuPolicy(Qt::CustomContextMenu);
     connect(header, &QHeaderView::customContextMenuRequested, this, [this, header]() {
         auto menu = showFilterMenu(header);
@@ -263,12 +263,12 @@ IssuesWidget::IssuesWidget(QWidget *parent)
     });
 }
 
-IssuesWidget::~IssuesWidget()
+SyncErrorWidget::~SyncErrorWidget()
 {
     delete _ui;
 }
 
-QMenu *IssuesWidget::showFilterMenu(QWidget *parent)
+QMenu *SyncErrorWidget::showFilterMenu(QWidget *parent)
 {
     auto menu = new QMenu(parent);
     menu->setAttribute(Qt::WA_DeleteOnClose);
@@ -290,7 +290,7 @@ QMenu *IssuesWidget::showFilterMenu(QWidget *parent)
     return menu;
 }
 
-void IssuesWidget::addResetFiltersAction(QMenu *menu, const QList<std::function<void()>> &resetFunctions)
+void SyncErrorWidget::addResetFiltersAction(QMenu *menu, const QList<std::function<void()>> &resetFunctions)
 {
     menu->addAction(QCoreApplication::translate("OCC::Models", "Reset Filters"), [resetFunctions]() {
         for (const auto &reset : resetFunctions) {
@@ -299,7 +299,7 @@ void IssuesWidget::addResetFiltersAction(QMenu *menu, const QList<std::function<
     });
 }
 
-void IssuesWidget::slotProgressInfo(Folder *folder, const ProgressInfo &progress)
+void SyncErrorWidget::slotProgressInfo(Folder *folder, const ProgressInfo &progress)
 {
     if (progress.status() == ProgressInfo::Reconcile) {
         // Wipe all non-persistent entries - as well as the persistent ones
@@ -348,14 +348,14 @@ void IssuesWidget::slotProgressInfo(Folder *folder, const ProgressInfo &progress
     }
 }
 
-void IssuesWidget::slotItemCompleted(Folder *folder, const SyncFileItemPtr &item)
+void SyncErrorWidget::slotItemCompleted(Folder *folder, const SyncFileItemPtr &item)
 {
     if (!item->showInIssuesTab())
         return;
     _model->addProtocolItem(ProtocolItem { folder, item });
 }
 
-void IssuesWidget::filterDidChange()
+void SyncErrorWidget::filterDidChange()
 {
     // We have two filters here: the filter by status (which can have multiple items checked *off*...
     int filterCount = _statusSortModel->filterCount();
@@ -367,7 +367,7 @@ void IssuesWidget::filterDidChange()
     _ui->_filterButton->setText(filterCount > 0 ? CommonStrings::filterButtonText(filterCount) : tr("Filter"));
 }
 
-void IssuesWidget::slotItemContextMenu(const QPoint &pos)
+void SyncErrorWidget::slotItemContextMenu(const QPoint &pos)
 {
     auto rows = _ui->_tableView->selectionModel()->selectedRows();
     for (int i = 0; i < rows.size(); ++i) {
@@ -378,7 +378,7 @@ void IssuesWidget::slotItemContextMenu(const QPoint &pos)
     LocalActivityWidget::showContextMenu(this, _ui->_tableView, _sortModel, _model, rows, pos);
 }
 
-std::function<void(void)> IssuesWidget::addStatusFilter(QMenu *menu)
+std::function<void(void)> SyncErrorWidget::addStatusFilter(QMenu *menu)
 {
     menu->addAction(QCoreApplication::translate("OCC::Models", "Status Filter:"))->setEnabled(false);
 
diff --git a/src/gui/syncerrorwidget.h b/src/gui/syncerrorwidget.h
@@ -29,19 +29,19 @@ namespace Models {
 }
 
 namespace Ui {
-    class IssuesWidget;
+    class SyncErrorWidget;
 }
 
 /**
- * @brief The LocalActivityWidget class
+ * @brief The SyncErrorWidget class
  * @ingroup gui
  */
-class IssuesWidget : public QWidget
+class SyncErrorWidget : public QWidget
 {
     Q_OBJECT
 public:
-    explicit IssuesWidget(QWidget *parent = nullptr);
-    ~IssuesWidget() override;
+    explicit SyncErrorWidget(QWidget *parent = nullptr);
+    ~SyncErrorWidget() override;
 
 public Q_SLOTS:
     void slotProgressInfo(Folder *folder, const ProgressInfo &progress);
@@ -63,6 +63,6 @@ private Q_SLOTS:
     Models::SignalledQSortFilterProxyModel *_sortModel;
     SyncFileItemStatusSetSortFilterProxyModel *_statusSortModel;
 
-    Ui::IssuesWidget *_ui;
+    Ui::SyncErrorWidget *_ui;
 };
 }
diff --git a/src/gui/syncerrorwidget.ui b/src/gui/syncerrorwidget.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OCC::IssuesWidget</class>
- <widget class="QWidget" name="OCC::IssuesWidget">
+ <class>OCC::SyncErrorWidget</class>
+ <widget class="QWidget" name="OCC::SyncErrorWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -16,7 +16,7 @@
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
@@ -34,7 +34,7 @@
    <item>
     <widget class="QTableView" name="_tableView">
      <property name="contextMenuPolicy">
-      <enum>Qt::CustomContextMenu</enum>
+      <enum>Qt::ContextMenuPolicy::CustomContextMenu</enum>
      </property>
      <property name="accessibleName">
       <string>Issues table</string>
@@ -46,7 +46,7 @@
       <bool>true</bool>
      </property>
      <property name="selectionBehavior">
-      <enum>QAbstractItemView::SelectRows</enum>
+      <enum>QAbstractItemView::SelectionBehavior::SelectRows</enum>
      </property>
      <property name="showGrid">
       <bool>false</bool>
diff --git a/src/libsync/progressdispatcher.h b/src/libsync/progressdispatcher.h
@@ -269,7 +269,7 @@ namespace ErrorCategoryPrivate {
     /** Type of error
      *
      * Used for ProgressDispatcher::syncError. May trigger error interactivity
-     * in IssuesWidget.
+     * in SyncErrorWidget.
      */
     enum class ErrorCategory {
         Normal,
diff --git a/test/gui/shared/scripts/names.py b/test/gui/shared/scripts/names.py
@@ -16,7 +16,7 @@
 settings_settingsdialog_toolbutton_Quit_ownCloud_QToolButton = {"name": "settingsdialog_toolbutton_Quit ownCloud", "type": "QToolButton", "visible": 1, "window": settings_OCC_SettingsDialog}
 settings_settingsdialog_toolbutton_Settings_QToolButton = {"name": "settingsdialog_toolbutton_Settings", "type": "QToolButton", "visible": 1, "window": settings_OCC_SettingsDialog}
 stack_qt_tabwidget_stackedwidget_QStackedWidget = {"container": settings_stack_QStackedWidget, "name": "qt_tabwidget_stackedwidget", "type": "QStackedWidget", "visible": 1}
-qt_tabwidget_stackedwidget_OCC_IssuesWidget_OCC_IssuesWidget = {"container": stack_qt_tabwidget_stackedwidget_QStackedWidget, "name": "OCC__IssuesWidget", "type": "OCC::IssuesWidget", "visible": 1}
+qt_tabwidget_stackedwidget_OCC_SyncErrorWidget_OCC_SyncErrorWidget = {"container": stack_qt_tabwidget_stackedwidget_QStackedWidget, "name": "OCC__SyncErrorWidget", "type": "OCC::SyncErrorWidget", "visible": 1}
 sharingDialog_qt_tabwidget_tabbar_QTabBar = {"name": "qt_tabwidget_tabbar", "type": "QTabBar", "visible": 1, "window": sharingDialog_OCC_ShareDialog}
 qt_tabwidget_stackedwidget_OCC_ShareLinkWidget_OCC_ShareLinkWidget = {"container": sharingDialog_qt_tabwidget_stackedwidget_QStackedWidget, "name": "OCC__ShareLinkWidget", "type": "OCC::ShareLinkWidget", "visible": 1}
 oCC_ShareLinkWidget_checkBox_password_QCheckBox = {"container": qt_tabwidget_stackedwidget_OCC_ShareLinkWidget_OCC_ShareLinkWidget, "name": "checkBox_password", "type": "QCheckBox", "visible": 1}
@@ -58,7 +58,7 @@
 stackedWidget_quickWidget_OCC_QmlUtils_OCQuickWidget = {"container": stack_stackedWidget_QStackedWidget, "name": "quickWidget", "type": "OCC::QmlUtils::OCQuickWidget", "visible": 1}
 qt_tabwidget_stackedwidget_OCC_LocalActivityWidget_OCC_LocalActivityWidget = {"container": stack_qt_tabwidget_stackedwidget_QStackedWidget, "name": "OCC__LocalActivityWidget", "type": "OCC::LocalActivityWidget", "visible": 1}
 oCC_LocalActivityWidget_tableView_QTableView = {"container": qt_tabwidget_stackedwidget_OCC_LocalActivityWidget_OCC_LocalActivityWidget, "name": "_tableView", "type": "QTableView", "visible": 1}
-oCC_IssuesWidget_tableView_QTableView = {"container": qt_tabwidget_stackedwidget_OCC_IssuesWidget_OCC_IssuesWidget, "name": "_tableView", "type": "QTableView", "visible": 1}
+oCC_SyncErrorWidget_tableView_QTableView = {"container": qt_tabwidget_stackedwidget_OCC_SyncErrorWidget_OCC_SyncErrorWidget, "name": "_tableView", "type": "QTableView", "visible": 1}
 dialogStack_quickWidget_OCC_QmlUtils_OCQuickWidget = {"container": settings_dialogStack_QStackedWidget, "name": "quickWidget", "type": "OCC::QmlUtils::OCQuickWidget", "visible": 1}
 contentWidget_OCC_QmlUtils_OCQuickWidget = {"container": contentWidget_contentWidget_QStackedWidget, "type": "OCC::QmlUtils::OCQuickWidget", "unnamed": 1, "visible": 1}
 stackedWidget_Add_Folder_Sync_Connection_QGroupBox = {"container": stack_stackedWidget_QStackedWidget, "title": "Add Folder Sync Connection", "type": "QGroupBox", "unnamed": 1, "visible": 1}
diff --git a/test/gui/shared/scripts/pageObjects/Activity.py b/test/gui/shared/scripts/pageObjects/Activity.py
@@ -19,7 +19,7 @@ class Activity:
         "visible": 1,
     }
     NOT_SYNCED_TABLE = {
-        "container": names.qt_tabwidget_stackedwidget_OCC_IssuesWidget_OCC_IssuesWidget,
+        "container": names.qt_tabwidget_stackedwidget_OCC_SyncErrorWidget_OCC_SyncErrorWidget,
         "name": "_tableView",
         "type": "QTableView",
         "visible": 1,
@@ -43,7 +43,7 @@ class Activity:
         "visible": 1,
     }
     NOT_SYNCED_FILTER_BUTTON = {
-        "container": names.qt_tabwidget_stackedwidget_OCC_IssuesWidget_OCC_IssuesWidget,
+        "container": names.qt_tabwidget_stackedwidget_OCC_SyncErrorWidget_OCC_SyncErrorWidget,
         "name": "_filterButton",
         "type": "QPushButton",
         "visible": 1,
@@ -62,7 +62,7 @@ class Activity:
         "visible": 1,
     }
     NOT_SYNCED_ACTIVITY_TABLE_HEADER_SELECTOR = {
-        "container": names.oCC_IssuesWidget_tableView_QTableView,
+        "container": names.oCC_SyncErrorWidget_tableView_QTableView,
         "name": "ActivityErrorListHeaderV2",
         "orientation": 1,
         "type": "OCC::ExpandingHeaderView",

Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ namespace ErrorCategoryPrivate {`
`269`	`269`	`/** Type of error`
`270`	`270`	`*`
`271`	`271`	`* Used for ProgressDispatcher::syncError. May trigger error interactivity`
`272`		`- * in IssuesWidget.`
	`272`	`+ * in SyncErrorWidget.`
`273`	`273`	`*/`
`274`	`274`	`enum class ErrorCategory {`
`275`	`275`	`Normal,`