------------------------------------------------------------
revno: 258
committer: Alan Alvarez <aalva...@aliensoft.net>
branch nick: login-system
timestamp: Thu 2010-12-16 20:09:26 -0400
message:
Move Leave Workplace feature to the menu
modified:
mira-client/include/gui/qt/GuiApp.h
mira-client/include/gui/qt/MainWindow.h
mira-client/include/gui/qt/WOptionsDockWidget.h
mira-client/src/gui/qt/GuiApp.cpp
mira-client/src/gui/qt/MainWindow.cpp
mira-client/src/gui/qt/WOptionsDockWidget.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/GuiApp.h'
--- mira-client/include/gui/qt/GuiApp.h 2010-08-24 20:10:25 +0000
+++ mira-client/include/gui/qt/GuiApp.h 2010-12-17 00:09:26 +0000
@@ -43,7 +43,6 @@
void trayMessage(const QString& title, const QString& message);
void receiveChatMessage(const std::string& source, const std::string& message);
void setWorkplaceDescription(const std::string& workplace, const std::string& description);
- void leaveActiveWorkplace();
void serverConnectionLost();
private slots:
=== modified file 'mira-client/include/gui/qt/MainWindow.h'
--- mira-client/include/gui/qt/MainWindow.h 2010-12-16 15:44:13 +0000
+++ mira-client/include/gui/qt/MainWindow.h 2010-12-17 00:09:26 +0000
@@ -51,6 +51,7 @@
void removeServerWidget();
void syncTriggered();
void goOfflineTriggered();
+ void leaveActiveWorkplace();
protected:
void closeEvent(QCloseEvent * event);
@@ -79,6 +80,7 @@
QAction * m_chatFocusAction;
QAction * m_createWorkplaceAction;
QAction * m_joinWorkplaceAction;
+ QAction * m_leaveWorkplaceAction;
QAction * m_newUserAction;
QAction * m_goOnlineAction;
QAction * m_goOfflineAction;
@@ -86,6 +88,7 @@
//Menus
QMenu * m_fileMenu;
QMenu * m_actionsMenu;
+ QMenu * m_workplacesMenu;
QMenu * m_viewMenu;
QMenu * m_helpMenu;
=== modified file 'mira-client/include/gui/qt/WOptionsDockWidget.h'
--- mira-client/include/gui/qt/WOptionsDockWidget.h 2010-07-31 01:35:30 +0000
+++ mira-client/include/gui/qt/WOptionsDockWidget.h 2010-12-17 00:09:26 +0000
@@ -19,7 +19,7 @@
WOptionsDockWidget();
~WOptionsDockWidget() {}
- void setActiveWorkplace(Workplace* workplace) { m_activeWorkplace = workplace; }
+ // void setActiveWorkplace(Workplace* workplace) { m_activeWorkplace = workplace; }
private:
Workplace* m_activeWorkplace;
=== modified file 'mira-client/src/gui/qt/GuiApp.cpp'
--- mira-client/src/gui/qt/GuiApp.cpp 2010-12-16 15:44:13 +0000
+++ mira-client/src/gui/qt/GuiApp.cpp 2010-12-17 00:09:26 +0000
@@ -64,20 +64,6 @@
return NULL;
}
-void GuiApp::leaveActiveWorkplace()
-{
- if (m_activeWorkplace != NULL)
- {
- int ret = QMessageBox::question(m_mainWindow, "Leave Workplace?", QString("Are you sure you want to leave workplace %1?").arg(QString::fromStdString(m_activeWorkplace->getName())), QMessageBox::Yes, QMessageBox::No);
- if (ret == QMessageBox::No)
- return;
-
- std::string message = "PG \"";
- message += m_activeWorkplace->getName() + '\"';
- Application::get_client()->send(message);
- }
-}
-
Workplace* GuiApp::getWorkplace(std::string name)
{
for (WorkplaceList::iterator iter = m_workplaces.begin(); iter != m_workplaces.end(); ++iter)
=== modified file 'mira-client/src/gui/qt/MainWindow.cpp'
--- mira-client/src/gui/qt/MainWindow.cpp 2010-12-16 16:18:22 +0000
+++ mira-client/src/gui/qt/MainWindow.cpp 2010-12-17 00:09:26 +0000
@@ -100,6 +100,7 @@
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_leaveWorkplaceAction, SIGNAL(triggered()), this, SLOT(leaveActiveWorkplace()));
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 *)));
@@ -148,11 +149,17 @@
m_goOnlineAction->setStatusTip(tr("Syncrhonize with Server"));
m_goOnlineAction->setVisible(false);
- //Go Offline ACtion
+ //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);
+
+ //Leave Workplace Action
+ m_leaveWorkplaceAction = new QAction("&Leave Workplace", this);
+ m_leaveWorkplaceAction->setShortcut(tr("Ctrl+L"));
+ m_leaveWorkplaceAction->setToolTip(tr("Leave active Workplace"));
+ m_leaveWorkplaceAction->setDisabled(true);
}
void MainWindow::closeEvent(QCloseEvent * event)
@@ -195,8 +202,10 @@
//Actions Menu
m_actionsMenu = menuBar()->addMenu(tr("&Actions"));
- m_actionsMenu->addAction(m_createWorkplaceAction);
- m_actionsMenu->addAction(m_joinWorkplaceAction);
+ m_workplacesMenu = m_actionsMenu->addMenu(tr("&Workplaces"));
+ m_workplacesMenu->addAction(m_createWorkplaceAction);
+ m_workplacesMenu->addAction(m_joinWorkplaceAction);
+ m_workplacesMenu->addAction(m_leaveWorkplaceAction);
m_actionsMenu->addAction(m_newUserAction);
m_actionsMenu->addAction(m_goOnlineAction);
m_actionsMenu->addAction(m_goOfflineAction);
@@ -263,6 +272,7 @@
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_leaveWorkplaceAction->setEnabled(true);
m_goOnlineAction->setVisible(false);
m_goOfflineAction->setVisible(true);
m_woptionsDock->show();
@@ -289,6 +299,8 @@
}
m_joinWorkplaceAction->setDisabled(true);
+ m_leaveWorkplaceAction->setDisabled(true);
+ m_createWorkplaceAction->setDisabled(true);
m_newUserAction->setDisabled(true);
m_goOnlineAction->setVisible(true);
m_goOfflineAction->setVisible(false);
@@ -397,3 +409,18 @@
{
Application::goOffline();
}
+
+void MainWindow::leaveActiveWorkplace()
+{
+ Workplace* activeWorkplace = Application::get_gui_application()->getActiveWorkplace();
+ if (activeWorkplace != NULL)
+ {
+ int ret = QMessageBox::question(this, "Leave Workplace?", QString("Are you sure you want to leave workplace %1?").arg(QString::fromStdString(activeWorkplace->getName())), QMessageBox::Yes, QMessageBox::No);
+ if (ret == QMessageBox::No)
+ return;
+
+ std::string message = "PG \"";
+ message += activeWorkplace->getName() + '\"';
+ Application::get_client()->send(message);
+ }
+}
=== modified file 'mira-client/src/gui/qt/WOptionsDockWidget.cpp'
--- mira-client/src/gui/qt/WOptionsDockWidget.cpp 2010-08-23 23:05:06 +0000
+++ mira-client/src/gui/qt/WOptionsDockWidget.cpp 2010-12-17 00:09:26 +0000
@@ -43,14 +43,6 @@
icon->setPixmap(QPixmap(":/images/invite.png"));
layout->addRow(icon, label);
- label = new QLabel(this);
- label->setText(QString("<a href=\"http://nowhere\"; style=\"color: gray;\">%1</a>").arg(tr("Leave Workplace")));
- label->setFont(font);
- connect(label, SIGNAL(linkActivated(QString)), dynamic_cast<gui::GuiApp*>(QApplication::instance()), SLOT(leaveActiveWorkplace()));
- icon = new QLabel(this);
- icon->setPixmap(QPixmap(":/images/user_go.png"));
- layout->addRow(icon, label);
-
// Set White background
QPalette palette;
palette.setColor(QPalette::Background, Qt::white);
------------------------------------------------------------------------------
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
