From 4a9b74c6700111dfb9c5deb8b7e38d6c3a7e6854 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 12 Jul 2022 11:59:06 +0200 Subject: [PATCH] Todo: Inline optiondialog.ui Change-Id: I55f170220a075e4d8db86f17eb857325a33bf82c Reviewed-by: Christian Stenger --- src/plugins/todo/CMakeLists.txt | 2 +- src/plugins/todo/optionsdialog.cpp | 114 +++++++++++++++++++------- src/plugins/todo/optionsdialog.h | 6 +- src/plugins/todo/optionsdialog.ui | 127 ----------------------------- src/plugins/todo/todo.qbs | 1 - 5 files changed, 88 insertions(+), 162 deletions(-) delete mode 100644 src/plugins/todo/optionsdialog.ui diff --git a/src/plugins/todo/CMakeLists.txt b/src/plugins/todo/CMakeLists.txt index 95b2be92462..9b3897fe6b2 100644 --- a/src/plugins/todo/CMakeLists.txt +++ b/src/plugins/todo/CMakeLists.txt @@ -7,7 +7,7 @@ add_qtc_plugin(Todo keyword.cpp keyword.h keyworddialog.cpp keyworddialog.h lineparser.cpp lineparser.h - optionsdialog.cpp optionsdialog.h optionsdialog.ui + optionsdialog.cpp optionsdialog.h qmljstodoitemsscanner.cpp qmljstodoitemsscanner.h settings.cpp settings.h todoicons.cpp todoicons.h diff --git a/src/plugins/todo/optionsdialog.cpp b/src/plugins/todo/optionsdialog.cpp index dc4f2d1d940..5ec879992a0 100644 --- a/src/plugins/todo/optionsdialog.cpp +++ b/src/plugins/todo/optionsdialog.cpp @@ -25,14 +25,20 @@ ****************************************************************************/ #include "optionsdialog.h" -#include "ui_optionsdialog.h" + #include "keyworddialog.h" #include "keyword.h" #include "settings.h" -#include "constants.h" -namespace Todo { -namespace Internal { +#include + +#include +#include +#include +#include +#include + +namespace Todo::Internal { class OptionsDialog final : public Core::IOptionsPageWidget { @@ -56,28 +62,79 @@ private: void editKeyword(QListWidgetItem *item); QSet keywordNames(); - Ui::OptionsDialog ui; Settings *m_settings = nullptr; std::function m_onApply; + + QListWidget *m_keywordsList; + QPushButton *m_editKeywordButton; + QPushButton *m_removeKeywordButton; + QPushButton *resetKeywordsButton; + QRadioButton *m_scanInProjectRadioButton; + QRadioButton *m_scanInCurrentFileRadioButton; + QRadioButton *m_scanInSubprojectRadioButton; }; OptionsDialog::OptionsDialog(Settings *settings, const std::function &onApply) : m_settings(settings), m_onApply(onApply) { - ui.setupUi(this); - ui.keywordsList->setIconSize(QSize(16, 16)); + m_keywordsList = new QListWidget; + m_keywordsList->setDragDropMode(QAbstractItemView::DragDrop); + m_keywordsList->setDefaultDropAction(Qt::MoveAction); + m_keywordsList->setSelectionBehavior(QAbstractItemView::SelectRows); + m_keywordsList->setSortingEnabled(false); + + auto addKeywordButton = new QPushButton(tr("Add")); + m_editKeywordButton = new QPushButton(tr("Edit")); + m_removeKeywordButton = new QPushButton(tr("Remove")); + resetKeywordsButton = new QPushButton(tr("Reset")); + + m_scanInProjectRadioButton = new QRadioButton(tr("Scan the whole active project")); + m_scanInProjectRadioButton->setEnabled(true); + + m_scanInCurrentFileRadioButton = new QRadioButton(tr("Scan only the currently edited document")); + m_scanInCurrentFileRadioButton->setChecked(true); + + m_scanInSubprojectRadioButton = new QRadioButton(tr("Scan the current subproject")); + + using namespace Utils::Layouting; + + Column { + Group { + Title(tr("Keywords")), + Row { + m_keywordsList, + Column { + addKeywordButton, + m_editKeywordButton, + m_removeKeywordButton, + resetKeywordsButton, + Stretch() + } + } + }, + Group { + Title(tr("Scanning scope")), + Column { + m_scanInProjectRadioButton, + m_scanInCurrentFileRadioButton, + m_scanInSubprojectRadioButton + } + } + }.attachTo(this); + + m_keywordsList->setIconSize(QSize(16, 16)); setKeywordsButtonsEnabled(); - connect(ui.addKeywordButton, &QAbstractButton::clicked, + connect(addKeywordButton, &QAbstractButton::clicked, this, &OptionsDialog::addKeywordButtonClicked); - connect(ui.removeKeywordButton, &QAbstractButton::clicked, + connect(m_removeKeywordButton, &QAbstractButton::clicked, this, &OptionsDialog::removeKeywordButtonClicked); - connect(ui.editKeywordButton, &QAbstractButton::clicked, + connect(m_editKeywordButton, &QAbstractButton::clicked, this, &OptionsDialog::editKeywordButtonClicked); - connect(ui.resetKeywordsButton, &QAbstractButton::clicked, + connect(resetKeywordsButton, &QAbstractButton::clicked, this, &OptionsDialog::resetKeywordsButtonClicked); - connect(ui.keywordsList, &QListWidget::itemDoubleClicked, + connect(m_keywordsList, &QListWidget::itemDoubleClicked, this, &OptionsDialog::editKeyword); - connect(ui.keywordsList, &QListWidget::itemSelectionChanged, + connect(m_keywordsList, &QListWidget::itemSelectionChanged, this, &OptionsDialog::setKeywordsButtonsEnabled); setSettings(*m_settings); @@ -88,7 +145,7 @@ void OptionsDialog::addToKeywordsList(const Keyword &keyword) auto item = new QListWidgetItem(icon(keyword.iconType), keyword.name); item->setData(Qt::UserRole, static_cast(keyword.iconType)); item->setForeground(keyword.color); - ui.keywordsList->addItem(item); + m_keywordsList->addItem(item); } QSet OptionsDialog::keywordNames() @@ -114,7 +171,7 @@ void OptionsDialog::addKeywordButtonClicked() void OptionsDialog::editKeywordButtonClicked() { - QListWidgetItem *item = ui.keywordsList->currentItem(); + QListWidgetItem *item = m_keywordsList->currentItem(); editKeyword(item); } @@ -140,7 +197,7 @@ void OptionsDialog::editKeyword(QListWidgetItem *item) void OptionsDialog::removeKeywordButtonClicked() { - delete ui.keywordsList->takeItem(ui.keywordsList->currentRow()); + delete m_keywordsList->takeItem(m_keywordsList->currentRow()); } void OptionsDialog::resetKeywordsButtonClicked() @@ -152,18 +209,18 @@ void OptionsDialog::resetKeywordsButtonClicked() void OptionsDialog::setKeywordsButtonsEnabled() { - const bool isSomethingSelected = !ui.keywordsList->selectedItems().isEmpty(); - ui.removeKeywordButton->setEnabled(isSomethingSelected); - ui.editKeywordButton->setEnabled(isSomethingSelected); + const bool isSomethingSelected = !m_keywordsList->selectedItems().isEmpty(); + m_removeKeywordButton->setEnabled(isSomethingSelected); + m_editKeywordButton->setEnabled(isSomethingSelected); } void OptionsDialog::setSettings(const Settings &settings) { - ui.scanInCurrentFileRadioButton->setChecked(settings.scanningScope == ScanningScopeCurrentFile); - ui.scanInProjectRadioButton->setChecked(settings.scanningScope == ScanningScopeProject); - ui.scanInSubprojectRadioButton->setChecked(settings.scanningScope == ScanningScopeSubProject); + m_scanInCurrentFileRadioButton->setChecked(settings.scanningScope == ScanningScopeCurrentFile); + m_scanInProjectRadioButton->setChecked(settings.scanningScope == ScanningScopeProject); + m_scanInSubprojectRadioButton->setChecked(settings.scanningScope == ScanningScopeSubProject); - ui.keywordsList->clear(); + m_keywordsList->clear(); for (const Keyword &keyword : qAsConst(settings.keywords)) addToKeywordsList(keyword); } @@ -172,16 +229,16 @@ Settings OptionsDialog::settingsFromUi() { Settings settings; - if (ui.scanInCurrentFileRadioButton->isChecked()) + if (m_scanInCurrentFileRadioButton->isChecked()) settings.scanningScope = ScanningScopeCurrentFile; - else if (ui.scanInSubprojectRadioButton->isChecked()) + else if (m_scanInSubprojectRadioButton->isChecked()) settings.scanningScope = ScanningScopeSubProject; else settings.scanningScope = ScanningScopeProject; settings.keywords.clear(); - for (int i = 0; i < ui.keywordsList->count(); ++i) { - QListWidgetItem *item = ui.keywordsList->item(i); + for (int i = 0; i < m_keywordsList->count(); ++i) { + QListWidgetItem *item = m_keywordsList->item(i); Keyword keyword; keyword.name = item->text(); @@ -220,5 +277,4 @@ TodoOptionsPage::TodoOptionsPage(Settings *settings, const std::function -namespace Todo { -namespace Internal { +namespace Todo::Internal { class Settings; @@ -39,5 +38,4 @@ public: TodoOptionsPage(Settings *settings, const std::function &onApply); }; -} // namespace Internal -} // namespace Todo +} // Todo::Internal diff --git a/src/plugins/todo/optionsdialog.ui b/src/plugins/todo/optionsdialog.ui deleted file mode 100644 index 8a31ce6bfea..00000000000 --- a/src/plugins/todo/optionsdialog.ui +++ /dev/null @@ -1,127 +0,0 @@ - - - Todo::Internal::OptionsDialog - - - - 0 - 0 - 444 - 482 - - - - - - - - - - Keywords - - - - - - QAbstractItemView::DragDrop - - - Qt::MoveAction - - - QAbstractItemView::SelectRows - - - false - - - - - - - - - Add - - - - - - - Edit - - - - - - - Remove - - - - - - - Reset - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - - Scanning scope - - - - - - true - - - Scan the whole active project - - - - - - - Scan only the currently edited document - - - true - - - - - - - Scan the current subproject - - - - - - - - - - - diff --git a/src/plugins/todo/todo.qbs b/src/plugins/todo/todo.qbs index df853f93bde..60faa34bc16 100644 --- a/src/plugins/todo/todo.qbs +++ b/src/plugins/todo/todo.qbs @@ -24,7 +24,6 @@ QtcPlugin { "lineparser.h", "optionsdialog.cpp", "optionsdialog.h", - "optionsdialog.ui", "todoprojectsettingswidget.cpp", "todoprojectsettingswidget.h", "todoprojectsettingswidget.ui",