Commit 7e5902f3 authored by dt's avatar dt

Remove make active from the runconfigurations page

The active runconfiguration is now the same as the one you are editing.
parent c05e11b1
......@@ -33,6 +33,7 @@
#include "iprojectproperties.h"
#include <QtGui/QWidget>
#include <QtCore/QAbstractListModel>
QT_BEGIN_NAMESPACE
class QMenu;
......@@ -92,20 +93,41 @@ private slots:
void aboutToShowAddMenu();
void addRunConfiguration();
void removeRunConfiguration();
void makeActive();
void displayNameChanged();
void initRunConfigurationComboBox();
void activeRunConfigurationChanged();
private:
RunConfiguration *currentRunConfiguration() const;
Target *m_target;
RunConfigurationsModel *m_runConfigurationsModel;
Ui::RunSettingsPropertiesPage *m_ui;
QWidget *m_runConfigurationWidget;
QMenu *m_addMenu;
bool m_ignoreChange;
};
/*! A model to represent the run configurations of a target. */
class RunConfigurationsModel : public QAbstractListModel
{
Q_OBJECT
public:
RunConfigurationsModel(Target *target, QObject *parent = 0);
int rowCount(const QModelIndex &parent = QModelIndex()) const;
int columnCount(const QModelIndex &parent = QModelIndex()) const;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
RunConfiguration *runConfigurationAt(int i);
RunConfiguration *runConfigurationFor(const QModelIndex &idx);
QModelIndex indexFor(RunConfiguration *rc);
private slots:
void addedRunConfiguration(ProjectExplorer::RunConfiguration*);
void removedRunConfiguration(ProjectExplorer::RunConfiguration*);
void displayNameChanged();
private:
Target *m_target;
QList<RunConfiguration *> m_runConfigurations;
};
} // namespace Internal
} // namespace ProjectExplorer
......
......@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>442</width>
<width>480</width>
<height>32</height>
</rect>
</property>
......@@ -25,7 +25,7 @@
</sizepolicy>
</property>
<property name="text">
<string>Edit run configuration:</string>
<string>Run configuration:</string>
</property>
<property name="buddy">
<cstring>runConfigurationCombo</cstring>
......@@ -62,13 +62,6 @@
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="makeActiveButton">
<property name="text">
<string>Make Active</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment