diff --git a/changelog/unreleased/7962 b/changelog/unreleased/7962
new file mode 100644
index 00000000000..fdb197bc6a0
--- /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 abf03eb4090..3751debcf39 100644
--- a/src/gui/generalsettings.ui
+++ b/src/gui/generalsettings.ui
@@ -15,152 +15,196 @@
-
-
-
- General Settings
-
-
-
-
-
-
- &Launch on System Startup
-
-
-
- -
-
-
- Show &Desktop Notifications
-
-
-
- -
-
-
- For System Tray
-
-
- Use &Monochrome Icons
-
-
-
-
-
-
- -
-
-
- Advanced
+
+
+ true
-
-
-
-
-
-
-
-
- Edit &Ignored Files
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 555
- 20
-
-
-
-
-
-
- -
-
-
-
-
-
- Ask for confirmation before synchronizing folders larger than
-
-
- true
-
-
-
- -
-
-
- 999999
-
-
- 99
-
-
-
- -
-
-
- MB
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
-
-
-
- Ask for confirmation before synchronizing external storages
-
-
-
-
-
- -
-
-
-
-
-
- Show sync folders in &Explorer's Navigation Pane
-
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
- S&how crash reporter
-
-
-
-
-
-
+
+
+
+ 0
+ 0
+ 771
+ 578
+
+
+
+ -
+
+
+ General Settings
+
+
+
-
+
+
+ &Launch on System Startup
+
+
+
+ -
+
+
+ Show &Desktop Notifications
+
+
+
+ -
+
+
+ For System Tray
+
+
+ Use &Monochrome Icons
+
+
+
+
+
+
+ -
+
+
+ Advanced
+
+
+
-
+
+
-
+
+
+ Edit &Ignored Files
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 555
+ 20
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Ask for confirmation before synchronizing folders larger than
+
+
+ true
+
+
+
+ -
+
+
+ 999999
+
+
+ 99
+
+
+
+ -
+
+
+ MB
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Ask for confirmation before synchronizing external storages
+
+
+
+
+
+ -
+
+
-
+
+
+ Show sync folders in &Explorer's Navigation Pane
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ S&how crash reporter
+
+
+
+
+
+
+
+
+ -
+
+
+ Network
+
+
+
-
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
+
-
@@ -338,21 +382,16 @@
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 0
-
-
-
-
+
+
+ NetworkSettings
+ QWidget
+
+ 1
+
+
autostartCheckBox
desktopNotificationsCheckBox
diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index 3e41336e3a8..f64d2dded01 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);