feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Macros: Use new settings page convenience

Browse Source 
Change-Id: I42caad4311d4238310a767543acafe0a142917f4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-01-07 17:34:48 +01:00
parent 06b094bf20
commit 9c3fc239b4
4 changed files with 12 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/macros/macrooptionspage.cpp
View File

@@ -33,7 +33,6 @@
#include <QCoreApplication> #include <QCoreApplication>
#include <QWidget> #include <QWidget>
#include <QIcon>
using namespace Macros; using namespace Macros;
using namespace Macros::Internal; using namespace Macros::Internal;
@@ -44,22 +43,5 @@ MacroOptionsPage::MacroOptionsPage()
setId(Constants::M_OPTIONS_PAGE); setId(Constants::M_OPTIONS_PAGE);
setDisplayName(QCoreApplication::translate("Macros", Constants::M_OPTIONS_TR_PAGE)); setDisplayName(QCoreApplication::translate("Macros", Constants::M_OPTIONS_TR_PAGE));
setCategory(TextEditor::Constants::TEXT_EDITOR_SETTINGS_CATEGORY); setCategory(TextEditor::Constants::TEXT_EDITOR_SETTINGS_CATEGORY);
} setWidgetCreator([] { return new MacroOptionsWidget; });
QWidget *MacroOptionsPage::widget()
{
if (!m_widget)
m_widget = new MacroOptionsWidget;
return m_widget;
}
void MacroOptionsPage::apply()
{
if (m_widget)
m_widget->apply();
}
void MacroOptionsPage::finish()
{
delete m_widget;
} }

12
src/plugins/macros/macrooptionspage.h
View File

@@ -27,27 +27,15 @@
#include <coreplugin/dialogs/ioptionspage.h> #include <coreplugin/dialogs/ioptionspage.h>
#include <QPointer>
namespace Macros { namespace Macros {
namespace Internal { namespace Internal {
class MacroOptionsWidget;
class MacroOptionsPage : public Core::IOptionsPage class MacroOptionsPage : public Core::IOptionsPage
{ {
Q_OBJECT Q_OBJECT
public: public:
MacroOptionsPage(); MacroOptionsPage();
// IOptionsPage implementation
QWidget *widget() override;
void apply() override;
void finish() override;
private:
QPointer<MacroOptionsWidget> m_widget;
}; };
} // namespace Internal } // namespace Internal

6
src/plugins/macros/macrooptionswidget.cpp
View File

@@ -50,10 +50,8 @@ using namespace Macros;
using namespace Macros::Internal; using namespace Macros::Internal;
MacroOptionsWidget::MacroOptionsWidget(QWidget *parent) : MacroOptionsWidget::MacroOptionsWidget() :
QWidget(parent), m_ui(new Ui::MacroOptionsWidget)
m_ui(new Ui::MacroOptionsWidget),
m_changingCurrent(false)
{ {
m_ui->setupUi(this); m_ui->setupUi(this);

16
src/plugins/macros/macrooptionswidget.h
View File

@@ -25,7 +25,7 @@
#pragma once #pragma once
#include <QWidget> #include <coreplugin/dialogs/ioptionspage.h>
#include <QStringList> #include <QStringList>
#include <QMap> #include <QMap>
@@ -34,21 +34,23 @@ QT_BEGIN_NAMESPACE
class QTreeWidgetItem; class QTreeWidgetItem;
QT_END_NAMESPACE QT_END_NAMESPACE
namespace Macros { namespace Macros {
namespace Internal { namespace Internal {
namespace Ui { class MacroOptionsWidget; } namespace Ui { class MacroOptionsWidget; }
class MacroOptionsWidget : public QWidget { class MacroOptionsWidget : public Core::IOptionsPageWidget
{
Q_OBJECT Q_OBJECT
public: public:
explicit MacroOptionsWidget(QWidget *parent = nullptr); MacroOptionsWidget();
~MacroOptionsWidget() override; ~MacroOptionsWidget() final;
void initialize(); void initialize();
void apply(); void apply() final;
void finish() final {}
private: private:
void remove(); void remove();
@@ -61,7 +63,7 @@ private:
private: private:
Ui::MacroOptionsWidget *m_ui; Ui::MacroOptionsWidget *m_ui;
QStringList m_macroToRemove; QStringList m_macroToRemove;
bool m_changingCurrent; bool m_changingCurrent = false;
QMap<QString, QString> m_macroToChange; QMap<QString, QString> m_macroToChange;
}; };