December 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r42729 - /trunk/qt/src/pkg/YQPackageSelectorBase.h
by sh-sh-sh＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: sh-sh-sh Date: Wed Dec 5 19:23:09 2007 New Revision: 42729 URL: http://svn.opensuse.org/viewcvs/yast?rev=42729&view=rev Log: catch WM_CLOSE directly Modified: trunk/qt/src/pkg/YQPackageSelectorBase.h Modified: trunk/qt/src/pkg/YQPackageSelectorBase.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPackageSelectorBase… ============================================================================== --- trunk/qt/src/pkg/YQPackageSelectorBase.h (original) +++ trunk/qt/src/pkg/YQPackageSelectorBase.h Wed Dec 5 19:23:09 2007 @@ -91,7 +91,14 @@ **/ virtual bool setKeyboardFocus(); + /** + * Event filter to handle WM_CLOSE like "Cancel" + * + * Reimplemented from QObject. + **/ + virtual bool eventFilter( QObject * obj, QEvent * event ); + public slots: /** -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42728 - /trunk/qt/src/pkg/YQPackageSelectorBase.cc
by sh-sh-sh＠svn.opensuse.org 05 Dec '07

05 Dec '07

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(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42727 - /trunk/qt/src/YQWidgetFactory.cc
by sh-sh-sh＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: sh-sh-sh Date: Wed Dec 5 19:22:16 2007 New Revision: 42727 URL: http://svn.opensuse.org/viewcvs/yast?rev=42727&view=rev Log: done automatically in mainWinDock / dialog Modified: trunk/qt/src/YQWidgetFactory.cc Modified: trunk/qt/src/YQWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQWidgetFactory.cc?rev=42… ============================================================================== --- trunk/qt/src/YQWidgetFactory.cc (original) +++ trunk/qt/src/YQWidgetFactory.cc Wed Dec 5 19:22:16 2007 @@ -17,10 +17,14 @@ /-*/ +#define y2log_component "qt-ui" +#include <ycp/y2log.h> + #include "YQWidgetFactory.h" #include "YQUI.h" #include "YUIException.h" #include "YQPackageSelectorPlugin.h" +#include "YQMainWinDock.h" #include <string> @@ -49,8 +53,7 @@ YQDialog * YQWidgetFactory::createDialog( YDialogType dialogType, YDialogColorMode colorMode ) { - QWidget * qParent = 0; - YQDialog * dialog = new YQDialog( qParent, dialogType, colorMode ); + YQDialog * dialog = new YQDialog( dialogType, colorMode ); YUI_CHECK_NEW( dialog ); return dialog; @@ -218,7 +221,7 @@ { YQIntField * intField = new YQIntField( parent, label, minVal, maxVal, initialVal ); YUI_CHECK_NEW( intField ); - + return intField; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42726 - /trunk/qt/src/YQUI_builtins.cc
by sh-sh-sh＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: sh-sh-sh Date: Wed Dec 5 19:21:53 2007 New Revision: 42726 URL: http://svn.opensuse.org/viewcvs/yast?rev=42726&view=rev Log: removed cruft Modified: trunk/qt/src/YQUI_builtins.cc Modified: trunk/qt/src/YQUI_builtins.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQUI_builtins.cc?rev=4272… ============================================================================== --- trunk/qt/src/YQUI_builtins.cc (original) +++ trunk/qt/src/YQUI_builtins.cc Wed Dec 5 19:21:53 2007 @@ -79,8 +79,7 @@ YCPValue YQUI::runPkgSelection( YWidget * packageSelector ) { y2milestone( "Running package selection..." ); - _wm_close_blocked = true; - _auto_activate_dialogs = false; + _auto_activate_dialogs = false; YCPValue input = YCPVoid(); @@ -99,8 +98,7 @@ y2error( "This is a libzypp problem. Do not file a bug against the UI!" ); } - _auto_activate_dialogs = true; - _wm_close_blocked = false; + _auto_activate_dialogs = true; y2milestone( "Package selection done - returning %s", input->toString().c_str() ); return input; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42725 - in /trunk/qt/src: YQEBunny.cc YQEBunny.h
by sh-sh-sh＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: sh-sh-sh Date: Wed Dec 5 19:20:55 2007 New Revision: 42725 URL: http://svn.opensuse.org/viewcvs/yast?rev=42725&view=rev Log: obsolete Removed: trunk/qt/src/YQEBunny.cc trunk/qt/src/YQEBunny.h -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42724 - /trunk/core/libyui/src/YUI_builtins.cc
by sh-sh-sh＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: sh-sh-sh Date: Wed Dec 5 19:17:22 2007 New Revision: 42724 URL: http://svn.opensuse.org/viewcvs/yast?rev=42724&view=rev Log: more logging Modified: trunk/core/libyui/src/YUI_builtins.cc Modified: trunk/core/libyui/src/YUI_builtins.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YUI_builtins.cc?… ============================================================================== --- trunk/core/libyui/src/YUI_builtins.cc (original) +++ trunk/core/libyui/src/YUI_builtins.cc Wed Dec 5 19:17:22 2007 @@ -23,6 +23,7 @@ #define VERBOSE_REPLACE_WIDGET 0 #define VERBOSE_EVENTS 0 +#define VERBOSE_DISCARDED_EVENTS 0 #include <stdio.h> #include <unistd.h> // pipe() @@ -666,6 +667,18 @@ // Yes, really y2debug() - this may legitimately happen. y2debug( "Discarding event from widget from foreign dialog" ); +#if VERBOSE_DISCARDED_EVENTS + y2debug( "Expected: %p (widgetRep %p), received: %p (widgetRep %p)", + YDialog::currentDialog(), + YDialog::currentDialog()->widgetRep(), + widgetEvent->widget()->findDialog(), + widgetEvent->widget()->findDialog()->widgetRep() ); + y2debug( "Event widget: " ); + widgetEvent->widget()->findDialog()->dumpWidgetTree(); + y2debug( "Current dialog:" ); + YDialog::currentDialog()->dumpWidgetTree(); +#endif + delete widgetEvent; return 0; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42723 - in /trunk/yast2: ./ package/yast2.changes scripts/yast2
by sh-sh-sh＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: sh-sh-sh Date: Wed Dec 5 17:35:25 2007 New Revision: 42723 URL: http://svn.opensuse.org/viewcvs/yast?rev=42723&view=rev Log: dropped obsolete --noborder option Modified: trunk/yast2/ (props changed) trunk/yast2/package/yast2.changes trunk/yast2/scripts/yast2 Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Wed Dec 5 17:35:25 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Dec 5 17:32:22 CET 2007 - sh(a)suse.de + +- Dropped obsolete --noborder option for /sbin/yast2 + +------------------------------------------------------------------- Mon Dec 3 16:43:50 CET 2007 - locilka(a)suse.cz - Adjusted RPM dependencies: mod_UI in yast2-core. Modified: trunk/yast2/scripts/yast2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/yast2?rev=42723&r1… ============================================================================== --- trunk/yast2/scripts/yast2 (original) +++ trunk/yast2/scripts/yast2 Wed Dec 5 17:35:25 2007 @@ -55,7 +55,6 @@ # Accumulated arguments for both the Qt UI and y2cc; currently supported: # --fullscreen -# --noborder # well also for gtk and ncurses Y2QT_ARGS="" GNOME_SHELL="$ybindir/y2controlcenter-gnome" @@ -69,7 +68,6 @@ echo " -h, --help this message" echo " -l, --list list all available modules" echo " -g, --geometry default window size (qt only)" - echo " --noborder no window manager border for main window" echo " --fullscreen use full screen" echo echo "exceptional case for installing packages:" @@ -169,7 +167,7 @@ fi } -TEMP=`/usr/bin/getopt -o hlg:s:Si --long help,list,kcontrol,geometry:,style:,strings,install,update,remove,fullscreen,noborder \ +TEMP=`/usr/bin/getopt -o hlg:s:Si --long help,list,kcontrol,geometry:,style:,strings,install,update,remove,fullscreen \ -n 'yast2' -- "$@"` if [ $? != 0 ] ; then echo "Exit." >&2 ; exit 1 ; fi @@ -186,7 +184,6 @@ --update) Y2_INSTALL_PACKAGES=true; Y2_INSTALL_ACTION=--update; shift ;; --remove) Y2_INSTALL_PACKAGES=true; Y2_INSTALL_ACTION=--remove; shift ;; --fullscreen) Y2QT_ARGS="$Y2QT_ARGS --fullscreen"; shift ;; - --noborder) Y2QT_ARGS="$Y2QT_ARGS --noborder" ; shift ;; --kcontrol) Y2QT_ARGS="$Y2QT_ARGS --kcontrol_id YaST" ; shift ;; --) shift ; break ;; *) echo "Unrecognized option $1" ; exit 1 ;; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42722 - /trunk/yast2/doc/
by sh-sh-sh＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: sh-sh-sh Date: Wed Dec 5 17:33:59 2007 New Revision: 42722 URL: http://svn.opensuse.org/viewcvs/yast?rev=42722&view=rev Log: ignore generated stuff Modified: trunk/yast2/doc/ (props changed) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42721 - /tags/stable-2_15_9/http-server/
by mzugec＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: mzugec Date: Wed Dec 5 17:03:39 2007 New Revision: 42721 URL: http://svn.opensuse.org/viewcvs/yast?rev=42721&view=rev Log: Created tag stable-2_15_9 for http-server Added: tags/stable-2_15_9/http-server/ - copied from r42720, trunk/http-server/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42720 - /tags/branch-SLE-10-SP2-2_13_30/http-server/
by mzugec＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: mzugec Date: Wed Dec 5 17:03:11 2007 New Revision: 42720 URL: http://svn.opensuse.org/viewcvs/yast?rev=42720&view=rev Log: Created tag branch-SLE-10-SP2-2_13_30 for http-server Added: tags/branch-SLE-10-SP2-2_13_30/http-server/ - copied from r42719, branches/SuSE-SLE-10-SP2-Branch/http-server/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0