From 060f4f291bdf7e6cb182a03d08c97ad98da2ff9e Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Mon, 2 Nov 2015 15:46:00 +0100 Subject: [PATCH] SettingsDialog: Add a tab with the SyncProtocol to ActivityWidget. --- src/gui/settingsdialog.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp index 03f29461b..24a1c099b 100644 --- a/src/gui/settingsdialog.cpp +++ b/src/gui/settingsdialog.cpp @@ -83,11 +83,10 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent) : addActionToToolBar(_activityAction); // FIXME: Put this QTabWidget into its own class to be used here. - QTabWidget *tabs = new QTabWidget(this); - tabs->addTab(new ProtocolWidget, tr("Sync Protocol")); _activityWidget = new ActivityWidget; - tabs->addTab(_activityWidget, tr("Server Activity")); - _ui->stack->addWidget(tabs); + _activityWidget->setParent(this); + _ui->stack->addWidget(_activityWidget); + _activityWidget->tabWidget()->addTab(new ProtocolWidget(this), tr("Sync Protocol")); QAction *generalAction = createColorAwareAction(QLatin1String(":/client/resources/settings.png"), tr("General")); _actionGroup->addAction(generalAction); @@ -101,7 +100,7 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent) : NetworkSettings *networkSettings = new NetworkSettings; _ui->stack->addWidget(networkSettings); - _actionGroupWidgets.insert(_activityAction, tabs); + _actionGroupWidgets.insert(_activityAction, _activityWidget); _actionGroupWidgets.insert(generalAction, generalSettings); _actionGroupWidgets.insert(networkAction, networkSettings);