From 977b4075254ca79e68bbdec2e689eccb291fe701 Mon Sep 17 00:00:00 2001 From: Tannin Date: Tue, 13 May 2014 21:20:44 +0200 Subject: - mod list context menu split into two menus (one for whole list, one for selected mods) - added option to combine category filters using "or" - added context menu option for deselecting category filters - slightly changed ui on the category filters - added a sample plugin for cpp that can be built without building the rest of MO - simple installer can now be configured to run without any user interaction - extended interface for python plugins - iorganizer implementation moved out of the main window - nexus requests from plugins will now be identified in the user agent - bugfix: shortcuts created from MO used the wrong working directory - bugfix: deactivation of bsas didn't stick - bugfix: file hiding mechanism wasn't active - bugfix: executables linked on the toolbar couldn't be removed if the executable was removed first - bugfix: the endorsement-filter couldn't be combined with other filters - bugfix: python interface to repository bridge was broken --- src/nxmaccessmanager.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'src/nxmaccessmanager.cpp') diff --git a/src/nxmaccessmanager.cpp b/src/nxmaccessmanager.cpp index 3df34de1..b65ff082 100644 --- a/src/nxmaccessmanager.cpp +++ b/src/nxmaccessmanager.cpp @@ -42,7 +42,10 @@ using namespace MOShared; NXMAccessManager::NXMAccessManager(QObject *parent) - : QNetworkAccessManager(parent), m_LoginReply(NULL), m_ProgressDialog() + : QNetworkAccessManager(parent) + , m_LoginReply(NULL) + , m_ProgressDialog() + , m_LoginAttempted(false) { setCookieJar(new PersistentCookieJar( QDir::fromNativeSeparators(MOBase::ToQString(MOShared::GameInfo::instance().getCacheDir())) + "/nexus_cookies.dat", this)); @@ -92,6 +95,11 @@ bool NXMAccessManager::loggedIn() const return hasLoginCookies(); } +bool NXMAccessManager::loginWaiting() const +{ + return m_LoginReply != NULL; +} + void NXMAccessManager::login(const QString &username, const QString &password) { @@ -104,6 +112,8 @@ void NXMAccessManager::login(const QString &username, const QString &password) return; } + m_LoginAttempted = true; + m_Username = username; m_Password = password; pageLogin(); @@ -149,6 +159,7 @@ void NXMAccessManager::loginTimeout() emit loginFailed(tr("timeout")); m_LoginReply->deleteLater(); m_LoginReply = NULL; + m_LoginAttempted = false; // this usually means we might have usccess later m_LoginTimeout.stop(); m_Username.clear(); m_Password.clear(); -- cgit v1.3.1