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

ProjectExplorer: Unify naming scheme of widgets on settings page

Browse Source 
Change-Id: If149d3fffa3c305ca5f69f4d5c3b0ee572c80c94
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2018-10-05 14:27:16 +02:00
parent acb1cd33bb
commit 5f80bdfbcb
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/projectexplorer/projectexplorersettingspage.cpp
View File

@@ -34,6 +34,7 @@
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <QCoreApplication> #include <QCoreApplication>
#include <QWidget>
namespace ProjectExplorer { namespace ProjectExplorer {
namespace Internal { namespace Internal {
@@ -62,7 +63,7 @@ public:
private: private:
void slotDirectoryButtonGroupChanged(); void slotDirectoryButtonGroupChanged();
void resetDefaultBuildDirectory(); void resetDefaultBuildDirectory();
void updateResetButton(); void updateBuildDirectoryResetButton();
void setJomVisible(bool); void setJomVisible(bool);
@@ -80,10 +81,10 @@ ProjectExplorerSettingsWidget::ProjectExplorerSettingsWidget(QWidget *parent) :
connect(m_ui.directoryButtonGroup, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked), connect(m_ui.directoryButtonGroup, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked),
this, &ProjectExplorerSettingsWidget::slotDirectoryButtonGroupChanged); this, &ProjectExplorerSettingsWidget::slotDirectoryButtonGroupChanged);
connect(m_ui.resetButton, &QAbstractButton::clicked, connect(m_ui.buildDirectoryResetButton, &QAbstractButton::clicked,
this, &ProjectExplorerSettingsWidget::resetDefaultBuildDirectory); this, &ProjectExplorerSettingsWidget::resetDefaultBuildDirectory);
connect(m_ui.buildDirectoryEdit, &QLineEdit::textChanged, connect(m_ui.buildDirectoryEdit, &QLineEdit::textChanged,
this, &ProjectExplorerSettingsWidget::updateResetButton); this, &ProjectExplorerSettingsWidget::updateBuildDirectoryResetButton);
auto chooser = new Core::VariableChooser(this); auto chooser = new Core::VariableChooser(this);
chooser->addSupportedWidget(m_ui.buildDirectoryEdit); chooser->addSupportedWidget(m_ui.buildDirectoryEdit);
@@ -180,9 +181,9 @@ void ProjectExplorerSettingsWidget::resetDefaultBuildDirectory()
setBuildDirectory(QLatin1String(Core::Constants::DEFAULT_BUILD_DIRECTORY)); setBuildDirectory(QLatin1String(Core::Constants::DEFAULT_BUILD_DIRECTORY));
} }
void ProjectExplorerSettingsWidget::updateResetButton() void ProjectExplorerSettingsWidget::updateBuildDirectoryResetButton()
{ {
m_ui.resetButton->setEnabled(buildDirectory() != QLatin1String(Core::Constants::DEFAULT_BUILD_DIRECTORY)); m_ui.buildDirectoryResetButton->setEnabled(buildDirectory() != QLatin1String(Core::Constants::DEFAULT_BUILD_DIRECTORY));
} }
// ------------------ ProjectExplorerSettingsPage // ------------------ ProjectExplorerSettingsPage

6
src/plugins/projectexplorer/projectexplorersettingspage.ui
View File

@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>831</width> <width>831</width>
<height>507</height> <height>520</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -328,7 +328,7 @@
<number>12</number> <number>12</number>
</property> </property>
<item> <item>
<widget class="QLabel" name="buildDirLabel"> <widget class="QLabel" name="buildDirectoryLabel">
<property name="text"> <property name="text">
<string>Default build directory:</string> <string>Default build directory:</string>
</property> </property>
@@ -338,7 +338,7 @@
<widget class="QLineEdit" name="buildDirectoryEdit"/> <widget class="QLineEdit" name="buildDirectoryEdit"/>
</item> </item>
<item> <item>
<widget class="QPushButton" name="resetButton"> <widget class="QPushButton" name="buildDirectoryResetButton">
<property name="text"> <property name="text">
<string>Reset</string> <string>Reset</string>
</property> </property>