diff options
| author | Hannah von Reth <hannah.vonreth@owncloud.com> | 2020-08-19 14:30:40 +0300 |
|---|---|---|
| committer | Hannah von Reth <vonreth@kde.org> | 2020-08-19 16:15:46 +0300 |
| commit | b86a1f45478aedf443dda8d71397259015db4c57 (patch) | |
| tree | 4f119068719fc389361e80654b932b02f4777437 /src | |
| parent | a36b9ed378afea9483309a31005712e0997cb361 (diff) | |
Move update settings into its own group
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/generalsettings.ui | 300 |
1 files changed, 132 insertions, 168 deletions
diff --git a/src/gui/generalsettings.ui b/src/gui/generalsettings.ui index dd6e00bf5..a708e3ebb 100644 --- a/src/gui/generalsettings.ui +++ b/src/gui/generalsettings.ui @@ -25,7 +25,7 @@ <x>0</x> <y>0</y> <width>771</width> - <height>578</height> + <height>640</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_5"> @@ -186,6 +186,77 @@ </widget> </item> <item> + <widget class="QGroupBox" name="updaterWidget"> + <property name="title"> + <string>Updates</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="updateChannelLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>&Update Channel</string> + </property> + <property name="buddy"> + <cstring>updateChannel</cstring> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="updateChannel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <item> + <property name="text"> + <string>stable</string> + </property> + </item> + <item> + <property name="text"> + <string>beta</string> + </property> + </item> + </widget> + </item> + <item> + <widget class="QLabel" name="updateStateLabel"> + <property name="text"> + <string/> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + <property name="openExternalLinks"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="restartButton"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>&Restart && Update</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> <spacer name="verticalSpacer"> <property name="orientation"> <enum>Qt::Vertical</enum> @@ -203,177 +274,72 @@ </widget> </item> <item> - <widget class="QGroupBox" name="versionGroupBox"> - <property name="title"> - <string>Version</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout_2"> + <widget class="QWidget" name="versionInfoWidget" native="true"> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> <item> - <widget class="QWidget" name="updaterWidget" native="true"> - <layout class="QHBoxLayout" name="horizontalLayout_5"> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> - <item> - <widget class="QLabel" name="updateChannelLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>&Update Channel</string> - </property> - <property name="buddy"> - <cstring>updateChannel</cstring> - </property> - </widget> - </item> - <item> - <widget class="QComboBox" name="updateChannel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <item> - <property name="text"> - <string>stable</string> - </property> - </item> - <item> - <property name="text"> - <string>beta</string> - </property> - </item> - </widget> - </item> - <item> - <widget class="QLabel" name="updateStateLabel"> - <property name="text"> - <string/> - </property> - <property name="wordWrap"> - <bool>true</bool> - </property> - <property name="openExternalLinks"> - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="restartButton"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>&Restart && Update</string> - </property> - </widget> - </item> - <item> - <spacer name="spacer_2"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Preferred</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>222</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> + <widget class="QLabel" name="versionLabel"> + <property name="cursor"> + <cursorShape>PointingHandCursor</cursorShape> + </property> + <property name="text"> + <string notr="true">Version 3.1.3 (build 37)</string> + </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByMouse</set> + </property> </widget> </item> <item> - <widget class="QWidget" name="versionInfoWidget" native="true"> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> - <item> - <widget class="QLabel" name="versionLabel"> - <property name="cursor"> - <cursorShape>PointingHandCursor</cursorShape> - </property> - <property name="text"> - <string notr="true">Version 3.1.3 (build 37)</string> - </property> - <property name="textInteractionFlags"> - <set>Qt::LinksAccessibleByMouse</set> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="copyrightLabelDotBefore"> - <property name="cursor"> - <cursorShape>ArrowCursor</cursorShape> - </property> - <property name="text"> - <string>•</string> - </property> - <property name="textInteractionFlags"> - <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="copyrightLabel"> - <property name="cursor"> - <cursorShape>ArrowCursor</cursorShape> - </property> - <property name="text"> - <string notr="true">Copyright ownCloud GmbH</string> - </property> - <property name="textInteractionFlags"> - <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set> - </property> - </widget> - </item> - <item> - <spacer name="spacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> + <widget class="QLabel" name="copyrightLabelDotBefore"> + <property name="cursor"> + <cursorShape>ArrowCursor</cursorShape> + </property> + <property name="text"> + <string>•</string> + </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="copyrightLabel"> + <property name="cursor"> + <cursorShape>ArrowCursor</cursorShape> + </property> + <property name="text"> + <string notr="true">Copyright ownCloud GmbH</string> + </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set> + </property> </widget> </item> + <item> + <spacer name="spacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> </layout> </widget> </item> @@ -398,8 +364,6 @@ <tabstop>crashreporterCheckBox</tabstop> <tabstop>syncHiddenFilesCheckBox</tabstop> <tabstop>ignoredFilesButton</tabstop> - <tabstop>updateChannel</tabstop> - <tabstop>restartButton</tabstop> <tabstop>scrollArea</tabstop> </tabstops> <resources/> |