From 46a82b69c5c15e5169843a314c8aa1bbbf282dc2 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Fri, 2 Nov 2012 14:09:23 +0100 Subject: [PATCH] Show user name for connection in statusdialog Move server version purely to tooltip. Fixes issue #8. --- src/mirall/statusdialog.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/mirall/statusdialog.cpp b/src/mirall/statusdialog.cpp index f4b2302e06..24fb8a650e 100644 --- a/src/mirall/statusdialog.cpp +++ b/src/mirall/statusdialog.cpp @@ -16,6 +16,7 @@ #include "mirall/folder.h" #include "mirall/theme.h" #include "mirall/owncloudinfo.h" +#include "mirall/mirallconfigfile.h" #include #include @@ -448,10 +449,11 @@ void StatusDialog::slotOCInfo( const QString& url, const QString& versionStr, co qDebug() << "#-------# oC found on " << url; /* enable the open button */ + MirallConfigFile cfg; _ocUrlLabel->setOpenExternalLinks(true); - _ocUrlLabel->setText( tr("Connected to %2, server version %3") - .arg(url).arg(url).arg(versionStr) ); - _ocUrlLabel->setToolTip( tr("Version: %1").arg(version)); + _ocUrlLabel->setText( tr("Connected to %1 as %2.") + .arg(url).arg(cfg.ownCloudUser()) ); + _ocUrlLabel->setToolTip( tr("Version: %1 (%2)").arg(versionStr).arg(version)); _ButtonAdd->setEnabled(true); disconnect(ownCloudInfo::instance(), SIGNAL(ownCloudInfoFound(const QString&, const QString&, const QString&, const QString&)),