diff options
author | Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> | 2019-09-12 18:52:31 +0300 |
---|---|---|
committer | Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> | 2019-09-12 18:52:31 +0300 |
commit | c873da75e44defeca1b5fa2b44d11878891fb6ac (patch) | |
tree | 72d409f8534709edf8b7d233c3ca5bb4e812760a | |
parent | 907f36bfcb975bb8e98417e27012e61a39186262 (diff) |
Fixed wrong resource paths
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
-rw-r--r-- | client.qrc | 4 | ||||
-rw-r--r-- | src/gui/wizard/owncloudsetupnocredspage.ui | 301 |
2 files changed, 145 insertions, 160 deletions
diff --git a/client.qrc b/client.qrc index 8b691ef70..14c6bd3da 100644 --- a/client.qrc +++ b/client.qrc @@ -27,8 +27,8 @@ <file>resources/confirm.svg</file> <file>resources/copy.svg</file> <file>resources/state-sync.svg</file> - <file>../desktop/resources/next.svg</file> - <file>../desktop/resources/previous.svg</file> + <file>resources/next.svg</file> + <file>resources/previous.svg</file> <file>resources/add.png</file> <file>resources/state-info.svg</file> </qresource> diff --git a/src/gui/wizard/owncloudsetupnocredspage.ui b/src/gui/wizard/owncloudsetupnocredspage.ui index b11dbf952..a3a0161e5 100644 --- a/src/gui/wizard/owncloudsetupnocredspage.ui +++ b/src/gui/wizard/owncloudsetupnocredspage.ui @@ -27,22 +27,6 @@ </property> <layout class="QGridLayout" name="gridLayout"> <item row="16" column="0"> - <widget class="QLabel" name="bottomLabel"> - <property name="minimumSize"> - <size> - <width>0</width> - <height>0</height> - </size> - </property> - <property name="text"> - <string notr="true">TextLabel</string> - </property> - <property name="textFormat"> - <enum>Qt::RichText</enum> - </property> - </widget> - </item> - <item row="14" column="0"> <layout class="QHBoxLayout" name="horizontalLayout_3"> <property name="bottomMargin"> <number>0</number> @@ -85,13 +69,13 @@ </item> </layout> </item> - <item row="3" column="0"> - <widget class="QLabel" name="topLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <item row="17" column="0"> + <widget class="QLabel" name="bottomLabel"> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> </property> <property name="text"> <string notr="true">TextLabel</string> @@ -99,15 +83,41 @@ <property name="textFormat"> <enum>Qt::RichText</enum> </property> - <property name="alignment"> - <set>Qt::AlignCenter</set> + </widget> + </item> + <item row="8" column="0"> + <spacer name="verticalSpacer_4"> + <property name="orientation"> + <enum>Qt::Vertical</enum> </property> - <property name="wordWrap"> - <bool>true</bool> + <property name="sizeType"> + <enum>QSizePolicy::MinimumExpanding</enum> </property> - </widget> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> </item> - <item row="11" column="0" rowspan="2"> + <item row="0" column="0"> + <spacer name="verticalSpacer_5"> + <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>20</height> + </size> + </property> + </spacer> + </item> + <item row="13" column="0" rowspan="2"> <layout class="QHBoxLayout" name="buttons" stretch="0,0,0,0"> <property name="spacing"> <number>6</number> @@ -190,41 +200,10 @@ </item> </layout> </item> - <item row="6" column="0"> - <spacer name="verticalSpacer_4"> - <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>20</height> - </size> - </property> - </spacer> - </item> - <item row="15" column="3"> - <layout class="QHBoxLayout" name="horizontalLayout_3"> - <property name="bottomMargin"> - <number>0</number> - </property> - </layout> - </item> <item row="2" column="3"> - <widget class="OCC::SlideShow" name="slideShow" native="true"> - <property name="font"> - <font> - <pointsize>12</pointsize> - <weight>75</weight> - <bold>true</bold> - </font> - </property> - </widget> + </item> - <item row="4" column="0"> + <item row="6" column="0"> <widget class="QWidget" name="login" native="true"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Expanding"> @@ -392,115 +371,121 @@ </layout> </widget> </item> - <item row="0" column="0"> - <spacer name="verticalSpacer_5"> - <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>20</height> - </size> - </property> - </spacer> - </item> - <item row="2" column="4"> - <widget class="QPushButton" name="nextButton"> - <property name="enabled"> - <bool>true</bool> - </property> + <item row="5" column="0"> + <widget class="QLabel" name="topLabel"> <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="mouseTracking"> - <bool>false</bool> - </property> - <property name="tabletTracking"> - <bool>false</bool> - </property> - <property name="layoutDirection"> - <enum>Qt::RightToLeft</enum> - </property> - <property name="autoFillBackground"> - <bool>false</bool> - </property> <property name="text"> - <string/> - </property> - <property name="icon"> - <iconset resource="../../../client.qrc"> - <normaloff>:/client/desktop/resources/next.svg</normaloff>:/client/desktop/resources/next.svg</iconset> - </property> - <property name="checkable"> - <bool>false</bool> - </property> - <property name="autoRepeat"> - <bool>false</bool> + <string notr="true">TextLabel</string> </property> - <property name="autoDefault"> - <bool>false</bool> + <property name="textFormat"> + <enum>Qt::RichText</enum> </property> - <property name="default"> - <bool>false</bool> + <property name="alignment"> + <set>Qt::AlignCenter</set> </property> - <property name="flat"> + <property name="wordWrap"> <bool>true</bool> </property> </widget> </item> - <item row="2" column="0"> - <widget class="QPushButton" name="previousButton"> - <property name="enabled"> - <bool>true</bool> - </property> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>70</width> - <height>0</height> - </size> - </property> - <property name="mouseTracking"> - <bool>false</bool> - </property> - <property name="autoFillBackground"> - <bool>false</bool> - </property> - <property name="text"> - <string/> - </property> - <property name="icon"> - <iconset resource="../../../client.qrc"> - <normaloff>:/client/desktop/resources/previous.svg</normaloff>:/client/desktop/resources/previous.svg</iconset> - </property> - <property name="checkable"> - <bool>false</bool> - </property> - <property name="autoExclusive"> - <bool>false</bool> - </property> - <property name="autoDefault"> - <bool>false</bool> - </property> - <property name="default"> - <bool>false</bool> - </property> - <property name="flat"> - <bool>true</bool> - </property> - </widget> + <item row="4" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout_5"> + <item> + <widget class="QPushButton" name="previousButton"> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>50</width> + <height>0</height> + </size> + </property> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset> + <normaloff>:/client/desktop/resources/previous.svg</normaloff>:/client/desktop/resources/previous.svg</iconset> + </property> + <property name="checkable"> + <bool>false</bool> + </property> + <property name="autoDefault"> + <bool>false</bool> + </property> + <property name="default"> + <bool>false</bool> + </property> + <property name="flat"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="OCC::SlideShow" name="slideShow" native="true"> + <property name="font"> + <font> + <pointsize>12</pointsize> + <weight>75</weight> + <bold>true</bold> + </font> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="nextButton"> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>50</width> + <height>0</height> + </size> + </property> + <property name="layoutDirection"> + <enum>Qt::RightToLeft</enum> + </property> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset> + <normaloff>:/client/desktop/resources/next.svg</normaloff>:/client/desktop/resources/next.svg</iconset> + </property> + <property name="checkable"> + <bool>false</bool> + </property> + <property name="autoDefault"> + <bool>false</bool> + </property> + <property name="default"> + <bool>false</bool> + </property> + <property name="flat"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> </item> </layout> </widget> |