Commit 57c3ab22 authored by Eike Ziller's avatar Eike Ziller

Reduce vertical minimum size of Qt versions settings.

The main point of the change is to hide the version info while the
details for the helpers are shown.

Change-Id: I02166674d2339a585fda0eebe643289471ca139c
Reviewed-on: http://codereview.qt-project.org/5325Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent 76176a83
......@@ -331,6 +331,7 @@ void DetailsWidget::setState(State state)
return;
d->m_state = state;
d->updateControls();
emit expanded(d->m_state == Expanded);
}
void DetailsWidget::setExpanded(bool expanded)
......
......@@ -90,6 +90,7 @@ public:
signals:
void checked(bool);
void linkActivated(const QString &link);
void expanded(bool);
private slots:
void setExpanded(bool);
......
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>321</width>
<height>159</height>
<width>404</width>
<height>176</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
......@@ -28,24 +28,17 @@
</item>
<item row="1" column="1">
<widget class="QLabel" name="qmlDumpStatus">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>2</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string notr="true">TextLabel</string>
</property>
</widget>
</item>
<item row="1" column="2">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="0">
<widget class="QLabel" name="qmlObserverLabel">
<property name="toolTip">
......@@ -58,35 +51,14 @@
</item>
<item row="3" column="1">
<widget class="QLabel" name="qmlObserverStatus">
<property name="text">
<string notr="true">TextLabel</string>
</property>
</widget>
</item>
<item row="3" column="2">
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="4">
<widget class="QPushButton" name="qmlDumpBuildButton">
<property name="text">
<string>Build</string>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>2</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="3" column="4">
<widget class="QPushButton" name="qmlObserverBuildButton">
<property name="text">
<string>Build</string>
<string notr="true">TextLabel</string>
</property>
</widget>
</item>
......@@ -99,28 +71,14 @@
</item>
<item row="2" column="1">
<widget class="QLabel" name="qmlDebuggingLibStatus">
<property name="text">
<string notr="true">TextLabel</string>
</property>
</widget>
</item>
<item row="2" column="2">
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>2</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="4">
<widget class="QPushButton" name="qmlDebuggingLibBuildButton">
<property name="text">
<string>Build</string>
<string notr="true">TextLabel</string>
</property>
</widget>
</item>
......@@ -136,25 +94,39 @@
</item>
<item row="4" column="1">
<widget class="QLabel" name="gdbHelperStatus">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>2</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string notr="true">TextLabel</string>
</property>
</widget>
</item>
<item row="4" column="2">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<item row="1" column="2">
<widget class="QPushButton" name="qmlDumpBuildButton">
<property name="text">
<string>Build</string>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</widget>
</item>
<item row="2" column="2">
<widget class="QPushButton" name="qmlDebuggingLibBuildButton">
<property name="text">
<string>Build</string>
</property>
</spacer>
</widget>
</item>
<item row="4" column="4">
<item row="3" column="2">
<widget class="QPushButton" name="qmlObserverBuildButton">
<property name="text">
<string>Build</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QPushButton" name="gdbHelperBuildButton">
<property name="text">
<string>Build</string>
......@@ -163,22 +135,6 @@
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
......
......@@ -151,6 +151,8 @@ QtOptionsPageWidget::QtOptionsPageWidget(QWidget *parent, QList<BaseQtVersion *>
m_ui->versionInfoWidget->setState(Utils::DetailsWidget::NoSummary);
m_ui->debuggingHelperWidget->setWidget(debuggingHelperDetailsWidget);
connect(m_ui->debuggingHelperWidget, SIGNAL(expanded(bool)),
this, SLOT(handleDebuggingHelperExpanded(bool)));
// setup parent items for auto-detected and manual versions
m_ui->qtdirList->header()->setResizeMode(QHeaderView::ResizeToContents);
......@@ -369,6 +371,11 @@ void QtOptionsPageWidget::qtVersionsDumpUpdated(const QString &qmakeCommand)
}
}
void QtOptionsPageWidget::handleDebuggingHelperExpanded(bool expanded)
{
m_ui->versionInfoWidget->setVisible(!expanded);
}
QtOptionsPageWidget::ValidityInfo QtOptionsPageWidget::validInformation(const BaseQtVersion *version)
{
ValidityInfo info;
......
......@@ -118,6 +118,7 @@ private slots:
void selectedToolChainChanged(int index);
void qtVersionsDumpUpdated(const QString &qmakeCommand);
void handleDebuggingHelperExpanded(bool expanded);
private:
struct ValidityInfo {
......
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