Skip to content

Commit

Permalink
Wizard: Increase vertical size to fit error text #6546
Browse files Browse the repository at this point in the history
  • Loading branch information
@ckamm
ckamm committed Jun 11, 2018
1 parent f80c237 commit 1d785bb
Show file tree
Hide file tree
Showing 3 changed files with 135 additions and 128 deletions.
5 changes: 3 additions & 2 deletions src/gui/wizard/owncloudadvancedsetuppage.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ bool OwncloudAdvancedSetupPage::isComplete() const
void OwncloudAdvancedSetupPage::initializePage()
{
WizardCommon::initErrorLabel(_ui.errorLabel);
_ui.syncModeLabel->setVisible(false);

if (!ConfigFile().showExperimentalOptions()) {
// If the layout were wrapped in a widget, the auto-grouping of the
Expand Down Expand Up @@ -180,10 +181,10 @@ void OwncloudAdvancedSetupPage::updateStatus()
_ui.resolutionWidget->setVisible(false);
}

_ui.syncModeLabel->setVisible(true);
_ui.syncModeLabel->setText(t);
_ui.syncModeLabel->setFixedHeight(_ui.syncModeLabel->sizeHint().height());
wizard()->resize(wizard()->sizeHint());
setErrorString(errorStr);
wizard()->resize(wizard()->sizeHint());
emit completeChanged();
}

Expand Down
255 changes: 132 additions & 123 deletions src/gui/wizard/owncloudadvancedsetuppage.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>912</width>
<height>635</height>
<width>884</width>
<height>562</height>
</rect>
</property>
<property name="sizePolicy">
Expand All @@ -29,7 +29,7 @@
</sizepolicy>
</property>
<property name="text">
<string>TextLabel</string>
<string>topLabel</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
Expand Down Expand Up @@ -60,118 +60,6 @@
</item>
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="2" 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="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="lServerIcon">
<property name="text">
<string>TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="lServer">
<property name="text">
<string>Server</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="1" column="1">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" rowspan="3">
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QLabel" name="lLocalIcon">
<property name="text">
<string>TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="lLocal">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>&amp;Local Folder</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="buddy">
<cstring>pbSelectLocalFolder</cstring>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="4" column="1" colspan="2">
<widget class="QWidget" name="resolutionWidget" native="true">
<property name="sizePolicy">
Expand Down Expand Up @@ -226,8 +114,64 @@
</property>
</widget>
</item>
<item row="2" 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="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="lServerIcon">
<property name="text">
<string>TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="lServer">
<property name="text">
<string>Server</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="0" column="1" colspan="2">
<widget class="QWidget" name="wSyncStrategy" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>0</number>
Expand Down Expand Up @@ -452,15 +396,67 @@
</layout>
</widget>
</item>
<item row="2" column="0" rowspan="3">
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QLabel" name="lLocalIcon">
<property name="text">
<string>TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="lLocal">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>&amp;Local Folder</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="buddy">
<cstring>pbSelectLocalFolder</cstring>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="5" column="1">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="errorLabel">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="syncModeLabel">
<property name="text">
Expand All @@ -477,13 +473,26 @@
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="errorLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Error label</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="resultLayout"/>
</item>
<item>
<widget class="QLabel" name="bottomLabel">
<property name="text">
<string>TextLabel</string>
<string>bottomLabel</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
Expand Down
3 changes: 0 additions & 3 deletions src/gui/wizard/owncloudwizardcommon.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,6 @@ namespace WizardCommon {

errorLabel->setStyleSheet(style);
errorLabel->setWordWrap(true);
auto sizePolicy = errorLabel->sizePolicy();
sizePolicy.setRetainSizeWhenHidden(true);
errorLabel->setSizePolicy(sizePolicy);
errorLabel->setVisible(false);
}

Expand Down

0 comments on commit 1d785bb

Please sign in to comment.