diff options
author | Markus Goetz <markus@woboq.com> | 2017-10-06 13:01:10 +0300 |
---|---|---|
committer | Markus Goetz <markus@woboq.com> | 2017-10-06 14:34:40 +0300 |
commit | cd07865da6b205dfdccc50d6566c1b575be69f7c (patch) | |
tree | 796516f0516de05079591a143bcae448a8769975 /src/gui/settingsdialog.cpp | |
parent | 315e38e814bc0ac8c32cb32f9a00ec84716587fc (diff) |
Settings Dialog: Fix display name compilation for macOS #6078
Diffstat (limited to 'src/gui/settingsdialog.cpp')
-rw-r--r-- | src/gui/settingsdialog.cpp | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp index fc50dd120..d4b9c3eda 100644 --- a/src/gui/settingsdialog.cpp +++ b/src/gui/settingsdialog.cpp @@ -55,6 +55,8 @@ static const float buttonSizeRatio = 1.618; // golden ratio namespace OCC { +#include "settingsdialogcommon.cpp" + static QIcon circleMask(const QImage &avatar) { int dim = avatar.width(); @@ -236,7 +238,7 @@ void SettingsDialog::accountAdded(AccountState *s) if (!brandingSingleAccount) { accountAction->setToolTip(s->account()->displayName()); - accountAction->setIconText(shortDisplayNameForSettings(s->account().data(), height * buttonSizeRatio)); + accountAction->setIconText(SettingsDialogCommon::shortDisplayNameForSettings(s->account().data(), height * buttonSizeRatio)); } _toolBar->insertAction(_toolBar->actions().at(0), accountAction); auto accountSettings = new AccountSettings(s, this); @@ -278,32 +280,11 @@ void SettingsDialog::slotAccountDisplayNameChanged() QString displayName = account->displayName(); action->setText(displayName); auto height = _toolBar->sizeHint().height(); - action->setIconText(shortDisplayNameForSettings(account, height * buttonSizeRatio)); + action->setIconText(SettingsDialogCommon::shortDisplayNameForSettings(account, height * buttonSizeRatio)); } } } -QString SettingsDialog::shortDisplayNameForSettings(Account* account, int width) const -{ - QString user = account->davDisplayName(); - if (user.isEmpty()) { - user = account->credentials()->user(); - } - QString host = account->url().host(); - int port = account->url().port(); - if (port > 0 && port != 80 && port != 443) { - host.append(QLatin1Char(':')); - host.append(QString::number(port)); - } - if (width > 0) { - QFont f; - QFontMetrics fm(f); - host = fm.elidedText(host, Qt::ElideMiddle, width); - user = fm.elidedText(user, Qt::ElideRight, width); - } - return user + QLatin1String("\n") + host; -} - void SettingsDialog::accountRemoved(AccountState *s) { for (auto it = _actionGroupWidgets.begin(); it != _actionGroupWidgets.end(); ++it) { |