From bb6a50be022075715cd0b8a583906f79faa08c0e Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Thu, 7 Jan 2016 17:58:23 +0100 Subject: [PATCH] SettingsDialog: show "Account" for the tab name for branded client https://github.com/owncloud/enterprise/issues/863 --- src/gui/settingsdialog.cpp | 11 ++++++++--- src/gui/settingsdialogmac.cpp | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp index 5c5304a2c..abe9c9276 100644 --- a/src/gui/settingsdialog.cpp +++ b/src/gui/settingsdialog.cpp @@ -190,10 +190,15 @@ void SettingsDialog::showActivityPage() void SettingsDialog::accountAdded(AccountState *s) { auto height = _toolBar->sizeHint().height(); + + bool brandingSingleAccount = !Theme::instance()->multiAccount(); + auto accountAction = createColorAwareAction(QLatin1String(":/client/resources/account.png"), - s->account()->displayName()); - accountAction->setToolTip(s->account()->displayName()); - accountAction->setIconText(s->shortDisplayNameForSettings(height * buttonSizeRatio)); + brandingSingleAccount ? tr("Account") : s->account()->displayName()); + if (!brandingSingleAccount) { + accountAction->setToolTip(s->account()->displayName()); + accountAction->setIconText(s->shortDisplayNameForSettings(height * buttonSizeRatio)); + } _toolBar->insertAction(_toolBar->actions().at(0), accountAction); auto accountSettings = new AccountSettings(s, this); _ui->stack->insertWidget(0 , accountSettings); diff --git a/src/gui/settingsdialogmac.cpp b/src/gui/settingsdialogmac.cpp index 997c1f975..a73d56f03 100644 --- a/src/gui/settingsdialogmac.cpp +++ b/src/gui/settingsdialogmac.cpp @@ -117,7 +117,7 @@ void SettingsDialogMac::accountAdded(AccountState *s) QIcon accountIcon = MacStandardIcon::icon(MacStandardIcon::UserAccounts); auto accountSettings = new AccountSettings(s, this); - QString displayName = s->shortDisplayNameForSettings(); + QString displayName = Theme::instance()->multiAccount() ? s->shortDisplayNameForSettings() : tr("Account"); insertPreferencesPanel(0, accountIcon, displayName, accountSettings); -- 2.30.2