Author: sh-sh-sh Date: Wed Dec 5 19:22:54 2007 New Revision: 42728 URL: http://svn.opensuse.org/viewcvs/yast?rev=42728&view=rev Log: catch WM_CLOSE directly Modified: trunk/qt/src/pkg/YQPackageSelectorBase.cc Modified: trunk/qt/src/pkg/YQPackageSelectorBase.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPackageSelectorBase.... ============================================================================== --- trunk/qt/src/pkg/YQPackageSelectorBase.cc (original) +++ trunk/qt/src/pkg/YQPackageSelectorBase.cc Wed Dec 5 19:22:54 2007 @@ -60,7 +60,6 @@ YQUI::setTextdomain( "packages-qt" ); setFont( YQUI::yqApp()->currentFont() ); - YQUI::ui()->blockWmClose(); // Automatically undone after UI::RunPkgSelection() _pkgConflictDialog = new YQPkgConflictDialog( this ); CHECK_PTR( _pkgConflictDialog ); @@ -82,12 +81,8 @@ zyppPool().saveState<zypp::Patch >(); - // - // Handle WM_CLOSE like "Cancel" - // - - connect( YQUI::ui(), SIGNAL( wmClose() ), - this, SLOT ( reject() ) ); + // Install event handler to handle WM_CLOSE like "Cancel" + topLevelWidget()->installEventFilter( this ); y2milestone( "PackageSelectorBase init done" ); } @@ -385,17 +380,26 @@ return; } } - else if ( event->key() == Qt::Key_F5 ) // No matter if Ctrl/Alt/Shift pressed - { - YQUI::ui()->easterEgg(); - return; - } } QWidget::keyPressEvent( event ); } +bool YQPackageSelectorBase::eventFilter( QObject * obj, QEvent * event ) +{ + if ( event->type() == QEvent::Close ) + { + // Handle WM_CLOSE like "Cancel" + reject(); + + return true; // Stop processing this event + } + + return false; // Don't stop processing this event +} + + int YQPackageSelectorBase::preferredWidth() { return max( 640, sizeHint().width() ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org