Commit 9d974ddc authored by hjk's avatar hjk Committed by hjk

projectexplorer: inline runsettingspropertiespage.ui

Change-Id: I291a5f0cf76721ade80ff72fc9c9d20b027bb1c5
Reviewed-on: http://codereview.qt-project.org/5736Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent e108cf43
......@@ -191,7 +191,6 @@ SOURCES += projectexplorer.cpp \
FORMS += processstep.ui \
toolchainoptionspage.ui \
editorsettingspropertiespage.ui \
runsettingspropertiespage.ui \
sessiondialog.ui \
projectwizardpage.ui \
removefiledialog.ui \
......
......@@ -39,8 +39,11 @@
#include <QtGui/QIcon>
QT_BEGIN_NAMESPACE
class QMenu;
class QComboBox;
class QGridLayout;
class QLabel;
class QMenu;
class QPushButton;
class QVBoxLayout;
QT_END_NAMESPACE
......@@ -57,10 +60,6 @@ namespace Internal {
const char RUNSETTINGS_PANEL_ID[] = "ProjectExplorer.RunSettingsPanel";
namespace Ui {
class RunSettingsPropertiesPage;
}
class BuildStepListWidget;
class RunSettingsPanelFactory : public ITargetPanelFactory
......@@ -106,7 +105,6 @@ private:
Target *m_target;
RunConfigurationModel *m_runConfigurationsModel;
DeployConfigurationModel *m_deployConfigurationModel;
Ui::RunSettingsPropertiesPage *m_ui;
QWidget *m_runConfigurationWidget;
QVBoxLayout *m_runLayout;
DeployConfigurationWidget *m_deployConfigurationWidget;
......@@ -117,6 +115,18 @@ private:
bool m_ignoreChange;
typedef QPair<RunConfigWidget *, QLabel *> RunConfigItem;
QList<RunConfigItem> m_subWidgets;
QGridLayout *m_gridLayout;
QComboBox *m_deployConfigurationCombo;
QWidget *m_deployWidget;
QComboBox *m_runConfigurationCombo;
QPushButton *m_addDeployToolButton;
QPushButton *m_removeDeployToolButton;
QPushButton *m_renameDeployToolButton;
QPushButton *m_addRunToolButton;
QPushButton *m_removeRunToolButton;
QPushButton *m_renameRunButton;
QPushButton *m_renameDeployButton;
};
} // namespace Internal
......
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ProjectExplorer::Internal::RunSettingsPropertiesPage</class>
<widget class="QWidget" name="ProjectExplorer::Internal::RunSettingsPropertiesPage">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>485</width>
<height>191</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="horizontalSpacing">
<number>6</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="deployLabel">
<property name="text">
<string>Deployment:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="deployConfigurationCombo"/>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="addDeployToolButton">
<property name="text">
<string>Add</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="removeDeployToolButton">
<property name="text">
<string>Remove</string>
</property>
</widget>
</item>
<item row="0" column="4">
<widget class="QPushButton" name="renameDeployButton">
<property name="text">
<string>Rename</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="6">
<widget class="QWidget" name="deployWidget" native="true"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="runLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Run configuration:</string>
</property>
<property name="buddy">
<cstring>runConfigurationCombo</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="runConfigurationCombo">
<property name="maximumSize">
<size>
<width>500</width>
<height>16777215</height>
</size>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
<property name="minimumContentsLength">
<number>15</number>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QPushButton" name="addRunToolButton">
<property name="text">
<string>Add</string>
</property>
</widget>
</item>
<item row="2" column="3">
<widget class="QPushButton" name="removeRunToolButton">
<property name="text">
<string>Remove</string>
</property>
</widget>
</item>
<item row="2" column="4">
<widget class="QPushButton" name="renameRunButton">
<property name="text">
<string>Rename</string>
</property>
</widget>
</item>
<item row="2" column="5">
<spacer name="runHorizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>17</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="0" colspan="6">
<widget class="QWidget" name="runWidget" native="true"/>
</item>
</layout>
</widget>
<layoutdefault spacing="0" margin="0"/>
<resources/>
<connections/>
</ui>
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