Skip to content

Commit

Permalink
Merge pull request #6927 from nextcloud/bugfix/info-container-visibli…
Browse files Browse the repository at this point in the history 
…ty-no-updater

Fix visibility of info buttons and details when updater is disabled in general settings
  • Loading branch information
@claucambra
claucambra authored Jul 19, 2024
2 parents d64650a + dbe2479 commit f42d51d
Showing 1 changed file with 43 additions and 55 deletions.
98 changes: 43 additions & 55 deletions src/gui/generalsettings.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Policy::Fixed</enum>
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
Expand Down Expand Up @@ -77,10 +77,10 @@
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Policy::Fixed</enum>
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
Expand All @@ -104,10 +104,10 @@
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Policy::Fixed</enum>
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
Expand Down Expand Up @@ -197,7 +197,7 @@
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
Expand Down Expand Up @@ -233,21 +233,9 @@
</item>
<item>
<widget class="QFrame" name="updatesContainer">
<layout class="QVBoxLayout" name="verticalLayout_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>
<layout class="QVBoxLayout" name="updatesLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<layout class="QHBoxLayout" name="updatesLayout_1">
<item>
<widget class="QLabel" name="updateChannelLabel">
<property name="sizePolicy">
Expand Down Expand Up @@ -300,7 +288,7 @@
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_7">
<layout class="QHBoxLayout" name="updatesLayout_2">
<item>
<widget class="QCheckBox" name="autoCheckForUpdatesCheckBox">
<property name="sizePolicy">
Expand Down Expand Up @@ -333,38 +321,7 @@
<item>
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QPushButton" name="usageDocumentationButton">
<property name="text">
<string>Usage Documentation</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="legalNoticeButton">
<property name="text">
<string>Legal Notice</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
Expand All @@ -379,13 +336,44 @@
</layout>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="infoContainer">
<item>
<widget class="QPushButton" name="usageDocumentationButton">
<property name="text">
<string>Usage Documentation</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="legalNoticeButton">
<property name="text">
<string>Legal Notice</string>
</property>
</widget>
</item>
<item>
<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>
</layout>
</item>
</layout>
</widget>
</item>
<item row="4" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
Expand Down

0 comments on commit f42d51d

Please sign in to comment.