From 16f27124035f87d56428fcca96a4c410781112d5 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Tue, 28 Sep 2010 11:49:43 +0200
Subject: [PATCH] Use PathChooser in MakeStep config widget

TaskNumber: QTCREATORBUG-2479
Reviewed-by: Robert Loehning
---
 src/plugins/qt4projectmanager/makestep.cpp | 10 +++++++---
 src/plugins/qt4projectmanager/makestep.ui  | 26 ++++++++++++++++++--------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp
index 4a42a65633..6fa06af26e 100644
--- a/src/plugins/qt4projectmanager/makestep.cpp
+++ b/src/plugins/qt4projectmanager/makestep.cpp
@@ -238,7 +238,11 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep)
     : BuildStepConfigWidget(), m_ui(new Ui::MakeStep), m_makeStep(makeStep), m_ignoreChange(false)
 {
     m_ui->setupUi(this);
-    connect(m_ui->makeLineEdit, SIGNAL(textEdited(QString)),
+
+    m_ui->makePathChooser->setExpectedKind(Utils::PathChooser::ExistingCommand);
+    m_ui->makePathChooser->setBaseDirectory(Utils::PathChooser::homePath());
+
+    connect(m_ui->makePathChooser, SIGNAL(editingFinished()),
             this, SLOT(makeEdited()));
     connect(m_ui->makeArgumentsLineEdit, SIGNAL(textEdited(QString)),
             this, SLOT(makeArgumentsLineEdited()));
@@ -336,7 +340,7 @@ void MakeStepConfigWidget::init()
     updateMakeOverrideLabel();
 
     const QString &makeCmd = m_makeStep->m_makeCmd;
-    m_ui->makeLineEdit->setText(makeCmd);
+    m_ui->makePathChooser->setPath(makeCmd);
 
     const QStringList &makeArguments = m_makeStep->userArguments();
     m_ui->makeArgumentsLineEdit->setText(Utils::Environment::joinArgumentList(makeArguments));
@@ -345,7 +349,7 @@ void MakeStepConfigWidget::init()
 
 void MakeStepConfigWidget::makeEdited()
 {
-    m_makeStep->m_makeCmd = m_ui->makeLineEdit->text();
+    m_makeStep->m_makeCmd = m_ui->makePathChooser->rawPath();
     updateDetails();
 }
 
diff --git a/src/plugins/qt4projectmanager/makestep.ui b/src/plugins/qt4projectmanager/makestep.ui
index 1dfff96f27..015936f46c 100644
--- a/src/plugins/qt4projectmanager/makestep.ui
+++ b/src/plugins/qt4projectmanager/makestep.ui
@@ -11,18 +11,14 @@
    </rect>
   </property>
   <layout class="QFormLayout" name="formLayout">
+   <property name="fieldGrowthPolicy">
+    <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+   </property>
    <property name="margin">
     <number>0</number>
    </property>
-   <item row="0" column="0">
-    <widget class="QLabel" name="makeLabel">
-     <property name="text">
-      <string>Override %1:</string>
-     </property>
-    </widget>
-   </item>
    <item row="0" column="1">
-    <widget class="QLineEdit" name="makeLineEdit"/>
+    <widget class="Utils::PathChooser" name="makePathChooser"/>
    </item>
    <item row="1" column="0">
     <widget class="QLabel" name="makeArgumentsLabel">
@@ -34,8 +30,22 @@
    <item row="1" column="1">
     <widget class="QLineEdit" name="makeArgumentsLineEdit"/>
    </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="makeLabel">
+     <property name="text">
+      <string>Override %1:</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>Utils::PathChooser</class>
+   <extends>QLineEdit</extends>
+   <header>utils/pathchooser.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>
-- 
2.11.0