diff options
| -rw-r--r-- | changelog/unreleased/7962 | 5 | ||||
| -rw-r--r-- | src/gui/generalsettings.ui | 355 | ||||
| -rw-r--r-- | src/gui/settingsdialog.cpp | 9 |
3 files changed, 203 insertions, 166 deletions
diff --git a/changelog/unreleased/7962 b/changelog/unreleased/7962 new file mode 100644 index 000000000..fdb197bc6 --- /dev/null +++ b/changelog/unreleased/7962 @@ -0,0 +1,5 @@ +Change: Reorgenize Settings + +We rename "General" to "Settings" and move the "Network" into "Settings" + +https://github.com/owncloud/client/pull/7962 diff --git a/src/gui/generalsettings.ui b/src/gui/generalsettings.ui index abf03eb40..3751debcf 100644 --- a/src/gui/generalsettings.ui +++ b/src/gui/generalsettings.ui @@ -15,152 +15,196 @@ </property> <layout class="QVBoxLayout" name="verticalLayout_3"> <item> - <widget class="QGroupBox" name="generalGroupBox"> - <property name="title"> - <string>General Settings</string> - </property> - <layout class="QGridLayout" name="gridLayout_2"> - <item row="0" column="0"> - <widget class="QCheckBox" name="autostartCheckBox"> - <property name="text"> - <string>&Launch on System Startup</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QCheckBox" name="desktopNotificationsCheckBox"> - <property name="text"> - <string>Show &Desktop Notifications</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="monoIconsCheckBox"> - <property name="toolTip"> - <string>For System Tray</string> - </property> - <property name="text"> - <string>Use &Monochrome Icons</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QGroupBox" name="advancedGroupBox"> - <property name="title"> - <string>Advanced</string> + <widget class="QScrollArea" name="scrollArea"> + <property name="widgetResizable"> + <bool>true</bool> </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_4"> - <item> - <widget class="QPushButton" name="ignoredFilesButton"> - <property name="text"> - <string>Edit &Ignored Files</string> - </property> - </widget> - </item> - <item> - <spacer name="spacer_3"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>555</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_3"> - <item> - <widget class="QCheckBox" name="newFolderLimitCheckBox"> - <property name="text"> - <string>Ask for confirmation before synchronizing folders larger than</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QSpinBox" name="newFolderLimitSpinBox"> - <property name="maximum"> - <number>999999</number> - </property> - <property name="value"> - <number>99</number> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="label"> - <property name="text"> - <string extracomment="Trailing part of "Ask confirmation before syncing folder larger than" ">MB</string> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_3"> - <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> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_8"> - <item> - <widget class="QCheckBox" name="newExternalStorage"> - <property name="text"> - <string>Ask for confirmation before synchronizing external storages</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_10"> - <item> - <widget class="QCheckBox" name="showInExplorerNavigationPaneCheckBox"> - <property name="text"> - <string>Show sync folders in &Explorer's Navigation Pane</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_9"> - <item> - <widget class="QCheckBox" name="crashreporterCheckBox"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>S&how crash reporter</string> - </property> - </widget> - </item> - </layout> - </item> - </layout> + <widget class="QWidget" name="scrollAreaWidgetContents_2"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>771</width> + <height>578</height> + </rect> + </property> + <layout class="QVBoxLayout" name="verticalLayout_5"> + <item> + <widget class="QGroupBox" name="generalGroupBox"> + <property name="title"> + <string>General Settings</string> + </property> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <widget class="QCheckBox" name="autostartCheckBox"> + <property name="text"> + <string>&Launch on System Startup</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QCheckBox" name="desktopNotificationsCheckBox"> + <property name="text"> + <string>Show &Desktop Notifications</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="monoIconsCheckBox"> + <property name="toolTip"> + <string>For System Tray</string> + </property> + <property name="text"> + <string>Use &Monochrome Icons</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="advancedGroupBox"> + <property name="title"> + <string>Advanced</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_4"> + <item> + <widget class="QPushButton" name="ignoredFilesButton"> + <property name="text"> + <string>Edit &Ignored Files</string> + </property> + </widget> + </item> + <item> + <spacer name="spacer_3"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>555</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <widget class="QCheckBox" name="newFolderLimitCheckBox"> + <property name="text"> + <string>Ask for confirmation before synchronizing folders larger than</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="newFolderLimitSpinBox"> + <property name="maximum"> + <number>999999</number> + </property> + <property name="value"> + <number>99</number> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string extracomment="Trailing part of "Ask confirmation before syncing folder larger than" ">MB</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_3"> + <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> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_8"> + <item> + <widget class="QCheckBox" name="newExternalStorage"> + <property name="text"> + <string>Ask for confirmation before synchronizing external storages</string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_10"> + <item> + <widget class="QCheckBox" name="showInExplorerNavigationPaneCheckBox"> + <property name="text"> + <string>Show sync folders in &Explorer's Navigation Pane</string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_9"> + <item> + <widget class="QCheckBox" name="crashreporterCheckBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>S&how crash reporter</string> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Network</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_4"> + <item> + <widget class="NetworkSettings" name="widget" native="true"/> + </item> + </layout> + </widget> + </item> + <item> + <spacer name="verticalSpacer"> + <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> + </widget> </widget> </item> <item> @@ -338,21 +382,16 @@ </layout> </widget> </item> - <item> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>0</height> - </size> - </property> - </spacer> - </item> </layout> </widget> + <customwidgets> + <customwidget> + <class>NetworkSettings</class> + <extends>QWidget</extends> + <header>networksettings.h</header> + <container>1</container> + </customwidget> + </customwidgets> <tabstops> <tabstop>autostartCheckBox</tabstop> <tabstop>desktopNotificationsCheckBox</tabstop> diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp index 3e41336e3..f64d2dded 100644 --- a/src/gui/settingsdialog.cpp +++ b/src/gui/settingsdialog.cpp @@ -114,19 +114,13 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent) &ownCloudGui::slotShowOptionalTrayMessage); _activitySettings->setNotificationRefreshInterval(cfg.notificationRefreshInterval()); - QAction *generalAction = createColorAwareAction(QLatin1String(":/client/resources/settings.png"), tr("General")); + QAction *generalAction = createColorAwareAction(QLatin1String(":/client/resources/settings.png"), tr("Settings")); _actionGroup->addAction(generalAction); _ui->toolBar->addAction(generalAction); GeneralSettings *generalSettings = new GeneralSettings; _ui->stack->addWidget(generalSettings); QObject::connect(generalSettings, &GeneralSettings::showAbout, gui, &ownCloudGui::slotAbout); - QAction *networkAction = createColorAwareAction(QLatin1String(":/client/resources/network.png"), tr("Network")); - _actionGroup->addAction(networkAction); - _ui->toolBar->addAction(networkAction); - NetworkSettings *networkSettings = new NetworkSettings; - _ui->stack->addWidget(networkSettings); - QWidget *spacer = new QWidget(); spacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum); _ui->toolBar->addWidget(spacer); @@ -145,7 +139,6 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent) _actionGroupWidgets.insert(_activityAction, _activitySettings); _actionGroupWidgets.insert(generalAction, generalSettings); - _actionGroupWidgets.insert(networkAction, networkSettings); connect(_actionGroup, &QActionGroup::triggered, this, &SettingsDialog::slotSwitchPage); |