Hello community,
here is the log from the commit of package libyui-ncurses-pkg for
openSUSE:Factory checked in at 2013-08-04 16:56:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-30 11:44:22.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.libyui-ncurses-pkg.new/libyui-ncurses-pkg.changes
2013-08-04 16:56:04.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Jul 31 15:47:16 CEST 2013 - g...@suse.de
+
+- Online Update: show multi version packages correctly
+- Version 2.44.4
+
+-------------------------------------------------------------------
Old:
----
libyui-ncurses-pkg-2.44.3.tar.bz2
New:
----
libyui-ncurses-pkg-2.44.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libyui-ncurses-pkg-doc.spec ++++++
--- /var/tmp/diff_new_pack.LiceQi/_old 2013-08-04 16:56:05.000000000 +0200
+++ /var/tmp/diff_new_pack.LiceQi/_new 2013-08-04 16:56:05.000000000 +0200
@@ -17,7 +17,7 @@
Name: libyui-ncurses-pkg-doc
-Version: 2.44.3
+Version: 2.44.4
Release: 0
Source: libyui-ncurses-pkg-%{version}.tar.bz2
++++++ libyui-ncurses-pkg.spec ++++++
--- /var/tmp/diff_new_pack.LiceQi/_old 2013-08-04 16:56:05.000000000 +0200
+++ /var/tmp/diff_new_pack.LiceQi/_new 2013-08-04 16:56:05.000000000 +0200
@@ -17,7 +17,7 @@
Name: libyui-ncurses-pkg
-Version: 2.44.3
+Version: 2.44.4
Release: 0
Source: libyui-ncurses-pkg-%{version}.tar.bz2
++++++ libyui-ncurses-pkg-2.44.3.tar.bz2 -> libyui-ncurses-pkg-2.44.4.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.44.3/ChangeLog
new/libyui-ncurses-pkg-2.44.4/ChangeLog
--- old/libyui-ncurses-pkg-2.44.3/ChangeLog 2013-07-25 14:39:05.000000000
+0200
+++ new/libyui-ncurses-pkg-2.44.4/ChangeLog 2013-07-31 15:59:06.000000000
+0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Jul 31 15:47:16 CEST 2013 - g...@suse.de
+
+- Online Update: show multi version packages correctly
+- Version 2.44.4
+
+-------------------------------------------------------------------
Tue Jul 24 11:56:24 CEST 2013 - g...@suse.de
- Online Update: improve help, show column 'Kind' beside 'Name',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.44.3/VERSION.cmake
new/libyui-ncurses-pkg-2.44.4/VERSION.cmake
--- old/libyui-ncurses-pkg-2.44.3/VERSION.cmake 2013-07-25 14:39:05.000000000
+0200
+++ new/libyui-ncurses-pkg-2.44.4/VERSION.cmake 2013-07-31 15:59:06.000000000
+0200
@@ -1,6 +1,6 @@
SET( VERSION_MAJOR "2" )
SET( VERSION_MINOR "44" )
-SET( VERSION_PATCH "3" )
+SET( VERSION_PATCH "4" )
SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
##### This is need for the libyui core, ONLY.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.44.3/src/NCPackageSelector.cc
new/libyui-ncurses-pkg-2.44.4/src/NCPackageSelector.cc
--- old/libyui-ncurses-pkg-2.44.3/src/NCPackageSelector.cc 2013-07-25
14:39:05.000000000 +0200
+++ new/libyui-ncurses-pkg-2.44.4/src/NCPackageSelector.cc 2013-07-31
15:59:06.000000000 +0200
@@ -974,7 +974,14 @@
ZyppSel sel = patchPkgs->getSelPointer( patchPkgs->getCurrentItem() );
// show the availables
- NCPkgPopupTable * availablePopup = new NCPkgPopupTable( wpos( 3, 8),
this );
+ NCPkgPopupTable * availablePopup =
+ new NCPkgPopupTable( wpos( 3, 8), this,
+ // headline of package versions popup
+ _("Package Versions"),
+ // text above of list of all package versions
+ _("List of all available package versions:"),
+ "", // no additional text line
+ false ); // no 'Cancel' button
NCursesEvent input = availablePopup->showAvailablesPopup( sel );
YDialog::deleteTopmostDialog();
@@ -1257,7 +1264,15 @@
if ( !youMode ) // don't show automatic changes if YOU mode
{
// show the automatic changes list
- NCPkgPopupTable * autoChangePopup = new NCPkgPopupTable( wpos( 3, 8),
this );
+ NCPkgPopupTable * autoChangePopup =
+ new NCPkgPopupTable( wpos( 3, 8), this,
+ // headline - packages with automatic status
change
+ _("Automatic Changes"),
+ // text part1 of popup with automatic changes
(it's a label; text continous)
+ _( "In addition to your manual selections,
the following" ),
+ // text part2 of popup with automatic changes
+ _( "packages have been changed to resolve
dependencies:" )
+ );
NCursesEvent input = autoChangePopup->showInfoPopup();
YDialog::deleteTopmostDialog();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.44.3/src/NCPkgMenuDeps.cc
new/libyui-ncurses-pkg-2.44.4/src/NCPkgMenuDeps.cc
--- old/libyui-ncurses-pkg-2.44.3/src/NCPkgMenuDeps.cc 2013-07-25
14:39:05.000000000 +0200
+++ new/libyui-ncurses-pkg-2.44.4/src/NCPkgMenuDeps.cc 2013-07-31
15:59:06.000000000 +0200
@@ -241,7 +241,15 @@
pkg->systemVerification( &ok );
//display the popup with automatic changes
- NCPkgPopupTable * autoChangePopup = new NCPkgPopupTable( wpos( 3, 8 ), pkg
);
+ NCPkgPopupTable * autoChangePopup =
+ new NCPkgPopupTable( wpos( 3, 8 ), pkg,
+ // headline of a popup with packages
+ _("Automatic Changes"),
+ // part 1 of a text explaining the list of
packages which follow
+ _("To fulfill the dependencies of already
installed packages following"),
+ // part 2 of the text
+ _("packages have been automatically selected for
installation:")
+ );
NCursesEvent input = autoChangePopup->showInfoPopup();
if ( input == NCursesEvent::cancel )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.44.3/src/NCPkgPopupTable.cc
new/libyui-ncurses-pkg-2.44.4/src/NCPkgPopupTable.cc
--- old/libyui-ncurses-pkg-2.44.3/src/NCPkgPopupTable.cc 2013-07-25
14:39:05.000000000 +0200
+++ new/libyui-ncurses-pkg-2.44.4/src/NCPkgPopupTable.cc 2013-07-31
15:59:06.000000000 +0200
@@ -73,14 +73,18 @@
//
// DESCRIPTION :
//
-NCPkgPopupTable::NCPkgPopupTable( const wpos at, NCPackageSelector * pkger )
+NCPkgPopupTable::NCPkgPopupTable( const wpos at, NCPackageSelector * pkger,
+ std::string headline,
+ std::string label1,
+ std::string label2,
+ bool add_cancel )
: NCPopup( at, false )
, pkgTable( 0 )
, okButton( 0 )
, cancelButton( 0 )
, packager( pkger )
{
- createLayout( );
+ createLayout( headline, label1, label2, add_cancel );
}
///////////////////////////////////////////////////////////////////
@@ -103,7 +107,10 @@
//
// DESCRIPTION :
//
-void NCPkgPopupTable::createLayout( )
+void NCPkgPopupTable::createLayout( std::string headline,
+ std::string label1,
+ std::string label2,
+ bool add_cancel )
{
// the vertical split is the (only) child of the dialog
NCLayoutBox * split = new NCLayoutBox( this, YD_VERT );
@@ -111,16 +118,20 @@
new NCSpacing( split, YD_VERT, false, 0.6 ); // stretchable = false
// the headline of the popup containing a list with packages with status
changes
- new NCLabel( split, _( "Automatic Changes" ), true, false ); //
isHeading = true
+ new NCLabel( split, headline, true, false ); // isHeading = true
new NCSpacing( split, YD_VERT, false, 0.6 );
- // text part1 of popup with automatic changes (it's a label; text
continous)
- new NCLabel( split, _( "In addition to your manual selections, the
following" ), false, false );
-
- // text part2 of popup with automatic changes
- new NCLabel( split, _( "packages have been changed to resolve
dependencies:" ), false, false );
-
+ if ( label1 != "" )
+ {
+ // text part 1
+ new NCLabel( split, label1, false, false );
+ }
+ if ( label2 != "" )
+ {
+ // text part 2
+ new NCLabel( split, label2, false, false );
+ }
YTableHeader * tableHeader = new YTableHeader();
// add the package table (use default type T_Packages)
pkgTable = new NCPkgTable( split, tableHeader );
@@ -136,12 +147,14 @@
okButton->setFunctionKey( 10 );
okButton->setKeyboardFocus();
- new NCSpacing( hSplit, YD_HORIZ, true, 0.4 );
-
- // add the Cancel button
- cancelButton = new NCPushButton( hSplit, NCPkgStrings::CancelLabel() );
- cancelButton->setFunctionKey( 9 );
-
+ if ( add_cancel )
+ {
+ new NCSpacing( hSplit, YD_HORIZ, true, 0.4 );
+
+ // add the Cancel button
+ cancelButton = new NCPushButton( hSplit, NCPkgStrings::CancelLabel() );
+ cancelButton->setFunctionKey( 9 );
+ }
new NCSpacing( hSplit, YD_HORIZ, true, 0.2 );
new NCSpacing( split, YD_VERT, false, 0.6 );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.44.3/src/NCPkgPopupTable.h
new/libyui-ncurses-pkg-2.44.4/src/NCPkgPopupTable.h
--- old/libyui-ncurses-pkg-2.44.3/src/NCPkgPopupTable.h 2013-07-25
14:39:05.000000000 +0200
+++ new/libyui-ncurses-pkg-2.44.4/src/NCPkgPopupTable.h 2013-07-31
15:59:06.000000000 +0200
@@ -81,7 +81,11 @@
public:
- NCPkgPopupTable( const wpos at, NCPackageSelector * pkger );
+ NCPkgPopupTable( const wpos at, NCPackageSelector * pkger,
+ std::string headline,
+ std::string label1,
+ std::string label2,
+ bool add_cancel = true );
virtual ~NCPkgPopupTable();
@@ -92,7 +96,10 @@
bool fillAvailables( NCPkgTable * pkgTable, ZyppSel sel );
- void createLayout( );
+ void createLayout( std::string headline,
+ std::string label1,
+ std::string label2,
+ bool add_cancel );
NCursesEvent showInfoPopup( );
NCursesEvent showAvailablesPopup( ZyppSel sel );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.44.3/src/NCPkgTable.cc
new/libyui-ncurses-pkg-2.44.4/src/NCPkgTable.cc
--- old/libyui-ncurses-pkg-2.44.3/src/NCPkgTable.cc 2013-07-25
14:39:05.000000000 +0200
+++ new/libyui-ncurses-pkg-2.44.4/src/NCPkgTable.cc 2013-07-31
15:59:06.000000000 +0200
@@ -764,28 +764,22 @@
ZyppObj objPtr = getDataPointer( getCurrentItem() );
ZyppSel slbPtr = getSelPointer( getCurrentItem() );
- yuiMilestone() << "*** show info for " << slbPtr->name() << "***" << endl;
- if ( !packager )
+ if ( !packager || !objPtr || !slbPtr )
return false;
+ yuiMilestone() << "show information for " << slbPtr->name() << endl;
+
switch ( tableType )
{
case T_Packages:
case T_Update:
// show the required package info
- if (objPtr && slbPtr)
- {
- updateInfo( objPtr, slbPtr, VisibleInfo() );
- packager->PackageLabel()->setLabel( slbPtr->name() );
- }
+ updateInfo( objPtr, slbPtr, VisibleInfo() );
+ packager->PackageLabel()->setLabel( slbPtr->name() );
break;
case T_Patches:
// show the patch info
- if (objPtr && slbPtr )
- {
- yuiMilestone() << "updateinfo" << endl;
- updateInfo( objPtr, slbPtr, VisibleInfo() );
- }
+ updateInfo( objPtr, slbPtr, VisibleInfo() );
break;
default:
break;
@@ -1245,7 +1239,6 @@
case I_PatchPkgs:
if ( packager->PatchPkgs() )
{
- yuiMilestone() << "fillPatchPackages" << endl;
packager->fillPatchPackages( packager->PatchPkgs(), pkgPtr );
}
break;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
