HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorer Commit - r97:9f8fee223cb9

Session manager ready for release.

jeandet -

r97:9f8fee223cb9 default

parent child

Context file:

r97:9f8fee223cb9

src/mainwindow.cpp +37 -9

                  connect(this->sessionManagerAction, SIGNAL(triggered(bool)),this,SLOT(showSessionManager(bool)));
                  connect(this->p_SessionManagerDialog, SIGNAL(switchSession(QString)),this,SLOT(setActiveSession(QString)));
+                 connect(this->p_SessionManagerDialog, SIGNAL(sessionRenamed(QString,QString)),this,SLOT(renameSession(QString,QString)));
+                 connect(this->p_SessionManagerDialog, SIGNAL(sessionAdded(QString)),this,SLOT(addSession(QString)));
+                 connect(this->p_SessionManagerDialog, SIGNAL(sessionRemoved(QString)),this,SLOT(removeSession(QString)));
                  connect(this->sessionsActions,SIGNAL(triggered(QAction*)),this,SLOT(setActiveSession(QAction*)));
                  this->pluginManager->connect(this->pluginManager,SIGNAL(loadSysDrviver(QString)),socexplorerproxy::self(),SLOT(loadSysDriver(QString)));
                  }
                  foreach (stext, p_Sessions)
                  {
-                     sact = new QAction(stext,this);
-                     sact->setCheckable(true);
-                     sact->setData(stext);
-                     if(p_currentSession==stext)
-                        sact->setChecked(true);
-                     sessionsActions->addAction(sact);
-                     SessionsMenu->addAction(sact);
+                     addSession(stext);
                  }
              }
                  this->p_SessionManagerDialog->show();
              }
-             //TODO handle rename
-             void SocExplorerMainWindow::sessionListChanged()
+             void SocExplorerMainWindow::renameSession(const QString &oldName, const QString &newName)
+             {
+                 for(int i=0;i<sessionsActions->actions().count();i++)
+                 {
+                     if(Q_UNLIKELY(sessionsActions->actions().at(i)->text()==oldName))
+                     {
+                         sessionsActions->actions().at(i)->setText(newName);
+                     }
+                 }
+             }
+             void SocExplorerMainWindow::addSession(const QString &newSession)
              {
+                 QAction* sact = new QAction(newSession,this);
+                 sact->setCheckable(true);
+                 sact->setData(newSession);
+                 if(Q_UNLIKELY(p_currentSession==newSession))
+                    sact->setChecked(true);
+                 sessionsActions->addAction(sact);
+                 SessionsMenu->addAction(sact);
+             }
+             void SocExplorerMainWindow::removeSession(const QString &session)
+             {
+                 QAction* sact;
+                 foreach (sact, sessionsActions->actions())
+                 {
+                     if(Q_UNLIKELY(sact->text()==session))
+                     {
+                         sessionsActions->removeAction(sact);
+                         SessionsMenu->removeAction(sact);
+                         delete sact;
              }
+                 }
+             }

src/mainwindow.h +3 -1

                  void setActiveSession(const QString & session);
                  void setActiveSession(QAction* session);
                  void showSessionManager(bool);
-                 void sessionListChanged();
+                 void renameSession(const QString& oldName,const QString& newName);
+                 void addSession(const QString& newSession);
+                 void removeSession(const QString& session);
              signals:
                  void translateSig();
                  void registerObject(QObject* object,const QString& instanceName);

src/sessionmanagerdialog.cpp +4 -1

                  {
                      this->ui->listWidget->addItem(session);
                      updateSessionList();
+                     emit sessionAdded(session);
                  }
              }
                  if (ok && !text.isEmpty())
                  {
                      item->setText(text);
-                     SocExplorerSettings::renameSession(text,OldText);
+                     SocExplorerSettings::renameSession(OldText,text);
+                     emit sessionRenamed(OldText,text);
                      updateSessionList();
                      emit sessionListChanged();
                  }
                      {
                          this->ui->listWidget->removeItemWidget(item);
                          SocExplorerSettings::deleteSession(item->text());
+                         emit sessionRemoved(item->text());
                          delete item;
                          updateSessionList();
                      }

src/sessionmanagerdialog.h +3 -1

              signals:
                  void switchSession(QString session);
                  void sessionListChanged();
+                 void sessionRenamed(const QString& oldName,const QString& newName);
+                 void sessionRemoved(const QString& session);
+                 void sessionAdded(const QString& newSession);
              private:
                  void updateSessionList();
                  Ui::SessionManagerDialog *ui;

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages