diff --git a/CMakeLists.txt b/CMakeLists.txt index 79aff75..a9c8802 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ set(META_APP_CATEGORIES "Network;FileTransfer") set(META_GUI_OPTIONAL false) set(META_VERSION_MAJOR 0) set(META_VERSION_MINOR 11) -set(META_VERSION_PATCH 0) +set(META_VERSION_PATCH 1) set(META_VERSION_EXACT_SONAME ON) set(META_ADD_DEFAULT_CPP_UNIT_TEST_APPLICATION ON) diff --git a/widgets/CMakeLists.txt b/widgets/CMakeLists.txt index bed4a07..3a2d070 100644 --- a/widgets/CMakeLists.txt +++ b/widgets/CMakeLists.txt @@ -76,7 +76,7 @@ find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.0.0 REQUIRED) use_cpp_utilities() # find qtutilities -find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX} 6.0.0 REQUIRED) +find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX} 6.1.0 REQUIRED) use_qt_utilities() # find backend libraries diff --git a/widgets/settings/settingsdialog.cpp b/widgets/settings/settingsdialog.cpp index e58c547..b41a6ff 100644 --- a/widgets/settings/settingsdialog.cpp +++ b/widgets/settings/settingsdialog.cpp @@ -856,7 +856,7 @@ LauncherOptionPage::LauncherOptionPage(const QString &tool, QWidget *parentWidge , LauncherOptionPageBase(parentWidget) , m_process(&Launcher::toolProcess(tool)) , m_launcher(nullptr) - , m_restoreArgsButton(nullptr) + , m_restoreArgsAction(nullptr) , m_kill(false) , m_tool(tool) { @@ -885,12 +885,12 @@ QWidget *LauncherOptionPage::setupWidget() // add "restore to defaults" action for Syncthing arguments if (isSyncthing) { - m_restoreArgsButton = new IconButton(ui()->argumentsLineEdit); - m_restoreArgsButton->setPixmap( - QIcon::fromTheme(QStringLiteral("edit-undo"), QIcon(QStringLiteral(":/icons/hicolor/scalable/actions/edit-paste.svg"))).pixmap(16)); - m_restoreArgsButton->setToolTip(tr("Restore default")); - connect(m_restoreArgsButton, &IconButton::clicked, this, &LauncherOptionPage::restoreDefaultArguments); - ui()->argumentsLineEdit->insertCustomButton(0, m_restoreArgsButton); + m_restoreArgsAction = new QAction(ui()->argumentsLineEdit); + m_restoreArgsAction->setText(tr("Restore default")); + m_restoreArgsAction->setIcon( + QIcon::fromTheme(QStringLiteral("edit-undo"), QIcon(QStringLiteral(":/icons/hicolor/scalable/actions/edit-paste.svg")))); + connect(m_restoreArgsAction, &QAction::triggered, this, &LauncherOptionPage::restoreDefaultArguments); + ui()->argumentsLineEdit->addCustomAction(m_restoreArgsAction); ui()->configDirPathSelection->provideCustomFileMode(QFileDialog::Directory); ui()->dataDirPathSelection->provideCustomFileMode(QFileDialog::Directory); } diff --git a/widgets/settings/settingsdialog.h b/widgets/settings/settingsdialog.h index bf02a2c..fff4400 100644 --- a/widgets/settings/settingsdialog.h +++ b/widgets/settings/settingsdialog.h @@ -14,6 +14,7 @@ #include #include +QT_FORWARD_DECLARE_CLASS(QAction) QT_FORWARD_DECLARE_CLASS(QLabel) namespace CppUtilities { @@ -126,7 +127,7 @@ private: Data::SyncthingProcess *const m_process; Data::SyncthingLauncher *const m_launcher; - QtUtilities::IconButton *m_restoreArgsButton; + QAction *m_restoreArgsAction; bool m_kill; QString m_tool; };