Author: kmachalkova Date: Tue Dec 4 15:06:22 2007 New Revision: 42661 URL: http://svn.opensuse.org/viewcvs/yast?rev=42661&view=rev Log: Removed reference to printing license text (#327542) Modified: trunk/ncurses/src/NCPkgTable.cc trunk/ncurses/src/NCPopupInfo.cc trunk/ncurses/src/NCPopupInfo.h trunk/ncurses/src/pkg/NCPackageSelector.cc trunk/ncurses/src/pkg/NCPkgNames.cc trunk/ncurses/src/pkg/NCPkgNames.h Modified: trunk/ncurses/src/NCPkgTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCPkgTable.cc?rev=42661&r1=42660&r2=42661&view=diff ============================================================================== --- trunk/ncurses/src/NCPkgTable.cc (original) +++ trunk/ncurses/src/NCPkgTable.cc Tue Dec 4 15:06:22 2007 @@ -270,8 +270,7 @@ string( _("End User License Agreement") + "<i>" + pkgName + "</i><br><br>" + packager->createDescrText( license ) ), NCPkgNames::AcceptLabel(), - NCPkgNames::CancelLabel(), - NCPkgNames::PrintLicenseText() + NCPkgNames::CancelLabel() ); info->setNiceSize( (NCurses::cols() * 80)/100, (NCurses::lines()*80)/100); license_confirmed = info->showInfoPopup( ) != NCursesEvent::cancel; Modified: trunk/ncurses/src/NCPopupInfo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCPopupInfo.cc?rev=42661&r1=42660&r2=42661&view=diff ============================================================================== --- trunk/ncurses/src/NCPopupInfo.cc (original) +++ trunk/ncurses/src/NCPopupInfo.cc Tue Dec 4 15:06:22 2007 @@ -45,8 +45,7 @@ const string & headline, const string & text, string okButtonLabel, - string cancelButtonLabel, - string printLicenseText ) + string cancelButtonLabel ) : NCPopup( at, false ) , helpText( 0 ) , okButton( 0 ) @@ -55,7 +54,7 @@ , vDim( 20 ) , visible ( false ) { - createLayout( headline, text, okButtonLabel, cancelButtonLabel, printLicenseText ); + createLayout( headline, text, okButtonLabel, cancelButtonLabel ); } /////////////////////////////////////////////////////////////////// @@ -81,8 +80,7 @@ void NCPopupInfo::createLayout( const string & headline, const string & text, string okButtonLabel, - string cancelButtonLabel, - string printLicenseText ) + string cancelButtonLabel ) { // the vertical split is the (only) child of the dialog NCLayoutBox * split = new NCLayoutBox( this, YD_VERT ); @@ -95,14 +93,6 @@ // add the rich text widget helpText = new NCRichText( split, text ); - if (printLicenseText != "" ) - { - new NCSpacing( split, YD_VERT, false, 1 ); - new NCLabel (split, printLicenseText ); - new NCSpacing( split, YD_VERT, false, 1 ); - } - - NCLayoutBox * hSplit = new NCLayoutBox( split, YD_HORIZ ); if ( okButtonLabel != "" && cancelButtonLabel != "" ) Modified: trunk/ncurses/src/NCPopupInfo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCPopupInfo.h?rev=42661&r1=42660&r2=42661&view=diff ============================================================================== --- trunk/ncurses/src/NCPopupInfo.h (original) +++ trunk/ncurses/src/NCPopupInfo.h Tue Dec 4 15:06:22 2007 @@ -72,8 +72,7 @@ const string & text, // the label of an OK button string okButtonLabel = _( "&OK" ), - string cancelButtonLabel = "", - string printLicenseText = "" ); + string cancelButtonLabel = "" ); virtual ~NCPopupInfo(); @@ -83,8 +82,7 @@ void createLayout( const string & headline, const string & text, string okButtonLabel, - string cancelButtonLabel, - string printLicenseText ); + string cancelButtonLabel ); NCursesEvent & showInfoPopup( ); Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelector.cc?rev=42661&r1=42660&r2=42661&view=diff ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelector.cc (original) +++ trunk/ncurses/src/pkg/NCPackageSelector.cc Tue Dec 4 15:06:22 2007 @@ -2556,8 +2556,7 @@ "<i>" + pkgName + "</i><br><br>" + createDescrText( licenseText ), NCPkgNames::AcceptLabel(), - NCPkgNames::CancelLabel(), - NCPkgNames::PrintLicenseText() ); + NCPkgNames::CancelLabel() ); info->setNiceSize( (NCurses::cols() * 80)/100, (NCurses::lines()*80)/100); license_confirmed = info->showInfoPopup( ) != NCursesEvent::cancel; Modified: trunk/ncurses/src/pkg/NCPkgNames.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgNames.cc?rev=42661&r1=42660&r2=42661&view=diff ============================================================================== --- trunk/ncurses/src/pkg/NCPkgNames.cc (original) +++ trunk/ncurses/src/pkg/NCPkgNames.cc Tue Dec 4 15:06:22 2007 @@ -1211,13 +1211,6 @@ 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 ... Modified: trunk/ncurses/src/pkg/NCPkgNames.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgNames.h?rev=42661&r1=42660&r2=42661&view=diff ============================================================================== --- trunk/ncurses/src/pkg/NCPkgNames.h (original) +++ trunk/ncurses/src/pkg/NCPkgNames.h Tue Dec 4 15:06:22 2007 @@ -878,7 +878,6 @@ static const string ConflictText(); static const string NoConflictText(); static const string NotAvailableText(); - static const string PrintLicenseText(); static const string MenuEtc(); static const string MenuDeps(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org