From 21281bbd4225df82f8ce54ee0b3b1e201e6b88cd Mon Sep 17 00:00:00 2001 From: asl Date: Fri, 9 Dec 2005 09:16:57 +0000 Subject: [PATCH] PAL10669 - there are no toolbars if runSalome with deleted file of user preferences (which is situated in home dir) --- src/Qtx/QtxMainWindow.cxx | 7 ++----- src/Qtx/QtxMainWindow.h | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Qtx/QtxMainWindow.cxx b/src/Qtx/QtxMainWindow.cxx index 41b5bbee7..39c197fb6 100644 --- a/src/Qtx/QtxMainWindow.cxx +++ b/src/Qtx/QtxMainWindow.cxx @@ -226,15 +226,14 @@ void QtxMainWindow::loadGeometry( QtxResourceMgr* resMgr, const QString& section myMode = winState; - vis ? show() : hide(); + vis ? showWithMode() : hide(); } -void QtxMainWindow::show() +void QtxMainWindow::showWithMode() { int mode = myMode; myMode = -1; - switch ( mode ) { case WS_Normal: @@ -247,8 +246,6 @@ void QtxMainWindow::show() showMaximized(); break; } - - QMainWindow::show(); } int QtxMainWindow::relativeCoordinate( const int type, const int WH, const int wh ) const diff --git a/src/Qtx/QtxMainWindow.h b/src/Qtx/QtxMainWindow.h index 3d9a1922c..63689d30e 100644 --- a/src/Qtx/QtxMainWindow.h +++ b/src/Qtx/QtxMainWindow.h @@ -54,7 +54,6 @@ public: virtual bool eventFilter( QObject*, QEvent* ); public slots: - virtual void show(); virtual void setAppropriate( QDockWindow*, bool ); protected: @@ -67,6 +66,7 @@ private: int windowState( const QString& ) const; int windowPosition( const QString& ) const; int relativeCoordinate( const int, const int, const int ) const; + void showWithMode(); private: int myMode; -- 2.39.2