Author: kmachalkova Date: Mon Jul 16 16:30:49 2007 New Revision: 39443 URL: http://svn.opensuse.org/viewcvs/yast?rev=39443&view=rev Log: Merged zypp refactoring branch back to trunk Added: trunk/ncurses/src/pkg/NCPkgPopupRepo.cc - copied unchanged from r39440, branches/REFACTORING-10_3/ncurses/src/pkg/NCPkgPopupRepo.cc trunk/ncurses/src/pkg/NCPkgPopupRepo.h - copied unchanged from r39440, branches/REFACTORING-10_3/ncurses/src/pkg/NCPkgPopupRepo.h Modified: trunk/ncurses/VERSION trunk/ncurses/package/yast2-ncurses.changes trunk/ncurses/src/pkg/Makefile.am trunk/ncurses/src/pkg/NCPackageSelector.cc trunk/ncurses/src/pkg/NCPackageSelector.h trunk/ncurses/src/pkg/NCPkgNames.cc trunk/ncurses/src/pkg/NCPkgNames.h trunk/ncurses/src/pkg/NCPkgPopupSelection.cc trunk/ncurses/src/pkg/NCZypp.h trunk/ncurses/src/pkg/pkg_layout.ycp Modified: trunk/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/VERSION?rev=39443&r1=39442&r2=39443&view=diff ============================================================================== --- trunk/ncurses/VERSION (original) +++ trunk/ncurses/VERSION Mon Jul 16 16:30:49 2007 @@ -1 +1 @@ -2.15.19 +2.15.20 Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.changes?rev=39443&r1=39442&r2=39443&view=diff ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Mon Jul 16 16:30:49 2007 @@ -1,4 +1,71 @@ ------------------------------------------------------------------- +Mon Jul 16 16:27:38 CEST 2007 - kmachalkova@suse.cz + +- Added repositories list popup (FaTE #301810 - part II) - does + not do anything useful yet + +------------------------------------------------------------------- +Wed Jul 4 14:40:23 CEST 2007 - gs@suse.de + +- adapted to libzypp-3.10 +- 2.15.20 + +------------------------------------------------------------------- +Thu Jun 21 17:38:48 CEST 2007 - adrian@suse.de + +- fix changelog entry order + +------------------------------------------------------------------- +Thu Jun 14 16:41:04 CEST 2007 - kmachalkova@suse.cz + +- Use environment variable Y2NCURSES_COLOR_THEME to set color theme + of UI (FaTE #301893) +- Added new rxvt theme (for rxvt-style terminals) +- 2.15.19 + +------------------------------------------------------------------- +Thu Jun 7 17:48:20 CEST 2007 - kmachalkova@suse.cz + +- Do not add extra vertical space to CheckBoxFrame widget (expand + only horizontally so that check box fits in) +- 2.15.18 + +------------------------------------------------------------------- +Wed Jun 6 13:18:39 CEST 2007 - gs@suse.de + +- Online Update/Package Installation: allow status change and show + correct version of patch packages, add installed packages to the + list of package versions, replace obsolete transactResKind() by + resolvePool() + +------------------------------------------------------------------- +Thu May 31 11:00:22 CEST 2007 - gs@suse.de + +- Load library libpy2ncurses_pkg as plugin + +------------------------------------------------------------------- +Tue May 29 13:03:07 CEST 2007 - kmachalkova@suse.cz + +- Removed obsolete save/load selection stuff + related NCPkgPopupFile + class - replaced by save/load pkgs & patterns (FaTE #300729) +- Improved usability of cancel dialog in pkg manager (#274774) +- Fix disappearing 'Etc./All Packages List' submenu after unchecking + AutoDependency Check +- Place all popup dialogs in pkg manager to the centre of the screen + and calculate their size relatively to the screen size (if applicable) + (#275610) +- 2.15.17 + +------------------------------------------------------------------- +Wed May 23 13:54:16 CEST 2007 - gs@suse.de + +------------------------------------------------------------------- +Wed Jul 4 14:40:23 CEST 2007 - gs@suse.de + +- adapted to libzypp-3.10 +- 2.15.20 + +------------------------------------------------------------------- Thu Jun 21 17:38:48 CEST 2007 - adrian@suse.de - fix changelog entry order Modified: trunk/ncurses/src/pkg/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/Makefile.am?rev=39443&r1=39442&r2=39443&view=diff ============================================================================== --- trunk/ncurses/src/pkg/Makefile.am (original) +++ trunk/ncurses/src/pkg/Makefile.am Mon Jul 16 16:30:49 2007 @@ -25,6 +25,7 @@ NCPkgPopupDiskspace.h \ NCPkgPopupDescr.h \ NCPkgPopupTable.h \ + NCPkgPopupRepo.h \ NCPkgPopupSearch.h \ NCPkgPopupSelection.h \ NCPkgPopupTree.h \ @@ -39,6 +40,7 @@ NCPkgPopupDiskspace.cc \ NCPkgPopupDescr.cc \ NCPkgPopupTable.cc \ + NCPkgPopupRepo.cc \ NCPkgPopupSearch.cc \ NCPkgPopupSelection.cc \ NCPkgPopupTree.cc \ Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelector.cc?rev=39443&r1=39442&r2=39443&view=diff ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelector.cc (original) +++ trunk/ncurses/src/pkg/NCPackageSelector.cc Mon Jul 16 16:30:49 2007 @@ -27,6 +27,7 @@ #include "NCSelectionBox.h" #include "NCMenuButton.h" #include "NCPkgPopupSelection.h" +#include "NCPkgPopupRepo.h" #include "NCPkgPopupDeps.h" #include "NCPkgPopupDiskspace.h" #include "NCPkgPopupTable.h" @@ -104,6 +105,7 @@ , selectionPopup( 0 ) , patternPopup( 0 ) , languagePopup( 0 ) + , repoPopup( 0 ) , diskspacePopup( 0 ) , searchPopup( 0 ) , youMode( false ) @@ -123,6 +125,7 @@ eventHandlerMap[ NCPkgNames::Selections()->toString() ] = &NCPackageSelector::FilterHandler; eventHandlerMap[ NCPkgNames::Patterns()->toString() ] = &NCPackageSelector::FilterHandler; eventHandlerMap[ NCPkgNames::Languages()->toString() ] = &NCPackageSelector::FilterHandler; + eventHandlerMap[ NCPkgNames::Repositories()->toString() ] = &NCPackageSelector::FilterHandler; eventHandlerMap[ NCPkgNames::UpdateList()->toString() ] = &NCPackageSelector::FilterHandler; eventHandlerMap[ NCPkgNames::Installed()->toString() ] = &NCPackageSelector::FilterHandler; eventHandlerMap[ NCPkgNames::Whatif()->toString() ] = &NCPackageSelector::FilterHandler; @@ -219,6 +222,8 @@ // create language popup languagePopup = new NCPkgPopupSelection( wpos( 1,1 ), this, NCPkgPopupSelection::S_Language ); + repoPopup = new NCPkgPopupRepo( wpos( 1,1), this ); + // create the filter popup filterPopup = new NCPkgPopupTree( wpos( 1, 1 ), this ); @@ -257,6 +262,10 @@ { delete languagePopup; } + if ( repoPopup ) + { + delete repoPopup; + } if ( depsPopup ) { delete depsPopup; @@ -1732,6 +1741,15 @@ retEvent = languagePopup->showSelectionPopup( ); } } + else if ( event.selection->compare( NCPkgNames::Repositories() ) == YO_EQUAL ) + { + if ( repoPopup ) + { + // show the selection popup + retEvent = repoPopup->showRepoPopup( ); + } + } + // patches else if ( event.selection->compare( NCPkgNames::Recommended() ) == YO_EQUAL ) { Modified: trunk/ncurses/src/pkg/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelector.h?rev=39443&r1=39442&r2=39443&view=diff ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelector.h (original) +++ trunk/ncurses/src/pkg/NCPackageSelector.h Mon Jul 16 16:30:49 2007 @@ -40,6 +40,7 @@ #include "NCPkgSelMapper.h" class NCPkgPopupSelection; +class NCPkgPopupRepo; class LangCode; class NCPkgPopupDeps; class NCPkgPopupDiskspace; @@ -82,6 +83,7 @@ NCPkgPopupSelection * selectionPopup; // the selections popup NCPkgPopupSelection * patternPopup; // the pattern popup NCPkgPopupSelection * languagePopup; // language popup + NCPkgPopupRepo * repoPopup; NCPkgPopupDiskspace * diskspacePopup; // the popup showing the disk usage Modified: trunk/ncurses/src/pkg/NCPkgNames.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgNames.cc?rev=39443&r1=39442&r2=39443&view=diff ============================================================================== --- trunk/ncurses/src/pkg/NCPkgNames.cc (original) +++ trunk/ncurses/src/pkg/NCPkgNames.cc Mon Jul 16 16:30:49 2007 @@ -289,6 +289,13 @@ static const YCPValue value = createIdValue ( "languages" ); return value; } + +const YCPValue& NCPkgNames::Repositories () +{ + static const YCPValue value = createIdValue ( "repos"); + return value; +} + // menu selection Installation Summary const YCPValue& NCPkgNames::Whatif () { @@ -622,6 +629,13 @@ return value; } +const string NCPkgNames::RepoLabel() +{ + // the label of language table + static const string value = _( "Available Repositories" ); + return value; +} + const string NCPkgNames::YOUPatches() { // A label for a list of YOU Patches - keep it short - max 25 chars! @@ -1235,7 +1249,7 @@ const string NCPkgNames::MenuEntryRPMGroups() { // menu entry RpmGroups - static const string value = _( "&RPM Groups" ); + static const string value = _( "RPM &Groups" ); return value; } @@ -1253,6 +1267,13 @@ return value; } +const string NCPkgNames::MenuEntryRepos() +{ + // menu entry Repositories + static const string value = _( "&Repositories" ); + return value; +} + const string NCPkgNames::MenuEntryPatterns() { // menu entry Patterns @@ -1632,6 +1653,13 @@ return value; } +const string NCPkgNames::RepoURL() +{ + static const string value = _("URL"); + return value; + +} + const string NCPkgNames::Partition() { // column header name of the partition (keep it short!) Modified: trunk/ncurses/src/pkg/NCPkgNames.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgNames.h?rev=39443&r1=39442&r2=39443&view=diff ============================================================================== --- trunk/ncurses/src/pkg/NCPkgNames.h (original) +++ trunk/ncurses/src/pkg/NCPkgNames.h Mon Jul 16 16:30:49 2007 @@ -200,6 +200,7 @@ static const YCPValue& Selections (); static const YCPValue& Patterns (); static const YCPValue& Languages (); + static const YCPValue& Repositories (); /** * Widget id of the menu item update list @@ -418,6 +419,10 @@ static const string LanguageLabel(); /** + * The label of the repositories selections popup + */ + static const string RepoLabel(); + /** * The label Filter: YOU Patches */ static const string YOUPatches(); @@ -849,6 +854,8 @@ static const string LangCode(); static const string LangName(); + static const string RepoURL(); + static const string Partition(); static const string UsedSpace(); static const string FreeSpace(); @@ -890,6 +897,7 @@ static const string MenuFilter(); static const string MenuEntryRPMGroups(); static const string MenuEntryLanguages(); + static const string MenuEntryRepos(); static const string MenuEntrySelections(); static const string MenuEntryPatterns(); static const string MenuEntrySearch(); Modified: trunk/ncurses/src/pkg/NCPkgPopupSelection.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgPopupSelection.cc?rev=39443&r1=39442&r2=39443&view=diff ============================================================================== --- trunk/ncurses/src/pkg/NCPkgPopupSelection.cc (original) +++ trunk/ncurses/src/pkg/NCPkgPopupSelection.cc Mon Jul 16 16:30:49 2007 @@ -134,6 +134,7 @@ opt.notifyMode.setValue( true ); + NCLabel * help = new NCLabel( split, opt, YCPString(NCPkgNames::DepsHelpLine()) ); split->addChild( help ); @@ -444,6 +445,7 @@ slbList.sort( orderLang ); break; } + default: NCERR << "Selecion type not handled: " << type << endl; } Modified: trunk/ncurses/src/pkg/NCZypp.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCZypp.h?rev=39443&r1=39442&r2=39443&view=diff ============================================================================== --- trunk/ncurses/src/pkg/NCZypp.h (original) +++ trunk/ncurses/src/pkg/NCZypp.h Mon Jul 16 16:30:49 2007 @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -58,9 +59,12 @@ typedef zypp::Pattern::constPtr ZyppPattern; typedef zypp::Language::constPtr ZyppLang; typedef zypp::Patch::constPtr ZyppPatch; +typedef zypp::Product::constPtr ZyppProduct; +typedef zypp::Repository ZyppRepo; typedef zypp::ResPoolProxy ZyppPool; typedef zypp::ResPoolProxy::const_iterator ZyppPoolIterator; +typedef zypp::ResPoolProxy::repository_iterator ZyppRepositoryIterator; inline ZyppPool zyppPool() { return zypp::getZYpp()->poolProxy(); } @@ -83,6 +87,12 @@ inline ZyppPoolIterator zyppPatchesBegin() { return zyppBeginzypp::Patch(); } inline ZyppPoolIterator zyppPatchesEnd() { return zyppEndzypp::Patch(); } +inline ZyppPoolIterator zyppProductsBegin() { return zyppBeginzypp::Product(); } +inline ZyppPoolIterator zyppProductsEnd() { return zyppEndzypp::Product(); } + +inline ZyppRepositoryIterator ZyppRepositoriesBegin() { return zyppPool().knownRepositoriesBegin(); } +inline ZyppRepositoryIterator ZyppRepositoriesEnd() { return zyppPool().knownRepositoriesEnd(); } + inline ZyppPkg tryCastToZyppPkg( ZyppObj zyppObj ) { @@ -109,6 +119,10 @@ return zypp::dynamic_pointer_cast<const zypp::Patch>( zyppObj ); } +inline ZyppProduct tryCastToZyppProduct( ZyppObj zyppObj ) +{ + return zypp::dynamic_pointer_cast<const zypp::Product>( zyppObj ); +} template<typename T> bool contains( const std::set<T> & container, T search ) { Modified: trunk/ncurses/src/pkg/pkg_layout.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/pkg_layout.ycp?rev=39443&r1=39442&r2=39443&view=diff ============================================================================== --- trunk/ncurses/src/pkg/pkg_layout.ycp (original) +++ trunk/ncurses/src/pkg/pkg_layout.ycp Mon Jul 16 16:30:49 2007 @@ -18,9 +18,10 @@ `Left(`ReplacePoint(`id(`replacefilter),`MenuButton( `opt(`key_F4), _( "&Filter" ), // begin: menu items of the filter menu // please note: use unique hotkeys until end: - [`item( `id("groups"), _( "&RPM Groups" ) ), + [`item( `id("groups"), _( "RPM &Groups" ) ), `item( `id("patterns"), _( "Pa&tterns" ) ), `item( `id("languages"), _( "&Languages" ) ), + `item( `id("repos"), _( "&Repositories") ), `item( `id("search"), _( "&Search" ) ), `item( `id("installed"), _( "Installed &Packages" ) ), `item( `id("whatif"), _( "&Installation Summary" ) ), -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org