projectexplorer: make toolchain "Clone" option more obvious

Reviewed-By: Tobias Hunger

diff --git a/src/plugins/projectexplorer/toolchainoptionspage.cpp b/src/plugins/projectexplorer/toolchainoptionspage.cpp
index 378fefb..3df8ec2 100644 (file)
--- a/src/plugins/projectexplorer/toolchainoptionspage.cpp
+++ b/src/plugins/projectexplorer/toolchainoptionspage.cpp
@@ -432,7 +432,7 @@ void ToolChainModel::removeToolChain(ToolChain *tc)
 // --------------------------------------------------------------------------
 
 ToolChainOptionsPage::ToolChainOptionsPage() :
-    m_ui(0), m_cloneAction(0), m_model(0), m_selectionModel(0), m_currentTcWidget(0)
+    m_ui(0), m_model(0), m_selectionModel(0), m_currentTcWidget(0)
 { }
 
 QString ToolChainOptionsPage::id() const
@@ -501,14 +501,9 @@ QWidget *ToolChainOptionsPage::createPage(QWidget *parent)
             addMenu->addAction(action);
         }
     }
-    m_cloneAction = new QAction(addMenu);
-    m_cloneAction->setText(tr("Clone ..."));
-    connect(m_cloneAction, SIGNAL(triggered()), mapper, SLOT(map()));
-    mapper->setMapping(m_cloneAction, static_cast<QObject *>(0));
-
-    if (!addMenu->isEmpty())
-        addMenu->addSeparator();
-    addMenu->addAction(m_cloneAction);
+    connect(m_ui->cloneButton, SIGNAL(clicked()), mapper, SLOT(map()));
+    mapper->setMapping(m_ui->cloneButton, static_cast<QObject *>(0));
+
     m_ui->addButton->setMenu(addMenu);
 
     connect(m_ui->delButton, SIGNAL(clicked()), this, SLOT(removeToolChain()));
@@ -599,7 +594,7 @@ void ToolChainOptionsPage::updateState()
         canDelete = !tc->isAutoDetected();
     }
 
-    m_cloneAction->setEnabled(canCopy);
+    m_ui->cloneButton->setEnabled(canCopy);
     m_ui->delButton->setEnabled(canDelete);
 }
 

diff --git a/src/plugins/projectexplorer/toolchainoptionspage.h b/src/plugins/projectexplorer/toolchainoptionspage.h
index dd14b2d..44bc46c 100644 (file)
--- a/src/plugins/projectexplorer/toolchainoptionspage.h
+++ b/src/plugins/projectexplorer/toolchainoptionspage.h
@@ -144,7 +144,6 @@ private:
     Ui::ToolChainOptionsPage *m_ui;
     QWidget *m_configWidget;
     QString m_searchKeywords;
-    QAction *m_cloneAction;
 
     ToolChainModel *m_model;
     QList<ToolChainFactory *> m_factories;

diff --git a/src/plugins/projectexplorer/toolchainoptionspage.ui b/src/plugins/projectexplorer/toolchainoptionspage.ui
index 5c23b4a..3f5bb0e 100644 (file)
--- a/src/plugins/projectexplorer/toolchainoptionspage.ui
+++ b/src/plugins/projectexplorer/toolchainoptionspage.ui
@@ -51,6 +51,25 @@
         </widget>
        </item>
        <item>
+        <widget class="QPushButton" name="cloneButton">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>21</width>
+           <height>23</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>Clone</string>
+         </property>
+        </widget>
+       </item>
+       <item>
         <widget class="QPushButton" name="delButton">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">