June 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r48077 - in /trunk/qt/src: YQMainWinDock.cc YQMainWinDock.h YQWizard.cc
by sh-sh-sh＠svn.opensuse.org 04 Jun '08

04 Jun '08

Author: sh-sh-sh Date: Wed Jun 4 16:35:26 2008 New Revision: 48077 URL: http://svn.opensuse.org/viewcvs/yast?rev=48077&view=rev Log: use single shot timer Modified: trunk/qt/src/YQMainWinDock.cc trunk/qt/src/YQMainWinDock.h trunk/qt/src/YQWizard.cc Modified: trunk/qt/src/YQMainWinDock.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQMainWinDock.cc?rev=4807… ============================================================================== --- trunk/qt/src/YQMainWinDock.cc (original) +++ trunk/qt/src/YQMainWinDock.cc Wed Jun 4 16:35:26 2008 @@ -19,7 +19,6 @@ #define YUILogComponent "qt-ui" #include "YUILog.h" -#include <QTimer> #include <QResizeEvent> #include "YQDialog.h" #include <YQUI.h> @@ -86,9 +85,11 @@ QRect rect = QRect( QPoint( 0, 0 ), size() ); - YQWizard *wizard = dialog->findWizard(); + YQWizard * wizard = dialog->findWizard(); + if ( wizard ) - yuiDebug() << "wizard " << wizard << " " << wizard->isSecondary() << endl; + yuiDebug() << dialog << " with " << wizard << " isSecondary: " << boolalpha << wizard->isSecondary() << endl; + if ( wizard && wizard->isSecondary() ) rect.setLeft( _sideBarWidth ); @@ -148,7 +149,7 @@ if ( _widgetStack.empty() ) return; - // In the normal case, the (still or against) topmost dialog needs to be + // In the normal case, the (still or again) topmost dialog needs to be // activated or deactivated directly. Since this is done on the QWidget // level, its widgetRep() is needed -- which may or may not be the same as // the YQDialog. Modified: trunk/qt/src/YQMainWinDock.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQMainWinDock.h?rev=48077… ============================================================================== --- trunk/qt/src/YQMainWinDock.h (original) +++ trunk/qt/src/YQMainWinDock.h Wed Jun 4 16:35:26 2008 @@ -136,21 +136,24 @@ virtual void resizeEvent( QResizeEvent * event ); /** - * Resize the visible child to the current size of the dock. - **/ - void resizeVisibleChild(); - - /** * For secondary wizards **/ void setSideBarWidth( int width ); /** * Activate or deactivate the next-lower dialog in the dock when a new - * dialog is opened or when a dialog is closed. + * dialog is opened or when a dialog is closed. **/ void activateCurrentDialog( bool active ); - + + +public slots: + + /** + * Resize the visible child to the current size of the dock. + **/ + void resizeVisibleChild(); + protected slots: Modified: trunk/qt/src/YQWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQWizard.cc?rev=48077&r1=… ============================================================================== --- trunk/qt/src/YQWizard.cc (original) +++ trunk/qt/src/YQWizard.cc Wed Jun 4 16:35:26 2008 @@ -30,6 +30,7 @@ #include <QSvgRenderer> #include <QPainter> #include <QStackedWidget> +#include <QTimer> #include <qimage.h> #include <qlabel.h> #include <qlayout.h> @@ -74,7 +75,9 @@ #define USE_ICON_ON_HELP_BUTTON 0 -YQWizard *YQWizard::main_wizard = 0; + +YQWizard * YQWizard::main_wizard = 0; + YQWizard::YQWizard( YWidget * parent, const string & backButtonLabel, @@ -142,9 +145,14 @@ if ( !main_wizard && _stepsEnabled ) { main_wizard = this; - } else if ( main_wizard ) + } + else if ( main_wizard ) { - YQMainWinDock::mainWinDock()->resizeVisibleChild(); + // Calling this in the Qt main loop, not here in the constructor: + // This will indirectly call a lot of virtual methods that are not available yet + // while this object is being constructed. + + QTimer::singleShot( 0, YQMainWinDock::mainWinDock(), SLOT( resizeVisibleChild() ) ); } } @@ -159,11 +167,13 @@ delete _helpDlg; } + bool YQWizard::isSecondary() const { return this != main_wizard; } + void YQWizard::layoutTitleBar( QWidget * parent ) { QFrame * titleBar = new QFrame( parent ); -- 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] r48076 - in /trunk/ncurses-pkg/src: NCPkgFilterSearch.cc NCPkgFilterSearch.h
by kmachalkova＠svn.opensuse.org 04 Jun '08

04 Jun '08

Author: kmachalkova Date: Wed Jun 4 15:33:14 2008 New Revision: 48076 URL: http://svn.opensuse.org/viewcvs/yast?rev=48076&view=rev Log: Use PoolQuery API for searching in packages Modified: trunk/ncurses-pkg/src/NCPkgFilterSearch.cc trunk/ncurses-pkg/src/NCPkgFilterSearch.h Modified: trunk/ncurses-pkg/src/NCPkgFilterSearch.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterSearc… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterSearch.cc (original) +++ trunk/ncurses-pkg/src/NCPkgFilterSearch.cc Wed Jun 4 15:33:14 2008 @@ -52,7 +52,6 @@ : NCLayoutBox( parent, dim ) , searchExpr( 0 ) , ignoreCase( 0 ) - , searchButton( 0 ) , packager( pkger ) { createLayout( parent ); @@ -165,71 +164,41 @@ // clear the package table packageList->itemsCleared (); -// FIXME filter it inside zypp - ZyppPoolIterator b = zyppPkgBegin (); - ZyppPoolIterator e = zyppPkgEnd (); - ZyppPoolIterator i; - - // get the package list and sort it - list<ZyppSel> pkgList( b, e ); - pkgList.sort( sortByName ); - - // fill the package table - list<ZyppSel>::iterator listIt = pkgList.begin(); - ZyppPkg pkg; - string description = ""; - string provides = ""; - string requires = ""; - - while ( listIt != pkgList.end() ) - { - if ( (*listIt)->installedObj() ) - pkg = tryCastToZyppPkg ((*listIt)->installedObj()); - else - pkg = tryCastToZyppPkg ((*listIt)->theObj()); - - if ( pkg ) - { - if ( checkDescr ) - { - description = pkg->description(); - //zypp::Text value = pkg->description(); - //description = createDescrText( value ); - } - if ( checkProvides ) - { - zypp::Capabilities value = pkg->dep (zypp::Dep::PROVIDES); - //provides = createRelLine( value ); - } - if ( checkRequires ) - { - zypp::Capabilities value = pkg->dep (zypp::Dep::REQUIRES); - //requires = createRelLine( value ); - } - if ( ( checkName && match( pkg->name(), expr, ignoreCase )) || - ( checkSummary && match( pkg->summary(), expr, ignoreCase) ) || - ( checkDescr && match( description, expr, ignoreCase) ) || - ( checkProvides && match( provides, expr, ignoreCase) ) || - ( checkRequires && match( requires, expr, ignoreCase) ) - ) - { - // search sucessful - packageList->createListEntry( pkg, *listIt ); - } - } + zypp::PoolQuery q; + q.addString( expr ); + q.addKind( zypp::ResKind::package ); + //no clue what this means, but it segfaults if it's not here :) + q.addAttribute( zypp::sat::SolvAttr::keywords ); + + if ( !ignoreCase ) + q.setCaseSensitive(); + if ( checkName ) + q.addAttribute( zypp::sat::SolvAttr::name ); + if ( checkSummary ) + q.addAttribute( zypp::sat::SolvAttr::summary ); + if ( checkDescr ) + q.addAttribute( zypp::sat::SolvAttr::description ); + if ( checkProvides ) + q.addAttribute( zypp::sat::SolvAttr("solvable:provides") ); + if ( checkRequires ) + q.addAttribute( zypp::sat::SolvAttr("solvable:requires") ); - ++listIt; + for( zypp::PoolQuery::Selectable_iterator it = q.selectableBegin(); + it != q.selectableEnd(); it++) + { + ZyppPkg pkg = tryCastToZyppPkg( (*it)->theObj() ); + packageList->createListEntry ( pkg, *it); } - + // show the package list packageList->drawList(); + if ( packageList->getNumLines() > 0 ) { packageList->setCurrentItem( 0 ); packageList->showInformation(); } - return true; } Modified: trunk/ncurses-pkg/src/NCPkgFilterSearch.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterSearc… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterSearch.h (original) +++ trunk/ncurses-pkg/src/NCPkgFilterSearch.h Wed Jun 4 15:33:14 2008 @@ -52,8 +52,6 @@ NCInputField * searchExpr; NCCheckBox * ignoreCase; - - NCPushButton * searchButton; NCPackageSelector * packager; // connection to the package selector -- 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] r48075 - in /trunk/installation: package/yast2-installation.changes src/include/inst_inc_first.ycp
by locilka＠svn.opensuse.org 04 Jun '08

04 Jun '08

Author: locilka Date: Wed Jun 4 15:22:32 2008 New Revision: 48075 URL: http://svn.opensuse.org/viewcvs/yast?rev=48075&view=rev Log: - Initial mouse probing has been disabled (bnc #395426). Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/include/inst_inc_first.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Jun 4 15:22:32 2008 @@ -2,6 +2,7 @@ Wed Jun 4 11:57:07 CEST 2008 - locilka(a)suse.cz - Copying /license.tar.gz to /etc/YaST2/license/ (bnc #396444). +- Initial mouse probing has been disabled (bnc #395426). ------------------------------------------------------------------- Tue Jun 3 13:44:56 CEST 2008 - locilka(a)suse.cz Modified: trunk/installation/src/include/inst_inc_first.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/inst_in… ============================================================================== --- trunk/installation/src/include/inst_inc_first.ycp (original) +++ trunk/installation/src/include/inst_inc_first.ycp Wed Jun 4 15:22:32 2008 @@ -26,11 +26,13 @@ include "installation/misc.ycp"; void InitMouse () { - if (!Arch::s390 () || Arch::board_iseries ()) { - // in another client because of dependencies - // used in inst-sys only - WFM::CallFunction ("inst_init_mouse", []); - } +// disabled +// bnc #395426 +// if (!Arch::s390 () || Arch::board_iseries ()) { +// // in another client because of dependencies +// // used in inst-sys only +// WFM::CallFunction ("inst_init_mouse", []); +// } } /** -- 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] r48074 - /tags/branch-Linux-11_0-2_16_19/bootloader/
by juhliarik＠svn.opensuse.org 04 Jun '08

04 Jun '08

Author: juhliarik Date: Wed Jun 4 15:04:34 2008 New Revision: 48074 URL: http://svn.opensuse.org/viewcvs/yast?rev=48074&view=rev Log: Created tag branch-Linux-11_0-2_16_19 for bootloader Added: tags/branch-Linux-11_0-2_16_19/bootloader/ - copied from r48073, branches/SuSE-Linux-11_0-Branch/bootloader/ -- 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] r48073 - in /branches/SuSE-Linux-11_0-Branch/bootloader: VERSION package/yast2-bootloader.changes
by juhliarik＠svn.opensuse.org 04 Jun '08

04 Jun '08

Author: juhliarik Date: Wed Jun 4 15:04:23 2008 New Revision: 48073 URL: http://svn.opensuse.org/viewcvs/yast?rev=48073&view=rev Log: added new version 2.16.19 Modified: branches/SuSE-Linux-11_0-Branch/bootloader/VERSION branches/SuSE-Linux-11_0-Branch/bootloader/package/yast2-bootloader.changes Modified: branches/SuSE-Linux-11_0-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/bootlo… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/bootloader/VERSION (original) +++ branches/SuSE-Linux-11_0-Branch/bootloader/VERSION Wed Jun 4 15:04:23 2008 @@ -1 +1 @@ -2.16.18 +2.16.19 Modified: branches/SuSE-Linux-11_0-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/bootlo… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-Linux-11_0-Branch/bootloader/package/yast2-bootloader.changes Wed Jun 4 15:04:23 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jun 4 13:39:59 CEST 2008 - juhliarik(a)suse.cz + +- added fix for problem with deleting boot sections bnc #396810 +- 2.16.19 + +------------------------------------------------------------------- Wed Jun 4 10:06:01 CEST 2008 - juhliarik(a)suse.cz - added fix for problem with liveCD and simlinks for initrd and -- 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] r48072 - /branches/tmp/sh/ncurses-cleanup/ncurses/
by sh-sh-sh＠svn.opensuse.org 04 Jun '08

04 Jun '08

Author: sh-sh-sh Date: Wed Jun 4 14:41:42 2008 New Revision: 48072 URL: http://svn.opensuse.org/viewcvs/yast?rev=48072&view=rev Log: branch Added: branches/tmp/sh/ncurses-cleanup/ncurses/ - copied from r48071, trunk/ncurses/ -- 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] r48071 - /branches/tmp/sh/ncurses-cleanup/
by sh-sh-sh＠svn.opensuse.org 04 Jun '08

04 Jun '08

Author: sh-sh-sh Date: Wed Jun 4 14:39:47 2008 New Revision: 48071 URL: http://svn.opensuse.org/viewcvs/yast?rev=48071&view=rev Log: new branch Added: branches/tmp/sh/ncurses-cleanup/ -- 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] r48070 - /tags/stable-2_16_34/printer/
by mzugec＠svn.opensuse.org 04 Jun '08

04 Jun '08

Author: mzugec Date: Wed Jun 4 14:08:32 2008 New Revision: 48070 URL: http://svn.opensuse.org/viewcvs/yast?rev=48070&view=rev Log: Created tag stable-2_16_34 for printer Added: tags/stable-2_16_34/printer/ - copied from r48069, trunk/printer/ -- 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] r48069 - in /trunk/printer: VERSION package/yast2-printer.changes src/common/dialogs.ycp
by mzugec＠svn.opensuse.org 04 Jun '08

04 Jun '08

Author: mzugec Date: Wed Jun 4 14:08:21 2008 New Revision: 48069 URL: http://svn.opensuse.org/viewcvs/yast?rev=48069&view=rev Log: improved hostname validation Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/common/dialogs.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=48069&r1=480… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Wed Jun 4 14:08:21 2008 @@ -1 +1 @@ -2.16.33 +2.16.34 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Wed Jun 4 14:08:21 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jun 4 14:07:42 CEST 2008 - mzugec(a)suse.cz + +- improved hostname validation +- 2.16.34 + +------------------------------------------------------------------- Wed Jun 4 13:23:24 CEST 2008 - mzugec(a)suse.cz - initialization sequence sent to usb blocks usb port (bnc#397036) Modified: trunk/printer/src/common/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/common/dialogs.ycp?r… ============================================================================== --- trunk/printer/src/common/dialogs.ycp (original) +++ trunk/printer/src/common/dialogs.ycp Wed Jun 4 14:08:21 2008 @@ -32,6 +32,7 @@ import "DialogTree"; import "CWM"; import "IP"; + import "String"; include "printer/helps.ycp"; include "printer/misc.ycp"; @@ -1873,6 +1874,7 @@ case `test_ipp: string n = (string)UI::QueryWidget (`id(`server_name), `Value); if (nil == n || "" == n) + if (!(size(String::CutBlanks(n))>0)) // popup Popup::Message (_("Enter a valid server name.")); else @@ -1889,7 +1891,7 @@ boolean validateServerType(string key, map event){ if (! (UI::QueryWidget(`id(`server_type), `CurrentButton) == `local)){ - if (size((string)UI::QueryWidget (`id (`server_name), `Value))==0){ + if (size(String::CutBlanks( (string)UI::QueryWidget (`id (`server_name), `Value) ))==0){ Popup::Warning (_("Enter a valid server name.")); return false; } -- 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] r48068 - /trunk/printer/testsuite/tests/detectPrinters.out
by mzugec＠svn.opensuse.org 04 Jun '08

04 Jun '08

Author: mzugec Date: Wed Jun 4 13:48:37 2008 New Revision: 48068 URL: http://svn.opensuse.org/viewcvs/yast?rev=48068&view=rev Log: fixed testsuite Modified: trunk/printer/testsuite/tests/detectPrinters.out Modified: trunk/printer/testsuite/tests/detectPrinters.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/testsuite/tests/detectPr… ============================================================================== --- trunk/printer/testsuite/tests/detectPrinters.out (original) +++ trunk/printer/testsuite/tests/detectPrinters.out Wed Jun 4 13:48:37 2008 @@ -26,7 +26,9 @@ Read .target.size "/usr/lib/cups/backend/usb" -1 Execute .target.bash "grep '^usblp ' /proc/modules" 0 Read .proc.modules $["usblp":""] -Execute .target.bash "\nMAIN_PID=$$\n{ /bin/echo -en \"\\000\\000\\000\\033\\001\\100\\105\\112\\114\\040\\061\\062\\070\\064\\056\\064\\012\\100\\105\\112\\114\\040\\040\\040\\040\\040\\012\" > /dev/usblp0 ; kill $MAIN_PID; } &\nECHO_PID=$!\n{ sleep 2s; kill $ECHO_PID &>/dev/null; } &" 0 +Execute .process.start_shell "echo -en \"\\000\\000\\000\\033\\001\\100\\105\\112\\114\\040\\061\\062\\070\\064\\056\\064\\012\\100\\105\\112\\114\\040\\040\\040\\040\\040\\012\" > /dev/usblp0 " 0 +Read .process.running 0 true +Execute .process.kill 0 0 Read .ppd.db.vendorname "Epson" "" Read .ppd.db.modelname ["Epson", "USB Printer"] "" Execute .target.bash "grep '^usblp ' /proc/modules" 0 @@ -37,7 +39,9 @@ Read .target.size "/usr/lib/cups/backend/usb" -1 Execute .target.bash "grep '^usblp ' /proc/modules" 0 Read .proc.modules $["usblp":""] -Execute .target.bash "\nMAIN_PID=$$\n{ /bin/echo -en \"\\000\\000\\000\\033\\001\\100\\105\\112\\114\\040\\061\\062\\070\\064\\056\\064\\012\\100\\105\\112\\114\\040\\040\\040\\040\\040\\012\" > /dev/usblp0 ; kill $MAIN_PID; } &\nECHO_PID=$!\n{ sleep 2s; kill $ECHO_PID &>/dev/null; } &" 0 +Execute .process.start_shell "echo -en \"\\000\\000\\000\\033\\001\\100\\105\\112\\114\\040\\061\\062\\070\\064\\056\\064\\012\\100\\105\\112\\114\\040\\040\\040\\040\\040\\012\" > /dev/usblp0 " 0 +Read .process.running 0 true +Execute .process.kill 0 0 Read .ppd.db.vendorname "Epson" "" Read .ppd.db.modelname ["Epson", "USB Printer"] "" Execute .target.bash "grep '^usblp ' /proc/modules" 0 @@ -49,7 +53,9 @@ Execute .target.bash_output "/usr/lib/cups/backend/usb" $["exit":0, "stderr":"", "stdout":"direct usb://EPSON/Stylus%20Photo%20810?serial=W33040110201335050 \"EPSON Stylus Photo 810\" \"USB Printer #1\"\ndirect usb:/dev/usb/lp1 \"Unknown\" \"USB Printer #2\"\ndirect usb:/dev/usb/lp2 \"Unknown\" \"USB Printer #3\""] Execute .target.bash "grep '^usblp ' /proc/modules" 0 Read .proc.modules $["usblp":""] -Execute .target.bash "\nMAIN_PID=$$\n{ /bin/echo -en \"\\000\\000\\000\\033\\001\\100\\105\\112\\114\\040\\061\\062\\070\\064\\056\\064\\012\\100\\105\\112\\114\\040\\040\\040\\040\\040\\012\" > /dev/usblp0 ; kill $MAIN_PID; } &\nECHO_PID=$!\n{ sleep 2s; kill $ECHO_PID &>/dev/null; } &" 0 +Execute .process.start_shell "echo -en \"\\000\\000\\000\\033\\001\\100\\105\\112\\114\\040\\061\\062\\070\\064\\056\\064\\012\\100\\105\\112\\114\\040\\040\\040\\040\\040\\012\" > /dev/usblp0 " 0 +Read .process.running 0 true +Execute .process.kill 0 0 Read .ppd.db.vendorname "Epson" "" Read .ppd.db.modelname ["Epson", "Stylus Photo 810"] "" Execute .target.bash "grep '^usblp ' /proc/modules" 0 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0