[yast-commit] r39833 - in /branches/tmp/mvidner/ui-as-namespace/ncurses: ./ package/ src/ src/pkg/
Author: mvidner
Date: Tue Jul 31 13:43:10 2007
New Revision: 39833
URL: http://svn.opensuse.org/viewcvs/yast?rev=39833&view=rev
Log:
Merged revisions 39049-39832 via svnmerge from
http://svn.opensuse.org/svn/yast/trunk/ncurses
........
r39137 | kmachalkova | 2007-07-03 11:32:45 +0200 (Út, 03 čec 2007) | 2 lines
Merged adrian's changelog fix
........
r39443 | kmachalkova | 2007-07-16 16:30:49 +0200 (Po, 16 čec 2007) | 2 lines
Merged zypp refactoring branch back to trunk
........
r39449 | mvidner | 2007-07-16 17:14:51 +0200 (Po, 16 čec 2007) | 2 lines
fixed changelog duplicates
........
r39455 | kmachalkova | 2007-07-17 09:33:53 +0200 (Út, 17 čec 2007) | 2 lines
Require refactored libzypp
........
r39456 | kmachalkova | 2007-07-17 09:34:55 +0200 (Út, 17 čec 2007) | 2 lines
Merged libzypp refactoring changes
........
r39457 | kmachalkova | 2007-07-17 09:52:41 +0200 (Út, 17 čec 2007) | 2 lines
Again and better
........
r39494 | gs | 2007-07-18 12:26:15 +0200 (St, 18 čec 2007) | 2 lines
change shortcut to prevent duplicates (bug #289771)
........
r39519 | kmachalkova | 2007-07-19 11:32:54 +0200 (Čt, 19 čec 2007) | 4 lines
- New helper classes NCPkgRepoTag and NCPkgRepoTable
- Make it work: list all repositories (+ their products),
collect packages for selected repository
........
r39522 | kmachalkova | 2007-07-19 13:11:05 +0200 (Čt, 19 čec 2007) | 2 lines
Documenting and commenting the whole stuff
........
r39523 | kmachalkova | 2007-07-19 13:23:37 +0200 (Čt, 19 čec 2007) | 2 lines
Fixed syntax errors ;-)
........
r39524 | kmachalkova | 2007-07-19 13:24:02 +0200 (Čt, 19 čec 2007) | 2 lines
BuildRequires: dejagnu++
........
r39533 | kmachalkova | 2007-07-19 14:41:30 +0200 (Čt, 19 čec 2007) | 2 lines
version 2.15.21
........
r39535 | kmachalkova | 2007-07-19 14:45:37 +0200 (Čt, 19 čec 2007) | 2 lines
changelog up ;-)
........
Added:
branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgPopupRepo.cc
- copied unchanged from r39535, trunk/ncurses/src/pkg/NCPkgPopupRepo.cc
branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgPopupRepo.h
- copied unchanged from r39535, trunk/ncurses/src/pkg/NCPkgPopupRepo.h
Modified:
branches/tmp/mvidner/ui-as-namespace/ncurses/ (props changed)
branches/tmp/mvidner/ui-as-namespace/ncurses/VERSION
branches/tmp/mvidner/ui-as-namespace/ncurses/package/yast2-ncurses.changes
branches/tmp/mvidner/ui-as-namespace/ncurses/src/NCPkgTable.cc
branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/Makefile.am
branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPackageSelector.cc
branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPackageSelector.h
branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgNames.cc
branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgNames.h
branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgPopupDeps.cc
branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgPopupSelection.cc
branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCZypp.h
branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/pkg_layout.ycp
branches/tmp/mvidner/ui-as-namespace/ncurses/yast2-ncurses.spec.in
Modified: branches/tmp/mvidner/ui-as-namespace/ncurses/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/ncurses/VERSION?rev=39833&r1=39832&r2=39833&view=diff
==============================================================================
--- branches/tmp/mvidner/ui-as-namespace/ncurses/VERSION (original)
+++ branches/tmp/mvidner/ui-as-namespace/ncurses/VERSION Tue Jul 31 13:43:10 2007
@@ -1 +1 @@
-2.15.19
+2.15.21
Modified: branches/tmp/mvidner/ui-as-namespace/ncurses/package/yast2-ncurses.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/ncurses/package/yast2-ncurses.changes?rev=39833&r1=39832&r2=39833&view=diff
==============================================================================
--- branches/tmp/mvidner/ui-as-namespace/ncurses/package/yast2-ncurses.changes (original)
+++ branches/tmp/mvidner/ui-as-namespace/ncurses/package/yast2-ncurses.changes Tue Jul 31 13:43:10 2007
@@ -1,4 +1,43 @@
-------------------------------------------------------------------
+Thu Jul 19 13:24:01 CEST 2007 - kmachalkova@suse.cz
+
+- Make repositories list popup work (FaTE #301810 - part II) -
+ show repositories (and their products), show packages for selected
+ repository
+- Added dejagnu to BuildRequires (needed to run testsuite during pkg
+ build)
+- Changed kbd shortcut to prevent duplicates (bug #289771) - by gs
+- 2.15.21
+
+-------------------------------------------------------------------
+Tue Jul 17 09:51:36 CEST 2007 - kmachalkova@suse.cz
+
+- Require new libzypp (>= 3.11.8)
+- Correct svn merge from refactoring branch
+
+-------------------------------------------------------------------
+Mon Jul 16 17:12:46 CEST 2007 - mvidner@suse.cz
+
+- fixed changelog duplicates
+
+-------------------------------------------------------------------
+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
@@ -1334,12 +1373,6 @@
- improvements for package installation dialog
-------------------------------------------------------------------
-Thu Nov 14 20:56:17 CET 2002 - ma@suse.de
-
-- V 2.7.2
-- Fixed bug that inhibits logging on big-endian architectures.
-
--------------------------------------------------------------------
Tue Nov 26 15:36:02 CET 2002 - gs@suse.de
- V 2.6.24
@@ -1347,13 +1380,19 @@
(preserve newlines)
-------------------------------------------------------------------
+Thu Nov 14 20:56:17 CET 2002 - ma@suse.de
+
+- V 2.7.2
+- Fixed bug that inhibits logging on big-endian architectures.
+
+-------------------------------------------------------------------
Thu Nov 14 19:34:31 CET 2002 - ma@suse.de
- V 2.6.23
- Fixed bug that inhibits logging on big-endian architectures.
--------------------------------------------------------------------
+------------------------------------------------------------------
Wed Nov 13 12:35:21 CET 2002 - gs@suse.de
- V 2.6.22
Modified: branches/tmp/mvidner/ui-as-namespace/ncurses/src/NCPkgTable.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/ncurses/src/NCPkgTable.cc?rev=39833&r1=39832&r2=39833&view=diff
==============================================================================
--- branches/tmp/mvidner/ui-as-namespace/ncurses/src/NCPkgTable.cc (original)
+++ branches/tmp/mvidner/ui-as-namespace/ncurses/src/NCPkgTable.cc Tue Jul 31 13:43:10 2007
@@ -646,8 +646,8 @@
version = pkgPtr->edition().asString();
pkgLine.push_back( version );
- // is alias the right string? id?
- pkgLine.push_back( pkgPtr->source().alias() ); // show the installation source
+ // show the repository (the installation source)
+ pkgLine.push_back( pkgPtr->repository().info().alias() );
// set package status either to S_NoInst or S_KeepInstalled
status = S_NoInst;
Modified: branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/Makefile.am?rev=39833&r1=39832&r2=39833&view=diff
==============================================================================
--- branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/Makefile.am (original)
+++ branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/Makefile.am Tue Jul 31 13:43:10 2007
@@ -24,6 +24,7 @@
NCPkgPopupDiskspace.h \
NCPkgPopupDescr.h \
NCPkgPopupTable.h \
+ NCPkgPopupRepo.h \
NCPkgPopupSearch.h \
NCPkgPopupSelection.h \
NCPkgPopupTree.h \
@@ -38,6 +39,7 @@
NCPkgPopupDiskspace.cc \
NCPkgPopupDescr.cc \
NCPkgPopupTable.cc \
+ NCPkgPopupRepo.cc \
NCPkgPopupSearch.cc \
NCPkgPopupSelection.cc \
NCPkgPopupTree.cc \
Modified: branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPackageSelector.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPackageSelector.cc?rev=39833&r1=39832&r2=39833&view=diff
==============================================================================
--- branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPackageSelector.cc (original)
+++ branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPackageSelector.cc Tue Jul 31 13:43:10 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,9 @@
// create language popup
languagePopup = new NCPkgPopupSelection( wpos( 1,1 ), this, NCPkgPopupSelection::S_Language );
+ // create repositories popup
+ repoPopup = new NCPkgPopupRepo( wpos( 1,1), this );
+
// create the filter popup
filterPopup = new NCPkgPopupTree( wpos( 1, 1 ), this );
@@ -257,6 +263,10 @@
{
delete languagePopup;
}
+ if ( repoPopup )
+ {
+ delete repoPopup;
+ }
if ( depsPopup )
{
delete depsPopup;
@@ -1153,6 +1163,76 @@
///////////////////////////////////////////////////////////////////
//
+// fillRepoFilterList
+//
+// Fills the package table with packages from selected repository
+//
+
+bool NCPackageSelector::fillRepoFilterList( ZyppRepo repo)
+{
+ NCMIL << "Collecting packages in selected repository" << endl;
+
+ NCPkgTable *pkgList = getPackageList();
+ //clean the pkg table first
+ pkgList->itemsCleared ();
+
+ //sets to store matching packages
+ set <ZyppSel> exactMatch;
+ set <ZyppSel> nearMatch;
+
+ //iterate through the package pool
+ for ( ZyppPoolIterator it = zyppPkgBegin();
+ it != zyppPkgEnd();
+ ++it )
+ {
+ //we have candidate object in this repository
+ if ( (*it)->candidateObj() &&
+ (*it)->candidateObj()->repository() == repo )
+ {
+ exactMatch.insert( *it );
+ }
+ //something else (?)
+ else
+ {
+ zypp::ui::Selectable::available_iterator pkg_it = (*it)->availableBegin();
+
+ while ( pkg_it != (*it)->availableEnd() )
+ {
+ if ( (*pkg_it)->repository() == repo )
+ nearMatch.insert( *it );
+
+ ++pkg_it;
+ }
+ }
+
+ }
+
+ //finally create pkg table list entries
+ set<ZyppSel>::const_iterator e_it = exactMatch.begin();
+ while ( e_it != exactMatch.end() )
+ {
+ ZyppPkg pkg = tryCastToZyppPkg( (*e_it)->theObj() );
+ pkgList->createListEntry ( pkg, *e_it);
+ e_it++;
+ }
+
+ set<ZyppSel>::const_iterator n_it = nearMatch.begin();
+ while ( n_it != nearMatch.end() )
+ {
+ ZyppPkg pkg = tryCastToZyppPkg( (*n_it)->theObj() );
+ pkgList->createListEntry ( pkg, *n_it);
+ n_it++;
+ }
+
+ //and show the whole stuff to the user
+ pkgList->drawList();
+
+ return true;
+
+}
+
+///////////////////////////////////////////////////////////////////
+//
// match
//
@@ -1732,6 +1812,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 )
{
@@ -2702,7 +2791,7 @@
// add the media nr
text += NCPkgNames::MediaNo();
char num[5];
- int medianr = package->sourceMediaNr ();
+ int medianr = package->mediaNr ();
sprintf( num, "%d", medianr );
text += num;
text += "<br>";
Modified: branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPackageSelector.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPackageSelector.h?rev=39833&r1=39832&r2=39833&view=diff
==============================================================================
--- branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPackageSelector.h (original)
+++ branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPackageSelector.h Tue Jul 31 13:43:10 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
@@ -190,6 +192,12 @@
bool checkRequires );
bool fillPatchSearchList( const YCPString & expr );
+
+ /**
+ *Fills the package table with packages from selected repository
+ *@param repo zypp::Repository
+ */
+ bool fillRepoFilterList ( ZyppRepo repo );
bool isYouMode() { return youMode; }
/**
Modified: branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgNames.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgNames.cc?rev=39833&r1=39832&r2=39833&view=diff
==============================================================================
--- branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgNames.cc (original)
+++ branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgNames.cc Tue Jul 31 13:43:10 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: branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgNames.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgNames.h?rev=39833&r1=39832&r2=39833&view=diff
==============================================================================
--- branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgNames.h (original)
+++ branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgNames.h Tue Jul 31 13:43:10 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: branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgPopupDeps.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgPopupDeps.cc?rev=39833&r1=39832&r2=39833&view=diff
==============================================================================
--- branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgPopupDeps.cc (original)
+++ branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgPopupDeps.cc Tue Jul 31 13:43:10 2007
@@ -154,7 +154,7 @@
// add the package list containing the dependencies
solutionw = new NCSolutionSelectionBox ( vSplit, opt,
- _("P&ossible Solutions"),
+ _("Possible &Solutions"),
this);
vSplit->addChild( solutionw );
Modified: branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgPopupSelection.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgPopupSelection.cc?rev=39833&r1=39832&r2=39833&view=diff
==============================================================================
--- branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgPopupSelection.cc (original)
+++ branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgPopupSelection.cc Tue Jul 31 13:43:10 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: branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCZypp.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCZypp.h?rev=39833&r1=39832&r2=39833&view=diff
==============================================================================
--- branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCZypp.h (original)
+++ branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCZypp.h Tue Jul 31 13:43:10 2007
@@ -28,6 +28,7 @@
#include
participants (1)
-
mvidner@svn.opensuse.org