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 +3 -2

             	<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>
                             Copyright (C) 2011-2014 Plasmas Physic Laboratory.<BR>
             		This is free software; licenced under the terms of the GPLV2 license.<BR><BR>
             			<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>

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

                 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();
                 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);

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

             signals:
                 void addPluginGUI(QDockWidget* plugin);
+                void removePluginGUI(QDockWidget* plugin);
                 int registermenu(QMainWindow* menuHolder);
                 void clearMenu();
                 QStringList findDrivers(int VID,int PID);
                 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);

src/mainwindow.cpp +13 -9

                 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);
                 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()
                 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)));
             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()
             {
             LPMONMainWindow::~LPMONMainWindow()
             {
                 delete this->p_about;
+                delete this->p_pluginGUIlist;
             }
                 socexplorerplugin* drv=socexplorerproxy::self()->getSysDriver(instanceName);
                 if(drv)
                     drv->raise();
-            // TODO add plugin widget auto focus
             }

src/mainwindow.h +2 -1

             public slots:
                 void launchPluginManager();
                 void addPluginInterface(QDockWidget* plugin);
+                void removePluginInterface(QDockWidget* plugin);
                 void clearMenu();
                 void updateText();
                 void setLangage(QAction* action);
                 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