fixed bug 2659

src/gui/FWWindow.cpp

@@ -226,15 +226,18 @@ void FWWindow::showSub(ProjectPanel *projectW)
     m_space->addSubWindow(sub);
     QIcon p(":Icons/Firewall/icon-tree");
     sub->setWindowIcon(p); 
-    if (st->getInt("Window/maximized")!=0)
+
-    {
+    connect(sub,
-        sub->showMaximized();
+            SIGNAL(windowStateChanged(Qt::WindowStates,Qt::WindowStates)),
-    }
+            projectW,
-    else
+            SLOT(stateChanged(Qt::WindowStates, Qt::WindowStates )));
-    {
+         
+
+    if (st->getInt("Window/maximized"))
+        projectW->setWindowState(Qt::WindowMaximized);
+
     sub->show();
 }
-}
 
 ProjectPanel* FWWindow::activeProject()
 {
@@ -271,7 +274,7 @@ void FWWindow::startupLoad()
     if (activeProject())
     {
         activeProject()->startupLoad();
-        activeProject()->loadState();
+        //activeProject()->loadState();
     }
 }
 
@@ -335,6 +338,7 @@ void FWWindow::fileNew()
     if (proj->fileNew())
     {
     	showSub(proj);
+        proj->startupLoad();
     }
     else
     {
@@ -381,7 +385,9 @@ void FWWindow::fileOpen()
                 m_space->removeSubWindow(m_space->currentSubWindow());
             }
         }
-        showSub(proj.release());
+        showSub(proj.get());
+        proj->loadState();
+        proj.release();
     }
     recreateWindowsMenu();
 }
@@ -1367,6 +1373,8 @@ bool FWWindow::isSystem(libfwbuilder::FWObject *obj)
 
 void FWWindow::closeEvent( QCloseEvent*)
 {   
+    st->setInt("Window/maximized", activeProject()->isMaximized());
+
     QList<QMdiSubWindow *> subWindowList = m_space->subWindowList();
     for (int i = 0 ; i < subWindowList.size();i++)
     {
@@ -1396,12 +1404,26 @@ void FWWindow::selectActiveSubWindow (/*const QString & text*/)
 
 void FWWindow::minimize()
 {
+    if (fwbdebug) qDebug("FWWindow::minimize");
     m_space->activeSubWindow ()->showMinimized ();
+    st->setInt("Window/maximized", 0);
+
+    QList<QMdiSubWindow *> subWindowList = m_space->subWindowList();
+    for (int i = 0 ; i < subWindowList.size();i++)
+    {
+        ProjectPanel * pp = dynamic_cast<ProjectPanel *>(subWindowList[i]->widget());
+        if (pp!=NULL)
+        {
+            pp->loadState();
+        }
+    }
 }
 
 void FWWindow::maximize ()
 {
+    if (fwbdebug) qDebug("FWWindow::maximize");
     m_space->activeSubWindow()->showMaximized ();
+    st->setInt("Window/maximized", 1);
 }
 
 void FWWindow::recreateWindowsMenu ()

src/gui/ProjectPanel.cpp

@@ -233,7 +233,6 @@ void ProjectPanel::info(libfwbuilder::FWObject *obj, bool forced)
 
 void ProjectPanel::setStartupFileName(const QString &fn) 
 { 
-//    enableAvtoSaveState = false;
     startupFileName = fn; 
 }
 
@@ -1415,8 +1414,9 @@ void ProjectPanel::pasteRuleBelow()
 //rcs
 void ProjectPanel::startupLoad()
 {
-    if (fwbdebug) qDebug("startup: load everything ...");
+    if (fwbdebug) qDebug("ProjectPanel::startupLoad: "
-    firstResize=false;
+                         "startup: load everything.");
+
     int sa = st->getStartupAction();
 
     if (safeMode)  load(NULL);
@@ -1431,14 +1431,11 @@ void ProjectPanel::startupLoad()
         {
             try
             {
-                enableAvtoSaveState=false;
-
                 RCS *rcs=new RCS(startupFileName);
                 rcs->co();
                 load(NULL,rcs);
+
                 loadState(startupFileName);
-                loadSplitters(startupFileName);
-                //firstResize=true;
             } catch (FWException &ex)
             {
                 qDebug("Exception: %s",ex.toString().c_str());
@@ -1447,6 +1444,7 @@ void ProjectPanel::startupLoad()
         } else
         {
             load(NULL); // load standard objects
+            loadState("");
         }
     }
 
@@ -1474,7 +1472,6 @@ void ProjectPanel::startupLoad()
         }
     }
     mw->recreateWindowsMenu();
-    enableAvtoSaveState=true ;
 }
 
 
@@ -3039,70 +3036,44 @@ void ProjectPanel::findWhereUsed(FWObject * obj)
 
 void ProjectPanel::showEvent( QShowEvent *ev)
 { 
-//  if (rcs!=NULL)
-//    if (!firstLoad)
-//    {
-//        loadSplitters();
-//    }
-
     if (fwbdebug)
     {
-        qDebug("ProjectPanel::showEvent:  isMaximized=%d", isMaximized());
+        qDebug("ProjectPanel::showEvent");
         int wf = windowFlags();
         qDebug("windowFlags=%x", wf);
     }
     QWidget::showEvent(ev);
 }
 
-void ProjectPanel::loadSplitters(QString filename)
+
+// this slot is called when user hits "maximize" or "minimize" buttons
+// on the title bar of the internal window. Need to restore window
+// geometry and splitter position when window becomes normal (not maximized).
+void ProjectPanel::stateChanged(Qt::WindowStates oldState,
+                                Qt::WindowStates newState)
 {
-    QString FileName = getFileName();
+    bool is_maximized = ((newState & Qt::WindowMaximized) != 0);
-    if (filename !="")
+    if (fwbdebug)
-        FileName = filename;
+        qDebug("ProjectPanel::stateChanged newState=%d is_maximized=%d",
-    firstLoad=true ;
+               int(newState), is_maximized);
-    QString val = st->getStr("Layout/MainWindowSplitter"+FileName);
+    st->setInt("Window/maximized", is_maximized);
-    QString out1 = "load Layout/MainWindowSplitter"+FileName;
+    if (!is_maximized) loadState();
-    out1+= " " + val;
-    qDebug(out1.toAscii().data());
-    
-        int  w1 = val.section(',',0,0).toInt();
-        int  w2 = val.section(',',1,1).toInt();
-        if (w1==0&&w2==0)
-        {
-            w1=250;
-            w2=mdiWindow->width ()-250;
-        }
-        QList<int> sl;
-        sl.push_back(w1);
-        sl.push_back(w2);
-        if (w1 || w2)
-            m_panel->mainSplitter->setSizes( sl );
-
-    val = st->getStr("Layout/ObjInfoSplitter"+FileName);
-    if (!val.isEmpty())
-    {
-        int  w1 = val.section(',',0,0).toInt();
-        int  w2 = val.section(',',1,1).toInt();
-
-        QList<int> sl;
-        sl.push_back(w1);
-        sl.push_back(w2);
-        if (w1 || w2)
-            m_panel->objInfoSplitter->setSizes( sl );
-    }
-
 }
 
 void ProjectPanel::hideEvent( QHideEvent *ev)
 {
+    if (fwbdebug) qDebug("ProjectPanel::hideEvent");
     QWidget::hideEvent(ev);
 }
 
 
 void ProjectPanel::closeEvent( QCloseEvent * ev)
 {   
+    if (fwbdebug) qDebug("ProjectPanel::closeEvent");
+
     if (!closing)
         saveState();
+
     if (saveIfModified() && checkin(true))
     {
         if (rcs)
@@ -3136,21 +3107,23 @@ QString ProjectPanel::getFileName()
 
 void ProjectPanel::saveState ()
 {
-
     QString FileName ;
     if (rcs!=NULL)
     {
         FileName = rcs->getFileName();
-
     }
+
+    if (fwbdebug)
+        qDebug("ProjectPanel::saveState FileName=%s", FileName.toAscii().data());
+
     if (mdiWindow->isMaximized())
     {
-        qDebug ("Window/maximized true");
+        if (fwbdebug) qDebug ("Window/maximized true");
         st->setInt("Window/maximized", 1);
     }
     else
     {
-        qDebug ("Window/maximized false");
+        if (fwbdebug) qDebug ("Window/maximized false");
         st->setInt("Window/maximized", 0);
     }
 
@@ -3160,34 +3133,43 @@ void ProjectPanel::saveState ()
         st->setInt("Window/" + FileName + "/y", mdiWindow->y());
         st->setInt("Window/" + FileName + "/width", mdiWindow->width ());
         st->setInt("Window/" + FileName + "/height", mdiWindow->height ());
+    }
 
+    // Save position of splitters regardless of the window state
     QList<int> sl = m_panel->mainSplitter->sizes();
     QString arg = QString("%1,%2").arg(sl[0]).arg(sl[1]);
     if (sl[0] || sl[1])
-            st->setStr("Layout/MainWindowSplitter"+getFileName(), arg );
+        st->setStr("Window/" + FileName + "/MainWindowSplitter", arg );
-        QString out1 = " save Layout/MainWindowSplitter"+getFileName();
+
+    if (fwbdebug)
+    {
+        QString out1 = " save Window/" + FileName + "/MainWindowSplitter";
         out1+= " " + arg;
         qDebug(out1.toAscii().data());
+    }
 
     sl = m_panel->objInfoSplitter->sizes();
     arg = QString("%1,%2").arg(sl[0]).arg(sl[1]);
     if (sl[0] || sl[1])
-            st->setStr("Layout/ObjInfoSplitter"+getFileName(), arg );
+        st->setStr("Window/" + FileName + "/ObjInfoSplitter", arg );
-    }  
-    
 }
 
 void ProjectPanel::loadState(QString filename)
 {
+    if (fwbdebug) qDebug("ProjectPanel::loadState  isMaximized=%d",
+                         isMaximized());
+
     QString FileName ;
     if (rcs!=NULL)
         FileName = rcs->getFileName();
     if (filename!="")
         FileName = filename ;
-//    if (FileName!="")
+
-//    {
+    int maximized_status = st->getInt("Window/maximized");
-        if (st->getInt("Window/maximized")==0)
+    if (!maximized_status)
     {
+        if (fwbdebug) qDebug("ProjectPanel::loadState  show normal");
+        setWindowState(0);
         int x = st->getInt("Window/"+FileName+"/x");
         int y = st->getInt("Window/"+FileName+"/y");
         int width = st->getInt("Window/"+FileName+"/width");
@@ -3199,58 +3181,66 @@ void ProjectPanel::loadState (QString filename)
             width = 600;
             height= 600;
         }
-//        loadSplitters();
+        if (fwbdebug) qDebug("ProjectPanel::loadState  set geometry: %d %d %d %d",
-        mdiWindow->setGeometry (x,y,width,height);
+                             x,y,width,height);
-        firstResize=true ;
-        }
-//    }
         
-/*    if (FileName=="")
+        mdiWindow->setGeometry(x,y,width,height);
-    {
-        if (st->getInt("Window/maximized")==0)
-        {
-            mdiWindow->setGeometry (10,10,600,600);
-            loadSplitters();
-            firstResize=true ;
     }
+    // load splitter position even when window is maximized
+    loadSplitters(filename);
+    if (fwbdebug) qDebug("ProjectPanel::loadState done");
+}
+
+void ProjectPanel::loadSplitters(QString filename)
+{
+    QString FileName = getFileName();
+    if (filename !="")
+        FileName = filename;
+
+    firstLoad = true ;
+    QString val = st->getStr("Window/" + FileName + "/MainWindowSplitter");
+    
+    if (fwbdebug)
+    {
+        QString out1 = "load Window/" + FileName + "/MainWindowSplitter";
+        out1+= " " + val;
+        qDebug(out1.toAscii().data());
+    }
+
+    int  w1 = val.section(',',0,0).toInt();
+    int  w2 = mdiWindow->width() - w1;
+    if (w1 == 0 && w2 == 0)
+    {
+        w1 = 250;
+        w2 = mdiWindow->width() - 250;
+    }
+
+    QList<int> sl;
+    sl.push_back(w1);
+    sl.push_back(w2);
+    if (w1 || w2)
+        m_panel->mainSplitter->setSizes( sl );
+
+    val = st->getStr("Window/" + FileName + "/ObjInfoSplitter");
+    if (!val.isEmpty())
+    {
+        int  w1 = val.section(',',0,0).toInt();
+        int  w2 = val.section(',',1,1).toInt();
+
+        QList<int> sl;
+        sl.push_back(w1);
+        sl.push_back(w2);
+        if (w1 || w2)
+            m_panel->objInfoSplitter->setSizes( sl );
     }
-*/
 }
 
 void ProjectPanel::splitterMoved ( int , int )
 {
-    saveState();
 }
 
 void ProjectPanel::resizeEvent ( QResizeEvent* )
 {
-    /*if (oldState==-1)
-    {
-        if (isMaximized ())
-            oldState=0;
-        return ;
-    }*/
-    if (firstResize&&enableAvtoSaveState)
-    {
-        saveState();
-    }   
-
-    if (!firstResize&&!startupFileName.isEmpty())
-    {
-        loadState(startupFileName);
-        loadSplitters(startupFileName);
-       //firstResize = true ;    
-      //  startupFileName="";
-    }
-
-
-    if (!firstResize/*&&rcs!=NULL*/)
-    {
-        loadState();
-        loadSplitters();
-        if (!isMaximized())
-            firstResize = true ;    
-    } 
 }
 
 ProjectPanel * ProjectPanel::clone(ProjectPanel * cln)
@@ -3264,7 +3254,6 @@ ProjectPanel * ProjectPanel::clone (ProjectPanel * cln)
     cln->editingStandardLib = editingStandardLib;
     cln->editingTemplateLib = editingTemplateLib;
     cln->ruleSetRedrawPending = ruleSetRedrawPending;
-    cln->firstResize = firstResize;
     cln->startupFileName = startupFileName;
     //cln->objdb = objdb;
     cln->editorOwner = editorOwner;

src/gui/ProjectPanel.h

@@ -306,6 +306,8 @@ public:
      virtual void rollBackSelectionSameWidget();
      virtual void rollBackSelectionDifferentWidget();
      void splitterMoved ( int pos, int index );
+     void stateChanged(Qt::WindowStates oldState, Qt::WindowStates newState);
+     
  signals:
      void restoreSelection_sign(bool same_widget);
 public: