[Pkg-owncloud-commits] [owncloud-client] 27/219: Wizard: adjust alignements
Sandro Knauß
hefee-guest at moszumanska.debian.org
Sat Oct 11 14:43:05 UTC 2014
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit 79f00c2a2a9b1e77523b73a6e28c18b23fab18de
Author: Olivier Goffart <ogoffart at woboq.com>
Date: Thu Aug 28 13:32:14 2014 +0200
Wizard: adjust alignements
---
src/wizard/owncloudadvancedsetuppage.cpp | 1 -
src/wizard/owncloudadvancedsetuppage.ui | 125 ++++++++++++++++++++-----------
src/wizard/owncloudwizardresultpage.ui | 68 ++++++++++-------
3 files changed, 123 insertions(+), 71 deletions(-)
diff --git a/src/wizard/owncloudadvancedsetuppage.cpp b/src/wizard/owncloudadvancedsetuppage.cpp
index ba76988..71ebb8b 100644
--- a/src/wizard/owncloudadvancedsetuppage.cpp
+++ b/src/wizard/owncloudadvancedsetuppage.cpp
@@ -65,7 +65,6 @@ OwncloudAdvancedSetupPage::OwncloudAdvancedSetupPage()
QIcon appIcon = theme->applicationIcon();
_ui.lServerIcon->setText(QString());
_ui.lServerIcon->setPixmap(appIcon.pixmap(48));
-
_ui.lLocalIcon->setText(QString());
_ui.lLocalIcon->setPixmap(QPixmap(":/mirall/resources/folder-sync.png"));
diff --git a/src/wizard/owncloudadvancedsetuppage.ui b/src/wizard/owncloudadvancedsetuppage.ui
index e9cff7c..ad4e8be 100644
--- a/src/wizard/owncloudadvancedsetuppage.ui
+++ b/src/wizard/owncloudadvancedsetuppage.ui
@@ -57,6 +57,19 @@
</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>
@@ -64,6 +77,9 @@
<property name="text">
<string>TextLabel</string>
</property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
</widget>
</item>
<item>
@@ -71,11 +87,14 @@
<property name="text">
<string>Server</string>
</property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
</widget>
</item>
</layout>
</item>
- <item row="0" column="1">
+ <item row="0" column="1" colspan="2">
<widget class="QWidget" name="widget" native="true">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
@@ -135,20 +154,40 @@
</property>
</spacer>
</item>
- <item row="2" column="1">
- <widget class="QPushButton" name="pbSelectLocalFolder">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>pbSelectLocalFolder</string>
- </property>
- </widget>
+ <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>&Local Folder</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ <property name="buddy">
+ <cstring>pbSelectLocalFolder</cstring>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
- <item row="3" column="1">
+ <item row="4" column="1" colspan="2">
<widget class="QWidget" name="resolutionWidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -163,7 +202,7 @@
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
- <item row="0" column="0" colspan="2">
+ <item row="1" column="0" colspan="2">
<widget class="QRadioButton" name="radioButton">
<property name="text">
<string>&Keep local data</string>
@@ -173,7 +212,7 @@
</property>
</widget>
</item>
- <item row="1" column="0" colspan="2">
+ <item row="2" column="0" colspan="2">
<widget class="QRadioButton" name="cbSyncFromScratch">
<property name="toolTip">
<string><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></string>
@@ -189,32 +228,34 @@
</layout>
</widget>
</item>
- <item row="2" column="0" rowspan="2">
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <item>
- <widget class="QLabel" name="lLocalIcon">
- <property name="text">
- <string>TextLabel</string>
- </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>&Local Folder</string>
- </property>
- <property name="buddy">
- <cstring>pbSelectLocalFolder</cstring>
- </property>
- </widget>
- </item>
- </layout>
+ <item row="3" column="2">
+ <spacer name="verticalSpacer_3">
+ <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="1" rowspan="2">
+ <widget class="QPushButton" name="pbSelectLocalFolder">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>pbSelectLocalFolder</string>
+ </property>
+ </widget>
</item>
</layout>
</item>
diff --git a/src/wizard/owncloudwizardresultpage.ui b/src/wizard/owncloudwizardresultpage.ui
index 6a1e58a..67eb5a6 100644
--- a/src/wizard/owncloudwizardresultpage.ui
+++ b/src/wizard/owncloudwizardresultpage.ui
@@ -64,32 +64,6 @@
</spacer>
</item>
<item>
- <widget class="QLabel" name="localFolderLabel">
- <property name="text">
- <string>Your entire account is synced to the local folder </string>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="verticalSpacer_3">
- <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>16</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<spacer name="horizontalSpacer_3">
@@ -108,9 +82,15 @@
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QToolButton" name="pbOpenServer">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="minimumSize">
<size>
- <width>160</width>
+ <width>200</width>
<height>80</height>
</size>
</property>
@@ -124,9 +104,15 @@
</item>
<item>
<widget class="QToolButton" name="pbOpenLocal">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="minimumSize">
<size>
- <width>160</width>
+ <width>200</width>
<height>80</height>
</size>
</property>
@@ -156,6 +142,32 @@
</layout>
</item>
<item>
+ <spacer name="verticalSpacer_3">
+ <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>16</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="localFolderLabel">
+ <property name="text">
+ <string>Your entire account is synced to the local folder </string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list