Hello community,
here is the log from the commit of package libyui-ncurses-pkg for
openSUSE:Factory checked in at 2013-07-21 08:11:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libyui-ncurses-pkg (Old)
and /work/SRC/openSUSE:Factory/.libyui-ncurses-pkg.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-ncurses-pkg"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libyui-ncurses-pkg/libyui-ncurses-pkg.changes
2013-07-16 15:41:25.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.libyui-ncurses-pkg.new/libyui-ncurses-pkg.changes
2013-07-21 08:11:39.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Jul 18 12:33:24 CEST 2013 - [email protected]
+
+- Improve help for Online Update, show column 'Kind' beside 'Name'
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
libyui-ncurses-pkg.spec: same change
++++++ libyui-ncurses-pkg-2.44.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.44.2/ChangeLog
new/libyui-ncurses-pkg-2.44.2/ChangeLog
--- old/libyui-ncurses-pkg-2.44.2/ChangeLog 2013-07-11 14:18:09.000000000
+0200
+++ new/libyui-ncurses-pkg-2.44.2/ChangeLog 2013-07-18 12:53:15.000000000
+0200
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Thu Jul 18 12:33:24 CEST 2013 - [email protected]
+
+- Improve help for Online Update, show column 'Kind' beside 'Name'
+
+-------------------------------------------------------------------
Thu Jul 11 14:06:27 CEST 2013 - [email protected]
- Online Update: show irrelevant patches only in list 'All Patches',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.44.2/src/NCPkgMenuHelp.cc
new/libyui-ncurses-pkg-2.44.2/src/NCPkgMenuHelp.cc
--- old/libyui-ncurses-pkg-2.44.2/src/NCPkgMenuHelp.cc 2013-07-11
14:18:09.000000000 +0200
+++ new/libyui-ncurses-pkg-2.44.2/src/NCPkgMenuHelp.cc 2013-07-18
12:53:15.000000000 +0200
@@ -143,6 +143,7 @@
text += NCPkgStrings::YouHelp2();
text += NCPkgStrings::YouHelp3();
text += NCPkgStrings::YouHelp4();
+ text += NCPkgStrings::YouHelp5();
}
else
yuiError() << "zatim nic" << endl;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.44.2/src/NCPkgStrings.cc
new/libyui-ncurses-pkg-2.44.2/src/NCPkgStrings.cc
--- old/libyui-ncurses-pkg-2.44.2/src/NCPkgStrings.cc 2013-07-11
14:18:09.000000000 +0200
+++ new/libyui-ncurses-pkg-2.44.2/src/NCPkgStrings.cc 2013-07-18
12:53:15.000000000 +0200
@@ -118,7 +118,7 @@
const std::string NCPkgStrings::HelpPkgGen1()
{
// part1 of help text package installation
- static const std::string value = _( "<h3>Welcome to the package
selector</h3><p>This tool will help you to manage the software on your system.
You can install, update or remove single packages, as well as patterns (sets of
packages serving certain purpose) or languages. Usually, you do not need to
care about package dependencies when installing or removing anything, the
solver will do it for you. The package selector consists of three main parts:
<b>filters</b>, <b>package table</b> and <b>menu</b>.</p>" );
+ static const std::string value = _( "<p><b>Welcome to the package
selector</b></p><p>This tool will help you to manage the software on your
system. You can install, update or remove single packages, as well as patterns
(sets of packages serving certain purpose) or languages. Usually, you do not
need to care about package dependencies when installing or removing anything,
the solver will do it for you. The package selector consists of three main
parts: <b>filters</b>, <b>package table</b> and <b>menu</b>.</p>" );
return value;
}
@@ -126,7 +126,7 @@
const std::string NCPkgStrings::HelpPkgGen2()
{
// part of help text package installation
- static const std::string value = _( "<p><b>Filters</b> (left panel) are
designed for easy orientation in a large amount of packages. Use filters to
display only packages from a certain repository or in a selected pattern (for
example, Games or C/C++ Development) or to search for particular keywords. More
information on filters can be found in <i>How to use filters</i>.</p>" );
+ static const std::string value = _( "<p><b>Filter</b> on left panel is
designed for easy orientation in a large amount of packages. Use filters to
display only packages from a certain repository or in a selected pattern (for
example, Games or C/C++ Development) or to search for particular keywords. More
information on filters can be found in <i>How to use filters</i>.</p>" );
return value;
}
@@ -210,7 +210,7 @@
const std::string NCPkgStrings::HelpOnFilters1()
{
// help text package status
- static const std::string value = _( "<p><b>Filters</b> allow you to
filter all available packages according to the selected criteria. Package
filters are based on package properties (repository, RPM group), package
\"containers\" (patterns, languages), package classification or search results.
Select the desired filter from the drop-down menu. Specific filters are
described below.</p>" );
+ static const std::string value = _( "<p><b>Filter</b> allow you to filter
all available packages according to the selected criteria. Package filters are
based on package properties (repository, RPM group), package \"containers\"
(patterns, languages), package classification or search results. Select the
desired filter from the drop-down menu. Specific filters are described
below.</p>" );
return value;
}
@@ -238,7 +238,7 @@
const std::string NCPkgStrings::HelpOnFilters5()
{
// help text package status
-static const std::string value = _( "The <b>Installation summary</b> presents
an overview of packages whose status has changed during this session (e.g.
marked for installation or removal), either by the user or automatically by the
solver. The filter <b>Package Classification</b> provides information about
<i>Recommended</i>, <i>Suggested</i>, <i>Orphaned</i> and <i>Unneeded</i>
packages.</p>" );
+static const std::string value = _( "<p>The <b>Installation summary</b>
presents an overview of packages whose status has changed during this session
(e.g. marked for installation or removal), either by the user or automatically
by the solver. The filter <b>Package Classification</b> provides information
about <i>Recommended</i>, <i>Suggested</i>, <i>Orphaned</i> and <i>Unneeded</i>
packages.</p>" );
return value;
}
@@ -269,7 +269,7 @@
const std::string NCPkgStrings::HelpPkgMenu2_3()
{
- static const std::string value = _("<p>Advanced options:<br> <i>Cleanup
when deleting packages</i>: remove dependent unused packages and <i>Allow
vendor change</i>: package vendor may differ from vendor of installed package.
These options will not be saved, they can only be set in the configuration file
of the package library <tt>/etc/zypp/zypp.conf</tt>.</p>" );
+ static const std::string value = _("<p>Advanced options:<br> <i>Cleanup
when deleting packages</i>: remove dependent unused packages. <i>Allow vendor
change</i>: package vendor may differ from vendor of installed package. These
options will not be saved, they can only be set in the configuration file of
the package library <tt>/etc/zypp/zypp.conf</tt>.</p>" );
return value;
}
@@ -608,7 +608,7 @@
{
// help text online udpate
// Do NOT translate 'recommended' and 'security'! because the patch kind
is always shown as english text.
- static const std::string value = _( "<p>Kind \"recommended\" means you
should install the patch. \"security\" is a security patch and we highly
recommend to install it.</p>" );
+ static const std::string value = _( "<p>General information about
patches:</p><p>The patches of kind <b>security</b> are solving security issues
and we highly recommend to install it. You should also install
<b>recommended</b> patches, they usually contain important bug-fixes. Install
<b>feature</b> patches if you are interested in the feature.</p>" );
return value;
}
@@ -629,10 +629,16 @@
const std::string NCPkgStrings::YouHelp4()
{
// help text online udpate continue
- static const std::string value = _( "<p>More details about the
status:<br>If there are several patches for a package or for a set of packages
which aren't yet applied to the system all got preselected and have status
<b>a+</b>. If you want to deselect one of the patches with '-' it might show
the status <b>i</b> afterwards. This is because any of the other patches
concerning the same packages is still selected and the newer packages would be
installed and withit would satisfy this patch.</p>");
+ static const std::string value = _( "<p>More details about the
status:<br>If there are several patches for a package (or a set of packages)
which aren't yet applied to the system all got preselected and have status
<b>a+</b>. If you want to deselect one of the patches with '-' it might show
the status <b>i</b> afterwards. This is because any of the other patches
concerning the same packages is still selected and the newer packages will be
installed and withit this patch is satified.</p>");
return value;
}
+const std::string NCPkgStrings::YouHelp5()
+{
+ // help text online udpate continue
+ static const std::string value = _( "<p>The menus:</p><p>The <b>Filter</b>
menu allows to filter the patches, e.g. show the 'Installed' ones or list
'Security' patches. It also provides to search for patches.<br>Use the
<b>Actions</b> menu to change the status of a patch.<br>The <b>View</b> menu
offers the possibilty to see which packages are concerned by the patch. Please
note: If the filter is 'All Patches' the package list for some patches might be
empty. This means no packages are concerned because none of the patch packages
is installed on the system.<br>The <b>Dependencies</b> menus contains
dependencies checks and the 'Generate Solver Testcase' entry.</p>");
+ return value;
+}
//
// label, text for translation
//
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.44.2/src/NCPkgStrings.h
new/libyui-ncurses-pkg-2.44.2/src/NCPkgStrings.h
--- old/libyui-ncurses-pkg-2.44.2/src/NCPkgStrings.h 2013-07-11
14:18:09.000000000 +0200
+++ new/libyui-ncurses-pkg-2.44.2/src/NCPkgStrings.h 2013-07-18
12:53:15.000000000 +0200
@@ -238,6 +238,7 @@
static const std::string YouHelp2();
static const std::string YouHelp3();
static const std::string YouHelp4();
+ static const std::string YouHelp5();
static const std::string WarningLabel();
static const std::string ErrorLabel();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.44.2/src/NCPkgTable.cc
new/libyui-ncurses-pkg-2.44.2/src/NCPkgTable.cc
--- old/libyui-ncurses-pkg-2.44.2/src/NCPkgTable.cc 2013-07-11
14:18:09.000000000 +0200
+++ new/libyui-ncurses-pkg-2.44.2/src/NCPkgTable.cc 2013-07-18
12:53:15.000000000 +0200
@@ -491,8 +491,8 @@
header.reserve(6);
header.push_back( "L" + NCPkgStrings::PkgStatus() );
header.push_back( "L" + NCPkgStrings::PkgName() );
- header.push_back( "L" + NCPkgStrings::PkgSummary() );
header.push_back( "L" + NCPkgStrings::PatchKind() );
+ header.push_back( "L" + NCPkgStrings::PkgSummary() );
header.push_back( "L" + NCPkgStrings::PkgVersion() );
// header.push_back( "L" + NCPkgStrings::PkgSize() );
break;
@@ -733,12 +733,13 @@
pkgLine.push_back( slb->name() ); // show the patch name
+ pkgLine.push_back( patchPtr->category() ); // patch kind
+
if ( !patchPtr->summary().empty() )
pkgLine.push_back( patchPtr->summary() ); // short description
else
pkgLine.push_back( slb->name() ); // name
- pkgLine.push_back( patchPtr->category() ); // patch kind
pkgLine.push_back( patchPtr->edition().asString() ); // patch version
// zypp::ByteCount size = patchPtr->size();
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
