[fwbuilder-commits] r1380 - in branches/v3_1_secunet: . src/gui
Brought to you by:
mikehorn
From: <va...@in...> - 2009-09-01 03:44:10
|
Author: vadim Date: 2009-08-31 19:06:24 -0700 (Mon, 31 Aug 2009) New Revision: 1380 Modified: branches/v3_1_secunet/build_num branches/v3_1_secunet/src/gui/FWWindow.cpp branches/v3_1_secunet/src/gui/FWWindow.h Log: using signal QMdiArea::subWindowActivated among other things to refresh File menu Modified: branches/v3_1_secunet/build_num =================================================================== --- branches/v3_1_secunet/build_num 2009-09-01 00:21:15 UTC (rev 1379) +++ branches/v3_1_secunet/build_num 2009-09-01 02:06:24 UTC (rev 1380) @@ -1 +1 @@ -#define BUILD_NUM 1378 +#define BUILD_NUM 1379 Modified: branches/v3_1_secunet/src/gui/FWWindow.cpp =================================================================== --- branches/v3_1_secunet/src/gui/FWWindow.cpp 2009-09-01 00:21:15 UTC (rev 1379) +++ branches/v3_1_secunet/src/gui/FWWindow.cpp 2009-09-01 02:06:24 UTC (rev 1380) @@ -226,8 +226,8 @@ connect( m_mainWindow->menuWindow, SIGNAL (aboutToShow() ), this, SLOT( prepareWindowsMenu() )); - connect( m_space, SIGNAL(subWindowActivated (QMdiSubWindow *)), - this, SLOT(changeActiveSubwindow())); + connect( m_space, SIGNAL(subWindowActivated(QMdiSubWindow*)), + this, SLOT(subWindowActivated(QMdiSubWindow*))); disableActions(false); @@ -1181,6 +1181,19 @@ } } +/** + * QMdiArea emits this signal after window has been activated. When + * window is 0, QMdiArea has just deactivated its last active window, + * and there are no active windows on the workspace. + */ +void FWWindow::subWindowActivated(QMdiSubWindow *subwindow) +{ + if (subwindow==NULL) return; + ProjectPanel *pp = dynamic_cast<ProjectPanel*>(subwindow->widget()); + prepareFileMenu(); + +} + void FWWindow::setupAutoSave() { if (activeProject()) activeProject()->setupAutoSave(); @@ -1653,8 +1666,6 @@ st->setInt("Window/maximized", 1); } -void FWWindow::changeActiveSubwindow() {} - void FWWindow::updateTreeFont () { QFont font = st->getTreeFont(); Modified: branches/v3_1_secunet/src/gui/FWWindow.h =================================================================== --- branches/v3_1_secunet/src/gui/FWWindow.h 2009-09-01 00:21:15 UTC (rev 1379) +++ branches/v3_1_secunet/src/gui/FWWindow.h 2009-09-01 02:06:24 UTC (rev 1380) @@ -104,10 +104,10 @@ public slots: void selectActiveSubWindow (/*const QString & text*/); + void subWindowActivated(QMdiSubWindow*); void minimize(); void maximize(); - void changeActiveSubwindow(); virtual void search(); virtual void reopenFirewall(); |