mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Activity tab doesn't vanish with too many accounts #4188

Browse Source 
The bug was introduced by a bad merge.
This commit is contained in:
Christian Kamm 2015-12-10 09:43:16 +01:00
parent db0674dc76
commit fbb85fab81
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/settingsdialog.cpp
View File

@ -84,7 +84,7 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent) :
// all buttons must have the same size in order to keep a good layout
_activityAction = createColorAwareAction(QLatin1String(":/client/resources/activity.png"), tr("Activity"));
_actionGroup->addAction(_activityAction);
addActionToToolBar(_activityAction);
_toolBar->addAction(_activityAction);
_activitySettings = new ActivitySettings;
_ui->stack->addWidget(_activitySettings);
connect( _activitySettings, SIGNAL(guiLog(QString,QString)), _gui,
@ -308,15 +308,6 @@ QAction *SettingsDialog::createColorAwareAction(const QString &iconPath, const Q
return action;
}
void SettingsDialog::addActionToToolBar(QAction *action) {
QToolButton* btn = new QToolButton;
btn->setDefaultAction(action);
btn->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
btn->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
_toolBar->addWidget(btn);
btn->setMinimumWidth(_toolBar->sizeHint().height() * 1.3);
}
void SettingsDialog::slotRefreshActivity( AccountState* accountState )
{
if (accountState) {

1
src/gui/settingsdialog.h
View File

@ -69,7 +69,6 @@ private slots:
private:
void customizeStyle();
void addActionToToolBar(QAction* action);
QIcon createColorAwareIcon(const QString &name);
QAction *createColorAwareAction(const QString &iconName, const QString &fileName);