Author: tgoettlicher Date: Wed Aug 13 16:16:25 2008 New Revision: 50027 URL: http://svn.opensuse.org/viewcvs/yast?rev=50027&view=rev Log: Fixed wrong icon when using several wizards (#411579) Modified: trunk/qt/package/yast2-qt.changes trunk/qt/src/YQWizard.cc trunk/qt/src/YQWizard.h Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=50027&r1=50026&r2=50027&view=diff ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Wed Aug 13 16:16:25 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Aug 13 16:02:56 CEST 2008 - tgoettlicher@suse.de + +- Fixed wrong icon when using several wizards (#411579) + +------------------------------------------------------------------- Tue Aug 5 11:14:01 CEST 2008 - tgoettlicher@suse.de - V 2.18.5 Modified: trunk/qt/src/YQWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQWizard.cc?rev=50027&r1=50026&r2=50027&view=diff ============================================================================== --- trunk/qt/src/YQWizard.cc (original) +++ trunk/qt/src/YQWizard.cc Wed Aug 13 16:16:25 2008 @@ -127,6 +127,8 @@ _sendButtonEvents = true; _contentsReplacePoint = 0; + _previousWindowIcon = topLevelWidget()->windowIcon(); + YQUI::setTextdomain( TEXTDOMAIN ); //layoutTitleBar( this ); @@ -146,6 +148,7 @@ { YQMainWinDock::mainWinDock()->resizeVisibleChild(); } + } @@ -158,6 +161,8 @@ delete _helpDlg; QY2Styler::self()->unregisterWidget( this ); + + topLevelWidget()->setWindowIcon( _previousWindowIcon ); } bool YQWizard::isSecondary() const Modified: trunk/qt/src/YQWizard.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQWizard.h?rev=50027&r1=50026&r2=50027&view=diff ============================================================================== --- trunk/qt/src/YQWizard.h (original) +++ trunk/qt/src/YQWizard.h Wed Aug 13 16:16:25 2008 @@ -560,6 +560,8 @@ QHash _menuIDs; QHash _menuEntryIDs; + QIcon _previousWindowIcon; + private: static YQWizard *main_wizard; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org