Hello community,
here is the log from the commit of package libyui-ncurses-pkg for
openSUSE:Factory checked in at 2012-12-19 14:50:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libyui-ncurses-pkg (Old)
and /work/SRC/openSUSE:Factory/.libyui-ncurses-pkg.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-ncurses-pkg", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/libyui-ncurses-pkg/libyui-ncurses-pkg.changes
2012-11-20 13:08:54.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.libyui-ncurses-pkg.new/libyui-ncurses-pkg.changes
2012-12-19 14:50:12.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Dec 12 11:05:08 CET 2012 - g...@suse.de
+
+- Improve help text for recommended packages
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
libyui-ncurses-pkg.spec: same change
++++++ libyui-ncurses-pkg-2.43.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.43.1/ChangeLog
new/libyui-ncurses-pkg-2.43.1/ChangeLog
--- old/libyui-ncurses-pkg-2.43.1/ChangeLog 2012-11-13 12:00:42.000000000
+0100
+++ new/libyui-ncurses-pkg-2.43.1/ChangeLog 2012-12-12 11:12:50.000000000
+0100
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Wed Dec 12 11:05:08 CET 2012 - g...@suse.de
+
+- Improve help text for recommended packages
+
+-------------------------------------------------------------------
Wed Oct 24 16:55:45 CEST 2012 - g...@suse.de
- Save settings from 'Dependency' menu (bnc # 766598)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.43.1/src/NCPackageSelector.cc
new/libyui-ncurses-pkg-2.43.1/src/NCPackageSelector.cc
--- old/libyui-ncurses-pkg-2.43.1/src/NCPackageSelector.cc 2012-11-13
12:00:42.000000000 +0100
+++ new/libyui-ncurses-pkg-2.43.1/src/NCPackageSelector.cc 2012-12-12
11:12:50.000000000 +0100
@@ -1844,7 +1844,7 @@
if ( !pkgList )
return false;
- yuiMilestone() << "Fill std::list: " << (NCWidget *) pkgList << endl;
+ yuiMilestone() << "Filling package list: " << (NCWidget *) pkgList << endl;
switch ( pkgList->getTableType() )
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.43.1/src/NCPackageSelector.h
new/libyui-ncurses-pkg-2.43.1/src/NCPackageSelector.h
--- old/libyui-ncurses-pkg-2.43.1/src/NCPackageSelector.h 2012-11-13
12:00:42.000000000 +0100
+++ new/libyui-ncurses-pkg-2.43.1/src/NCPackageSelector.h 2012-12-12
11:12:50.000000000 +0100
@@ -289,7 +289,7 @@
/**
- * Fills the std::list of packages belonging to the youPatch
+ * Fills the list of packages belonging to the youPatch
* @param pkgTable The table widget
* @param youPatch Show all packages belonging to the patch
* @param versions Show all versions of all packages belonging to the patch
@@ -432,7 +432,7 @@
void showSelectionDependencies ( );
/**
- * Updates the status in std::list of packages
+ * Updates the status in list of packages
*/
void updatePackageList();
@@ -483,7 +483,7 @@
bool showLicenseAgreement( ZyppSel & slbPtr , std::string licenseText );
/**
- * Get std::list of packages already selected for automatic changes
+ * Get list of packages already selected for automatic changes
* (usually via 'verify system' call)
* @return std::set <std::string>
*/
@@ -493,7 +493,7 @@
}
/**
- * Insert package name into the std::list of already selected for
automatic changes
+ * Insert package name into the list of already selected for automatic
changes
* @param pkgname Package name
*/
void insertVerifiedPkg( std::string pkgname ) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libyui-ncurses-pkg-2.43.1/src/NCPkgFilterClassification.cc
new/libyui-ncurses-pkg-2.43.1/src/NCPkgFilterClassification.cc
--- old/libyui-ncurses-pkg-2.43.1/src/NCPkgFilterClassification.cc
2012-11-13 12:00:42.000000000 +0100
+++ new/libyui-ncurses-pkg-2.43.1/src/NCPkgFilterClassification.cc
2012-12-12 11:12:50.000000000 +0100
@@ -146,7 +146,7 @@
packageList->drawList();
packageList->showInformation();
- yuiMilestone() << "Filling package std::list \"" << group->label() <<
"\"" << endl;
+ yuiMilestone() << "Filling package list \"" << group->label() << "\"" <<
endl;
return true;
}
@@ -198,7 +198,7 @@
if ( group == recommended )
{
- description = _("This is a std::list of useful packages. They are
automatically selected for installation (unless the option <b>Ignore
Recommended Packages</b> from <b>Dependencies</b> menu is std::set).");
+ description = _("This is a list of useful packages. They will be
additionally installed if recommeded by a newly installed package. To get
packages recommeded by already installed packages the option <b>Install
Recommended Packages for Already Installed Packages</b> from
<b>Dependencies</b> menu has to be set.");
}
else if ( group == suggested )
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libyui-ncurses-pkg-2.43.1/src/NCPkgFilterClassification.h
new/libyui-ncurses-pkg-2.43.1/src/NCPkgFilterClassification.h
--- old/libyui-ncurses-pkg-2.43.1/src/NCPkgFilterClassification.h
2012-11-13 12:00:42.000000000 +0100
+++ new/libyui-ncurses-pkg-2.43.1/src/NCPkgFilterClassification.h
2012-12-12 11:12:50.000000000 +0100
@@ -97,7 +97,7 @@
virtual NCursesEvent wHandleInput ( wint_t ch );
/**
- * Fill package std::list
+ * Fill package list
*/
bool showPackages( );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libyui-ncurses-pkg-2.43.1/src/NCPkgFilterInstSummary.cc
new/libyui-ncurses-pkg-2.43.1/src/NCPkgFilterInstSummary.cc
--- old/libyui-ncurses-pkg-2.43.1/src/NCPkgFilterInstSummary.cc 2012-11-13
12:00:42.000000000 +0100
+++ new/libyui-ncurses-pkg-2.43.1/src/NCPkgFilterInstSummary.cc 2012-12-12
11:12:50.000000000 +0100
@@ -154,7 +154,7 @@
packageList->drawList();
packageList->showInformation();
- yuiMilestone() << "Fill package std::list" << endl;
+ yuiMilestone() << "Fill package list" << endl;
return true;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libyui-ncurses-pkg-2.43.1/src/NCPkgFilterRPMGroups.cc
new/libyui-ncurses-pkg-2.43.1/src/NCPkgFilterRPMGroups.cc
--- old/libyui-ncurses-pkg-2.43.1/src/NCPkgFilterRPMGroups.cc 2012-11-13
12:00:42.000000000 +0100
+++ new/libyui-ncurses-pkg-2.43.1/src/NCPkgFilterRPMGroups.cc 2012-12-12
11:12:50.000000000 +0100
@@ -282,7 +282,7 @@
packageList->drawList();
packageList->showInformation();
- yuiMilestone() << "Fill package std::list" << endl;
+ yuiMilestone() << "Filling package list" << endl;
if ( ! label.empty() )
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.43.1/src/NCPkgFilterRepo.cc
new/libyui-ncurses-pkg-2.43.1/src/NCPkgFilterRepo.cc
--- old/libyui-ncurses-pkg-2.43.1/src/NCPkgFilterRepo.cc 2012-11-13
12:00:42.000000000 +0100
+++ new/libyui-ncurses-pkg-2.43.1/src/NCPkgFilterRepo.cc 2012-12-12
11:12:50.000000000 +0100
@@ -218,7 +218,7 @@
//
bool NCPkgRepoTable::fillRepoList()
{
- yuiMilestone() << "Filling repository std::list" << endl;
+ yuiMilestone() << "Filling repository list" << endl;
std::vector <std::string> oneLine;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.43.1/src/NCPkgFilterRepo.h
new/libyui-ncurses-pkg-2.43.1/src/NCPkgFilterRepo.h
--- old/libyui-ncurses-pkg-2.43.1/src/NCPkgFilterRepo.h 2012-11-13
12:00:42.000000000 +0100
+++ new/libyui-ncurses-pkg-2.43.1/src/NCPkgFilterRepo.h 2012-12-12
11:12:50.000000000 +0100
@@ -151,7 +151,7 @@
ZyppProduct findProductForRepo (ZyppRepo repo);
/**
- * Add items to the repository std::list (assoc.
+ * Add items to the repository list (assoc.
* product name, if any, and URL)
* @return bool (always true ;-) )
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.43.1/src/NCPkgMenuExtras.cc
new/libyui-ncurses-pkg-2.43.1/src/NCPkgMenuExtras.cc
--- old/libyui-ncurses-pkg-2.43.1/src/NCPkgMenuExtras.cc 2012-11-13
12:00:42.000000000 +0100
+++ new/libyui-ncurses-pkg-2.43.1/src/NCPkgMenuExtras.cc 2012-12-12
11:12:50.000000000 +0100
@@ -208,12 +208,12 @@
exportFile.exceptions(std::ios_base::badbit |
std::ios_base::failbit );
exportFile << writer;
- yuiMilestone() << "Exported std::list of packages and patterns to
" << filename << endl;
+ yuiMilestone() << "Exported list of packages and patterns to " <<
filename << endl;
}
catch (std::exception & exception)
{
- yuiWarning() << "Error exporting std::list of packages and patterns
to " << filename << endl;
+ yuiWarning() << "Error exporting list of packages and patterns to "
<< filename << endl;
//delete partially written file (don't care if it doesn't exist)
(void) unlink( filename.c_str() );
@@ -221,7 +221,7 @@
//present error popup to the user
NCPopupInfo * errorMsg = new NCPopupInfo( wpos(
(NCurses::lines()-5)/2, (NCurses::cols()-40)/2 ),
NCPkgStrings::ErrorLabel(),
- _( "Error exporting std::list
of packages and patterns to " )
+ _( "Error exporting list of
packages and patterns to " )
// FIXME: String addition is
evil for translators!
+ filename,
NCPkgStrings::OKLabel(),
@@ -247,7 +247,7 @@
if ( ! filename.empty() )
{
NCPkgTable * packageList = pkg->PackageList();
- yuiMilestone() << "Importing std::list of packages and patterns from "
<< filename << endl;
+ yuiMilestone() << "Importing list of packages and patterns from " <<
filename << endl;
try
{
@@ -303,11 +303,11 @@
}
catch ( const zypp::Exception & exception )
{
- yuiWarning() << "Error importing std::list of packages and patterns
from" << filename << endl;
+ yuiWarning() << "Error importing list of packages and patterns from" <<
filename << endl;
NCPopupInfo * errorMsg = new NCPopupInfo( wpos( (NCurses::lines()-5)/2,
(NCurses::cols()-40)/2) ,
NCPkgStrings::ErrorLabel(),
- _( "Error importing std::list
of packages and patterns from " )
+ _( "Error importing list of
packages and patterns from " )
// FIXME: String addition is
evil for translators!
+ filename,
NCPkgStrings::OKLabel(),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.43.1/src/NCPkgMenuFilter.cc
new/libyui-ncurses-pkg-2.43.1/src/NCPkgMenuFilter.cc
--- old/libyui-ncurses-pkg-2.43.1/src/NCPkgMenuFilter.cc 2012-11-13
12:00:42.000000000 +0100
+++ new/libyui-ncurses-pkg-2.43.1/src/NCPkgMenuFilter.cc 2012-12-12
11:12:50.000000000 +0100
@@ -104,7 +104,7 @@
if ( !pkgList )
{
- yuiError() << "No package std::list available" << endl;
+ yuiError() << "No package list available" << endl;
return false;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.43.1/src/NCPkgMenuView.cc
new/libyui-ncurses-pkg-2.43.1/src/NCPkgMenuView.cc
--- old/libyui-ncurses-pkg-2.43.1/src/NCPkgMenuView.cc 2012-11-13
12:00:42.000000000 +0100
+++ new/libyui-ncurses-pkg-2.43.1/src/NCPkgMenuView.cc 2012-12-12
11:12:50.000000000 +0100
@@ -114,7 +114,7 @@
if ( !pkgPtr || !slbPtr)
{
- yuiWarning() << "package std::list empty - no package pointer" << endl;
+ yuiWarning() << "package list empty - no package pointer" << endl;
return true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.43.1/src/NCPkgStrings.cc
new/libyui-ncurses-pkg-2.43.1/src/NCPkgStrings.cc
--- old/libyui-ncurses-pkg-2.43.1/src/NCPkgStrings.cc 2012-11-13
12:00:42.000000000 +0100
+++ new/libyui-ncurses-pkg-2.43.1/src/NCPkgStrings.cc 2012-12-12
11:12:50.000000000 +0100
@@ -133,7 +133,7 @@
const std::string NCPkgStrings::HelpPkgGen3()
{
// additional help text for post installation
- static const std::string value = _( "<p><b>Package table</b> is the main
component of the package selector. You will see a std::list of packages
matching the current filter (for example, the selected RPM group or search
result). Each line of the package table has several columns:</p>" );
+ static const std::string value = _( "<p><b>Package table</b> is the main
component of the package selector. You will see a list of packages matching the
current filter (for example, the selected RPM group or search result). Each
line of the package table has several columns:</p>" );
return value;
}
@@ -148,7 +148,7 @@
const std::string NCPkgStrings::HelpPkgGen5()
{
// part3 of help text package installation
- static const std::string value = _( "<p>The <b>Actions</b> menu below the
table allows you to change the status of a selected package (or all packages in
the std::list), for example, to delete a package or select an additional
package for installation. The status change can also be done directly by
pressing the key specified in the menu item (for detailed information about the
package status, see <i>Package Status and Symbols</i>).</p>" );
+ static const std::string value = _( "<p>The <b>Actions</b> menu below the
table allows you to change the status of a selected package (or all packages in
the list), for example, to delete a package or select an additional package for
installation. The status change can also be done directly by pressing the key
specified in the menu item (for detailed information about the package status,
see <i>Package Status and Symbols</i>).</p>" );
return value;
}
@@ -176,7 +176,7 @@
const std::string NCPkgStrings::HelpOnStatus2()
{
// part 2 of help text package status
- static const std::string value = _( "<p>You can also use <b>RET</b> or
<b>SPACE</b> to toggle the package status. The <i>Actions</i> menu also allows
you to change the status for all packages in the std::list (select 'All Listed
Packages').</p>" );
+ static const std::string value = _( "<p>You can also use <b>RET</b> or
<b>SPACE</b> to toggle the package status. The <i>Actions</i> menu also allows
you to change the status for all packages in the list (select 'All Listed
Packages').</p>" );
return value;
}
const std::string NCPkgStrings::HelpOnStatus3()
@@ -217,7 +217,7 @@
const std::string NCPkgStrings::HelpOnFilters2()
{
// help text package status
- static const std::string value = _( "<p><b>Patterns</b> describe the
features and functions a system should have (for example, X server or Console
tools). Each pattern contains a std::set of packages it requires (must have),
recommends (should have) and suggests (may have). If you select a pattern for
installation, update, or deletion, the solver will run and change the status of
subordinate packages accordingly.</p>" );
+ static const std::string value = _( "<p><b>Patterns</b> describe the
features and functions a system should have (for example, X server or Console
tools). Each pattern contains a set of packages it requires (must have),
recommends (should have) and suggests (may have). If you select a pattern for
installation, update, or deletion, the solver will run and change the status of
subordinate packages accordingly.</p>" );
return value;
}
@@ -275,7 +275,7 @@
const std::string NCPkgStrings::HelpPkgMenu3()
{
- static const std::string value = _( "<p><b>View:</b><br>Choose which
information about the selected package will be displayed in the window below
the package table. Available options are: package description, technical data
(version, size, license etc.) package versions (all available), file std::list
(all files included in the package) and dependencies (provides, requires
etc.).</p>" );
+ static const std::string value = _( "<p><b>View:</b><br>Choose which
information about the selected package will be displayed in the window below
the package table. Available options are: package description, technical data
(version, size, license etc.) package versions (all available), file list (all
files included in the package) and dependencies (provides, requires etc.).</p>"
);
return value;
}
@@ -286,7 +286,7 @@
}
const std::string NCPkgStrings::HelpPkgMenu5()
{
- static const std::string value = _( "<p><b>Extras:</b><br>Miscellaneous
functions reside here. <i>Export Package List to File</i> will dump data on
installed packages, patterns and languages into specified XML file. This file
can be later read by <i>Import Package List from File</i> option e.g. on
different computer. It will bring the std::set of packages on the target
computer into the same state as described in provided XML file. <i>Show
Available Disk Space</i> will show a popup table displaying disk usage and free
disk space on currently mounted partition.</p>" );
+ static const std::string value = _( "<p><b>Extras:</b><br>Miscellaneous
functions reside here. <i>Export Package List to File</i> will dump data on
installed packages, patterns and languages into specified XML file. This file
can be later read by <i>Import Package List from File</i> option e.g. on
different computer. It will bring the set of packages on the target computer
into the same state as described in provided XML file. <i>Show Available Disk
Space</i> will show a popup table displaying disk usage and free disk space on
currently mounted partition.</p>" );
return value;
}
@@ -768,7 +768,7 @@
const std::string NCPkgStrings::HelpOnUpdate()
{
// help text package status
- static const std::string value = _( "<b>Update Problem List</b><br><p>The
packages in the std::list cannot be updated automatically.</p><p>Possible
reasons:</p><p>They are obsoleted by other packages.</p><p>There is no newer
version to which to update on any installation media.</p><p>They are
third-party packages</p><p>Manually select what to do with them. The safest
course of action is to delete them.</p>" );
+ static const std::string value = _( "<b>Update Problem List</b><br><p>The
packages in the list cannot be updated automatically.</p><p>Possible
reasons:</p><p>They are obsoleted by other packages.</p><p>There is no newer
version to which to update on any installation media.</p><p>They are
third-party packages</p><p>Manually select what to do with them. The safest
course of action is to delete them.</p>" );
return value;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.43.1/src/NCPkgStrings.h
new/libyui-ncurses-pkg-2.43.1/src/NCPkgStrings.h
--- old/libyui-ncurses-pkg-2.43.1/src/NCPkgStrings.h 2012-11-13
12:00:42.000000000 +0100
+++ new/libyui-ncurses-pkg-2.43.1/src/NCPkgStrings.h 2012-12-12
11:12:50.000000000 +0100
@@ -314,7 +314,7 @@
static const std::string Patch();
/**
- * Info line in empty patch std::list
+ * Info line in empty patch list
*/
static const std::string NoPatches();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.43.1/src/NCPkgTable.cc
new/libyui-ncurses-pkg-2.43.1/src/NCPkgTable.cc
--- old/libyui-ncurses-pkg-2.43.1/src/NCPkgTable.cc 2012-11-13
12:00:42.000000000 +0100
+++ new/libyui-ncurses-pkg-2.43.1/src/NCPkgTable.cc 2012-12-12
11:12:50.000000000 +0100
@@ -1035,7 +1035,7 @@
break;
}
default:
- yuiError() << "Unknown std::list action" << endl;
+ yuiError() << "Unknown list action" << endl;
}
if ( ok )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.43.1/src/NCPkgTable.h
new/libyui-ncurses-pkg-2.43.1/src/NCPkgTable.h
--- old/libyui-ncurses-pkg-2.43.1/src/NCPkgTable.h 2012-11-13
12:00:42.000000000 +0100
+++ new/libyui-ncurses-pkg-2.43.1/src/NCPkgTable.h 2012-12-12
11:12:50.000000000 +0100
@@ -167,7 +167,7 @@
/**
* The package table class. Provides methods to fill the table,
- * std::set the status info and so on.
+ * set the status info and so on.
* Has a connection to the PackageSelector which is used to do
* changes which affect other widgets.
*
@@ -245,7 +245,7 @@
/**
- * This method is called to add a line to the package std::list.
+ * This method is called to add a line to the package list.
* @param status The package status (first column of the table)
* @param elements A std::vector<std::string> containing the package data
* @param objPtr The pointer to the packagemanager object
@@ -258,12 +258,12 @@
ZyppSel slbPtr );
/**
- * Draws the package std::list (has to be called after the loop with
addLine() calls)
+ * Draws the package list (has to be called after the loop with addLine()
calls)
*/
void drawList( ) { myPad()->setOrder(1); return DrawPad(); }
/**
- * Clears the package std::list
+ * Clears the package list
*/
virtual void itemsCleared();
@@ -285,7 +285,7 @@
NClabel getCellContents( int index, int colnum );
/**
- * Handles the events concerning the package table (e.g. scroll the
std::list,
+ * Handles the events concerning the package table (e.g. scroll the list,
* change the package status, ...)
* @param key The key which is pressed
* @return NCursesEvent
@@ -302,7 +302,7 @@
/**
* Informs the package manager about the status change of
* the currently selected package and updates the states
- * of all packages in the std::list
+ * of all packages in the list
* @param newstat The new status
* @param slbPtr The pointer to the object to change
* @param objPtr is candidatePtr or what the user selected instead of it.
@@ -343,7 +343,7 @@
/**
* Sets the type of the table and the status strategy (which means call
particular methods
- * to std::set/get the status for different zypp::ResObjects (zypp::Patch,
zypp::Package or available zypp::Package)
+ * to set/get the status for different zypp::ResObjects (zypp::Patch,
zypp::Package or available zypp::Package)
* @param type The type (see enum NCPkgTableType)
* @param strategy The certain strategy (available strategies see
NCPkgStatusStrategy.h).
* Has to be allocated with new - is deleted by
NCPkgTable.
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
