mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-24 13:25:52 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add a tabwidget to Settings dialog for activity.

Browse source
This commit is contained in:
Klaas Freitag 2015-10-30 13:26:27 +01:00
parent c66c259447
commit 9279bcdba4
2 changed files with 57 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/gui/activitywidget.ui
View file

@ -6,31 +6,62 @@
<rect>
<x>0</x>
<y>0</y>
<width>612</width>
<height>515</height>
<width>672</width>
<height>640</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Sync Activity</string>
<item row="0" column="1">
<widget class="QTabWidget" name="tabWidget">
<property name="tabShape">
<enum>QTabWidget::Rounded</enum>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0">
<widget class="QDialogButtonBox" name="_dialogButtonBox">
<property name="standardButtons">
<set>QDialogButtonBox::NoButton</set>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QListView" name="_activityList"/>
</item>
</layout>
<property name="currentIndex">
<number>0</number>
</property>
<property name="elideMode">
<enum>Qt::ElideMiddle</enum>
</property>
<widget class="QWidget" name="protocolTab">
<attribute name="title">
<string>Sync Protocol</string>
</attribute>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QListView" name="_activityList"/>
</item>
<item row="1" column="0">
<widget class="QDialogButtonBox" name="_dialogButtonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="serverActivityTab">
<attribute name="title">
<string>Server Activity</string>
</attribute>
</widget>
<widget class="QWidget" name="ignoresTab">
<attribute name="title">
<string>Ignored Files</string>
</attribute>
</widget>
<widget class="QWidget" name="issuesTab">
<attribute name="title">
<string>Issues</string>
</attribute>
</widget>
<widget class="QWidget" name="tab">
<attribute name="title">
<string>Blacklist</string>
</attribute>
</widget>
</widget>
</item>
</layout>

10
src/gui/settingsdialog.cpp
View file

@ -24,6 +24,7 @@
#include "owncloudgui.h"
#include "activitywidget.h"
#include "accountmanager.h"
#include "protocolwidget.h"
#include <QLabel>
#include <QStandardItemModel>
@ -80,8 +81,13 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent) :
_activityAction = createColorAwareAction(QLatin1String(":/client/resources/activity.png"), tr("Activity"));
_actionGroup->addAction(_activityAction);
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 *activityWidget = new ActivityWidget;
_ui->stack->addWidget(activityWidget);
tabs->addTab(activityWidget, tr("Server Activity"));
_ui->stack->addWidget(tabs);
QAction *generalAction = createColorAwareAction(QLatin1String(":/client/resources/settings.png"), tr("General"));
_actionGroup->addAction(generalAction);
@ -95,7 +101,7 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent) :
NetworkSettings *networkSettings = new NetworkSettings;
_ui->stack->addWidget(networkSettings);
_actionGroupWidgets.insert(_activityAction, activityWidget);
_actionGroupWidgets.insert(_activityAction, tabs);
_actionGroupWidgets.insert(generalAction, generalSettings);
_actionGroupWidgets.insert(networkAction, networkSettings);