[Pkg-owncloud-commits] [owncloud-client] 415/498: OS X Settings Dialog: Two-lined account name #3516

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 0a93dc5e63d61038f8ceeab1e3dcba60c0b277bf
Author: Markus Goetz <markus at woboq.com>
Date:   Fri Jul 31 14:56:14 2015 +0200

    OS X Settings Dialog: Two-lined account name #3516
---
 src/gui/settingsdialogmac.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/gui/settingsdialogmac.cpp b/src/gui/settingsdialogmac.cpp
index 7d15c54..053e5a9 100644
--- a/src/gui/settingsdialogmac.cpp
+++ b/src/gui/settingsdialogmac.cpp
@@ -20,6 +20,7 @@
 #include "generalsettings.h"
 #include "networksettings.h"
 #include "accountsettings.h"
+#include "creds/abstractcredentials.h"
 #include "configfile.h"
 #include "progressdispatcher.h"
 #include "owncloudgui.h"
@@ -113,7 +114,19 @@ void SettingsDialogMac::accountAdded(AccountState *s)
     QIcon accountIcon = MacStandardIcon::icon(MacStandardIcon::UserAccounts);
     auto accountSettings = new AccountSettings(s, this);
 
-    insertPreferencesPanel(0, accountIcon, s->account()->displayName(), accountSettings);
+    QString userWithoutMailHost = s->account()->credentials()->user();
+    if (userWithoutMailHost.contains('@')) {
+        userWithoutMailHost = userWithoutMailHost.left(userWithoutMailHost.lastIndexOf('@'));
+    }
+    QString hostWithoutTld = s->account()->url().host();
+    if (hostWithoutTld.contains('.')) {
+        hostWithoutTld = hostWithoutTld.left(hostWithoutTld.lastIndexOf('.'));
+        hostWithoutTld = hostWithoutTld.replace(QLatin1String("www."), QLatin1String(""));
+    }
+
+    QString displayName = tr("%1\n%2").arg(userWithoutMailHost, hostWithoutTld);
+
+    insertPreferencesPanel(0, accountIcon, displayName, accountSettings);
 
     connect( accountSettings, &AccountSettings::folderChanged, _gui,  &ownCloudGui::slotFoldersChanged);
     connect( accountSettings, &AccountSettings::openFolderAlias, _gui, &ownCloudGui::slotFolderOpenAction);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git