Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2010-10-24 13:42:25 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2010-10-24 13:42:25 (GMT) |
| commit | 77fbff68d5aa3a292a3cb2aae4fdaf7f5619116a (patch) | |
| tree | 8aa7cc62f10eb2b4fbf96fb10ca976625f6baaf1 /Swift/Controllers | |
| parent | 0f078be02cd6818aeacc935a1ab790b41267a00d (diff) | |
| download | swift-77fbff68d5aa3a292a3cb2aae4fdaf7f5619116a.zip swift-77fbff68d5aa3a292a3cb2aae4fdaf7f5619116a.tar.bz2 | |
Provide feedback in the status header when attempting to connect.
Resolves: #657
Release-Notes: The status setter now shows when you're connecting.
Diffstat (limited to 'Swift/Controllers')
| -rw-r--r-- | Swift/Controllers/MainController.cpp | 3 | ||||
| -rw-r--r-- | Swift/Controllers/UIInterfaces/MainWindow.h | 1 | ||||
| -rw-r--r-- | Swift/Controllers/UnitTest/MockMainWindow.h | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp index fcd161b..26d29e7 100644 --- a/Swift/Controllers/MainController.cpp +++ b/Swift/Controllers/MainController.cpp @@ -425,6 +425,9 @@ void MainController::performLoginFromCachedCredentials() { /* In case we're in the middle of another login, make sure they don't overlap */ client_->disconnect(); } + if (rosterController_) { + rosterController_->getWindow()->setConnecting(); + } /* If we logged in with a bare JID, and we have a full bound JID, re-login with the * bound JID to try and keep dynamically assigned resources */ if (boundJID_.isValid() && jid_.isBare() && boundJID_.toBare() == jid_) { diff --git a/Swift/Controllers/UIInterfaces/MainWindow.h b/Swift/Controllers/UIInterfaces/MainWindow.h index 570c919..26b4ae8 100644 --- a/Swift/Controllers/UIInterfaces/MainWindow.h +++ b/Swift/Controllers/UIInterfaces/MainWindow.h @@ -30,6 +30,7 @@ namespace Swift { virtual void setMyStatusText(const String& status) = 0; virtual void setMyStatusType(StatusShow::Type type) = 0; virtual void setRosterModel(Roster* roster) = 0; + virtual void setConnecting() = 0; boost::signal<void (StatusShow::Type, const String&)> onChangeStatusRequest; boost::signal<void (bool)> onShowOfflineToggled; diff --git a/Swift/Controllers/UnitTest/MockMainWindow.h b/Swift/Controllers/UnitTest/MockMainWindow.h index 4d0c67a..3d786d9 100644 --- a/Swift/Controllers/UnitTest/MockMainWindow.h +++ b/Swift/Controllers/UnitTest/MockMainWindow.h @@ -19,6 +19,7 @@ namespace Swift { virtual void setMyAvatarPath(const String& /*path*/) {}; virtual void setMyStatusText(const String& /*status*/) {}; virtual void setMyStatusType(StatusShow::Type /*type*/) {}; + virtual void setConnecting() {}; Roster* roster; }; |