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

Beautifier: inline uncrustifyoptionspage.ui

Browse Source 
Change-Id: I12a595995b1567506d7c2c029ec3b7a1d4837ca3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2022-07-22 17:09:29 +02:00
parent 4933697d9a
commit 6aa712e11f
5 changed files with 97 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,6 @@ add_qtc_plugin(Beautifier
generalsettings.cpp generalsettings.h generalsettings.cpp generalsettings.h
uncrustify/uncrustify.cpp uncrustify/uncrustify.h uncrustify/uncrustify.cpp uncrustify/uncrustify.h
uncrustify/uncrustifyconstants.h uncrustify/uncrustifyconstants.h
uncrustify/uncrustifyoptionspage.cpp uncrustify/uncrustifyoptionspage.h uncrustify/uncrustifyoptionspage.ui uncrustify/uncrustifyoptionspage.cpp uncrustify/uncrustifyoptionspage.h
uncrustify/uncrustifysettings.cpp uncrustify/uncrustifysettings.h uncrustify/uncrustifysettings.cpp uncrustify/uncrustifysettings.h
) )

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

@@ -69,7 +69,6 @@ QtcPlugin {
"uncrustifyconstants.h", "uncrustifyconstants.h",
"uncrustifyoptionspage.cpp", "uncrustifyoptionspage.cpp",
"uncrustifyoptionspage.h", "uncrustifyoptionspage.h",
"uncrustifyoptionspage.ui",
"uncrustifysettings.cpp", "uncrustifysettings.cpp",
"uncrustifysettings.h" "uncrustifysettings.h"
] ]

129
src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp
View File

@@ -24,7 +24,6 @@
****************************************************************************/ ****************************************************************************/
#include "uncrustifyoptionspage.h" #include "uncrustifyoptionspage.h"
#include "ui_uncrustifyoptionspage.h"
#include "uncrustifyconstants.h" #include "uncrustifyconstants.h"
#include "uncrustifysettings.h" #include "uncrustifysettings.h"
@@ -32,9 +31,18 @@
#include "../beautifierconstants.h" #include "../beautifierconstants.h"
#include "../beautifierplugin.h" #include "../beautifierplugin.h"
#include "../configurationpanel.h"
namespace Beautifier { #include <utils/layoutbuilder.h>
namespace Internal { #include <utils/pathchooser.h>
#include <QApplication>
#include <QCheckBox>
#include <QGroupBox>
#include <QLabel>
#include <QLineEdit>
namespace Beautifier::Internal {
class UncrustifyOptionsPageWidget : public Core::IOptionsPageWidget class UncrustifyOptionsPageWidget : public Core::IOptionsPageWidget
{ {
@@ -46,52 +54,104 @@ public:
void apply() final; void apply() final;
private: private:
Ui::UncrustifyOptionsPage ui;
UncrustifySettings *m_settings; UncrustifySettings *m_settings;
Utils::PathChooser *m_command;
QLineEdit *m_mime;
QCheckBox *m_useOtherFiles;
QCheckBox *m_useSpecificFile;
Utils::PathChooser *m_uncrusifyFilePath;
QCheckBox *m_useHomeFile;
QCheckBox *m_useCustomStyle;
ConfigurationPanel *m_configurations;
QCheckBox *m_formatEntireFileFallback;
}; };
UncrustifyOptionsPageWidget::UncrustifyOptionsPageWidget(UncrustifySettings *settings) UncrustifyOptionsPageWidget::UncrustifyOptionsPageWidget(UncrustifySettings *settings)
: m_settings(settings) : m_settings(settings)
{ {
ui.setupUi(this); resize(817, 631);
ui.useHomeFile->setText(ui.useHomeFile->text().replace(
"HOME", QDir::toNativeSeparators(QDir::home().absolutePath())));
ui.uncrusifyFilePath->setExpectedKind(Utils::PathChooser::File);
ui.uncrusifyFilePath->setPromptDialogFilter(tr("Uncrustify file (*.cfg)"));
ui.command->setExpectedKind(Utils::PathChooser::ExistingCommand); m_command = new Utils::PathChooser;
ui.command->setCommandVersionArguments({"--version"});
ui.command->setPromptDialogTitle(BeautifierPlugin::msgCommandPromptDialogTitle( m_mime = new QLineEdit(m_settings->supportedMimeTypesAsString());
m_useOtherFiles = new QCheckBox(tr("Use file uncrustify.cfg defined in project files"));
m_useOtherFiles->setChecked(m_settings->useOtherFiles());
m_useSpecificFile = new QCheckBox(tr("Use file specific uncrustify.cfg"));
m_useSpecificFile->setChecked(m_settings->useSpecificConfigFile());
m_uncrusifyFilePath = new Utils::PathChooser;
m_uncrusifyFilePath->setExpectedKind(Utils::PathChooser::File);
m_uncrusifyFilePath->setPromptDialogFilter(tr("Uncrustify file (*.cfg)"));
m_uncrusifyFilePath->setFilePath(m_settings->specificConfigFile());
m_useHomeFile = new QCheckBox(tr("Use file uncrustify.cfg in HOME")
.replace( "HOME", QDir::toNativeSeparators(QDir::home().absolutePath())));
m_useHomeFile->setChecked(m_settings->useHomeFile());
m_useCustomStyle = new QCheckBox(tr("Use customized style:"));
m_useCustomStyle->setChecked(m_settings->useCustomStyle());
m_configurations = new ConfigurationPanel;
m_configurations->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
m_configurations->setSettings(m_settings);
m_configurations->setCurrentConfiguration(m_settings->customStyle());
m_formatEntireFileFallback = new QCheckBox(tr("Format entire file if no text was selected"));
m_formatEntireFileFallback->setToolTip(tr("For action Format Selected Text"));
m_formatEntireFileFallback->setChecked(m_settings->formatEntireFileFallback());
m_command->setExpectedKind(Utils::PathChooser::ExistingCommand);
m_command->setCommandVersionArguments({"--version"});
m_command->setPromptDialogTitle(BeautifierPlugin::msgCommandPromptDialogTitle(
Uncrustify::tr(Constants::UNCRUSTIFY_DISPLAY_NAME))); Uncrustify::tr(Constants::UNCRUSTIFY_DISPLAY_NAME)));
connect(ui.command, &Utils::PathChooser::validChanged, ui.options, &QWidget::setEnabled); m_command->setFilePath(m_settings->command());
ui.configurations->setSettings(m_settings);
ui.command->setFilePath(m_settings->command()); auto options = new QGroupBox(tr("Options"));
ui.mime->setText(m_settings->supportedMimeTypesAsString());
ui.useOtherFiles->setChecked(m_settings->useOtherFiles()); using namespace Utils::Layouting;
ui.useHomeFile->setChecked(m_settings->useHomeFile()); const Break br;
ui.useSpecificFile->setChecked(m_settings->useSpecificConfigFile());
ui.uncrusifyFilePath->setFilePath(m_settings->specificConfigFile()); Column {
ui.useCustomStyle->setChecked(m_settings->useCustomStyle()); m_useOtherFiles,
ui.configurations->setCurrentConfiguration(m_settings->customStyle()); Row { m_useSpecificFile, m_uncrusifyFilePath },
ui.formatEntireFileFallback->setChecked(m_settings->formatEntireFileFallback()); m_useHomeFile,
Row { m_useCustomStyle, m_configurations },
m_formatEntireFileFallback
}.attachTo(options);
Column {
Group {
Title(tr("Configuration")),
Form {
tr("Uncrustify command:"), m_command, br,
tr("Restrict to MIME types:"), m_mime
}
},
options,
Stretch()
}.attachTo(this);
connect(m_command, &Utils::PathChooser::validChanged, options, &QWidget::setEnabled);
} }
void UncrustifyOptionsPageWidget::apply() void UncrustifyOptionsPageWidget::apply()
{ {
m_settings->setCommand(ui.command->filePath().toString()); m_settings->setCommand(m_command->filePath().toString());
m_settings->setSupportedMimeTypes(ui.mime->text()); m_settings->setSupportedMimeTypes(m_mime->text());
m_settings->setUseOtherFiles(ui.useOtherFiles->isChecked()); m_settings->setUseOtherFiles(m_useOtherFiles->isChecked());
m_settings->setUseHomeFile(ui.useHomeFile->isChecked()); m_settings->setUseHomeFile(m_useHomeFile->isChecked());
m_settings->setUseSpecificConfigFile(ui.useSpecificFile->isChecked()); m_settings->setUseSpecificConfigFile(m_useSpecificFile->isChecked());
m_settings->setSpecificConfigFile(ui.uncrusifyFilePath->filePath()); m_settings->setSpecificConfigFile(m_uncrusifyFilePath->filePath());
m_settings->setUseCustomStyle(ui.useCustomStyle->isChecked()); m_settings->setUseCustomStyle(m_useCustomStyle->isChecked());
m_settings->setCustomStyle(ui.configurations->currentConfiguration()); m_settings->setCustomStyle(m_configurations->currentConfiguration());
m_settings->setFormatEntireFileFallback(ui.formatEntireFileFallback->isChecked()); m_settings->setFormatEntireFileFallback(m_formatEntireFileFallback->isChecked());
m_settings->save(); m_settings->save();
// update since not all MIME types are accepted (invalids or duplicates) // update since not all MIME types are accepted (invalids or duplicates)
ui.mime->setText(m_settings->supportedMimeTypesAsString()); m_mime->setText(m_settings->supportedMimeTypesAsString());
} }
UncrustifyOptionsPage::UncrustifyOptionsPage(UncrustifySettings *settings) UncrustifyOptionsPage::UncrustifyOptionsPage(UncrustifySettings *settings)
@@ -102,5 +162,4 @@ UncrustifyOptionsPage::UncrustifyOptionsPage(UncrustifySettings *settings)
setWidgetCreator([settings] { return new UncrustifyOptionsPageWidget(settings); }); setWidgetCreator([settings] { return new UncrustifyOptionsPageWidget(settings); });
} }
} // namespace Internal } // Beautifier::Internal
} // namespace Beautifier

6
src/plugins/beautifier/uncrustify/uncrustifyoptionspage.h
View File

@@ -27,8 +27,7 @@
#include <coreplugin/dialogs/ioptionspage.h> #include <coreplugin/dialogs/ioptionspage.h>
namespace Beautifier { namespace Beautifier::Internal {
namespace Internal {
class UncrustifySettings; class UncrustifySettings;
@@ -38,5 +37,4 @@ public:
explicit UncrustifyOptionsPage(UncrustifySettings *settings); explicit UncrustifyOptionsPage(UncrustifySettings *settings);
}; };
} // namespace Internal } // Beautifier::Internal
} // namespace Beautifier

138
src/plugins/beautifier/uncrustify/uncrustifyoptionspage.ui
View File

@@ -1,138 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Beautifier::Internal::UncrustifyOptionsPage</class>
<widget class="QWidget" name="Beautifier::Internal::UncrustifyOptionsPage">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>817</width>
<height>631</height>
</rect>
</property>
<property name="windowTitle">
<string/>
</property>
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0">
<item>
<widget class="QGroupBox" name="configuration">
<property name="title">
<string>Configuration</string>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="commandLabel">
<property name="text">
<string>Uncrustify command:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="Utils::PathChooser" name="command" native="true"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="mimeLabel">
<property name="text">
<string>Restrict to MIME types:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="mime"/>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="options">
<property name="title">
<string>Options</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QCheckBox" name="useOtherFiles">
<property name="text">
<string>Use file uncrustify.cfg defined in project files</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QCheckBox" name="useSpecificFile">
<property name="text">
<string>Use file specific uncrustify.cfg</string>
</property>
</widget>
</item>
<item>
<widget class="Utils::PathChooser" name="uncrusifyFilePath" native="true"/>
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="useHomeFile">
<property name="text">
<string extracomment="HOME is replaced by the user's home directory">Use file uncrustify.cfg in HOME</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,9999">
<item>
<widget class="QCheckBox" name="useCustomStyle">
<property name="text">
<string>Use customized style:</string>
</property>
</widget>
</item>
<item>
<widget class="Beautifier::Internal::ConfigurationPanel" name="configurations" native="true"/>
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="formatEntireFileFallback">
<property name="toolTip">
<string>For action Format Selected Text</string>
</property>
<property name="text">
<string>Format entire file if no text was selected</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<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>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>Utils::PathChooser</class>
<extends>QWidget</extends>
<header location="global">utils/pathchooser.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>Beautifier::Internal::ConfigurationPanel</class>
<extends>QWidget</extends>
<header location="global">beautifier/configurationpanel.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>