refactor: remove unused DeclarativeUi class.

The declarative ui in fact will be returned in the response from file actions.

Signed-off-by: Camila Ayres <[email protected]>

Author: camilasan

resources.qrc

@@ -64,7 +64,6 @@
         <file>src/gui/macOS/ui/FileProviderEvictionDialog.qml</file>
         <file>src/gui/macOS/ui/FileProviderSyncStatus.qml</file>
         <file>src/gui/macOS/ui/FileProviderStorageInfo.qml</file>
-        <file>src/gui/declarativeui/DeclarativeUiWindow.qml</file>
         <file>src/gui/declarativeui/FileActionsWindow.qml</file>
     </qresource>
 </RCC>

src/gui/application.cpp

@@ -428,9 +428,6 @@ Application::Application(int &argc, char **argv)
     connect(FolderMan::instance()->socketApi(), &SocketApi::fileActionsCommandReceived,
             _gui.data(), &ownCloudGui::slotShowFileActionsDialog);
 
-    connect(FolderMan::instance()->socketApi(), &SocketApi::declarativeUiCommandReceived,
-            _gui.data(), &ownCloudGui::slotShowDeclarativeUiDialog);
-
     // startup procedure.
     connect(&_checkConnectionTimer, &QTimer::timeout, this, &Application::slotCheckConnection);
     _checkConnectionTimer.setInterval(ConnectionValidator::DefaultCallingIntervalMsec); // check for connection every 32 seconds.

src/gui/declarativeui/DeclarativeUiWindow.qml

@@ -33,7 +33,7 @@
 #include "tray/sortedactivitylistmodel.h"
 #include "tray/syncstatussummary.h"
 #include "tray/unifiedsearchresultslistmodel.h"
-#include "declarativeui/declarativeui.h"
+#include "declarativeui/fileactionsmodel.h"
 #include "filesystem.h"
 
 #ifdef WITH_LIBCLOUDPROVIDERS
@@ -135,7 +135,6 @@ 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<DeclarativeUi>("com.nextcloud.desktopclient", 1, 0, "DeclarativeUi");
     qmlRegisterType<FileActionsModel>("com.nextcloud.desktopclient", 1, 0, "FileActionsModel");
 
     qmlRegisterUncreatableType<QAbstractItemModel>("com.nextcloud.desktopclient", 1, 0, "QAbstractItemModel", "QAbstractItemModel");
@@ -713,11 +712,6 @@ void ownCloudGui::slotShowFileActivityDialog(const QString &localPath) const
     _tray->createFileActivityDialog(localPath);
 }
 
-void ownCloudGui::slotShowDeclarativeUiDialog(const QString &localPath) const
-{
-    _tray->showDeclarativeUiDialog(localPath);
-}
-
 void ownCloudGui::slotShowFileActionsDialog(const QString &localPath) const
 {
     _tray->showFileActionsDialog(localPath);

src/gui/owncloudgui.cpp

@@ -95,7 +95,6 @@ public slots:
      */
     void slotShowShareDialog(const QString &localPath) const;
     void slotShowFileActivityDialog(const QString &localPath) const;
-    void slotShowDeclarativeUiDialog(const QString &localPath) const;
     void slotShowFileActionsDialog(const QString &localPath) const;
     void slotNewAccountWizard();
 

src/gui/owncloudgui.h

@@ -437,52 +437,11 @@ void Systray::createFileActivityDialog(const QString &localPath)
     Q_EMIT showFileDetailsPage(localPath, FileDetailsPage::Activity);
 }
 
-void Systray::showDeclarativeUiDialog(const QString &localPath)
-{
-    createDeclarativeUiDialog(localPath);
-}
-
 void Systray::showFileActionsDialog(const QString &localPath)
 {
     createFileActionsDialog(localPath);
 }
 
-void Systray::createDeclarativeUiDialog(const QString &localPath)
-{
-    if (!_trayEngine) {
-        qCWarning(lcSystray) << "Could not open declarative UI dialog for" << localPath << "as no tray engine was available";
-        return;
-    }
-
-    const auto folder = FolderMan::instance()->folderForPath(localPath);
-    if (!folder) {
-        qCWarning(lcSystray) << "Could not open declarative UI dialog for" << localPath << "no responsible folder found";
-        return;
-    }
-
-    QQmlComponent declarativeUiQml(trayEngine(), QStringLiteral("qrc:/qml/src/gui/declarativeui/DeclarativeUiWindow.qml"));
-    if (declarativeUiQml.isError()) {
-        qCWarning(lcSystray) << declarativeUiQml.errorString();
-        qCWarning(lcSystray) << declarativeUiQml.errors();
-        return;
-    }
-
-    const QVariantMap initialProperties{
-        {"accountState", QVariant::fromValue(folder->accountState())},
-        {"localPath", localPath},
-    };
-    const auto declarativeUiDialog = declarativeUiQml.createWithInitialProperties(initialProperties);
-    const auto dialog = qobject_cast<QQuickWindow*>(declarativeUiDialog);
-    if (!dialog) {
-        qCWarning(lcSystray) << "Declarative UI dialog window resulted in creation of object that was not a window!";
-        return;
-    }
-
-    dialog->show();
-    dialog->raise();
-    dialog->requestActivate();
-}
-
 void Systray::createFileActionsDialog(const QString &localPath)
 {
     if (!_trayEngine) {
@@ -535,12 +494,6 @@ void Systray::presentShareViewInTray(const QString &localPath)
     Q_EMIT showFileDetails(folder->accountState(), localPath, FileDetailsPage::Sharing);
 }
 
-void Systray::presentDeclarativeUiViewInSystray(const QString &localPath)
-{
-    qCDebug(lcSystray) << "Opening declarative ui view in tray for " << localPath;
-    createDeclarativeUiDialog(localPath);
-}
-
 void Systray::presentFileActionsViewInSystray(const QString &localPath)
 {
     qCDebug(lcSystray) << "Opening file actions view in tray for " << localPath;

src/gui/systray.cpp

@@ -146,11 +146,9 @@ public slots:
 
     void createShareDialog(const QString &localPath);
     void createFileActivityDialog(const QString &localPath);
-    void showDeclarativeUiDialog(const QString &localPath);
     void showFileActionsDialog(const QString &localPath);
 
     void presentShareViewInTray(const QString &localPath);
-    void presentDeclarativeUiViewInSystray(const QString &localPath);
     void presentFileActionsViewInSystray(const QString &localPath);
 
 private slots:
@@ -169,7 +167,6 @@ private slots:
 
     void setupContextMenu();
     void createFileDetailsDialog(const QString &localPath);
-    void createDeclarativeUiDialog(const QString &localPath);
     void createFileActionsDialog(const QString &localPath);
 
     [[nodiscard]] QScreen *currentScreen() const;