From 4bf4b4521e9ed6de8fd83c669a9b5fe64e2acf63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Mon, 18 May 2009 15:09:29 +0200
Subject: [PATCH] Simplified labels related to build and run settings
Mainly removed the "Settings" part, since we don't use that in our
settings pages generally.
Also merged the build and run group boxes, since they both have only a
single checkbox currently. Easy enough to add more structure when
necessary.
---
.../projectexplorersettingspage.cpp | 2 +-
.../projectexplorersettingspage.ui | 15 +++------------
2 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.cpp b/src/plugins/projectexplorer/projectexplorersettingspage.cpp
index f5e87f827ed..b6b7cce8a57 100644
--- a/src/plugins/projectexplorer/projectexplorersettingspage.cpp
+++ b/src/plugins/projectexplorer/projectexplorersettingspage.cpp
@@ -52,7 +52,7 @@ QString ProjectExplorerSettingsPage::id() const
QString ProjectExplorerSettingsPage::trName() const
{
- return tr("Build and Run Settings");
+ return tr("Build and Run");
}
QString ProjectExplorerSettingsPage::category() const
diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.ui b/src/plugins/projectexplorer/projectexplorersettingspage.ui
index d9104f52727..f3cfc1fe74f 100644
--- a/src/plugins/projectexplorer/projectexplorersettingspage.ui
+++ b/src/plugins/projectexplorer/projectexplorersettingspage.ui
@@ -6,15 +6,15 @@
<rect>
<x>0</x>
<y>0</y>
- <width>541</width>
- <height>358</height>
+ <width>296</width>
+ <height>152</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
- <string>Build Settings</string>
+ <string>Build and Run</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
@@ -24,15 +24,6 @@
</property>
</widget>
</item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="groupBox_2">
- <property name="title">
- <string>Run Settings</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QCheckBox" name="buildProjectBeforeRunCheckBox">
<property name="text">
--
GitLab