HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorer Commit - r12:a31c7daed0d6

Removed annoying GUI bug with dock widget handling:...

Jeandet Alexis -

r12:a31c7daed0d6 default

parent child

Context file:

r12:a31c7daed0d6

Collapse all files

ressources/txt/about.html +4 -3

             <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
             <html>
                 <head>
                 </head>
                 <body style="background-color : #dbdbdb;">
             	<div align="center">
             		<a href="http://www.cnrs.fr/"> <IMG src=":/images/logocnrs.png" alt="CNRS" width="47" height="47" align="top" border="0" ></a>
             		<a href="http://www.lpp.fr/"> <IMG src=":/images/logolpp.png" width="158" height="47" align="top" border="0" ></a>
                             <a href="http://www.solarorbiter.org/"> <IMG src=":/images/logoso.png" width="64" height="47" align="top" border="0" ></a>
             	</div>
             	<hr>
                     <div align="center">
                         <B style="font-size : 150%;">About SocExplorer</B>
                     </div>
             	<hr>
             	<div align="center">
                             <B>SocExplorer Version $VERSION$.</B><BR><BR>
-                            <B>       Changeset $Changeset$.</B><BR><BR>
+                            <B> Build from Changeset $Changeset$.</B><BR><BR>
-                            <B>       Branch $Branch$.</B><BR><BR>
+                            <B> Branch $Branch$.</B><BR><BR>
                             Copyright (C) 2011-2014 Plasmas Physic Laboratory.<BR>
             		This is free software; licenced under the terms of the GPLV2 license.<BR><BR>
             		This program uses:
             		<div align="left"  style="margin-left : 50%;">
             			<ul>
                                             <LI><a href="http://qt.nokia.com" title="Qt">Qt</a> (Copyright 2008-2013 Digia Plc).</LI>
             				<LI><a href="http://pythonqt.sourceforge.net" title="PythonQt">PythonQt</a> </LI>
+            				<LI><a href="http://commons.wikimedia.org/wiki/GNOME_Desktop_icons" title="Gnome Icons">Gnome Icons</a> </LI>
             				<LI><a href="http://nsis.sourceforge.net/Main_Page" title="NSIS">NSIS</a> (Nullsoft Scriptable Install System) </LI>
-            				<LI>LppSerial</LI>
+            				<LI><a href="https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/INSTRUMENTATION/lppserial" title="LppSerial">LppSerial</a></LI>
                                             <LI><a href="http://www.qcustomplot.com/index.php/introduction" title="qhexedit">QCustomPlot</a></LI>
             				<LI><a href="http://code.google.com/p/qhexedit2/" title="qhexedit">QHexEdit</a></LI>
             			</ul>
             		</div>
             	</div>
                 </body>
             </html>

src/SocExplorerEngine/proxy/socexplorerproxy.cpp +11 -10

             /*------------------------------------------------------------------------------
             --  This file is a part of the SocExplorer Software
             --  Copyright (C) 2011, Laboratory of Plasmas Physic - 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 "socexplorerproxy.h"
             #include <pluginmanagerWDGT.h>
             #include <socexplorerengine.h>
             #include <pluginloader.h>
             #include <socexplorerplugin.h>
             socexplorerproxy* socexplorerproxy::_self=NULL;
             QMainWindow* socexplorerproxy::mainWindow=NULL;
             QList<socexplorerplugin*>* socexplorerproxy::drivers=NULL;
             QList<socexplorerplugin*>* socexplorerproxy::linearDriverList=NULL;
             socexplorerplugin* socexplorerproxy::root=NULL;
             socexplorerplugin* socexplorerproxy::parent=NULL;
             PluginsCache* socexplorerproxy::cache=NULL;
             socexplorerproxy::socexplorerproxy(QObject *parent) :
                 QObject(parent)
             {
                 cache = new PluginsCache;
                 drivers = new QList<socexplorerplugin*>;
                 linearDriverList=new QList<socexplorerplugin*>;
                 root = NULL;
             }
             socexplorerproxy::socexplorerproxy(QMainWindow *Mainwindow, QObject *parent):
                 QObject(parent)
             {
                 mainWindow = Mainwindow;
                 cache = new PluginsCache;
                 drivers = new QList<socexplorerplugin*>;
                 linearDriverList=new QList<socexplorerplugin*>;
                 root = NULL;
             }
             void socexplorerproxy::init()
             {
                 if(!_self)
                 {
                     _self = new socexplorerproxy();
                     mainWindow = NULL;
                 }
             }
             void socexplorerproxy::setMainWindow(QMainWindow *Mainwindow)
             {
                 if(!_self)init();
                 mainWindow=Mainwindow;
             }
             void socexplorerproxy::loadSysDriver(const QString name)
             {
                 if(!_self)init();
                 if(pluginloader::libcanberoot(name))
                 {
                     socexplorerplugin* driver = pluginloader::newsocexplorerplugin(name);
                     QString driverName = _self->getinstanceName(driver->baseName());
                     loadSysDriver(driver,driverName);
                 }
             }
             void socexplorerproxy::loadSysDriver(const QString name, const QString instanceName)
             {
                 if(!_self)init();
                 if(pluginloader::libcanberoot(name) && !_self->instanceExists(instanceName))
                 {
                     socexplorerplugin* driver = pluginloader::newsocexplorerplugin(name);
                     loadSysDriver(driver,instanceName);
                 }
             }
             void socexplorerproxy::loadSysDriver(socexplorerplugin *driver, const QString instanceName)
             {
                 if(!_self)init();
                 driver->setInstanceName(instanceName);
                 driver->parent = NULL;
                 drivers->append(driver);
                 linearDriverList->append(driver);
                 connectChildToProxy(driver);
                 emit _self->addPluginGUI(driver);
                 emit _self->clearMenu();
                 emit _self->treeChanged(QList<socexplorerplugin*>(*drivers));
                 SocExplorerEngine::addSOC(driver);
             }
             void socexplorerproxy::loadChildSysDriver(socexplorerplugin *parent, const QString child)
             {
                 if(!_self)init();
                 if(pluginloader::libcanbechild(child))
                 {
                     socexplorerplugin* driver = pluginloader::newsocexplorerplugin(child);
                     QString driverName = _self->getinstanceName(driver->baseName());
                     bool ok=true;
                     if(ok)
                     {
                         if(parent!=NULL)_self->loadSysDriverToParent(driver,parent,driverName);
                     }
                 }
             }
             void socexplorerproxy::loadSysDriverToParent(const QString name,const QString ParentInst)
             {
                 if(!_self)init();
                 if(pluginloader::libcanbechild(name))
                 {
                     socexplorerplugin* driver = pluginloader::newsocexplorerplugin(name);
                     QString driverName = _self->getinstanceName(driver->baseName());
                     bool ok=true;
                     if(ok)
                     {
                         socexplorerplugin* parent=_self->getSysDriver(ParentInst);
                         if(parent!=NULL)loadSysDriverToParent(driver,parent,driverName);
                     }
                 }
             }
             void socexplorerproxy::loadSysDriverToParent(const QString name,const QString instanceName,const QString ParentInst)
             {
                 if(!_self)init();
                 if(pluginloader::libcanbechild(name) && !_self->instanceExists(instanceName))
                 {
                     socexplorerplugin* driver = pluginloader::newsocexplorerplugin(name);
                     bool ok=true;
                     if(ok)
                     {
                         socexplorerplugin* parent=_self->getSysDriver(ParentInst);
                         if(parent!=NULL)loadSysDriverToParent(driver,parent,instanceName);
                     }
                 }
             }
             void socexplorerproxy::loadSysDriverToParent(socexplorerplugin *driver,socexplorerplugin *parent, const QString instanceName)
             {
                 if(!_self)init();
                 linearDriverList->append(driver);
                 driver->parent = parent;
                 driver->setInstanceName(instanceName);
                 parent->childs.append(driver);
                 connectChildToProxy(driver);
                 connectChildToParent(parent,driver);
                 emit _self->clearMenu();
                 emit _self->addPluginGUI(driver);
                 emit _self->treeChanged(QList<socexplorerplugin*>(*drivers));
                 driver->postInstantiationTrigger();
             }
             void socexplorerproxy::changeSysDriverInstName(const QString instanceName)
             {
                 Q_UNUSED(instanceName)
             }
             void socexplorerproxy::changeSysDriverInstName(const QString newinstanceName, const QString previnstanceName)
             {
                 if(!_self)init();
                 socexplorerplugin*temp=_self->getSysDriver(previnstanceName);
                 if(temp!=NULL)
                 {
                     if(NULL!=_self->getSysDriver(newinstanceName))
                     {
                         emit _self->treeChanged(QList<socexplorerplugin*>(*drivers));
                         return;
                     }
                     temp->setInstanceName(newinstanceName);
                 }
                 emit _self->treeChanged(QList<socexplorerplugin*>(*drivers));
             }
-            void socexplorerproxy::loadChild(socexplorerplugin *parent)
+            //void socexplorerproxy::loadChild(socexplorerplugin *parent)
+            //{
-                if(!_self)init();
+            //    if(!_self)init();
-                parent = parent;
+            //    parent = parent;
-                pluginmanagerWDGT* pluginmanager0 = new pluginmanagerWDGT;
+            //    pluginmanagerWDGT* pluginmanager0 = new pluginmanagerWDGT;
-                pluginmanager0->setChildLoadable(true);
+            //    pluginmanager0->setChildLoadable(true);
-                pluginmanager0->connect(pluginmanager0,SIGNAL(loadSysDrviver(QString)),_self,SLOT(loadSysDriverToParent(QString)));
+            //    pluginmanager0->connect(pluginmanager0,SIGNAL(loadSysDrviver(QString)),_self,SLOT(loadSysDriverToParent(QString)));
-                pluginmanager0->show();
+            //    pluginmanager0->show();
+            //}
             void socexplorerproxy::connectChildToParent(socexplorerplugin *parent, socexplorerplugin *child)
             {
                 if(!_self)init();
                 connect(parent,SIGNAL(activateSig(bool)),child,SLOT(activate(bool)));
                 child->activate(parent->isConnected());
             }
             void socexplorerproxy::disconnectChildToParent(socexplorerplugin *child)
             {
                 if(!_self)init();
                 disconnect(child->parent,SIGNAL(activateSig(bool)),child,SLOT(activate(bool)));
             }
             void socexplorerproxy::connectChildToProxy(socexplorerplugin *child)
             {
                 if(!_self)init();
                 connect(child,SIGNAL(registerObject(QObject*,QString)),_self,SIGNAL(registerObject(QObject*,QString)));
                 connect(child,SIGNAL(closePlugin(socexplorerplugin*)),_self,SLOT(closeSysDriver(socexplorerplugin*)));
             }
             void socexplorerproxy::disconnectChildToProxy(socexplorerplugin *child)
             {
                 if(!_self)init();
                 disconnect(child,SIGNAL(registerObject(QObject*,QString)),_self,SIGNAL(registerObject(QObject*,QString)));
                 disconnect(child,SIGNAL(closePlugin(socexplorerplugin*)),_self,SLOT(closeSysDriverFromDriver(socexplorerplugin*)));
             }
             QString socexplorerproxy::getinstanceName(const QString& baseName)
             {
                 if(!_self)init();
                 int i=0;
                 QString name;
                 bool validName = false;
                 while(!validName)
                 {
                     name.clear();
                     name.append(baseName+QString::number(i));
                     validName = instanceNameIsValid(name);
                     i++;
                 }
                 return name;
             }
             void socexplorerproxy::changeSysDriverInstName(socexplorerplugin* driver)
             {
                 if(!_self)init();
                 QString prevName(driver->instanceName());
             }
             bool socexplorerproxy::instanceNameIsValid(const QString& instanceName)
             {
                 if(!_self)init();
                 for(int k=0;k<linearDriverList->count();k++)
                 {
                     if(!linearDriverList->at(k)->instanceName().compare(instanceName))
                         return false;
                 }
                 return true;
             }
             socexplorerplugin *socexplorerproxy::findPlugin(const QString &instanceName)
             {
                 if(!_self)init();
                 for(int k=0;k<linearDriverList->count();k++)
                 {
                     if(linearDriverList->at(k)->instanceName().compare(instanceName))
                         return linearDriverList->at(k);
                 }
                 return NULL;
             }
             bool socexplorerproxy::instanceExists(const QString &instanceName)
             {
                 return !socexplorerproxy::instanceNameIsValid(instanceName);
             }
             void socexplorerproxy::close()
             {
                 if(!_self)init();
                 socexplorerplugin* tmpPtr;
                 while(drivers->count()>0)
                 {
                     tmpPtr = drivers->last();
                     drivers->removeLast();
                     _self->closeSysDriver(tmpPtr);
                 }
                 if(root!=NULL)
                 {
                     _self->closeSysDriver(root);
                 }
             }
             socexplorerplugin* socexplorerproxy::getSysDriver(const QString instanceName)
             {
                 if(!_self)init();
                 for(int i=0;i<linearDriverList->count();i++)
                 {
                     if(!linearDriverList->at(i)->instanceName().compare(instanceName))
                         return linearDriverList->at(i);
                 }
                 return NULL;
             }
             void socexplorerproxy::closeSysDriver(const QString instanceName)
             {
                 if(!_self)init();
                 closeSysDriver(getSysDriver(instanceName),false);
             }
             void socexplorerproxy::closeSysDriver(socexplorerplugin *driver, bool recursive)
             {
                 if(!_self)init();
                 if(driver!=NULL)
                 {
+                    emit _self->removePluginGUI(driver);
                     if(driver->parent==NULL)SocExplorerEngine::removeSOC(driver);
                     while(driver->childs.count()!=0)closeSysDriver(driver->childs.first());
                     linearDriverList->removeOne(driver);
                     if(driver->parent!= NULL)
                     {
                         driver->parent->childs.removeOne(driver);     //Have parent so it's a child
                         disconnectChildToParent(driver);
                         disconnectChildToProxy(driver);
                         delete driver;
                     }
                     else
                     {
                         drivers->removeOne(driver);
                         disconnectChildToProxy(driver);
                         delete driver;
                     }
                     if(!recursive)
                     {
                         emit _self->clearMenu();
                         emit _self->registermenu(mainWindow);
                         emit _self->treeChanged(QList<socexplorerplugin*>(*drivers));
                     }
                 }
             }
             void socexplorerproxy::geteplugintree()
             {
                 if(!_self)init();
                 emit _self->treeChanged(QList<socexplorerplugin*>(*drivers));
             }
             void socexplorerproxy::closeSysDriverFromDriver(socexplorerplugin *driver)
             {
                 if(!_self)init();
                 emit _self->closeSysDriverSig(driver);
             }
             void socexplorerproxy::updateText()
             {
                 if(!_self)init();
                 emit _self->clearMenu();
                 emit _self->registermenu(mainWindow);
             }
             void socexplorerproxy::makeMenu(QMenu* menu)
             {
                 if(!_self)init();
                 for(int i=0;i<drivers->count();i++)
                 {
                     drivers->at(i)->registermenu(menu);
                 }
             }

src/SocExplorerEngine/proxy/socexplorerproxy.h +2 -1

             /*------------------------------------------------------------------------------
             --  This file is a part of the SocExplorer Software
             --  Copyright (C) 2011, Laboratory of Plasmas Physic - 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 SOCEXPLORERPROXY_H
             #define SOCEXPLORERPROXY_H
             #include <QObject>
             #include <QString>
             #include <QList>
             #include "pluginscache.h"
             #include <socexplorerplugin.h>
             #include <socexplorerplugininterface.h>
             #include <QInputDialog>
             #include <QtGlobal>
             #if defined(SOCEXPLORER_SDK_BUILD)
             #  define SOCEXPLORER_SDK_EXPORT Q_DECL_EXPORT
             #else
             #  define SOCEXPLORER_SDK_EXPORT Q_DECL_IMPORT
             #endif
             class SOCEXPLORER_SDK_EXPORT socexplorerproxy : public QObject
             {
                 Q_OBJECT
             private:
                 socexplorerproxy(QObject *parent = 0);
                 socexplorerproxy(QMainWindow* Mainwindow,QObject *parent = 0);
                 static socexplorerproxy* _self;
             public:
                 static socexplorerproxy* self(){if(!_self)init(); return _self;}
                 static void init();
                 static void setMainWindow(QMainWindow* Mainwindow);
                 static void connectChildToParent(socexplorerplugin* parent, socexplorerplugin* child);
                 static void connectChildToProxy(socexplorerplugin* child);
                 static void disconnectChildToParent(socexplorerplugin* child);
                 static void disconnectChildToProxy(socexplorerplugin* child);
                 static bool instanceNameIsValid(const QString& instanceName);
                 static socexplorerplugin* findPlugin(const QString &instanceName);
                 QT_ENSURE_STACK_ALIGNED_FOR_SSE static void loadChildSysDriver(socexplorerplugin* parent,const QString child);
             signals:
                 void addPluginGUI(QDockWidget* plugin);
+                void removePluginGUI(QDockWidget* plugin);
                 int registermenu(QMainWindow* menuHolder);
                 void clearMenu();
                 QStringList findDrivers(int VID,int PID);
                 void rootDriverAdded(socexplorerplugin* driver);
                 void rootDriverRemoved();
                 void closeSysDriverSig(socexplorerplugin* driver);
                 void registerObject(QObject* object,const QString& instanceName);
                 void treeChanged(const QList<socexplorerplugin*>& drivers);
             public slots:
                 QT_ENSURE_STACK_ALIGNED_FOR_SSE void loadSysDriver(const QString name);
                 QT_ENSURE_STACK_ALIGNED_FOR_SSE void loadSysDriver(const QString name,const QString instanceName);
                 QT_ENSURE_STACK_ALIGNED_FOR_SSE void loadSysDriver(socexplorerplugin* driver,const QString instanceName);
                 QT_ENSURE_STACK_ALIGNED_FOR_SSE void loadSysDriverToParent(const QString name,const QString ParentInst);
                 QT_ENSURE_STACK_ALIGNED_FOR_SSE void loadSysDriverToParent(const QString name,const QString instanceName,const QString ParentInst);
                 QT_ENSURE_STACK_ALIGNED_FOR_SSE void loadSysDriverToParent(socexplorerplugin *driver,socexplorerplugin *parent, const QString instanceName);
                 QT_ENSURE_STACK_ALIGNED_FOR_SSE void changeSysDriverInstName(const QString instanceName);
                 QT_ENSURE_STACK_ALIGNED_FOR_SSE void changeSysDriverInstName(const QString newinstanceName,const QString previnstanceName);
-                QT_ENSURE_STACK_ALIGNED_FOR_SSE void loadChild(socexplorerplugin* parent);
+             //   QT_ENSURE_STACK_ALIGNED_FOR_SSE void loadChild(socexplorerplugin* parent);
                 void updateText();
                 QT_ENSURE_STACK_ALIGNED_FOR_SSE void closeSysDriverFromDriver(socexplorerplugin* driver);
                 QT_ENSURE_STACK_ALIGNED_FOR_SSE void closeSysDriver(socexplorerplugin* driver,bool recursive=false);
                 QT_ENSURE_STACK_ALIGNED_FOR_SSE void closeSysDriver(const QString instanceName);
                 void makeMenu(QMenu* menu);
                 void close();
                 QString getinstanceName(const QString& baseName);
                 void geteplugintree();
                 QT_ENSURE_STACK_ALIGNED_FOR_SSE socexplorerplugin* getSysDriver(const QString instanceName);
                 bool instanceExists(const QString& instanceName);
             private:
                 static void changeSysDriverInstName(socexplorerplugin* driver);
                 static QMainWindow* mainWindow;
                 static QList<socexplorerplugin*>* drivers;
                 static QList<socexplorerplugin*>* linearDriverList;
                 static socexplorerplugin* root;
                 static socexplorerplugin* parent;
                 static PluginsCache* cache;
             };
             #endif // SOCEXPLORERPROXY_H

src/mainwindow.cpp +13 -9

             /*------------------------------------------------------------------------------
             --  This file is a part of the SocExplorer Software
             --  Copyright (C) 2011, Laboratory of Plasmas Physic - 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>
             LPMONMainWindow::LPMONMainWindow(QString ScriptToEval, QWidget *parent)
                 : QMainWindow(parent)
             {
                 QCoreApplication::setApplicationName("SocExplorer");
                 QCoreApplication::setOrganizationName("LPP");
                 QCoreApplication::setOrganizationDomain("lpp.fr");
                 this->makeObjects(ScriptToEval);
                 this->makeLayout();
                 this->makeMenu();
                 this->makeConnections();
                 this->setWindowIcon(QIcon(tr(":/images/logolppcutted.png")));
                 this->setAcceptDrops(true);
                 this->pluginManager->setRootLoadable(true);
                 this->PythonConsoleInst->pyConsoleRunFile(ScriptToEval);
-            //    QProgressBar* test = SocExplorerEngine::getProgressBar("test",10);
-            //    statusBar()->setFixedHeight(statusBar()->height());
-            //    SocExplorerEngine::deleteProgressBar(test);
             }
             void LPMONMainWindow::makeObjects(QString ScriptToEval)
             {
                 Q_UNUSED(ScriptToEval)
+                this->p_pluginGUIlist = new QList<QDockWidget*>();
                 pluginsDockContainer = new QMainWindow;
                 pluginsDockContainer->setWindowFlags(Qt::Widget);
                 pluginsDockContainer->setDockNestingEnabled(true);
                 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);
                 socexplorerproxy::setMainWindow(this);
                 SocExplorerEngine::setMainWindow(this);
                 SocExplorerEngine::xmlModel()->scanXmlFiles();
                 this->regExplorer = new regsExplorer();
                 this->regExplorer->setAllowedAreas(Qt::AllDockWidgetAreas);
-            //    this->pluginsDockContainer->addDockWidget(Qt::TopDockWidgetArea,this->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->p_about = new aboutsocexplorer();
             }
             void LPMONMainWindow::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 LPMONMainWindow::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()));
                 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 LPMONMainWindow::launchPluginManager()
             {
                 if(this->pluginManager->isHidden())
                 {
                     this->pluginManager->setHidden(false);
                 }
             }
             void LPMONMainWindow::addPluginInterface(QDockWidget *plugin)
             {
-                static QDockWidget* last=NULL;
                 plugin->setAllowedAreas(Qt::AllDockWidgetAreas);
                 this->pluginsDockContainer->addDockWidget(Qt::TopDockWidgetArea,plugin);
-                if(last!=NULL)
+                if(p_pluginGUIlist->count()!=0)
-                    this->pluginsDockContainer->tabifyDockWidget(last,plugin);
+                    this->pluginsDockContainer->tabifyDockWidget(p_pluginGUIlist->last(),plugin);
-                last = plugin;
+                p_pluginGUIlist->append(plugin);
             }
+            void LPMONMainWindow::removePluginInterface(QDockWidget *plugin)
+            {
+                p_pluginGUIlist->removeOne(plugin);
+                this->pluginsDockContainer->removeDockWidget(plugin);
+            }
             void LPMONMainWindow::clearMenu()
             {
                 this->menuBar()->clear();
                 this->makeMenu();
             }
             void LPMONMainWindow::makeMenu()
             {
                 this->FileMenu = menuBar()->addMenu(tr("&File"));
                 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);
             }
             LPMONMainWindow::~LPMONMainWindow()
             {
                 delete this->p_about;
+                delete this->p_pluginGUIlist;
             }
             void LPMONMainWindow::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 LPMONMainWindow::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 LPMONMainWindow::updateText()
             {
                 emit this->translateSig();
             }
             void LPMONMainWindow::showAboutBox()
             {
                 p_about->show();
             }
             void LPMONMainWindow::pluginselected(const QString &instanceName)
             {
                 socexplorerplugin* drv=socexplorerproxy::self()->getSysDriver(instanceName);
                 if(drv)
                     drv->raise();
-            // TODO add plugin widget auto focus
             }
             void LPMONMainWindow::closeEvent(QCloseEvent *event)
             {
                 socexplorerproxy::self()->close();
                 qApp->closeAllWindows();
                 event->accept();
             }

src/mainwindow.h +2 -1

             /*------------------------------------------------------------------------------
             --  This file is a part of the SocExplorer Software
             --  Copyright (C) 2011, Laboratory of Plasmas Physic - 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"
             class LPMONMainWindow : public QMainWindow
             {
                 Q_OBJECT
             public:
                 LPMONMainWindow(QString ScriptToEval,QWidget *parent = 0);
                 ~LPMONMainWindow();
                 QAction* Quit,*LoadPlugin,*ManagePlugins,*help,*regsManager,*exploreRegs,*about,*translateAction;
                 QActionGroup*langActionGrp;
                 QMenu* FileMenu,*PluginsMenu,*ToolsMenu,*langMenu,*helpMenu;
                 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);
             signals:
                 void translateSig();
                 void registerObject(QObject* object,const QString& instanceName);
             private:
                 void makeObjects(QString ScriptToEval);
                 void makeLayout();
                 void makeConnections();
                 void makeMenu();
                 QMainWindow* pluginsDockContainer;
                 QSplitter* mainWidget;
                 PythonConsole* PythonConsoleInst;
                 dockablePluginManager* pluginManager;
                 regsExplorer* regExplorer;
                 aboutsocexplorer* p_about;
+                QList<QDockWidget*>* p_pluginGUIlist;
             };
             #endif // MAINWINDOW_H

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