Hello community, here is the log from the commit of package yast2-ncurses-pkg checked in at Tue May 6 01:45:52 CEST 2008. -------- --- yast2-ncurses-pkg/yast2-ncurses-pkg.changes 2008-04-28 17:51:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-ncurses-pkg/yast2-ncurses-pkg.changes 2008-05-05 14:55:02.949492000 +0200 @@ -1,0 +2,8 @@ +Mon May 5 14:31:15 CEST 2008 - kmachalkova@suse.cz + +- Improved YOU layout, showing YOU help ( by gs ) +- The rest of deprecated libzypp stuff removed (by gs) +- PkgMenuExtras: correct ret. value to fix build (by coolo) +- 2.16.9 + +------------------------------------------------------------------- Old: ---- yast2-ncurses-pkg-2.16.8.tar.bz2 New: ---- yast2-ncurses-pkg-2.16.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses-pkg.spec ++++++ --- /var/tmp/diff_new_pack.p25747/_old 2008-05-06 01:45:48.000000000 +0200 +++ /var/tmp/diff_new_pack.p25747/_new 2008-05-06 01:45:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ncurses-pkg (Version 2.16.8) +# spec file for package yast2-ncurses-pkg (Version 2.16.9) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-ncurses-pkg -Version: 2.16.8 +Version: 2.16.9 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-pkg-2.16.8.tar.bz2 +Source0: yast2-ncurses-pkg-2.16.9.tar.bz2 Prefix: /usr BuildRequires: dejagnu doxygen gcc-c++ yast2-core-devel yast2-devtools BuildRequires: blocxx-devel libxcrypt-devel ncurses-devel yast2-ncurses-devel @@ -38,7 +38,7 @@ %prep -%setup -n yast2-ncurses-pkg-2.16.8 +%setup -n yast2-ncurses-pkg-2.16.9 %build %{prefix}/bin/y2tool y2autoconf @@ -68,6 +68,11 @@ %{_libdir}/YaST2/plugin/libpy2ncurses_pkg.so %doc %{prefix}/share/doc/packages/yast2-ncurses-pkg %changelog +* Mon May 05 2008 kmachalkova@suse.cz +- Improved YOU layout, showing YOU help ( by gs ) +- The rest of deprecated libzypp stuff removed (by gs) +- PkgMenuExtras: correct ret. value to fix build (by coolo) +- 2.16.9 * Mon Apr 28 2008 kmachalkova@suse.cz - Locale (prev. Language) support + displaying locale-related pkgs re-enabled ++++++ yast2-ncurses-pkg-2.16.8.tar.bz2 -> yast2-ncurses-pkg-2.16.9.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.16.8/src/NCPackageSelector.cc new/yast2-ncurses-pkg-2.16.9/src/NCPackageSelector.cc --- old/yast2-ncurses-pkg-2.16.8/src/NCPackageSelector.cc 2008-04-28 17:34:47.000000000 +0200 +++ new/yast2-ncurses-pkg-2.16.9/src/NCPackageSelector.cc 2008-05-05 14:30:59.000000000 +0200 @@ -94,6 +94,7 @@ , viewMenu( 0 ) , extrasMenu( 0 ) , helpMenu( 0 ) + , youHelpButton( 0 ) , filterMain( 0 ) , actionMenu( 0 ) , filterMenu( 0 ) @@ -110,26 +111,6 @@ , visibleInfo( 0 ) { - // FIXME - remove this code when everthiong is handled by handleEvent() ! - // (the eventHandlerMap is obsolete) - - // Fill the handler map - -#if 0 - eventHandlerMap[ NCPkgStrings::Search()->toString() ] = &NCPackageSelector::SearchHandler; -#endif - - // Information menu -> DONE - - // Action menu -> DONE - - // Etc. menu -> DONE - - // Help menu -#if 0 - eventHandlerMap[ NCPkgStrings::PatchHelp()->toString() ] = &NCPackageSelector::YouHelpHandler; -#endif - if ( modeFlags & YPkg_OnlineUpdateMode ) youMode = true; @@ -282,6 +263,8 @@ retVal = OkButtonHandler( event ); else if ( event.widget == cancelButton ) retVal = CancelHandler( event ); + else if ( event.widget == youHelpButton ) + retVal = YouHelpHandler( event ); else if ( event.widget == filterPopup ) { retVal = filterPopup->handleEvent(); @@ -995,11 +978,11 @@ text += NCPkgStrings::YouHelp3(); // open the popup with the help text - NCPopupInfo * youHelp = new NCPopupInfo( wpos( NCurses::lines()/3, NCurses::cols()/6 ), + NCPopupInfo * youHelp = new NCPopupInfo( wpos( (NCurses::lines()*8)/100, (NCurses::cols())*18/100 ), NCPkgStrings::YouHelp(), text ); - youHelp->setNiceSize( (NCurses::cols()*2)/3, NCurses::lines()/3 ); + youHelp->setNiceSize( (NCurses::cols()*65)/100, (NCurses::lines()*85)/100 ); youHelp->showInfoPopup( ); YDialog::deleteTopmostDialog(); @@ -1526,7 +1509,7 @@ viewMenu = new NCPkgMenuView( left3, NCPkgStrings::View(), this); YAlignment * left4 = YUI::widgetFactory()->createLeft( hSplit ); - extrasMenu = new NCPkgMenuExtras( left4, NCPkgStrings::Extras(), this); + depsMenu = new NCPkgMenuDeps( left4, NCPkgStrings::Deps(), this); // add the package table YTableHeader * tableHeader = new YTableHeader(); @@ -1563,10 +1546,15 @@ infoText = new NCPkgPackageDetails( replacePoint, " ", this ); YUI_CHECK_NEW( infoText ); - YLayoutBox * hSplit5 = YUI::widgetFactory()->createHBox( vSplit ); + YLayoutBox * bottom_bar = YUI::widgetFactory()->createHBox( vSplit ); + YAlignment *ll = YUI::widgetFactory()->createLeft( bottom_bar ); - helpMenu = new NCPkgMenuHelp (hSplit5, _("&Help")); - YUI_CHECK_NEW( helpMenu ); + youHelpButton = new NCPushButton ( ll, _("&Help")); + YUI_CHECK_NEW( youHelpButton ); + youHelpButton->setFunctionKey( 1 ); + + YAlignment *r = YUI::widgetFactory()->createRight( bottom_bar ); + YLayoutBox * hSplit5 = YUI::widgetFactory()->createHBox( r ); // add the Cancel button cancelButton = new NCPushButton( hSplit5, _( "&Cancel" ) ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.16.8/src/NCPackageSelector.h new/yast2-ncurses-pkg-2.16.9/src/NCPackageSelector.h --- old/yast2-ncurses-pkg-2.16.8/src/NCPackageSelector.h 2008-04-28 17:34:47.000000000 +0200 +++ new/yast2-ncurses-pkg-2.16.9/src/NCPackageSelector.h 2008-05-05 14:30:59.000000000 +0200 @@ -134,6 +134,7 @@ NCPkgMenuView *viewMenu; NCPkgMenuExtras *extrasMenu; NCPkgMenuHelp *helpMenu; + NCPushButton *youHelpButton; NCPkgFilterMain *filterMain; NCPkgMenuAction *actionMenu; NCPkgMenuFilter *filterMenu; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.16.8/src/NCPackageSelectorStart.cc new/yast2-ncurses-pkg-2.16.9/src/NCPackageSelectorStart.cc --- old/yast2-ncurses-pkg-2.16.8/src/NCPackageSelectorStart.cc 2008-04-21 15:21:45.000000000 +0200 +++ new/yast2-ncurses-pkg-2.16.9/src/NCPackageSelectorStart.cc 2008-05-05 14:30:59.000000000 +0200 @@ -148,8 +148,6 @@ { // show the required diskspace packager->showDiskSpace(); - // FIXME - show appropriate filter menu entries (with patterns or selections) - // This may be obsolete if selections are surely obsolete // packager->createFilterMenu(); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.16.8/src/NCPkgFilterSearch.cc new/yast2-ncurses-pkg-2.16.9/src/NCPkgFilterSearch.cc --- old/yast2-ncurses-pkg-2.16.8/src/NCPkgFilterSearch.cc 2008-04-28 17:34:47.000000000 +0200 +++ new/yast2-ncurses-pkg-2.16.9/src/NCPkgFilterSearch.cc 2008-05-05 14:30:59.000000000 +0200 @@ -122,7 +122,6 @@ string NCPkgFilterSearch::getSearchExpression() const { string value; - unsigned int i = 0; if ( searchExpr ) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.16.8/src/NCPkgMenuDeps.cc new/yast2-ncurses-pkg-2.16.9/src/NCPkgMenuDeps.cc --- old/yast2-ncurses-pkg-2.16.8/src/NCPkgMenuDeps.cc 2008-03-27 17:55:34.000000000 +0100 +++ new/yast2-ncurses-pkg-2.16.9/src/NCPkgMenuDeps.cc 2008-05-05 14:30:59.000000000 +0200 @@ -125,12 +125,12 @@ { if ( pkg->isAutoCheck() ) { - itemAt( 2 )->setLabel( _("&Automatic Dependency Check [ ]") ); + itemAt( 1 )->setLabel( _("&Automatic Dependency Check [ ]") ); pkg->AutoCheck( false ); } else { - itemAt( 2 )->setLabel( _("&Automatic Dependency Check [x]") ); + itemAt( 1 )->setLabel( _("&Automatic Dependency Check [x]") ); pkg->AutoCheck( true ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.16.8/src/NCPkgMenuExtras.cc new/yast2-ncurses-pkg-2.16.9/src/NCPkgMenuExtras.cc --- old/yast2-ncurses-pkg-2.16.8/src/NCPkgMenuExtras.cc 2008-04-21 15:21:45.000000000 +0200 +++ new/yast2-ncurses-pkg-2.16.9/src/NCPkgMenuExtras.cc 2008-05-05 14:30:59.000000000 +0200 @@ -210,6 +210,7 @@ return true; } + return false; } bool NCPkgMenuExtras::importFromFile() @@ -302,4 +303,5 @@ YDialog::deleteTopmostDialog(); //FIXME: move focus back to pkg table? + return true; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.16.8/src/NCPkgPackageDetails.cc new/yast2-ncurses-pkg-2.16.9/src/NCPkgPackageDetails.cc --- old/yast2-ncurses-pkg-2.16.8/src/NCPkgPackageDetails.cc 2008-04-21 15:21:45.000000000 +0200 +++ new/yast2-ncurses-pkg-2.16.9/src/NCPkgPackageDetails.cc 2008-05-05 14:30:59.000000000 +0200 @@ -141,7 +141,7 @@ // show the size text += NCPkgStrings::Size(); - text += pkgPtr->size().asString(); + text += pkgPtr->installsize().asString(); text += " "; ZyppPkg package = tryCastToZyppPkg (pkgPtr); @@ -258,8 +258,8 @@ descr += patchPtr->edition().asString(); descr += "<br>"; - if ( selectable->hasInstalledObj() - && selectable->installedPoolItem().isBroken() ) + if ( !selectable->installedEmpty() + && selectable->installedObj().isBroken() ) { descr += _( "----- this patch is broken !!! -----" ); descr += "<br>"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.16.8/src/NCPkgStatusStrategy.cc new/yast2-ncurses-pkg-2.16.9/src/NCPkgStatusStrategy.cc --- old/yast2-ncurses-pkg-2.16.8/src/NCPkgStatusStrategy.cc 2008-04-21 15:21:45.000000000 +0200 +++ new/yast2-ncurses-pkg-2.16.9/src/NCPkgStatusStrategy.cc 2008-05-05 14:30:59.000000000 +0200 @@ -108,7 +108,7 @@ bool valid = true; ZyppStatus retStat = S_NoInst; ZyppStatus oldStatus = getPackageStatus( slbPtr, objPtr ); - bool installed = slbPtr->hasInstalledObj(); + bool installed = !slbPtr->installedEmpty(); // get the new status switch ( key ) @@ -343,7 +343,7 @@ bool valid = true; ZyppStatus retStat = S_NoInst; ZyppStatus oldStatus = getPackageStatus( slbPtr, objPtr ); - bool installed = slbPtr->hasInstalledObj(); + bool installed = !slbPtr->installedEmpty(); // get the new status switch ( key ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.16.8/VERSION new/yast2-ncurses-pkg-2.16.9/VERSION --- old/yast2-ncurses-pkg-2.16.8/VERSION 2008-04-28 17:45:46.000000000 +0200 +++ new/yast2-ncurses-pkg-2.16.9/VERSION 2008-05-05 14:35:23.000000000 +0200 @@ -1 +1 @@ -2.16.8 +2.16.9 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org