Author: sh-sh-sh Date: Fri Nov 30 17:22:06 2007 New Revision: 42564 URL: http://svn.opensuse.org/viewcvs/yast?rev=42564&view=rev Log: new version for abuild Modified: trunk/qt/VERSION trunk/qt/package/yast2-qt.changes trunk/qt/src/YQDialog.cc trunk/qt/yast2-qt.spec.in Modified: trunk/qt/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION?rev=42564&r1=42563&r2=42564&view=diff ============================================================================== --- trunk/qt/VERSION (original) +++ trunk/qt/VERSION Fri Nov 30 17:22:06 2007 @@ -1 +1 @@ -2.16.5 +2.16.6 Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=42564&r1=42563&r2=42564&view=diff ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Fri Nov 30 17:22:06 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Nov 30 17:20:49 CET 2007 - sh@suse.de + +- Migrated YQDialog to mod-ui +- V 2.16.6 + +------------------------------------------------------------------- Tue Nov 27 19:08:00 CET 2007 - sh@suse.de - Moved all YCP related code out of YQWizard Modified: trunk/qt/src/YQDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQDialog.cc?rev=42564&r1=42563&r2=42564&view=diff ============================================================================== --- trunk/qt/src/YQDialog.cc (original) +++ trunk/qt/src/YQDialog.cc Fri Nov 30 17:22:06 2007 @@ -208,6 +208,9 @@ _defaultButton = findDefaultButton( childrenBegin(), childrenEnd() ); + YDialog::setDefaultButton( 0 ); // prevent complaints about multiple default buttons + YDialog::setDefaultButton( _defaultButton ); + return _defaultButton; } @@ -314,6 +317,13 @@ _defaultButton = wizardDefaultButton( wizard ); } + if ( _defaultButton ) + { + YDialog::setDefaultButton( 0 ); // prevent complaints about multiple default buttons + YDialog::setDefaultButton( _defaultButton ); + } + + YQGenericButton * def = _focusButton ? _focusButton : _defaultButton; if ( def ) @@ -422,6 +432,10 @@ if ( _defaultButton && ! _focusButton ) _defaultButton->showAsDefault( true ); } + + + YDialog::setDefaultButton( 0 ); // prevent complaints about multiple default buttons + YDialog::setDefaultButton( _defaultButton ); } Modified: trunk/qt/yast2-qt.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/yast2-qt.spec.in?rev=42564&r1=42563&r2=42564&view=diff ============================================================================== --- trunk/qt/yast2-qt.spec.in (original) +++ trunk/qt/yast2-qt.spec.in Fri Nov 30 17:22:06 2007 @@ -5,8 +5,8 @@ BuildRequires: dbus-1-devel boost-devel libzypp-devel curl-devel docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel libxcrypt-devel libxslt perl-XML-Writer qt3-devel rpm-devel sgml-skel update-desktop-files yast2-devtools yast2-core-devel hal-devel Summary: - -BuildRequires: yast2-core-devel >= 2.16.10 -Requires: yast2-core >= 2.16.10 +BuildRequires: yast2-core-devel >= 2.16.11 +Requires: yast2-core >= 2.16.11 Requires: libzypp >= 3.11.8 Provides: yast2_ui Provides: y2base:/var/lib/YaST2/servers/qt -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org