------------------------------------------------------------
revno: 256
committer: Alan Alvarez <aalva...@aliensoft.net>
branch nick: login-system
timestamp: Thu 2010-12-16 11:44:13 -0400
message:
- Go offline menu item
- Show pop up message box to display login errors
modified:
mira-client/include/gui/qt/MainWindow.h
mira-client/src/gui/qt/ConnectionManagementWidget.cpp
mira-client/src/gui/qt/GuiApp.cpp
mira-client/src/gui/qt/MainWindow.cpp
--
lp:~mira-dev/mira/login-system
https://code.launchpad.net/~mira-dev/mira/login-system
You are subscribed to branch lp:~mira-dev/mira/login-system.
To unsubscribe from this branch go to
https://code.launchpad.net/~mira-dev/mira/login-system/+edit-subscription
=== modified file 'mira-client/include/gui/qt/MainWindow.h'
--- mira-client/include/gui/qt/MainWindow.h 2010-12-09 19:48:10 +0000
+++ mira-client/include/gui/qt/MainWindow.h 2010-12-16 15:44:13 +0000
@@ -50,6 +50,7 @@
void newUserError(const std::string& message);
void removeServerWidget();
void syncTriggered();
+ void goOfflineTriggered();
protected:
void closeEvent(QCloseEvent * event);
@@ -80,6 +81,7 @@
QAction * m_joinWorkplaceAction;
QAction * m_newUserAction;
QAction * m_goOnlineAction;
+ QAction * m_goOfflineAction;
//Menus
QMenu * m_fileMenu;
=== modified file 'mira-client/src/gui/qt/ConnectionManagementWidget.cpp'
--- mira-client/src/gui/qt/ConnectionManagementWidget.cpp 2010-07-28 00:52:48 +0000
+++ mira-client/src/gui/qt/ConnectionManagementWidget.cpp 2010-12-16 15:44:13 +0000
@@ -51,7 +51,7 @@
m_mainLayout->addItem(new QSpacerItem(2,2), 2, 2, 2, 2);
// Labels
- m_headerLabel = new QLabel("Servers", this);
+ m_headerLabel = new QLabel("Connections", this);
QFont font;
font.setBold(true);
font.setPointSize(20);
=== modified file 'mira-client/src/gui/qt/GuiApp.cpp'
--- mira-client/src/gui/qt/GuiApp.cpp 2010-12-09 19:48:10 +0000
+++ mira-client/src/gui/qt/GuiApp.cpp 2010-12-16 15:44:13 +0000
@@ -306,7 +306,8 @@
}
m_mainWindow->setCentralWidgetIndex(WORKPLACE_WIDGET);
- m_mainWindow->m_goOnlineAction->setEnabled(true);
+ m_mainWindow->m_goOnlineAction->setVisible(true);
+ m_mainWindow->m_goOfflineAction->setVisible(false);
m_mainWindow->setWindowTitle(QString("%1 %2 %3: %4").arg(MiraNameStr).arg(MiraVersionStr).arg(tr("Working Offline")).arg(QString::fromStdString(Application::user_info.server_key)));
}
=== modified file 'mira-client/src/gui/qt/MainWindow.cpp'
--- mira-client/src/gui/qt/MainWindow.cpp 2010-12-15 23:37:15 +0000
+++ mira-client/src/gui/qt/MainWindow.cpp 2010-12-16 15:44:13 +0000
@@ -99,6 +99,7 @@
connect(m_joinWorkplaceAction, SIGNAL(triggered()), SLOT(joinWorkplace()));
connect(m_newUserAction, SIGNAL(triggered()), SLOT(newUser()));
connect(m_goOnlineAction, SIGNAL(triggered()), this, SLOT(syncTriggered()));
+ connect(m_goOfflineAction, SIGNAL(triggered()), this, SLOT(goOfflineTriggered()));
connect(m_chatFocusAction,SIGNAL(triggered()),m_chatWidget,SLOT(FocusOnChat()));
connect(app,SIGNAL(AddedUtility(const std::string&,Utility*)),m_navigationWidget,SLOT(AddUtility(const std::string&,Utility*)));
connect(app,SIGNAL(AddedWorkplace(Workplace *)),m_navigationWidget,SLOT(AddWorkplace(Workplace *)));
@@ -145,7 +146,13 @@
m_goOnlineAction = new QAction("&Go Online", this);
m_goOnlineAction->setShortcut(tr("Ctrl+O"));
m_goOnlineAction->setStatusTip(tr("Syncrhonize with Server"));
- m_goOnlineAction->setDisabled(true);
+ m_goOnlineAction->setVisible(false);
+
+ //Go Offline ACtion
+ m_goOfflineAction = new QAction("&Go Offline", this);
+ m_goOfflineAction->setShortcut(tr("Ctrl+F"));
+ m_goOfflineAction->setStatusTip(tr("Go to offline mode"));
+ m_goOfflineAction->setVisible(false);
}
void MainWindow::closeEvent(QCloseEvent * event)
@@ -192,6 +199,7 @@
m_actionsMenu->addAction(m_joinWorkplaceAction);
m_actionsMenu->addAction(m_newUserAction);
m_actionsMenu->addAction(m_goOnlineAction);
+ m_actionsMenu->addAction(m_goOfflineAction);
//View Menu
//m_viewMenu = createPopupMenu();
@@ -255,14 +263,17 @@
setWindowTitle(QString("%1 %2 %3: %4(%5)").arg(MiraNameStr).arg(MiraVersionStr).arg(tr("Connected")).arg(QString::fromStdString(Application::user_info.server_key)).arg(QString::fromStdString(Application::get_client()->get_remote_server_address())));
m_createWorkplaceAction->setEnabled(true);
m_joinWorkplaceAction->setEnabled(true);
- m_goOnlineAction->setEnabled(false);
+ m_goOnlineAction->setVisible(false);
+ m_goOfflineAction->setVisible(true);
m_woptionsDock->show();
}
void MainWindow::loginFailed(const QString& error_message)
{
m_connectionManagementWidget->loginFailed();
- statusBar()->showMessage(QString("%1: %2").arg(tr("Failed to login")).arg(error_message), 5000);
+ QString errorMsg = QString("%1: %2").arg(tr("Failed to login")).arg(error_message);
+ statusBar()->showMessage(errorMsg, 5000);
+ QMessageBox::warning(this, "Login Failed!", errorMsg);
Application::mode = Application::OFFLINE;
}
@@ -272,7 +283,8 @@
setWindowTitle(QString("%1 %2 %3: %4").arg(MiraNameStr).arg(MiraVersionStr).arg(tr("Working Offline")).arg(QString::fromStdString(Application::user_info.server_key)));
m_joinWorkplaceAction->setDisabled(true);
m_newUserAction->setDisabled(true);
- m_goOnlineAction->setDisabled(false);
+ m_goOnlineAction->setVisible(true);
+ m_goOfflineAction->setVisible(false);
Application::mode == Application::OFFLINE;
m_woptionsDock->hide();
@@ -373,3 +385,8 @@
emit syncStarted();
}
}
+
+void MainWindow::goOfflineTriggered()
+{
+ Application::goOffline();
+}
------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
_______________________________________________
Mira-development mailing list
Mira-development@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mira-development
