diff --git a/app/inpututils.cpp b/app/inpututils.cpp index 3582fb218..2cd5a65ae 100644 --- a/app/inpututils.cpp +++ b/app/inpututils.cpp @@ -2164,8 +2164,6 @@ void InputUtils::openLink( const QString &homePath, const QString &link ) qDebug() << "openLink android"; mAndroidUtils->showPDF( absoluteLinkPath ); #elif defined(Q_OS_IOS) - // Assuming mIOSUtils is the utility class for iOS, similar to mAndroidUtils for Android - //mIOSUtils->openDocument(absoluteLinkPath); qDebug() << "openLink IOS" << homePath; #endif diff --git a/app/inpututils.h b/app/inpututils.h index 8f6951026..8d57bfb75 100644 --- a/app/inpututils.h +++ b/app/inpututils.h @@ -599,8 +599,6 @@ class InputUtils: public QObject //! Returns icon url from QgsWkbType geometry static QUrl iconFromGeometry( const Qgis::GeometryType &geometry ); - static QString getAbsoluteProjectPath( const QString &projectLink ); - AndroidUtils *mAndroidUtils = nullptr; // not owned }; diff --git a/app/qml/main.qml b/app/qml/main.qml index 9bbd871f2..374ba2d0e 100644 --- a/app/qml/main.qml +++ b/app/qml/main.qml @@ -274,8 +274,7 @@ ApplicationWindow { text: qsTr("Sync") iconSource: __style.syncIcon onClicked: { - //__activeProject.requestSync() - __androidUtils.showPDF( "https://www.orimi.com/pdf-test.pdf" ) + __activeProject.requestSync() } } @@ -682,23 +681,14 @@ ApplicationWindow { usedData: __merginApi.workspaceInfo.storageLimit > 0 ? __merginApi.workspaceInfo.diskUsage / __merginApi.workspaceInfo.storageLimit : 0 apiSupportsSubscription: __merginApi.apiSupportsSubscriptions - onManageAccountClicked: { - if (__merginApi.apiSupportsSubscriptions) { - projectController.manageSubscriptionPlans() - } - } + onManageAccountClicked: Qt.openUrlExternally(__inputHelp.merginSubscriptionLink) } MMProjectLimitDialog { id: projectLimitDialog apiSupportsSubscription: __merginApi.apiSupportsSubscriptions - - onManageAccountClicked: { - if (__merginApi.apiSupportsSubscriptions) { - projectController.manageSubscriptionPlans() - } - } + onManageAccountClicked: Qt.openUrlExternally(__inputHelp.merginSubscriptionLink) } MMProjErrorDialog { @@ -920,6 +910,10 @@ ApplicationWindow { projectIssuesPage.projectLoadingLog = __activeProject.projectLoadingLog(); projectIssuesPage.visible = true; } + function onShowSwitchWorkspaceActionClicked() { + stateManager.state = "projects" + projectController.showSelectWorkspacePage() + } } Connections { diff --git a/core/merginapi.cpp b/core/merginapi.cpp index ea86b5d7b..d7090979f 100644 --- a/core/merginapi.cpp +++ b/core/merginapi.cpp @@ -2953,9 +2953,6 @@ bool MerginApi::hasLocalChanges( for ( const MerginFile &localFile : localFiles ) { - QFileInfo info( localFile.path ); - qDebug() << "HERE" << localFile.path << info.absoluteFilePath(); - QString filePath = localFile.path; bool hasOldServer = oldServerFilesMap.contains( localFile.path );