Author: coolo Date: Sun Dec 2 20:09:00 2007 New Revision: 42576 URL: http://svn.opensuse.org/viewcvs/yast?rev=42576&view=rev Log: trying to work on event blocking, but this did not help the original problem Modified: branches/tmp/coolo/wizard-rework/src/YQReplacePoint.cc branches/tmp/coolo/wizard-rework/src/YQUI.h branches/tmp/coolo/wizard-rework/src/YQUI_core.cc branches/tmp/coolo/wizard-rework/theme/style.qss Modified: branches/tmp/coolo/wizard-rework/src/YQReplacePoint.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/src/YQReplacePoint.cc?rev=42576&r1=42575&r2=42576&view=diff ============================================================================== --- branches/tmp/coolo/wizard-rework/src/YQReplacePoint.cc (original) +++ branches/tmp/coolo/wizard-rework/src/YQReplacePoint.cc Sun Dec 2 20:09:00 2007 @@ -35,7 +35,7 @@ void YQReplacePoint::showChild() { YWidget * child = firstChild(); - + if ( child ) { QWidget * qChild = (QWidget *) child->widgetRep(); Modified: branches/tmp/coolo/wizard-rework/src/YQUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/src/YQUI.h?rev=42576&r1=42575&r2=42576&view=diff ============================================================================== --- branches/tmp/coolo/wizard-rework/src/YQUI.h (original) +++ branches/tmp/coolo/wizard-rework/src/YQUI.h Sun Dec 2 20:09:00 2007 @@ -229,16 +229,14 @@ * * Reimplemented from YUI. **/ - virtual void blockEvents( bool block = true ) - { _event_handler.blockEvents( block ); } + virtual void blockEvents( bool block = true ); /** * Returns 'true' if events are currently blocked. * * Reimplemented from YUI. **/ - virtual bool eventsBlocked() const - { return _event_handler.eventsBlocked(); } + virtual bool eventsBlocked() const; /** * Returns the current product name @@ -630,6 +628,8 @@ **/ YSimpleEventHandler _event_handler; + int blocked_level; + /** * Saved normal palette **/ @@ -650,9 +650,9 @@ **/ bool _askedForLeftHandedMouse; - bool _ui_inited; - int _ui_argc; - char **_ui_argv; + bool _ui_inited; + int _ui_argc; + char **_ui_argv; }; #endif // YQUI_h Modified: branches/tmp/coolo/wizard-rework/src/YQUI_core.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/src/YQUI_core.cc?rev=42576&r1=42575&r2=42576&view=diff ============================================================================== --- branches/tmp/coolo/wizard-rework/src/YQUI_core.cc (original) +++ branches/tmp/coolo/wizard-rework/src/YQUI_core.cc Sun Dec 2 20:09:00 2007 @@ -72,6 +72,7 @@ _leftHandedMouse = false; _askedForLeftHandedMouse = false; screenShotNameTemplate = ""; + blocked_level = 0; qInstallMsgHandler( qMessageHandler ); @@ -443,7 +444,11 @@ { init_ui(); - // y2milestone( "userInput %ld", timeout_millisec ); + _event_handler.blockEvents( false ); + _eventLoop->wakeUp(); + blocked_level = 0; + + //y2milestone( "userInput %ld", timeout_millisec ); YEvent * event = 0; YQDialog * dialog = dynamic_cast ( YDialog::currentDialog( false ) ); @@ -463,12 +468,7 @@ normalCursor(); _do_exit_loop = true; // should exit_loop() be called in sendEvent()? - - while ( ! pendingEvent() ) - { - _eventLoop->processEvents(QEventLoop::WaitForMoreEvents); - } - + _eventLoop->exec(); _do_exit_loop = false; event = _event_handler.consumePendingEvent(); @@ -654,6 +654,31 @@ } +void YQUI::blockEvents( bool block ) +{ + if ( block ) + { + if ( ++blocked_level == 1 ) + { + _event_handler.blockEvents( true ); + _eventLoop->exit(); + } + } + else + { + if ( --blocked_level == 0 ) + { + _event_handler.blockEvents( false ); + _eventLoop->wakeUp(); + } + } +} + + +bool YQUI::eventsBlocked() const +{ + return _event_handler.eventsBlocked(); +} static void qMessageHandler( QtMsgType type, const char * msg ) Modified: branches/tmp/coolo/wizard-rework/theme/style.qss URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/wizard-rework/theme/style.qss?rev=42576&r1=42575&r2=42576&view=diff ============================================================================== --- branches/tmp/coolo/wizard-rework/theme/style.qss (original) +++ branches/tmp/coolo/wizard-rework/theme/style.qss Sun Dec 2 20:09:00 2007 @@ -47,7 +47,7 @@ } .current-step-name { - font: bold; + font: bold 10pt; } .todo-step-status { @@ -72,7 +72,7 @@ font: bold; color: black; margin-bottom: 7px; - font-size: 120%; + font-size: 11pt; } #DialogIcon { max-width: 0px; margin: 0px; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org