HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorer Commit - r95:083d612a5a2d

Sync

Jeandet Alexis -

r95:083d612a5a2d default

parent child

Context file:

r95:083d612a5a2d

Collapse all files

src/SocExplorerEngine/engine/socexplorersettings.cpp +20 0

@@ -197,6 +197,26 bool SocExplorerSettings::loadSession(co
197	return false;	197	return false;
198	}	198	}
199		199
		200	bool SocExplorerSettings::renameSession(const QString &session, const QString &newName)
		201	{
		202	INIT();
		203	sync();
		204	QFileInfo sessionInfo(m_settings->fileName());
		205	QString fullpath=sessionInfo.absoluteDir().absolutePath() +"/"+session+".conf";
		206	QString newFullpath=sessionInfo.absoluteDir().absolutePath() +"/"+newName+".conf";
		207	if(m_sessionSettings && m_sessionSettings->fileName()==fullpath)
		208	{
		209	delete m_sessionSettings;
		210	QFile::rename(fullpath,newFullpath);
		211	m_sessionSettings = new QSettings(newFullpath,QSettings::NativeFormat,self());
		212	}
		213	else
		214	{
		215	QFile::rename(fullpath,newFullpath);
		216	}
		217	return true;
		218	}
		219
200	bool SocExplorerSettings::deleteSession()	220	bool SocExplorerSettings::deleteSession()
201	{	221	{
202	INIT();	222	INIT();

src/SocExplorerEngine/engine/socexplorersettings.h +1 0

                 //! \param session Session name.
                 //! \return true if success or false if fails to create session config file.
                 static bool loadSession(const QString& session);
+                static bool renameSession(const QString& session,const QString& newName);
                 static bool deleteSession();
                 static bool deleteSession(const QString& session);
             signals:

src/SocExplorerEngine/plugins/socexplorerplugin.cpp +1 0

               if(this->menu)
                 this->menu->setTitle(this->_instanceName);
               this->setWindowTitle(newName);
+              this->setObjectName(newName);
             }
             bool socexplorerplugin::dumpMemory(unsigned int address, unsigned int count, QString file)

src/mainwindow.cpp +27 -16

                 pluginsDockContainer->setObjectName("pluginsDockContainer");
                 pluginsDockContainer->setWindowFlags(Qt::Widget);
                 pluginsDockContainer->setDockNestingEnabled(true);
+                this->sessionsActions = new QActionGroup(this);
+                this->sessionManagerAction =new QAction(tr("&Session manager"),this);
                 this->mainWidget = new QSplitter(Qt::Vertical);
                 this->appTranslator = new QTranslator;
                 this->Quit = new QAction(tr("&Quit"),this);
                 connect(this->sessionManagerAction, SIGNAL(triggered(bool)),this,SLOT(showSessionManager(bool)));
                 connect(this->p_SessionManagerDialog, SIGNAL(switchSession(QString)),this,SLOT(setActiveSession(QString)));
+                connect(this->sessionsActions,SIGNAL(triggered(QAction*)),this,SLOT(setActiveSession(QAction*)));
                 this->pluginManager->connect(this->pluginManager,SIGNAL(loadSysDrviver(QString)),socexplorerproxy::self(),SLOT(loadSysDriver(QString)));
                 this->pluginManager->connect(this->pluginManager,SIGNAL(loadSysDriverToParent(QString,QString)),socexplorerproxy::self(),SLOT(loadSysDriverToParent(QString,QString)));
                 this->FileMenu = menuBar()->addMenu(tr("&File"));
                 this->SessionsMenu = this->FileMenu->addMenu(tr("&Sessions"));
                 this->loadSessions();
-                this->sessionManagerAction = this->FileMenu->addAction(tr("&Session manager..."));
+                this->FileMenu->addAction(this->sessionManagerAction);
                 this->SettingsMenu = menuBar()->addMenu(tr("&Settings"));
                 SocExplorerGUI::registerMenuBar(menuBar(),this->FileMenu,this->SettingsMenu);
                 this->PluginsMenu = menuBar()->addMenu(tr("&Plugins"));
             void SocExplorerMainWindow::loadSessions()
             {
                 p_Sessions=this->p_SessionManagerDialog->getSessionsList();
-                sessionsActions_t* sact;
+                QAction* sact;
                 QString stext;
-                foreach (sact, sessionsActions)
+                QList<QAction*> sessions=sessionsActions->actions();
+                foreach (sact, sessions)
                 {
-                      sessionsActions.removeAll(sact);
+                      sessionsActions->removeAction(sact);
                       SessionsMenu->removeAction(sact);
-                      disconnect(sact);
                       delete sact;
                 }
                 foreach (stext, p_Sessions)
                 {
-                    sact = new sessionsActions_t(stext,this);
+                    sact = new QAction(stext,this);
                     sact->setCheckable(true);
-                    connect(sact,SIGNAL(triggered(QString)),this,SLOT(setActiveSession(QString)));
+                    sact->setData(stext);
-                    sessionsActions.append(sact);
+                    if(p_currentSession==stext)
+                       sact->setChecked(true);
+                    sessionsActions->addAction(sact);
                     SessionsMenu->addAction(sact);
                 }
             }
                 }
                 SocExplorerSettings::setValue("GLOBAL","LastModified",QDate::currentDate().toString(),SocExplorerSettings::Session);
                 SocExplorerSettings::setValue(this,"DOCK_LOCATIONS",this->saveState(0),SocExplorerSettings::Session);
+                SocExplorerSettings::setValue(this,"PLUGINS_DOCK_LOCATIONS",this->pluginsDockContainer->saveState(0),SocExplorerSettings::Session);
                 SocExplorerSettings::setValue(this,"MAIN_WINDOW_GEOMETRY",this->saveGeometry(),SocExplorerSettings::Session);
                 QStringList plugins = socexplorerproxy::getPluginsList();
                 SocExplorerSettings::setValue(this,"LOADED_PLUGINS",QVariant(plugins),SocExplorerSettings::Session);
                 socexplorerproxy::loadPluginsList(plugins);
                 this->restoreGeometry(SocExplorerSettings::value(this,"MAIN_WINDOW_GEOMETRY",QVariant(),SocExplorerSettings::Session).toByteArray());
                 this->restoreState(SocExplorerSettings::value(this,"DOCK_LOCATIONS",QVariant(),SocExplorerSettings::Session).toByteArray());
+                this->pluginsDockContainer->restoreState(SocExplorerSettings::value(this,"PLUGINS_DOCK_LOCATIONS",QVariant(),SocExplorerSettings::Session).toByteArray());
             }
                     saveCurrentSession();
                 socexplorerproxy::self()->close();
                 this->p_currentSession = session;
-                sessionsActions_t* sact;
                 SocExplorerSettings::loadSession(session);
                 loadCurrentSession();
-                foreach (sact, sessionsActions)
+            }
-                      if(sact->text().compare(session))
-                          sact->setChecked(false);
+            void SocExplorerMainWindow::setActiveSession(QAction *session)
-                      else
-                          sact->setChecked(true);
+                this->setActiveSession(session->text());
             }
             void SocExplorerMainWindow::showSessionManager(bool)
                 this->p_SessionManagerDialog->show();
             }
+            //TODO handle rename
+            void SocExplorerMainWindow::sessionListChanged()
+            {
+            }
             void SocExplorerMainWindow::closeEvent(QCloseEvent *event)

src/mainwindow.h +3 -19

             #include "regsExplorer/regsexplorer.h"
             #include "socexplorergui.h"
             #include "sessionmanagerdialog.h"
-            class sessionsActions_t: public QAction
-                Q_OBJECT
-            public:
-                sessionsActions_t(const QString &text, QObject* parent)
-                    :  QAction(text,parent)
-                    connect(this,SIGNAL(triggered(bool)),this,SLOT(p_triggered(bool)));
-            signals:
-                 void triggered(const QString & session);
-            private slots:
-                 void p_triggered(bool checked = false)
-                     Q_UNUSED(checked)
-                     emit triggered(this->text());
-            };
             class SocExplorerMainWindow : public QMainWindow
             {
                 SocExplorerMainWindow(QString ScriptToEval,QWidget *parent = 0);
                 ~SocExplorerMainWindow();
                 QAction* Quit,*LoadPlugin,*ManagePlugins,*help,*regsManager,*exploreRegs,*about,*translateAction,*sessionManagerAction;
-                QList<sessionsActions_t*> sessionsActions;
+                QActionGroup*sessionsActions;
                 QActionGroup*langActionGrp;
                 QMenu* FileMenu,*SettingsMenu,*PluginsMenu,*ToolsMenu,*langMenu,*helpMenu,*SessionsMenu;
                 QTranslator* appTranslator;
                 void showAboutBox();
                 void pluginselected(const QString& instanceName);
                 void setActiveSession(const QString & session);
+                void setActiveSession(QAction* session);
                 void showSessionManager(bool);
+                void sessionListChanged();
             signals:
                 void translateSig();
                 void registerObject(QObject* object,const QString& instanceName);

src/sessionmanagerdialog.cpp +4 0

                 int exists=0;
                 QListWidgetItem* item = this->ui->listWidget->currentItem();
                 QString text= item->text();
+                QString OldText= item->text();
                 do
                 {
                     text = QInputDialog::getText(this, tr("SocExplorer Session Manager"),
                 if (ok && !text.isEmpty())
                 {
                     item->setText(text);
+                    SocExplorerSettings::renameSession(text,OldText);
+                    updateSessionList();
+                    emit sessionListChanged();
                 }
             }

src/sessionmanagerdialog.h +1 0

                 void switchSession();
             signals:
                 void switchSession(QString session);
+                void sessionListChanged();
             private:
                 void updateSessionList();

src/sessionmanagerdialog.ui +6 0

             <ui version="4.0">
              <class>SessionManagerDialog</class>
              <widget class="QDialog" name="SessionManagerDialog">
+              <property name="windowModality">
+               <enum>Qt::ApplicationModal</enum>
+              </property>
               <property name="geometry">
                <rect>
                 <x>0</x>
               <property name="windowTitle">
                <string>SocExplorer Session Manager</string>
               </property>
+              <property name="modal">
+               <bool>true</bool>
+              </property>
               <layout class="QGridLayout" name="gridLayout">
                <item row="0" column="0">
                 <widget class="QListWidget" name="listWidget"/>

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