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

             /*------------------------------------------------------------------------------
             --  This file is a part of the SocExplorer Software
             --  Copyright (C) 2012, Plasma Physics Laboratory - CNRS
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 2 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             -------------------------------------------------------------------------------*/
             /*--                  Author : Alexis Jeandet
             --                     Mail : alexis.jeandet@lpp.polytechnique.fr
             ----------------------------------------------------------------------------*/
             #include "socexplorersettings.h"
             SocExplorerSettings* SocExplorerSettings::_self=NULL;
             QSettings* SocExplorerSettings::m_settings=NULL;
             QSettings* SocExplorerSettings::m_sessionSettings=NULL;
             SocExplorerSettingsDialog* SocExplorerSettings::m_configDialog = NULL;
             #include <socexplorergui.h>
             #include <QFile>
             #include <QFileInfo>
             #include <QDir>
             #include <QDebug>
             #define INIT() \
                 if(Q_UNLIKELY(_self==NULL))\
             {\
                 init();\
                 }
             SocExplorerSettings::SocExplorerSettings(QObject *parent) : QObject(parent)
             {
                 m_settings = new QSettings();
                 m_configDialog = new SocExplorerSettingsDialog();
                 QAction* trigerGUI = new QAction(tr("Settings"),this);
                 connect(trigerGUI,SIGNAL(triggered()),this,SLOT(popConfigDialog()));
                 SocExplorerGUI::addSettingsAction(trigerGUI);
             }
             SocExplorerSettings::~SocExplorerSettings()
             {
                 if(m_settings)
                 {
                     m_settings->sync();
                     delete m_settings;
                 }
                 if(m_sessionSettings)
                 {
                     m_sessionSettings->sync();
                     delete m_sessionSettings;
                 }
             }
             void SocExplorerSettings::init()
             {
                 if(!_self)
                 {
                     _self= new SocExplorerSettings();
                 }
             }
             void SocExplorerSettings::setValue(QObject *object, const QString &key, const QVariant &value, SettingScope Sscope)
             {
                 INIT();
                 setValue(object->metaObject()->className(),key,value,Sscope);
             }
             QVariant SocExplorerSettings::value(QObject *object, const QString &key, const QVariant &defaultValue, SettingScope Sscope)
             {
                 INIT();
                 return value(object->metaObject()->className(),key,defaultValue,Sscope);
             }
             void SocExplorerSettings::setValue(const QString scope, const QString &key, const QVariant &value, SettingScope Sscope)
             {
                 INIT();
                 switch (Sscope)
                 {
                 case SystemWide:
                     if(m_settings)
                         m_settings->setValue(scope+"/"+key,value);
                     break;
                 case Session:
                     if(m_sessionSettings)
                         m_sessionSettings->setValue(scope+"/"+key,value);
                     break;
                 default:
                     break;
                 }
             }
             QVariant SocExplorerSettings::value(const QString scope, const QString &key, const QVariant &defaultValue, SettingScope Sscope)
             {
                 INIT();
                 switch (Sscope)
                 {
                 case SystemWide:
                     if(m_settings)
                         return m_settings->value(scope+"/"+key,defaultValue);
                     break;
                 case Session:
                     if(m_sessionSettings)
                         return m_sessionSettings->value(scope+"/"+key,defaultValue);
                     break;
                 default:
                     break;
                 }
                 return defaultValue;
             }
             QList<QList<QVariant> > SocExplorerSettings::arrays(const QString &prefix, QStringList keys, SocExplorerSettings::SettingScope Sscope)
             {
                 INIT();
                 QList<QList<QVariant> > defaultValue;
                 switch (Sscope)
                 {
                 case SystemWide:
                     if(m_settings)
                         return arrays(prefix,keys,m_settings);
                     break;
                 case Session:
                     if(m_sessionSettings)
                         return arrays(prefix,keys,m_sessionSettings);
                     break;
                 default:
                     break;
                 }
                 return defaultValue;
             }
             void SocExplorerSettings::setArrays(const QString &prefix, QStringList keys, QList<QList<QVariant> > values, SocExplorerSettings::SettingScope Sscope)
             {
                 INIT();
                 switch (Sscope)
                 {
                 case SystemWide:
                     if(m_settings)
                         return setArrays(prefix,keys,values,m_settings);
                     break;
                 case Session:
                     if(m_sessionSettings)
                         return setArrays(prefix,keys,values,m_sessionSettings);
                     break;
                 default:
                     break;
                 }
             }
             void SocExplorerSettings::sync()
             {
                 INIT();
                 if(m_settings)
                 {
                     m_settings->sync();
                 }
                 if(m_sessionSettings)
                 {
                     m_sessionSettings->sync();
                 }
             }
             bool SocExplorerSettings::registerConfigEntry(SocExplorerSettingsItem *configEntry, QIcon icon, QString text)
             {
                 INIT();
                 return m_configDialog->registerConfigEntry(configEntry,icon,text);
             }
             bool SocExplorerSettings::loadSession(const QString &session)
             {
                 INIT();
                 QFileInfo sessionInfo(m_settings->fileName());
                 QString fullpath=sessionInfo.absoluteDir().absolutePath() +"/"+session+".conf";
                 if(m_sessionSettings)
                 {
                     delete m_sessionSettings;
                     m_sessionSettings = NULL;
                 }
                 m_sessionSettings = new QSettings(fullpath,QSettings::NativeFormat,self());
                 qDebug()<< m_sessionSettings->fileName();
                 if(m_sessionSettings->status()==QSettings::NoError)
                 {
                     return true;
                 }
                 delete m_sessionSettings;
                 m_sessionSettings = NULL;
                 return false;
             }
+            bool SocExplorerSettings::renameSession(const QString &session, const QString &newName)
+            {
+                INIT();
+                sync();
+                QFileInfo sessionInfo(m_settings->fileName());
+                QString fullpath=sessionInfo.absoluteDir().absolutePath() +"/"+session+".conf";
+                QString newFullpath=sessionInfo.absoluteDir().absolutePath() +"/"+newName+".conf";
+                if(m_sessionSettings && m_sessionSettings->fileName()==fullpath)
+                {
+                    delete m_sessionSettings;
+                    QFile::rename(fullpath,newFullpath);
+                    m_sessionSettings = new QSettings(newFullpath,QSettings::NativeFormat,self());
+                }
+                else
+                {
+                    QFile::rename(fullpath,newFullpath);
+                }
+                return true;
+            }
             bool SocExplorerSettings::deleteSession()
             {
                 INIT();
                 if(m_sessionSettings)
                 {
                     m_sessionSettings->clear();
                     QString filename= m_sessionSettings->fileName();
                     if(QFile::exists(filename))
                     {
                         delete m_sessionSettings;
                         QFile::remove(filename);
                     }
                     else
                         delete m_sessionSettings;
                     m_sessionSettings = NULL;
                     return true;
                 }
                 return false;
             }
             bool SocExplorerSettings::deleteSession(const QString &session)
             {
                 QFileInfo sessionInfo(m_settings->fileName());
                 QString fullpath=sessionInfo.absoluteDir().absolutePath() +"/"+session+".conf";
                 if(m_sessionSettings)
                 {
                     if(m_sessionSettings->fileName()==fullpath)
                     {
                         deleteSession();
                         return true;
                     }
                 }
                 QSettings* sessionSettings = new QSettings(fullpath,QSettings::NativeFormat,self());
                 if(sessionSettings)
                 {
                     if(sessionSettings->status()==QSettings::NoError)
                     {
                             sessionSettings->clear();
                             QString filename= m_sessionSettings->fileName();
                             if(QFile::exists(filename))
                             {
                                 delete sessionSettings;
                                 QFile::remove(filename);
                             }
                             else
                                 delete sessionSettings;
                             return true;
                     }
                     delete sessionSettings;
                 }
                 return false;
             }
             void SocExplorerSettings::popConfigDialog()
             {
                 m_configDialog->popConfigDialog(NULL);
             }
             QList<QList<QVariant> > SocExplorerSettings::arrays(const QString &prefix, QStringList keys, QSettings *settings)
             {
                 QList<QList<QVariant> > result;
                 if(settings)
                 {
                     int size = settings->beginReadArray(prefix);
                     for (int i = 0; i < size; ++i)
                     {
                         result.append(QList<QVariant>());
                         settings->setArrayIndex(i);
                         for(int l=0;l<keys.count();l++)
                         {
                             result[i].append(settings->value(keys.at(l)));
                         }
                     }
                     settings->endArray();
                 }
                 return result;
             }
             void SocExplorerSettings::setArrays(const QString &prefix, QStringList keys, QList<QList<QVariant> > values, QSettings *settings)
             {
                 if(settings)
                 {
                     QString key;
                     foreach (key, keys)
                     {
                         settings->remove(prefix+"/"+key);
                     }
                     settings->beginWriteArray(prefix);
                     for (int i = 0; i < values.size(); ++i)
                     {
                         settings->setArrayIndex(i);
                         for(int l=0;l<keys.count();l++)
                         {
                             settings->setValue(keys[l], values.at(i).at(l));
                         }
                     }
                     settings->endArray();
                 }
             }

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

             /*------------------------------------------------------------------------------
             --  This file is a part of the SocExplorer Software
             --  Copyright (C) 2012, Plasma Physics Laboratory - CNRS
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 2 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             -------------------------------------------------------------------------------*/
             /*--                  Author : Alexis Jeandet
             --                     Mail : alexis.jeandet@lpp.polytechnique.fr
             ----------------------------------------------------------------------------*/
             #ifndef SOCEXPLORERSETTINGS_H
             #define SOCEXPLORERSETTINGS_H
             #include <QObject>
             #include <QWidget>
             #include <QSettings>
             #include <socexplorersettingsdialog.h>
             class SocExplorerSettings : public QObject
             {
                 Q_OBJECT
             private:
                 static SocExplorerSettings* _self;
                 static QSettings* m_settings;
                 static QSettings* m_sessionSettings;
                 static SocExplorerSettingsDialog* m_configDialog;
                 SocExplorerSettings(QObject *parent = 0);
                 ~SocExplorerSettings();
             public:
                 enum SettingScope {
                     SystemWide = 0,
                     Session
                 };
                 static void init();
                 static SocExplorerSettings* self(){ if(!_self){_self= new SocExplorerSettings;}return _self;}
                 static void	setValue(QObject* object,const QString & key, const QVariant & value,SettingScope Sscope =SystemWide);
                 static QVariant	value(QObject* object, const QString & key, const QVariant & defaultValue = QVariant(),SettingScope Sscope=SystemWide);
                 static void	setValue(const QString scope,const QString & key, const QVariant & value,SettingScope Sscope= SystemWide);
                 static QVariant	value(const QString scope, const QString & key, const QVariant & defaultValue = QVariant(),SettingScope Sscope =SystemWide);
                 static QList<QList<QVariant> > arrays(const QString & prefix, QStringList keys,SettingScope Sscope =SystemWide);
                 static void setArrays(const QString & prefix, QStringList keys,QList<QList<QVariant> > values,SettingScope Sscope =SystemWide);
                 static void sync();
                 static bool registerConfigEntry(SocExplorerSettingsItem* configEntry,QIcon icon, QString text);
                 //! Loads the given session, or sreate it if doesn't exists.
                 //! \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:
             public slots:
                 void popConfigDialog();
             private:
                 static QList<QList<QVariant> > arrays(const QString & prefix, QStringList keys,QSettings* settings);
                 static void setArrays(const QString & prefix, QStringList keys,QList<QList<QVariant> > values,QSettings* settings);
             };
             #endif // SOCEXPLORERSETTINGS_H

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

             /*------------------------------------------------------------------------------
             --  This file is a part of the SocExplorer Software
             --  Copyright (C) 2014, Plasma Physics Laboratory - CNRS
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 2 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             -------------------------------------------------------------------------------*/
             /*--                  Author : Alexis Jeandet
             --                     Mail : alexis.jeandet@lpp.polytechnique.fr
             ----------------------------------------------------------------------------*/
             #include <socexplorerplugin.h>
             #include <abstractbinfile.h>
             #include <srec/srecfile.h>
             #include <BinFile/binaryfile.h>
             int socexplorerplugin::isConnected(){return this->Connected;}
             QString socexplorerplugin::baseName(){return *_Name;}
             int socexplorerplugin::baseAddress(){return this->BaseAddress;}
             void socexplorerplugin::setBaseAddress(unsigned int baseAddress){this->BaseAddress = baseAddress;}
             QString socexplorerplugin::instanceName()
             {
               return this->_instanceName;
             }
             int socexplorerplugin::registermenu(QMenu *menu)
             {
               this->menu = menu->addMenu(this->_instanceName);
               this->closeAction = this->menu->addAction(tr("Close plugin"));
               QObject::connect(this->closeAction,SIGNAL(triggered()),this,SLOT(closeMe()));
               this->ChildsMenu = this->menu->addMenu(QString("Childs"));
               for(int i=0;i<this->childs.count();i++)
                 {
                   this->childs.at(i)->registermenu(this->ChildsMenu);
                 }
               emit this->registerObject((QObject*)this,this->instanceName());
               return 0;
             }
             void socexplorerplugin::postInstantiationTrigger()
             {
               return;
             }
             unsigned int socexplorerplugin::Write(unsigned int *Value, unsigned int count, unsigned int address)
             {
               if(parent!=NULL)
                 {
                   return parent->Write(Value,count,address);
                 }
               return 0;
             }
             unsigned int socexplorerplugin::Read(unsigned int *Value, unsigned int count, unsigned int address)
             {
               if(parent!=NULL)
                 {
                   return parent->Read(Value,count,address);
                 }
               return 0;
             }
             QVariantList socexplorerplugin::Read(unsigned int address,unsigned int count)
             {
                 unsigned int data[count];
                 QVariantList result;
                 Read(data,count,address);
                 for(unsigned int i = 0;i<count;i++)
                 {
                     result.append(QVariant((int)data[i]));
                 }
                 return result;
             }
             void socexplorerplugin::Write(unsigned int address,QList<QVariant> dataList)
             {
                 unsigned int data[dataList.count()];
                 for(int i = 0;i<dataList.count();i++)
                 {
                     data[i] = (unsigned int)dataList.at(i).toUInt();
                 }
                 Write(data,dataList.count(),address);
             }
             void socexplorerplugin::closeMe(){emit this->closePlugin(this);}
             void socexplorerplugin::activate(bool flag){this->setEnabled(flag);emit this->activateSig(flag);}
             void socexplorerplugin::setInstanceName(const QString &newName)
             {
               this->_instanceName = newName;
               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)
             {
               unsigned int* buffer = (unsigned int*)malloc(count*sizeof(unsigned int));
               if(buffer!=NULL)
                 {
                   this->Read(buffer,count,address);
                   QFile outfile(file);
                   if (!outfile.open(QIODevice::ReadWrite | QIODevice::Text))
                     return false;
                   QTextStream out(&outfile);
                   for(int i=0;(unsigned int)i<count;i++)
                     out << "0x"+QString::number(address+(i*4),16) + ": 0x" + QString::number(buffer[i],16) + "\n";
                   free(buffer);
                   out.flush();
                   outfile.close();
                   return true;
                 }
               return false;
             }
             bool socexplorerplugin::memSet(unsigned int address, int value, unsigned int count)
             {
               unsigned int* buffer = (unsigned int*)malloc(count*sizeof(unsigned int));
               if(buffer!=NULL)
                 {
                   memset((void*)buffer,value,count*sizeof(unsigned int));
                   this->Write(buffer,count,address);
                   free(buffer );
                   return true;
                 }
               return false;
             }
             bool socexplorerplugin::loadbin(unsigned int address, QString file)
             {
               QFile infile(file);
               if (!infile.open(QIODevice::ReadOnly))
                 return false;
               uint32_t* buffer = (uint32_t*)malloc(infile.size());
               if(buffer!=NULL)
                 {
                   infile.read((char*)buffer,infile.size());
                   for(int i=0;i<(infile.size()/4);i++)
                     {
                       buffer[i] = socexplorerBswap32(buffer[i]);
                     }
                   this->Write(buffer,infile.size()/4,address);
                   free(buffer);
                   return true;
                 }
               return false;
             }
             bool socexplorerplugin::loadfile(abstractBinFile *file)
             {
               if(file->isopened())
                 {
                   QList<codeFragment*> fragments= file->getFragments();
                   for(int i=0;i<fragments.count();i++)
                     {
                       int size = fragments.at(i)->size/4;
                       // TODO fixme, should be the oposite
             #if __BYTE_ORDER == __LITTLE_ENDIAN
                       if(!file->litleendian)
                         {
                           uint32_t* buffer = (uint32_t*)malloc(fragments.at(i)->size);
                           memcpy(buffer,fragments.at(i)->data,fragments.at(i)->size);
                           if(buffer!=NULL)
                             {
                               for(int l=0;l<(size);l++)
                                 {
                                   buffer[l] = socexplorerBswap32(buffer[l]);
                                 }
                               this->Write(buffer,size,fragments.at(i)->address);
                               free(buffer);
                             }
                         }
                       else
                         {
                           this->Write((uint32_t*) fragments.at(i)->data,size,fragments.at(i)->address);
                         }
             #elif __BYTE_ORDER == __BIG_ENDIAN
                       if(file->litleendian)
                         {
                           uint32_t* buffer = (uint32_t*)malloc(fragments.at(i)->size);
                           memcpy(buffer,fragments.at(i)->data,fragments.at(i)->size);
                           if(buffer!=NULL)
                             {
                               for(int l=0;l<(size);l++)
                                 {
                                   buffer[l] = socexplorerBswap32(buffer[l]);
                                 }
                               this->Write(buffer,size,fragments.at(i)->address);
                               free(buffer);
                             }
                         }
                       else
                         {
                           this->Write((uint32_t*) fragments.at(i)->data,size,fragments.at(i)->address);
                         }
             #endif
                     }
                 }
               return true;
             }
             bool socexplorerplugin::dumpMemory(unsigned int address, unsigned int count, QString file, const QString &format)
             {
               unsigned int* buffer = (unsigned int*)malloc(count*sizeof(unsigned int));
               if(buffer!=NULL)
                 {
                   this->Read(buffer,count,address);
                   if(!format.compare("srec",Qt::CaseInsensitive))
                     {
                       //need to convert from in memory endianness to file endianness
                       //SREC is always big endian
             #if __BYTE_ORDER == __LITTLE_ENDIAN
                       for(int l=0;l<(count);l++)
                         {
                           buffer[l] = socexplorerBswap32(buffer[l]);
                         }
             #elif __BYTE_ORDER == __BIG_ENDIAN
             #endif
                       codeFragment fragment((char*)buffer,count*4,address);
                       srecFile::toSrec(QList<codeFragment*>()<<&fragment,file);
                     }
                   if(!format.compare("bin",Qt::CaseInsensitive))
                     {
                       //beware this format is not portable from a big endian host to a litle endian one
                       codeFragment fragment((char*)buffer,count*4,address);
                       binaryFile::toBinary(QList<codeFragment*>()<<&fragment,file);
                     }
                   if(!format.compare("hexa",Qt::CaseInsensitive))
                     {
                       QFile outfile(file);
                       if (!outfile.open(QIODevice::ReadWrite | QIODevice::Text))
                         return false;
                       QTextStream out(&outfile);
                       for(int i=0;(unsigned int)i<count;i++)
                         out << "0x"+QString::number(address+(i*4),16) + ": 0x" + QString::number(buffer[i],16) + "\n";
                       free(buffer);
                       out.flush();
                       outfile.close();
                     }
                   return true;
                 }
               return false;
             }

src/mainwindow.cpp +26 -15

             /*------------------------------------------------------------------------------
             --  This file is a part of the SocExplorer Software
             --  Copyright (C) 2011-2015, Plasma Physics Laboratory - CNRS
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 2 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             -------------------------------------------------------------------------------*/
             /*--                  Author : Alexis Jeandet
             --                     Mail : alexis.jeandet@lpp.polytechnique.fr
             ----------------------------------------------------------------------------*/
             #include "mainwindow.h"
             #include <QDockWidget>
             #include <socexplorersettings.h>
             #include <socexplorerconfigkeys.h>
             SocExplorerMainWindow::SocExplorerMainWindow(QString ScriptToEval, QWidget *parent)
                 : QMainWindow(parent)
             {
                 QCoreApplication::setApplicationName("SocExplorer");
                 QCoreApplication::setOrganizationName("LPP");
                 QCoreApplication::setOrganizationDomain("lpp.fr");
                 this->makeObjects(ScriptToEval);
                 this->makeLayout();
                 this->makeMenu();
                 SocExplorerSettings::init();
                 this->makeConnections();
                 this->setWindowIcon(QIcon(":/images/icon.png"));
                 this->setAcceptDrops(true);
                 this->pluginManager->setRootLoadable(true);
                 this->PythonConsoleInst->pyConsoleRunFile(ScriptToEval);
                 QFile file(":/styles/SocExplorer.css");
                 if(file.open(QIODevice::ReadOnly | QIODevice::Text))
                 {
                     qApp->setStyleSheet(file.readAll());
                     file.close();
                 }
             }
             void SocExplorerMainWindow::makeObjects(QString ScriptToEval)
             {
                 Q_UNUSED(ScriptToEval)
                 this->p_pluginGUIlist = new QList<QDockWidget*>();
                 pluginsDockContainer = new QMainWindow;
                 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);
                 this->Quit->setShortcut(tr("CTRL+Q"));
                 this->ManagePlugins = new QAction(tr("&Manage Plugins"),this);
                 this->ManagePlugins->setShortcut(tr("CTRL+P"));
                 this->regsManager = new QAction(tr("&Manage registers"),this);
                 this->exploreRegs = new QAction(tr("&Explore registers"),this);
                 this->help = new QAction(tr("&Help"),this);
                 this->help->setShortcut(tr("CTRL+H"));
                 this->about = new QAction(tr("&About"),this);
                 this->p_SessionManagerDialog = new SessionManagerDialog();
                 socexplorerproxy::setMainWindow(this);
                 SocExplorerEngine::setMainWindow(this);
                 SocExplorerEngine::xmlModel()->scanXmlFiles();
                 this->regExplorer = new RegsExplorer();
                 this->regExplorer->setAllowedAreas(Qt::AllDockWidgetAreas);
                 this->regExplorer->setObjectName("regExplorer");
                 this->addPluginInterface(this->regExplorer);
                 this->PythonConsoleInst = new PythonConsole(socexplorerproxy::self());
                 this->PythonConsoleInst->addObject("SocExplorerEngine",SocExplorerEngine::self());
                 this->pluginManager = new dockablePluginManager();
                 this->toolpane = new toolBar;
                 this->toolpane->setObjectName("toolpane");
                 this->p_about = new aboutsocexplorer();
             }
             void SocExplorerMainWindow::makeLayout()
             {
                 this->mainWidget->addWidget(pluginsDockContainer);
                 this->mainWidget->addWidget(this->PythonConsoleInst);
                 this->toolpane->setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea);
                 this->addDockWidget(Qt::LeftDockWidgetArea,this->toolpane);
                 this->toolpane->addTool(this->pluginManager);
                 this->setCentralWidget(this->mainWidget);
             }
             void SocExplorerMainWindow::makeConnections()
             {
                 connect(socexplorerproxy::self(),SIGNAL(clearMenu()),this,SLOT(clearMenu()));
                 connect(this,SIGNAL(translateSig()),socexplorerproxy::self(),SLOT(updateText()));
                 connect(socexplorerproxy::self(),SIGNAL(addPluginGUI(QDockWidget*)),this,SLOT(addPluginInterface(QDockWidget*)));
                 connect(socexplorerproxy::self(),SIGNAL(removePluginGUI(QDockWidget*)),this,SLOT(removePluginInterface(QDockWidget*)));
                 connect(this->ManagePlugins,SIGNAL(triggered()),this,SLOT(launchPluginManager()));
                 connect(this->Quit,SIGNAL(triggered()),qApp,SLOT(quit()));
                 connect(this,SIGNAL(registerObject(QObject*,QString)),this->PythonConsoleInst,SLOT(registerObject(QObject*,QString)));
                 connect(socexplorerproxy::self(),SIGNAL(registerObject(QObject*,QString)),this,SIGNAL(registerObject(QObject*,QString)));
                 connect(this->pluginManager,SIGNAL(geteplugintree()),socexplorerproxy::self(),SLOT(geteplugintree()));
                 connect(socexplorerproxy::self(),SIGNAL(treeChanged(QList<socexplorerplugin*>)),this->pluginManager,SIGNAL(treeChanged(QList<socexplorerplugin*>)));
                 connect(this->pluginManager,SIGNAL(changeSysDriverInstName(QString,QString)),socexplorerproxy::self(),SLOT(changeSysDriverInstName(QString,QString)));
                 connect(this->pluginManager,SIGNAL(changeSysDriverInstName(QString,QString)),this->PythonConsoleInst,SLOT(changeSysDriverInstName(QString,QString)));
                 connect(this->pluginManager,SIGNAL(closeSysDriver(QString)),socexplorerproxy::self(),SLOT(closeSysDriver(QString)));
                 connect(this->pluginManager,SIGNAL(closeSysDriver(QString)),this->PythonConsoleInst,SLOT(removeDriver(QString)));
                 connect(this->pluginManager,SIGNAL(pluginselected(QString)),this,SLOT(pluginselected(QString)));
                 connect(this->about,SIGNAL(triggered()),this,SLOT(showAboutBox()));
                 connect(this->exploreRegs,SIGNAL(triggered()),this->regExplorer,SLOT(show()));
                 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)));
             }
             void SocExplorerMainWindow::launchPluginManager()
             {
                 if(this->pluginManager->isHidden())
                 {
                     this->pluginManager->setHidden(false);
                 }
             }
             void SocExplorerMainWindow::addPluginInterface(QDockWidget *plugin)
             {
                 plugin->setAllowedAreas(Qt::AllDockWidgetAreas);
                 this->pluginsDockContainer->addDockWidget(Qt::TopDockWidgetArea,plugin);
                 if(p_pluginGUIlist->count()!=0)
                     this->pluginsDockContainer->tabifyDockWidget(p_pluginGUIlist->last(),plugin);
                 p_pluginGUIlist->append(plugin);
             }
             void SocExplorerMainWindow::removePluginInterface(QDockWidget *plugin)
             {
                 p_pluginGUIlist->removeOne(plugin);
                 this->pluginsDockContainer->removeDockWidget(plugin);
             }
             void SocExplorerMainWindow::clearMenu()
             {
                 this->menuBar()->clear();
                 this->makeMenu();
             }
             void SocExplorerMainWindow::makeMenu()
             {
                 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"));
                 this->ToolsMenu = menuBar()->addMenu(tr("&Tools"));
                 this->ToolsMenu->addAction(this->exploreRegs);
                 this->FileMenu->addAction(this->Quit);
                 socexplorerproxy::self()->makeMenu(this->PluginsMenu);
                 this->PluginsMenu->addAction(this->ManagePlugins);
                 this->helpMenu = menuBar()->addMenu(tr("Help"));
                 this->helpMenu->addAction(this->help);
                 this->helpMenu->addAction(this->about);
             }
             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);
                 }
             }
             void SocExplorerMainWindow::savePlugins()
             {
             }
             void SocExplorerMainWindow::saveCurrentSession()
             {
                 if(p_currentSession.isEmpty())
                 {
                     SocExplorerSettings::loadSession("default");
                 }
                 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);
                 SocExplorerSettings::sync();
             }
             void SocExplorerMainWindow::loadCurrentSession()
             {
                 QStringList plugins = SocExplorerSettings::value(this,"LOADED_PLUGINS",QVariant(),SocExplorerSettings::Session).toStringList();
                 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());
             }
             SocExplorerMainWindow::~SocExplorerMainWindow()
             {
             }
             void SocExplorerMainWindow::setLangage(QAction *action)
             {
                 QString local = action->data().toString();
                 QString qmPath = QDir(QString("translations")).absolutePath();
                 appTranslator->load(qmPath+"/socexplorer_"+local+".qm");
                 qApp->installTranslator(appTranslator);
                 emit this->translateSig();
             }
             void SocExplorerMainWindow::createLangMenu()
             {
                 this->langMenu = menuBar()->addMenu(tr("&Langue"));
                 this->langActionGrp = new QActionGroup(this);
                 connect(this->langActionGrp,SIGNAL(triggered(QAction*)),this,SLOT(setLangage(QAction*)));
                 QDir* qmDir = new QDir(QString("translations"));
                 QStringList LangFiles = qmDir->entryList(QStringList("socexplorer_*.qm"));
                 for(int i=0;i<LangFiles.size();++i)
                 {
                     QString Local = LangFiles[i];
                     Local.remove(0,Local.indexOf('_')+1);
                     Local.chop(3);
                     QTranslator translator;
                     translator.load(LangFiles[i],qmDir->absolutePath());
                     QString langage = translator.translate("MainWindow","English");
                     QAction *action = new QAction(tr("&%1 %2").arg(i+1).arg(langage),this);
                     action->setCheckable(true);
                     action->setData(Local);
                     langMenu->addAction(action);
                     langActionGrp->addAction(action);
                     if(langage==tr("English"))
                         action->setChecked(true);
                 }
             }
             void SocExplorerMainWindow::updateText()
             {
                 emit this->translateSig();
             }
             void SocExplorerMainWindow::showAboutBox()
             {
                 p_about->show();
             }
             void SocExplorerMainWindow::pluginselected(const QString &instanceName)
             {
                 socexplorerplugin* drv=socexplorerproxy::self()->getSysDriver(instanceName);
                 if(drv)
                     drv->raise();
             }
             void SocExplorerMainWindow::setActiveSession(const QString &session)
             {
                 if(!(p_currentSession.isNull() && session=="default"))
                     saveCurrentSession();
                 socexplorerproxy::self()->close();
                 this->p_currentSession = session;
-                sessionsActions_t* sact;
                 SocExplorerSettings::loadSession(session);
                 loadCurrentSession();
-                foreach (sact, sessionsActions)
+            }
+            void SocExplorerMainWindow::setActiveSession(QAction *session)
             {
-                      if(sact->text().compare(session))
+                this->setActiveSession(session->text());
-                          sact->setChecked(false);
-                      else
-                          sact->setChecked(true);
             }
             void SocExplorerMainWindow::showSessionManager(bool)
             {
                 this->p_SessionManagerDialog->show();
             }
+            //TODO handle rename
+            void SocExplorerMainWindow::sessionListChanged()
+            {
+            }
             void SocExplorerMainWindow::closeEvent(QCloseEvent *event)
             {
                 saveCurrentSession();
                 socexplorerproxy::self()->close();
                 qApp->closeAllWindows();
                 event->accept();
             }

src/mainwindow.h +3 -19

             /*------------------------------------------------------------------------------
             --  This file is a part of the SocExplorer Software
             --  Copyright (C) 2011, Plasma Physics Laboratory - CNRS
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 2 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             -------------------------------------------------------------------------------*/
             /*--                  Author : Alexis Jeandet
             --                     Mail : alexis.jeandet@lpp.polytechnique.fr
             ----------------------------------------------------------------------------*/
             #ifndef MAINWINDOW_H
             #define MAINWINDOW_H
             #include <QMainWindow>
             #include <QApplication>
             #include <QVBoxLayout>
             #include <QIcon>
             #include <QMenuBar>
             #include <QMenu>
             #include <QAction>
             #include <QDockWidget>
             #include <QTranslator>
             #include <QSplitter>
             #include "dockablepluginmanager.h"
             #include <socexplorerproxy.h>
             #include "PyWdgt/pythonconsole.h"
             #include "aboutsocexplorer.h"
             #include "toolbar.h"
             #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
             {
                 Q_OBJECT
             public:
                 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 createLangMenu();
                 void closeEvent(QCloseEvent *event);
                 toolBar* toolpane;
             public slots:
                 void launchPluginManager();
                 void addPluginInterface(QDockWidget* plugin);
                 void removePluginInterface(QDockWidget* plugin);
                 void clearMenu();
                 void updateText();
                 void setLangage(QAction* action);
                 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);
             private:
                 void makeObjects(QString ScriptToEval);
                 void makeLayout();
                 void makeConnections();
                 void makeMenu();
                 void loadSessions();
                 void savePlugins();
                 void saveCurrentSession();
                 void loadCurrentSession();
                 QMainWindow* pluginsDockContainer;
                 QSplitter* mainWidget;
                 PythonConsole* PythonConsoleInst;
                 dockablePluginManager* pluginManager;
                 RegsExplorer* regExplorer;
                 aboutsocexplorer* p_about;
                 QList<QDockWidget*>* p_pluginGUIlist;
                 QStringList p_Sessions;
                 QString p_currentSession;
                 SessionManagerDialog* p_SessionManagerDialog;
             };
             #endif // MAINWINDOW_H

src/sessionmanagerdialog.cpp +4 0

             /*------------------------------------------------------------------------------
             --  This file is a part of the SocExplorer Software
             --  Copyright (C) 2015, Plasma Physics Laboratory - CNRS
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 2 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             -------------------------------------------------------------------------------*/
             /*--                  Author : Alexis Jeandet
             --                     Mail : alexis.jeandet@lpp.polytechnique.fr
             ----------------------------------------------------------------------------*/
             #include "sessionmanagerdialog.h"
             #include "ui_sessionmanagerdialog.h"
             #include <socexplorersettings.h>
             #include <socexplorerconfigkeys.h>
             #include <QInputDialog>
             #include <QMessageBox>
             SessionManagerDialog::SessionManagerDialog(QWidget *parent) :
                 QDialog(parent),
                 ui(new Ui::SessionManagerDialog)
             {
                 ui->setupUi(this);
                 connect(this->ui->NewQPB,SIGNAL(clicked(bool)),this,SLOT(newSession()));
                 connect(this->ui->DeleteQPB,SIGNAL(clicked(bool)),this,SLOT(deleteSession()));
                 connect(this->ui->RenameQPB,SIGNAL(clicked(bool)),this,SLOT(renameSession()));
                 connect(this->ui->SwitchToQPB,SIGNAL(clicked(bool)),this,SLOT(switchSession()));
             }
             SessionManagerDialog::~SessionManagerDialog()
             {
                 delete ui;
             }
             QStringList SessionManagerDialog::getSessionsList()
             {
                 QStringList result;
                 QList<QList<QVariant> > sessions = SocExplorerSettings::arrays(SOCEXPLORERGLOBAL_SETTINGS_SESSIONS_SCOPE,QStringList()<<SOCEXPLORERGLOBAL_SETTINGS_SESSIONS_NAME);
                 for(int i=0;i<sessions.count();i++)
                 {
                     if(sessions.at(i).count()>=1)
                     {
                         result.append(sessions.at(i).at(0).toString());
                     }
                 }
                 // May always return at least default session
                 if(result.count()==0)
                 {
                     result.append("default");
                 }
                 return result;
             }
             void SessionManagerDialog::show()
             {
                 QStringList sessions = getSessionsList();
                 this->ui->listWidget->clear();
                 this->ui->listWidget->addItems(sessions);
                 QDialog::show();
             }
             void SessionManagerDialog::newSession()
             {
                 bool ok=true,exists=false;
                 QString text;
                 do
                 {
                     text = QInputDialog::getText(this, tr("SocExplorer Session Manager"),
                                                  tr("Session name:"), QLineEdit::Normal,
                                                  "New Session", &ok);
                     exists = sessionExists(text);
                     if(exists && ok)
                     {
                         QMessageBox::warning(this, tr("SocExplorer Session Manager"),
                                              tr("The session ")+text+tr(" already exists."),
                                              QMessageBox::Ok);
                     }
                 }while(ok && (text.isEmpty() || exists));
                 if (ok && !text.isEmpty())
                 {
                     this->newSession(text);
                 }
             }
             void SessionManagerDialog::newSession(QString session)
             {
                 if (!session.isEmpty())
                 {
                     this->ui->listWidget->addItem(session);
                     updateSessionList();
                 }
             }
             void SessionManagerDialog::renameSession()
             {
                 bool ok=true;
                 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"),
                                                  tr("New session name:"), QLineEdit::Normal,
                                                  text, &ok);
                     exists = sessionExists(text);
                     if(exists&& ok)
                     {
                         QMessageBox::warning(this, tr("SocExplorer Session Manager"),
                                              tr("The session ")+text+tr(" already exists."),
                                              QMessageBox::Ok);
                     }
                 }while(ok && text.isEmpty());
                 if (ok && !text.isEmpty())
                 {
                     item->setText(text);
+                    SocExplorerSettings::renameSession(text,OldText);
+                    updateSessionList();
+                    emit sessionListChanged();
                 }
             }
             void SessionManagerDialog::deleteSession()
             {
                 if(this->ui->listWidget->selectedItems().count())
                 {
                     QListWidgetItem* item = this->ui->listWidget->currentItem();
                     if(item && item->text().compare("default"))
                     {
                         this->ui->listWidget->removeItemWidget(item);
                         SocExplorerSettings::deleteSession(item->text());
                         delete item;
                         updateSessionList();
                     }
                 }
             }
             void SessionManagerDialog::switchSession()
             {
                 QListWidgetItem* item = this->ui->listWidget->currentItem();
                 if(item)
                     emit switchSession(item->text());
             }
             int SessionManagerDialog::sessionExists(QString session)
             {
                 int exists=0;
                 for(int i=0;i< this->ui->listWidget->count();i++)
                 {
                     exists += (this->ui->listWidget->item(i)->text().compare(session)==0);
                 }
                 return exists;
             }
             void SessionManagerDialog::updateSessionList()
             {
                 QList<QList<QVariant> >  sessions;
                 for(int i=0;i< this->ui->listWidget->count();i++)
                 {
                     QList<QVariant> sess;
                     sess.append(this->ui->listWidget->item(i)->text());
                     sessions.append(sess);
                 }
                 SocExplorerSettings::setArrays(SOCEXPLORERGLOBAL_SETTINGS_SESSIONS_SCOPE,QStringList()<<SOCEXPLORERGLOBAL_SETTINGS_SESSIONS_NAME,sessions);
             }

src/sessionmanagerdialog.h +1 0

             /*------------------------------------------------------------------------------
             --  This file is a part of the SocExplorer Software
             --  Copyright (C) 2015, Plasma Physics Laboratory - CNRS
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 2 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             -------------------------------------------------------------------------------*/
             /*--                  Author : Alexis Jeandet
             --                     Mail : alexis.jeandet@lpp.polytechnique.fr
             ----------------------------------------------------------------------------*/
             #ifndef SESSIONMANAGERDIALOG_H
             #define SESSIONMANAGERDIALOG_H
             #include <QDialog>
             namespace Ui {
             class SessionManagerDialog;
             }
             class SessionManagerDialog : public QDialog
             {
                 Q_OBJECT
             public:
                 explicit SessionManagerDialog(QWidget *parent = 0);
                 ~SessionManagerDialog();
                 QStringList getSessionsList();
             public slots:
                 void show();
                 void newSession(QString session);
                 int sessionExists(QString session);
             private slots:
                 void newSession();
                 void renameSession();
                 void deleteSession();
                 void switchSession();
             signals:
                 void switchSession(QString session);
+                void sessionListChanged();
             private:
                 void updateSessionList();
                 Ui::SessionManagerDialog *ui;
             };
             #endif // SESSIONMANAGERDIALOG_H

src/sessionmanagerdialog.ui +6 0

             <?xml version="1.0" encoding="UTF-8"?>
             <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>
                 <y>0</y>
                 <width>553</width>
                 <height>275</height>
                </rect>
               </property>
               <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"/>
                </item>
                <item row="0" column="1">
                 <widget class="QWidget" name="widget" native="true">
                  <layout class="QVBoxLayout" name="verticalLayout">
                   <item>
                    <widget class="QPushButton" name="NewQPB">
                     <property name="text">
                      <string>New</string>
                     </property>
                    </widget>
                   </item>
                   <item>
                    <widget class="QPushButton" name="RenameQPB">
                     <property name="text">
                      <string>Rename</string>
                     </property>
                    </widget>
                   </item>
                   <item>
                    <widget class="QPushButton" name="CloneQPB">
                     <property name="text">
                      <string>Clone</string>
                     </property>
                    </widget>
                   </item>
                   <item>
                    <widget class="QPushButton" name="DeleteQPB">
                     <property name="text">
                      <string>Delete</string>
                     </property>
                    </widget>
                   </item>
                   <item>
                    <widget class="QPushButton" name="SwitchToQPB">
                     <property name="text">
                      <string>Switch to</string>
                     </property>
                    </widget>
                   </item>
                   <item>
                    <spacer name="verticalSpacer">
                     <property name="orientation">
                      <enum>Qt::Vertical</enum>
                     </property>
                     <property name="sizeHint" stdset="0">
                      <size>
                       <width>20</width>
                       <height>40</height>
                      </size>
                     </property>
                    </spacer>
                   </item>
                  </layout>
                 </widget>
                </item>
                <item row="1" column="0" colspan="2">
                 <widget class="QDialogButtonBox" name="buttonBox">
                  <property name="orientation">
                   <enum>Qt::Horizontal</enum>
                  </property>
                  <property name="standardButtons">
                   <set>QDialogButtonBox::Close</set>
                  </property>
                 </widget>
                </item>
               </layout>
              </widget>
              <resources/>
              <connections>
               <connection>
                <sender>buttonBox</sender>
                <signal>accepted()</signal>
                <receiver>SessionManagerDialog</receiver>
                <slot>accept()</slot>
                <hints>
                 <hint type="sourcelabel">
                  <x>248</x>
                  <y>254</y>
                 </hint>
                 <hint type="destinationlabel">
                  <x>157</x>
                  <y>274</y>
                 </hint>
                </hints>
               </connection>
               <connection>
                <sender>buttonBox</sender>
                <signal>rejected()</signal>
                <receiver>SessionManagerDialog</receiver>
                <slot>reject()</slot>
                <hints>
                 <hint type="sourcelabel">
                  <x>316</x>
                  <y>260</y>
                 </hint>
                 <hint type="destinationlabel">
                  <x>286</x>
                  <y>274</y>
                 </hint>
                </hints>
               </connection>
              </connections>
             </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