[yast-commit] r47952 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes src/YQCheckBoxFrame.cc

Author: sh-sh-sh Date: Thu May 29 17:58:53 2008 New Revision: 47952 URL: http://svn.opensuse.org/viewcvs/yast?rev=47952&view=rev Log: - Fixed bnc #394525: Proxy settings don't work in installer - Fixed bnc #379622: CheckBoxFrame( `opt(`invertAutoEnable) ) Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQCheckBoxFrame.cc Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=47952&r1=47951&r2=47952&view=diff ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Thu May 29 17:58:53 2008 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "16") -SET(VERSION_PATCH "52") +SET(VERSION_PATCH "53") Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=47952&r1=47951&r2=47952&view=diff ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Thu May 29 17:58:53 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu May 29 17:57:08 CEST 2008 - sh@suse.de + +- Fixed bnc #394525: Proxy settings don't work in installer +- Fixed bnc #379622: CheckBoxFrame( `opt(`invertAutoEnable) ) +- V 2.16.53 + +------------------------------------------------------------------- Wed May 28 15:47:57 CEST 2008 - sh@suse.de - Fixed bnc #393040: Keyboard shortcuts in main dialogs broken Modified: trunk/qt/src/YQCheckBoxFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQCheckBoxFrame.cc?rev=47952&r1=47951&r2=47952&view=diff ============================================================================== --- trunk/qt/src/YQCheckBoxFrame.cc (original) +++ trunk/qt/src/YQCheckBoxFrame.cc Thu May 29 17:58:53 2008 @@ -43,10 +43,10 @@ setWidgetRep ( this ); QGroupBox::setTitle( fromUTF8( label ) ); QGroupBox::setCheckable( true ); - - connect( this, SIGNAL( toggled( bool ) ), - SLOT( stateChanged( bool ) ) ); setValue( checked ); + + connect( this, SIGNAL( toggled ( bool ) ), + this, SLOT ( stateChanged( bool ) ) ); } @@ -68,6 +68,7 @@ setChecked( newValue ); } + void YQCheckBoxFrame::setEnabled( bool enabled ) { if ( enabled ) @@ -87,56 +88,52 @@ void YQCheckBoxFrame::stateChanged( bool newState ) { - handleChildrenEnablement( newState ); - if ( notify() ) YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::ValueChanged ) ); } -bool YQCheckBoxFrame::event(QEvent *e) -{ - /* now on to something very fishy. The purpose of this widget - * is for whatever reason to provide a checkbox with a groupbox - * without the children having any connection to it. - * - * So we use this trick to undo everything the base class did - */ - QHash widgetState; - - QObjectList childList = children(); - for (int i = 0; i < childList.size(); ++i) - { - QObject *o = childList.at(i); - if (o->isWidgetType()) - { - QWidget *w = static_cast(o); - widgetState[w] = w->isEnabled(); - } - } +bool YQCheckBoxFrame::event( QEvent *e ) +{ + bool oldChildEnabled = true; + + if ( YCheckBoxFrame::hasChildren() ) + oldChildEnabled = YCheckBoxFrame::firstChild()->isEnabled(); + + bool oldStatus = QGroupBox::isChecked(); bool ret = QGroupBox::event( e ); + bool newStatus = QGroupBox::isChecked(); - childList = children(); - for (int i = 0; i < childList.size(); ++i) + if ( oldStatus != newStatus ) { - QObject *o = childList.at(i); - if (o->isWidgetType()) - { - QWidget *w = static_cast(o); - if ( widgetState.contains( w ) ) - w->setEnabled( widgetState[w] ); - } + yuiDebug() << "Status change of " << this << " : now " << boolalpha << newStatus << endl; + + if ( autoEnable() ) + { + handleChildrenEnablement( newStatus ); + } + else + { + if ( YCheckBoxFrame::hasChildren() ) + YCheckBoxFrame::firstChild()->setEnabled( oldChildEnabled ); + } } return ret; } -void YQCheckBoxFrame::childEvent( QChildEvent * ) + +void YQCheckBoxFrame::childEvent( QChildEvent * event ) { - // Reimplemented to prevent the parent class disabling child widgets - // according to its default policy. + if ( event->added() ) + { + // yuiDebug() << "Child widget added" << endl; - // yuiDebug() << "ChildEvent" << endl; + // Prevent parent class from disabling child widgets according to its + // own policy: YCheckBoxFrame is much more flexible than QGroupBox. + } + else + QGroupBox::childEvent( event ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org