diff --git a/main.qml b/main.qml index 76b29a85..bfae4c34 100644 --- a/main.qml +++ b/main.qml @@ -1335,7 +1335,21 @@ ApplicationWindow { if (persistentSettings.askDesktopShortcut && !persistentSettings.portable) { persistentSettings.askDesktopShortcut = false; - oshelper.createDesktopEntry(); + + if (isTails) { + oshelper.createDesktopEntry(); + } else if (isLinux) { + confirmationDialog.title = qsTr("Desktop entry") + translationManager.emptyString; + confirmationDialog.text = qsTr("Would you like to register Monero GUI Desktop entry?") + translationManager.emptyString; + confirmationDialog.icon = StandardIcon.Question; + confirmationDialog.cancelText = qsTr("No") + translationManager.emptyString; + confirmationDialog.okText = qsTr("Yes") + translationManager.emptyString; + confirmationDialog.onAcceptedCallback = function() { + oshelper.createDesktopEntry(); + }; + confirmationDialog.onRejectedCallback = null; + confirmationDialog.open(); + } } } @@ -1347,6 +1361,7 @@ ApplicationWindow { return ""; } + property bool askDesktopShortcut: isLinux property string language: 'English (US)' property string language_wallet: 'English' property string locale: 'en_US' diff --git a/src/qt/utils.cpp b/src/qt/utils.cpp index b7d649f4..b2e04ec2 100644 --- a/src/qt/utils.cpp +++ b/src/qt/utils.cpp @@ -28,7 +28,6 @@ #include #include -#include #include #include "TailsOS.h" @@ -89,17 +88,6 @@ QString getAccountName(){ } #ifdef Q_OS_LINUX -bool askInstallDesktopEntry() -{ - QMessageBox msgBox( - QMessageBox::Question, - QObject::tr("Monero GUI"), - QObject::tr("Would you like to register Monero GUI Desktop entry?"), - QMessageBox::Yes | QMessageBox::No); - msgBox.setDefaultButton(QMessageBox::Yes); - return msgBox.exec() == QMessageBox::Yes; -} - QString xdgMime(){ return QString( "[Desktop Entry]\n" @@ -139,11 +127,8 @@ void registerXdgMime(){ } else { - if (askInstallDesktopEntry()) - { - QDir().mkpath(QFileInfo(filePath).path()); - fileWrite(filePath, mime); - } + QDir().mkpath(QFileInfo(filePath).path()); + fileWrite(filePath, mime); } } #endif