Mailinglist Archive: opensuse-commit (2092 mails)

< Previous Next >
commit yast2-ncurses
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Mon, 06 Aug 2007 23:24:20 +0200
  • Message-id: <20070806212420.8D3BF678332@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-ncurses
checked in at Mon Aug 6 23:24:20 CEST 2007.

--------
--- yast2-ncurses/yast2-ncurses.changes 2007-07-19 14:48:03.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-ncurses/yast2-ncurses.changes    2007-08-06 19:19:48.152016000 +0200
@@ -1,0 +2,9 @@
+Mon Aug  6 19:09:59 CEST 2007 - kmachalkova@xxxxxxx
+
+- Added text referring to whereabouts of the license text to lic.
+  agreement popup (FaTE #302018)
+- Show Filter: <product summary> after filling the repository list 
+  - by gs
+- 2.15.22
+
+-------------------------------------------------------------------

Old:
----
  yast2-ncurses-2.15.21.tar.bz2

New:
----
  yast2-ncurses-2.15.22.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-ncurses.spec ++++++
--- /var/tmp/diff_new_pack.c26101/_old  2007-08-06 23:23:29.000000000 +0200
+++ /var/tmp/diff_new_pack.c26101/_new  2007-08-06 23:23:29.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-ncurses (Version 2.15.21)
+# spec file for package yast2-ncurses (Version 2.15.22)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
 # norootforbuild
 
 Name:           yast2-ncurses
-Version:        2.15.21
+Version:        2.15.22
 Release:        1
 License:        GPL v2 or later
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-ncurses-2.15.21.tar.bz2
+Source0:        yast2-ncurses-2.15.22.tar.bz2
 prefix:                /usr
 BuildRequires:  dejagnu doxygen gcc-c++ libzypp-devel yast2-core-devel yast2-devtools
 BuildRequires:  blocxx-devel libxcrypt-devel ncurses-devel
@@ -44,7 +44,7 @@
 
 
 %prep
-%setup -n yast2-ncurses-2.15.21
+%setup -n yast2-ncurses-2.15.22
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -80,6 +80,12 @@
 %doc %{prefix}/share/doc/packages/yast2-ncurses
 
 %changelog
+* Mon Aug 06 2007 - kmachalkova@xxxxxxx
+- Added text referring to whereabouts of the license text to lic.
+  agreement popup (FaTE #302018)
+- Show Filter: <product summary> after filling the repository list
+  - by gs
+- 2.15.22
 * Thu Jul 19 2007 - kmachalkova@xxxxxxx
 - Make repositories list popup work (FaTE #301810 - part II) -
   show repositories (and their products), show packages for selected

++++++ yast2-ncurses-2.15.21.tar.bz2 -> yast2-ncurses-2.15.22.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.21/src/NCPkgTable.cc new/yast2-ncurses-2.15.22/src/NCPkgTable.cc
--- old/yast2-ncurses-2.15.21/src/NCPkgTable.cc 2007-07-17 09:19:25.000000000 +0200
+++ new/yast2-ncurses-2.15.22/src/NCPkgTable.cc 2007-08-06 18:49:34.000000000 +0200
@@ -268,7 +268,8 @@
                              //YCPString(_("End User License Agreement") ),
                              YCPString( "<i>" + pkgName + "</i><br><br>" + packager->createDescrText( license ) ),
                              NCPkgNames::AcceptLabel(),
-                             NCPkgNames::CancelLabel() );
+                             NCPkgNames::CancelLabel(), 
+                             NCPkgNames::PrintLicenseText());
            info.setNiceSize( (NCurses::cols() * 80)/100, (NCurses::lines()*80)/100);
            license_confirmed = info.showInfoPopup( ) != NCursesEvent::cancel;
        }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.21/src/NCPopupInfo.cc new/yast2-ncurses-2.15.22/src/NCPopupInfo.cc
--- old/yast2-ncurses-2.15.21/src/NCPopupInfo.cc        2007-05-18 10:55:40.000000000 +0200
+++ new/yast2-ncurses-2.15.22/src/NCPopupInfo.cc        2007-08-06 19:03:01.000000000 +0200
@@ -43,7 +43,8 @@
                          const YCPString & headline,
                          const YCPString & text,
                          string okButtonLabel,
-                         string cancelButtonLabel )
+                         string cancelButtonLabel,
+                         string printLicenseText )
     : NCPopup( at, false )
       , helpText( 0 )
       , okButton( 0 )
@@ -52,7 +53,7 @@
       , vDim( 20 )
       , visible ( false )
 {
-    createLayout( headline, text, okButtonLabel, cancelButtonLabel );
+    createLayout( headline, text, okButtonLabel, cancelButtonLabel, printLicenseText );
 }
 
 ///////////////////////////////////////////////////////////////////
@@ -78,7 +79,8 @@
 void NCPopupInfo::createLayout( const YCPString & headline,
                                const YCPString & text,
                                string okButtonLabel,
-                               string cancelButtonLabel )
+                               string cancelButtonLabel,
+                               string printLicenseText )
 {
 
   YWidgetOpt opt;
@@ -96,6 +98,14 @@
   helpText = new NCRichText( split, opt, text );
   split->addChild( helpText );
 
+  if (printLicenseText != "" ) 
+  { 
+      NCLabel *printLabel = new NCLabel (split, opt, printLicenseText );
+      split->addChild( new NCSpacing( split, opt, 1, false, true ) ); 
+      split->addChild( printLabel );
+      split->addChild( new NCSpacing( split, opt, 1, false, true ) ); 
+  }  
+
   NCSplit * hSplit = new NCSplit( split, opt, YD_HORIZ );
   split->addChild( hSplit );
   if ( okButtonLabel != "" && cancelButtonLabel != "" )
@@ -126,6 +136,7 @@
       
       hSplit->addChild( new NCSpacing( hSplit, opt, 0.4, true, false ) ); 
   }
+  split->addChild( new NCSpacing( split, opt, 0.5, false, true ) ); 
   
 }
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.21/src/NCPopupInfo.h new/yast2-ncurses-2.15.22/src/NCPopupInfo.h
--- old/yast2-ncurses-2.15.21/src/NCPopupInfo.h 2007-05-29 16:28:47.000000000 +0200
+++ new/yast2-ncurses-2.15.22/src/NCPopupInfo.h 2007-08-06 18:56:38.000000000 +0200
@@ -73,7 +73,8 @@
                 const YCPString & text,
                 // the label of an OK button
                 string okButtonLabel = _( "&OK" ),
-                string cancelButtonLabel = "" );
+                string cancelButtonLabel = "",
+                string printLicenseText = "" );
     
     virtual ~NCPopupInfo();
 
@@ -82,7 +83,8 @@
     void createLayout( const YCPString & headline,
                       const YCPString & text,
                       string okButtonLabel,
-                      string cancelButtonLabel );
+                      string cancelButtonLabel, 
+                      string printLicenseText );
 
     NCursesEvent & showInfoPopup( );
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.21/src/pkg/NCPackageSelector.cc new/yast2-ncurses-2.15.22/src/pkg/NCPackageSelector.cc
--- old/yast2-ncurses-2.15.21/src/pkg/NCPackageSelector.cc      2007-07-19 13:13:41.000000000 +0200
+++ new/yast2-ncurses-2.15.22/src/pkg/NCPackageSelector.cc      2007-08-06 19:05:19.000000000 +0200
@@ -1227,6 +1227,17 @@
     //and show the whole stuff to the user
     pkgList->drawList();
 
+    YWidget * filterLabel = y2ui->widgetWithId( NCPkgNames::Filter(), true );
+    
+    if ( repoPopup && filterLabel )
+    {
+       ZyppProduct product = repoPopup->findProductForRepo( repo );
+       if ( product )
+       {
+           static_cast<NCLabel *>(filterLabel)->setLabel( product->summary() ); 
+       }
+    }
+    
     return true;
 
 }
@@ -2498,7 +2509,8 @@
                      NCPkgNames::NotifyLabel(),
                      YCPString( "<i>" + pkgName + "</i><br><br>" + createDescrText( licenseText ) ),
                      NCPkgNames::AcceptLabel(),
-                     NCPkgNames::CancelLabel() );
+                     NCPkgNames::CancelLabel(),
+                     NCPkgNames::PrintLicenseText() );
     info.setNiceSize( (NCurses::cols() * 80)/100, (NCurses::lines()*80)/100);
     license_confirmed = info.showInfoPopup( ) != NCursesEvent::cancel;
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.21/src/pkg/NCPkgNames.cc new/yast2-ncurses-2.15.22/src/pkg/NCPkgNames.cc
--- old/yast2-ncurses-2.15.21/src/pkg/NCPkgNames.cc     2007-07-16 16:24:38.000000000 +0200
+++ new/yast2-ncurses-2.15.22/src/pkg/NCPkgNames.cc     2007-08-06 18:50:05.000000000 +0200
@@ -1211,6 +1211,13 @@
     return value;
 }
 
+const string NCPkgNames::PrintLicenseText()
+{
+    //zzZZzz
+    static const string value = _( "If you would like to print this license,\ncheck the EULA.txt file on the first media" );
+    return value;
+}
+
 const string NCPkgNames::ContinueRequ()
 {
      // label continues the part required by ...
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.21/src/pkg/NCPkgNames.h new/yast2-ncurses-2.15.22/src/pkg/NCPkgNames.h
--- old/yast2-ncurses-2.15.21/src/pkg/NCPkgNames.h      2007-07-16 16:24:39.000000000 +0200
+++ new/yast2-ncurses-2.15.22/src/pkg/NCPkgNames.h      2007-08-06 18:49:31.000000000 +0200
@@ -878,6 +878,7 @@
     static const string ConflictText();
     static const string NoConflictText();
     static const string NotAvailableText();
+    static const string PrintLicenseText();
 
     static const string MenuEtc();
     static const string MenuDeps();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.21/VERSION new/yast2-ncurses-2.15.22/VERSION
--- old/yast2-ncurses-2.15.21/VERSION   2007-07-19 13:28:06.000000000 +0200
+++ new/yast2-ncurses-2.15.22/VERSION   2007-08-06 19:09:55.000000000 +0200
@@ -1 +1 @@
-2.15.21
+2.15.22


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >