Hello community,
here is the log from the commit of package yast2-ncurses-pkg
checked in at Thu Aug 7 01:40:02 CEST 2008.
--------
--- yast2-ncurses-pkg/yast2-ncurses-pkg.changes 2008-07-25 10:54:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-ncurses-pkg/yast2-ncurses-pkg.changes 2008-08-06 22:08:51.432127000 +0200
@@ -1,0 +2,9 @@
+Wed Aug 6 21:42:43 CEST 2008 - kmachalkova@suse.cz
+
+- Show "Start repository manager" menu only when requested by
+ `opt(`repoMgr) flag i.e. not in installation phase (bnc#381956)
+- Added filtering packages by status (bnc#384085)
+- Internal changes (YOU help, pkg selector modes)
+- 2.17.6
+
+-------------------------------------------------------------------
Old:
----
yast2-ncurses-pkg-2.17.5.tar.bz2
New:
----
yast2-ncurses-pkg-2.17.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ncurses-pkg.spec ++++++
--- /var/tmp/diff_new_pack.q23878/_old 2008-08-07 01:39:56.000000000 +0200
+++ /var/tmp/diff_new_pack.q23878/_new 2008-08-07 01:39:56.000000000 +0200
@@ -1,10 +1,17 @@
#
-# spec file for package yast2-ncurses-pkg (Version 2.17.5)
+# spec file for package yast2-ncurses-pkg (Version 2.17.6)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -12,12 +19,12 @@
Name: yast2-ncurses-pkg
-Version: 2.17.5
+Version: 2.17.6
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ncurses-pkg-2.17.5.tar.bz2
+Source0: yast2-ncurses-pkg-2.17.6.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 +45,7 @@
%prep
-%setup -n yast2-ncurses-pkg-2.17.5
+%setup -n yast2-ncurses-pkg-2.17.6
%build
%{prefix}/bin/y2tool y2autoconf
@@ -67,8 +74,13 @@
%{_libdir}/YaST2/plugin/libpy2ncurses_pkg.so.*
%{_libdir}/YaST2/plugin/libpy2ncurses_pkg.so
%doc %{prefix}/share/doc/packages/yast2-ncurses-pkg
-
%changelog
+* Wed Aug 06 2008 kmachalkova@suse.cz
+- Show "Start repository manager" menu only when requested by
+ `opt(`repoMgr) flag i.e. not in installation phase (bnc#381956)
+- Added filtering packages by status (bnc#384085)
+- Internal changes (YOU help, pkg selector modes)
+- 2.17.6
* Wed Jul 23 2008 kmachalkova@suse.cz
- Added pkg search modes (contains, regexp etc.) selection (uses
zypp::PoolQuery)
++++++ yast2-ncurses-pkg-2.17.5.tar.bz2 -> yast2-ncurses-pkg-2.17.6.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.5/src/Makefile.am new/yast2-ncurses-pkg-2.17.6/src/Makefile.am
--- old/yast2-ncurses-pkg-2.17.5/src/Makefile.am 2008-04-28 17:34:47.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.6/src/Makefile.am 2008-08-06 21:42:31.000000000 +0200
@@ -39,6 +39,7 @@
NCPkgFilterPattern.h \
NCPkgFilterLocale.h \
NCPkgFilterRPMGroups.h \
+ NCPkgFilterInstSummary.h \
NCPkgStrings.h \
NCZypp.h
@@ -68,6 +69,7 @@
NCPkgFilterPattern.cc \
NCPkgFilterLocale.cc \
NCPkgFilterRPMGroups.cc \
+ NCPkgFilterInstSummary.cc \
NCPkgStrings.cc
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.5/src/Makefile.in new/yast2-ncurses-pkg-2.17.6/src/Makefile.in
--- old/yast2-ncurses-pkg-2.17.5/src/Makefile.in 2008-04-28 17:46:08.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.6/src/Makefile.in 2008-08-06 21:48:30.000000000 +0200
@@ -68,7 +68,8 @@
NCPkgPatchSearch.lo NCPkgPopupDiskspace.lo NCPkgPopupDescr.lo \
NCPkgPopupTable.lo NCPkgFilterRepo.lo NCPkgFilterSearch.lo \
NCPkgSearchSettings.lo NCPkgFilterPattern.lo \
- NCPkgFilterLocale.lo NCPkgFilterRPMGroups.lo NCPkgStrings.lo
+ NCPkgFilterLocale.lo NCPkgFilterRPMGroups.lo \
+ NCPkgFilterInstSummary.lo NCPkgStrings.lo
libpy2ncurses_pkg_la_OBJECTS = $(am_libpy2ncurses_pkg_la_OBJECTS)
libpy2ncurses_pkg_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
@@ -272,6 +273,7 @@
NCPkgFilterPattern.h \
NCPkgFilterLocale.h \
NCPkgFilterRPMGroups.h \
+ NCPkgFilterInstSummary.h \
NCPkgStrings.h \
NCZypp.h
@@ -301,6 +303,7 @@
NCPkgFilterPattern.cc \
NCPkgFilterLocale.cc \
NCPkgFilterRPMGroups.cc \
+ NCPkgFilterInstSummary.cc \
NCPkgStrings.cc
INCLUDES = -I$(includedir) -I$(includedir)/yui -I$(includedir)/ncurses ${ZYPP_CFLAGS}
@@ -376,6 +379,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NCPackageSelector.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NCPackageSelectorPluginImpl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NCPackageSelectorStart.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NCPkgFilterInstSummary.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NCPkgFilterLocale.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NCPkgFilterMain.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NCPkgFilterPattern.Plo@am__quote@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.5/src/NCPackageSelector.cc new/yast2-ncurses-pkg-2.17.6/src/NCPackageSelector.cc
--- old/yast2-ncurses-pkg-2.17.5/src/NCPackageSelector.cc 2008-07-23 16:55:22.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.6/src/NCPackageSelector.cc 2008-08-06 21:42:31.000000000 +0200
@@ -77,25 +77,20 @@
//
// Constructor
//
-NCPackageSelector::NCPackageSelector( YNCursesUI * ui, YWidget * wRoot, long modeFlags )
- : y2ui( ui )
- , filterPopup( 0 )
+NCPackageSelector::NCPackageSelector( long modeFlags )
+ : filterPopup( 0 )
, depsPopup( 0 )
, patternPopup( 0 )
, languagePopup( 0 )
, repoPopup( 0 )
, diskspacePopup( 0 )
, searchPopup( 0 )
- , youMode( false )
- , updateMode( false )
- , testMode ( false )
, autoCheck( true )
, pkgList ( 0 )
, depsMenu( 0 )
, viewMenu( 0 )
, extrasMenu( 0 )
, helpMenu( 0 )
- , youHelpButton( 0 )
, filterMain( 0 )
, actionMenu( 0 )
, filterMenu( 0 )
@@ -112,16 +107,7 @@
, visibleInfo( 0 )
{
- if ( modeFlags & YPkg_OnlineUpdateMode )
- youMode = true;
-
- if ( modeFlags & YPkg_UpdateMode )
- updateMode = true;
-
- // read test source information
- if (modeFlags & YPkg_TestMode )
- testMode = true;
-
+ setFlags( modeFlags );
saveState ();
diskspacePopup = new NCPkgDiskspace( testMode );
@@ -139,6 +125,18 @@
// NCPackageSelectorPlugin::runPkgSelection
}
+void NCPackageSelector::setFlags( long modeFlags )
+{
+ youMode = ( modeFlags & YPkg_OnlineUpdateMode ) ? true : false ;
+
+ updateMode = ( modeFlags & YPkg_UpdateMode ) ? true : false ;
+
+ repoMgrEnabled = (modeFlags & YPkg_RepoMgr) ? true : false;
+
+ testMode = (modeFlags & YPkg_TestMode ) ? true : false ;
+
+}
+
bool NCPackageSelector::checkNow( bool *ok )
{
bool ret = false;
@@ -233,8 +231,6 @@
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();
@@ -882,10 +878,11 @@
}
case Summary:
{
- placeholder = new NCEmpty( replPoint );
- placeholder->setSize( oldSize.Sze.W, oldSize.Sze.H );
- placeholder->Redraw();
+ inst_summary = new NCPkgFilterInstSummary( replPoint, _("&Packages with Status"), this );
+ inst_summary->setSize( oldSize.Sze.W, oldSize.Sze.H );
+ inst_summary->Redraw();
pkgList->fillSummaryList(NCPkgTable::L_Changes);
+ break;
}
default:
yuiError() << "zatim nic" << endl;
@@ -977,39 +974,6 @@
///////////////////////////////////////////////////////////////////
//
-// YOUHelpHandler
-//
-// Show the Online Update Help
-//
-bool NCPackageSelector::YouHelpHandler( const NCursesEvent& event )
-{
- NCPkgTable * packageList = PackageList();
- string text = "";
-
- text += NCPkgStrings::YouHelp1();
- text += NCPkgStrings::YouHelp2();
- text += NCPkgStrings::YouHelp3();
-
- // open the popup with the help text
- NCPopupInfo * youHelp = new NCPopupInfo( wpos( (NCurses::lines()*8)/100, (NCurses::cols())*18/100 ),
- NCPkgStrings::YouHelp(),
- text
- );
- youHelp->setPreferredSize( (NCurses::cols()*65)/100, (NCurses::lines()*85)/100 );
- youHelp->showInfoPopup( );
-
- YDialog::deleteTopmostDialog();
-
- if ( packageList )
- {
- packageList->setKeyboardFocus();
- }
-
- return true;
-}
-
-///////////////////////////////////////////////////////////////////
-//
// CancelHandler
//
// Cancel button handler.
@@ -1567,9 +1531,7 @@
YLayoutBox * bottom_bar = YUI::widgetFactory()->createHBox( vSplit );
YAlignment *ll = YUI::widgetFactory()->createLeft( bottom_bar );
- youHelpButton = new NCPushButton ( ll, _("&Help"));
- YUI_CHECK_NEW( youHelpButton );
- youHelpButton->setFunctionKey( 1 );
+ helpMenu = new NCPkgMenuHelp (ll, _("&Help"), this);
YAlignment *r = YUI::widgetFactory()->createRight( bottom_bar );
YLayoutBox * hSplit5 = YUI::widgetFactory()->createHBox( r );
@@ -1667,7 +1629,7 @@
//Bottom button bar
YAlignment *ll = YUI::widgetFactory()->createLeft( bottom_bar );
- helpMenu = new NCPkgMenuHelp (ll, _("&Help"));
+ helpMenu = new NCPkgMenuHelp (ll, _("&Help"), this);
YUI_CHECK_NEW( helpMenu );
//right-alignment for OK-Cancel
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.5/src/NCPackageSelector.h new/yast2-ncurses-pkg-2.17.6/src/NCPackageSelector.h
--- old/yast2-ncurses-pkg-2.17.5/src/NCPackageSelector.h 2008-07-23 16:55:22.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.6/src/NCPackageSelector.h 2008-08-06 21:42:31.000000000 +0200
@@ -39,6 +39,7 @@
#include "NCPkgFilterRPMGroups.h"
#include "NCPkgFilterSearch.h"
+#include "NCPkgFilterInstSummary.h"
#include "NCPkgTable.h"
#include "NCEmpty.h"
#include "NCPkgMenuFilter.h"
@@ -57,6 +58,7 @@
class NCPkgDiskspace;
class NCPkgFilterRPMGroups;
class NCPkgFilterSearch;
+class NCPkgFilterInstSummary;
class NCPkgPopupFile;
class NCPkgMenuExtras;
class NCPkgMenuDeps;
@@ -100,8 +102,6 @@
tHandlerMap eventHandlerMap; // event handler map
- YNCursesUI * y2ui; // the UI
-
NCPkgFilterRPMGroups * filterPopup; // the rpm group tags popup
NCPkgPopupDeps * depsPopup; // the package dependeny popup
@@ -113,10 +113,12 @@
NCPkgDiskspace * diskspacePopup; // the popup showing the disk usage
NCPkgFilterSearch * searchPopup; // the package search popup
+ NCPkgFilterInstSummary *inst_summary;
bool youMode; // YOU
bool updateMode; // Update
bool testMode; // testing
+ bool repoMgrEnabled;
bool autoCheck;
YRpmGroupsTree * _rpmGroupsTree; // rpm groups of the found packages
@@ -128,7 +130,6 @@
NCPkgMenuView *viewMenu;
NCPkgMenuExtras *extrasMenu;
NCPkgMenuHelp *helpMenu;
- NCPushButton *youHelpButton;
NCPkgFilterMain *filterMain;
NCPkgMenuAction *actionMenu;
NCPkgMenuFilter *filterMenu;
@@ -148,7 +149,6 @@
YReplacePoint * replacePoint; // replace point for info text
YReplacePoint * replPoint;
YReplacePoint * replPoint2; //tohle pak urcite prejmenuj, Bublino
- NCEmpty *placeholder;
NCPkgTable * versionsList; // list of available package versions
// information about patches
@@ -182,13 +182,15 @@
* @param ui The NCurses UI
* @param opt The widget options
*/
- NCPackageSelector( YNCursesUI * ui, YWidget * wRoot, long modeFlags );
+ NCPackageSelector( long modeFlags );
/**
* Destructor
*/
virtual ~NCPackageSelector();
+ void setFlags( long modeFlags);
+
/**
* Create layout for the PackageSelector
* @param parent Parent is PackageSelectorStart
@@ -267,6 +269,10 @@
bool isYouMode() { return youMode; }
+ bool isUpdateMode() { return updateMode; }
+
+ bool isRepoMgrEnabled() { return repoMgrEnabled; }
+
bool isAutoCheck() { return autoCheck; }
void AutoCheck( bool check) { autoCheck = check; }
@@ -327,13 +333,6 @@
*/
bool CancelHandler ( const NCursesEvent& event );
- /**
- * Handler function for the "Help" button in YOU
- * @param event The Ncurses event
- * @return bool
- */
- bool YouHelpHandler( const NCursesEvent& event );
-
/**
* Handles hyperlinks in package description
* @param link The link
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.5/src/NCPackageSelectorStart.cc new/yast2-ncurses-pkg-2.17.6/src/NCPackageSelectorStart.cc
--- old/yast2-ncurses-pkg-2.17.5/src/NCPackageSelectorStart.cc 2008-06-11 13:00:04.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.6/src/NCPackageSelectorStart.cc 2008-08-06 21:42:31.000000000 +0200
@@ -43,42 +43,31 @@
long modeFlags,
YUIDimension dimension )
: NCLayoutBox( parent, dimension )
- , widgetRoot( 0 )
, packager( 0 )
- , youMode ( false )
- , updateMode ( false )
{
- YNCursesUI * ui = YNCursesUI::ui();
-
// set the textdomain
setTextdomain( "ncurses-pkg" );
- // get the mode (the mode is also available in PackageSelector via modeFlags)
- if ( modeFlags & YPkg_OnlineUpdateMode )
- youMode = true;
-
- if ( modeFlags & YPkg_UpdateMode )
- updateMode = true;
-
// NEW NEW
- packager = new NCPackageSelector( ui, widgetRoot, modeFlags );
+ packager = new NCPackageSelector( modeFlags );
NCPkgTable::NCPkgTableType type;
- if ( youMode )
- type = NCPkgTable::T_Patches;
- else if ( updateMode )
- type = NCPkgTable::T_Update;
- else
- type = NCPkgTable::T_Packages;
-
if ( packager )
{
- yuiMilestone() << "YouMode: " << (youMode?"true":"false") << endl;
- if ( !youMode )
- packager->createPkgLayout( this, type );
- else
+ if ( packager->isYouMode() )
+ {
packager->createYouLayout( this );
+ type = NCPkgTable::T_Patches;
+ }
+ else
+ {
+ if ( packager->isUpdateMode() )
+ type = NCPkgTable::T_Update;
+ else
+ type = NCPkgTable::T_Packages;
+ packager->createPkgLayout( this, type );
+ }
}
yuiDebug() << endl;
@@ -136,7 +125,7 @@
// fill package list with packages belonging to default RPM group
packager->fillDefaultList();
- if ( youMode )
+ if ( packager->isYouMode() )
{
// show download size
packager->showDownloadSize();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.5/src/NCPackageSelectorStart.h new/yast2-ncurses-pkg-2.17.6/src/NCPackageSelectorStart.h
--- old/yast2-ncurses-pkg-2.17.5/src/NCPackageSelectorStart.h 2008-06-11 13:00:04.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.6/src/NCPackageSelectorStart.h 2008-08-06 21:42:31.000000000 +0200
@@ -44,13 +44,8 @@
NCPackageSelectorStart ( const NCPackageSelectorStart & );
private:
-
- YWidget * widgetRoot; // root of the widget tree of the package selection dialog
NCPackageSelector *packager; // packager object contains the data and handles events
-
- bool youMode;
- bool updateMode;
protected:
@@ -97,12 +92,6 @@
* @return bool
*/
bool handleEvent( const NCursesEvent& event );
-
- /**
- * Returns the root of the widget tree.
- */
- YWidget * root( ) const { return widgetRoot; };
-
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.5/src/NCPkgFilterInstSummary.cc new/yast2-ncurses-pkg-2.17.6/src/NCPkgFilterInstSummary.cc
--- old/yast2-ncurses-pkg-2.17.5/src/NCPkgFilterInstSummary.cc 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-ncurses-pkg-2.17.6/src/NCPkgFilterInstSummary.cc 2008-08-06 21:42:31.000000000 +0200
@@ -0,0 +1,158 @@
+/*---------------------------------------------------------------------\
+| |
+| __ __ ____ _____ ____ |
+| \ \ / /_ _/ ___|_ _|___ \ |
+| \ V / _` \___ \ | | __) | |
+| | | (_| |___) || | / __/ |
+| |_|\__,_|____/ |_| |_____| |
+| |
+| core system |
+| (C) SuSE GmbH |
+\----------------------------------------------------------------------/
+
+ File: NCPkgFilterInstSummary.cc
+
+ Author: Hedgehog Painter