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

Macros: Inline macrooptionswidget.ui

Browse Source 
Change-Id: Ib35fd2816b7da5d2720f09ca89903549c7d3e66f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2022-07-20 17:30:47 +02:00
parent 715e5800a5
commit 6f62352bfa
5 changed files with 70 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/macros/CMakeLists.txt
View File

@@ -9,7 +9,7 @@ add_qtc_plugin(Macros
macrolocatorfilter.cpp macrolocatorfilter.h macrolocatorfilter.cpp macrolocatorfilter.h
macromanager.cpp macromanager.h macromanager.cpp macromanager.h
macrooptionspage.cpp macrooptionspage.h macrooptionspage.cpp macrooptionspage.h
macrooptionswidget.cpp macrooptionswidget.h macrooptionswidget.ui macrooptionswidget.cpp macrooptionswidget.h
macros.qrc macros.qrc
macrosconstants.h macrosconstants.h
macrosplugin.cpp macrosplugin.h macrosplugin.cpp macrosplugin.h

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

@@ -24,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
#include "macrooptionswidget.h" #include "macrooptionswidget.h"
#include "ui_macrooptionswidget.h"
#include "macrosconstants.h" #include "macrosconstants.h"
#include "macromanager.h" #include "macromanager.h"
#include "macro.h" #include "macro.h"
@@ -34,48 +34,77 @@
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/command.h> #include <coreplugin/actionmanager/command.h>
#include <utils/layoutbuilder.h>
#include <QAction> #include <QAction>
#include <QDir> #include <QDir>
#include <QFileInfo> #include <QFileInfo>
#include <QGroupBox>
#include <QHeaderView>
#include <QLabel>
#include <QLineEdit>
#include <QPushButton>
#include <QTreeWidget> #include <QTreeWidget>
#include <QTreeWidgetItem> #include <QTreeWidgetItem>
namespace { namespace Macros::Internal {
int NAME_ROLE = Qt::UserRole;
int WRITE_ROLE = Qt::UserRole+1;
}
using namespace Macros; const int NAME_ROLE = Qt::UserRole;
using namespace Macros::Internal; const int WRITE_ROLE = Qt::UserRole + 1;
MacroOptionsWidget::MacroOptionsWidget()
MacroOptionsWidget::MacroOptionsWidget() :
m_ui(new Ui::MacroOptionsWidget)
{ {
m_ui->setupUi(this); m_treeWidget = new QTreeWidget;
m_treeWidget->setTextElideMode(Qt::ElideLeft);
m_treeWidget->setUniformRowHeights(true);
m_treeWidget->setSortingEnabled(true);
m_treeWidget->setColumnCount(3);
m_treeWidget->header()->setSortIndicatorShown(true);
m_treeWidget->header()->setStretchLastSection(true);
m_treeWidget->header()->setSortIndicator(0, Qt::AscendingOrder);
m_treeWidget->setHeaderLabels({tr("Name"), tr("Description)"), tr("Shortcut")});
connect(m_ui->treeWidget, &QTreeWidget::currentItemChanged, m_description = new QLineEdit;
m_removeButton = new QPushButton(tr("Remove"));
m_macroGroup = new QGroupBox(tr("Macro"), this);
using namespace Utils::Layouting;
Row {
tr("Description:"), m_description
}.attachTo(m_macroGroup);
Column {
Group {
Title(tr("Preferences")),
Row {
m_treeWidget,
Column { m_removeButton, Stretch() },
}
},
m_macroGroup
}.attachTo(this);
connect(m_treeWidget, &QTreeWidget::currentItemChanged,
this, &MacroOptionsWidget::changeCurrentItem); this, &MacroOptionsWidget::changeCurrentItem);
connect(m_ui->removeButton, &QPushButton::clicked, connect(m_removeButton, &QPushButton::clicked,
this, &MacroOptionsWidget::remove); this, &MacroOptionsWidget::remove);
connect(m_ui->description, &QLineEdit::textChanged, connect(m_description, &QLineEdit::textChanged,
this, &MacroOptionsWidget::changeDescription); this, &MacroOptionsWidget::changeDescription);
m_ui->treeWidget->header()->setSortIndicator(0, Qt::AscendingOrder);
initialize(); initialize();
} }
MacroOptionsWidget::~MacroOptionsWidget() MacroOptionsWidget::~MacroOptionsWidget() = default;
{
delete m_ui;
}
void MacroOptionsWidget::initialize() void MacroOptionsWidget::initialize()
{ {
m_macroToRemove.clear(); m_macroToRemove.clear();
m_macroToChange.clear(); m_macroToChange.clear();
m_ui->treeWidget->clear(); m_treeWidget->clear();
changeCurrentItem(nullptr);
// Create the treeview // Create the treeview
createTable(); createTable();
@@ -88,7 +117,7 @@ void MacroOptionsWidget::createTable()
for (Macro *macro : MacroManager::macros()) { for (Macro *macro : MacroManager::macros()) {
QFileInfo fileInfo(macro->fileName()); QFileInfo fileInfo(macro->fileName());
if (fileInfo.absoluteDir() == dir.absolutePath()) { if (fileInfo.absoluteDir() == dir.absolutePath()) {
auto macroItem = new QTreeWidgetItem(m_ui->treeWidget); auto macroItem = new QTreeWidgetItem(m_treeWidget);
macroItem->setText(0, macro->displayName()); macroItem->setText(0, macro->displayName());
macroItem->setText(1, macro->description()); macroItem->setText(1, macro->description());
macroItem->setData(0, NAME_ROLE, macro->displayName()); macroItem->setData(0, NAME_ROLE, macro->displayName());
@@ -107,22 +136,20 @@ void MacroOptionsWidget::createTable()
void MacroOptionsWidget::changeCurrentItem(QTreeWidgetItem *current) void MacroOptionsWidget::changeCurrentItem(QTreeWidgetItem *current)
{ {
m_changingCurrent = true; m_changingCurrent = true;
m_removeButton->setEnabled(current);
m_macroGroup->setEnabled(current);
if (!current) { if (!current) {
m_ui->removeButton->setEnabled(false); m_description->clear();
m_ui->description->clear();
m_ui->macroGroup->setEnabled(false);
} else { } else {
m_ui->removeButton->setEnabled(true); m_description->setText(current->text(1));
m_ui->description->setText(current->text(1)); m_description->setEnabled(current->data(0, WRITE_ROLE).toBool());
m_ui->description->setEnabled(current->data(0, WRITE_ROLE).toBool());
m_ui->macroGroup->setEnabled(true);
} }
m_changingCurrent = false; m_changingCurrent = false;
} }
void MacroOptionsWidget::remove() void MacroOptionsWidget::remove()
{ {
QTreeWidgetItem *current = m_ui->treeWidget->currentItem(); QTreeWidgetItem *current = m_treeWidget->currentItem();
m_macroToRemove.append(current->data(0, NAME_ROLE).toString()); m_macroToRemove.append(current->data(0, NAME_ROLE).toString());
delete current; delete current;
} }
@@ -145,7 +172,7 @@ void MacroOptionsWidget::apply()
void MacroOptionsWidget::changeDescription(const QString &description) void MacroOptionsWidget::changeDescription(const QString &description)
{ {
QTreeWidgetItem *current = m_ui->treeWidget->currentItem(); QTreeWidgetItem *current = m_treeWidget->currentItem();
if (m_changingCurrent || !current) if (m_changingCurrent || !current)
return; return;
@@ -156,3 +183,5 @@ void MacroOptionsWidget::changeDescription(const QString &description)
font.setItalic(true); font.setItalic(true);
current->setFont(1, font); current->setFont(1, font);
} }
} // Macros::Internal

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

@@ -31,14 +31,16 @@
#include <QMap> #include <QMap>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QGroupBox;
class QLineEdit;
class QPushButton;
class QTreeWidget;
class QTreeWidgetItem; class QTreeWidgetItem;
QT_END_NAMESPACE QT_END_NAMESPACE
namespace Macros { namespace Macros {
namespace Internal { namespace Internal {
namespace Ui { class MacroOptionsWidget; }
class MacroOptionsWidget final : public Core::IOptionsPageWidget class MacroOptionsWidget final : public Core::IOptionsPageWidget
{ {
Q_OBJECT Q_OBJECT
@@ -60,11 +62,15 @@ private:
void changeDescription(const QString &description); void changeDescription(const QString &description);
private: private:
Ui::MacroOptionsWidget *m_ui;
QStringList m_macroToRemove; QStringList m_macroToRemove;
bool m_changingCurrent = false; bool m_changingCurrent = false;
QMap<QString, QString> m_macroToChange; QMap<QString, QString> m_macroToChange;
QTreeWidget *m_treeWidget;
QPushButton *m_removeButton;
QGroupBox *m_macroGroup;
QLineEdit *m_description;
}; };
} // namespace Internal } // namespace Internal

118
src/plugins/macros/macrooptionswidget.ui
View File

@@ -1,118 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Macros::Internal::MacroOptionsWidget</class>
<widget class="QWidget" name="Macros::Internal::MacroOptionsWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>464</width>
<height>473</height>
</rect>
</property>
<property name="windowTitle">
<string/>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QGroupBox" name="directoryGroupBox">
<property name="title">
<string>Preferences</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" rowspan="2">
<widget class="QTreeWidget" name="treeWidget">
<property name="textElideMode">
<enum>Qt::ElideLeft</enum>
</property>
<property name="uniformRowHeights">
<bool>true</bool>
</property>
<property name="sortingEnabled">
<bool>true</bool>
</property>
<property name="columnCount">
<number>3</number>
</property>
<attribute name="headerShowSortIndicator" stdset="0">
<bool>true</bool>
</attribute>
<attribute name="headerStretchLastSection">
<bool>true</bool>
</attribute>
<column>
<property name="text">
<string>Name</string>
</property>
</column>
<column>
<property name="text">
<string>Description</string>
</property>
</column>
<column>
<property name="text">
<string>Shortcut</string>
</property>
</column>
</widget>
</item>
<item row="1" column="1">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="removeButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize">
<size>
<width>21</width>
<height>23</height>
</size>
</property>
<property name="text">
<string>Remove</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="macroGroup">
<property name="title">
<string>Macro</string>
</property>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Description:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="description"/>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>

1
src/plugins/macros/macros.qbs
View File

@@ -31,7 +31,6 @@ QtcPlugin {
"macrooptionspage.h", "macrooptionspage.h",
"macrooptionswidget.cpp", "macrooptionswidget.cpp",
"macrooptionswidget.h", "macrooptionswidget.h",
"macrooptionswidget.ui",
"macros.qrc", "macros.qrc",
"macrosconstants.h", "macrosconstants.h",
"macrosplugin.cpp", "macrosplugin.cpp",