Author: gs Date: Thu Feb 3 13:13:21 2011 New Revision: 63323 URL: http://svn.opensuse.org/viewcvs/yast?rev=63323&view=rev Log: improve code concerning license popup Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc trunk/ncurses-pkg/src/NCPackageSelector.h trunk/ncurses-pkg/src/NCPkgTable.cc Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelector.cc?rev=63323&r1=63322&r2=63323&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.cc Thu Feb 3 13:13:21 2011 @@ -1194,8 +1194,8 @@ if ( ! licenseText.empty() ) { - yuiMilestone() << "Package/Patch %s has a license agreement" - << sel->name().c_str() << endl; + yuiMilestone() << "Package/Patch " << sel->name().c_str() << + "has a license" << endl; if( ! sel->hasLicenceConfirmed() ) { @@ -1203,8 +1203,8 @@ } else { - yuiMilestone() << "Package/Patch %s's license is already confirmed" - << sel->name().c_str() << endl; + yuiMilestone() << "License for " << sel->name().c_str() << + " is already confirmed" << endl; } } } @@ -1227,16 +1227,7 @@ bool ok = true; string pkgName = slbPtr->name(); - NCPopupInfo * info = new NCPopupInfo ( wpos( NCurses::lines()/10, NCurses::cols()/10), - NCPkgStrings::NotifyLabel(), - "<i>" + pkgName + "</i><br><br>" - + createLicenseText( licenseText ), - NCPkgStrings::AcceptLabel(), - NCPkgStrings::CancelLabel() ); - - info->setPreferredSize( (NCurses::cols() * 80)/100, (NCurses::lines()*80)/100); - info->focusOkButton(); - license_confirmed = info->showInfoPopup( ) != NCursesEvent::cancel; + license_confirmed = showLicensePopup( pkgName, licenseText ); if ( !license_confirmed ) { @@ -1264,8 +1255,6 @@ ok = true; } - YDialog::deleteTopmostDialog(); - return ok; } @@ -1307,21 +1296,36 @@ #define DOCTYPETAG "<!-- DT:Rich -->" // Special doctype for preformatted HTML -string NCPackageSelector::createLicenseText( string value ) +bool NCPackageSelector::showLicensePopup( string pkgName, string license ) { string html_text = ""; const string htmlIdent(DOCTYPETAG); - - if ( value.find( htmlIdent ) != string::npos ) + bool confirmed = false; + + if ( license.find( htmlIdent ) != string::npos ) { - html_text = value; // HTML text + html_text = license; // HTML text } else { - html_text = "<pre>" + value + "</pre>"; // add <pre> to preserve newlines and spaces + html_text = "<pre>" + license + "</pre>"; // add <pre> to preserve newlines and spaces } - return html_text; + NCPopupInfo * info = new NCPopupInfo ( wpos( NCurses::lines()/10, NCurses::cols()/10), + // headline of a popup showing the package license + string( _("End User License Agreement") ), + "<i>" + pkgName + "</i><br><br>" + + html_text, + NCPkgStrings::AcceptLabel(), + NCPkgStrings::CancelLabel() ); + + info->setPreferredSize( (NCurses::cols() * 80)/100, (NCurses::lines()*80)/100); + info->focusOkButton(); + confirmed = info->showInfoPopup( ) != NCursesEvent::cancel; + + YDialog::deleteTopmostDialog(); + + return confirmed; } /////////////////////////////////////////////////////////////////// Modified: trunk/ncurses-pkg/src/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelector.h?rev=63323&r1=63322&r2=63323&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.h (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.h Thu Feb 3 13:13:21 2011 @@ -395,11 +395,12 @@ bool autoChecking() { return autoCheck; } /** - * Creates a the license text - * @param t the license string - * @return string The text + * Shows 'End User License Agreement' popup with license text + * @param pkgName the package name + * @param license the license text + * @return bool license confirmed? */ - string createLicenseText( string t ); + bool showLicensePopup( string pkgName, string license ); /** * Calls the package mananager (updateDu()) and shows the required disk space Modified: trunk/ncurses-pkg/src/NCPkgTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgTable.cc?rev=63323&r1=63322&r2=63323&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgTable.cc (original) +++ trunk/ncurses-pkg/src/NCPkgTable.cc Thu Feb 3 13:13:21 2011 @@ -244,21 +244,9 @@ if ( !license.empty() ) { - if (!license_confirmed) + if ( !license_confirmed ) { - NCPopupInfo * info = new NCPopupInfo( wpos( (lines * 10)/100, (cols * 10) /100), - NCPkgStrings::NotifyLabel(), - string( _("End User License Agreement") + " " + - "<i>" + pkgName + "</i><br><br>" + packager->createLicenseText( license ) ), - NCPkgStrings::AcceptLabel(), - NCPkgStrings::CancelLabel() - ); - info->setPreferredSize( (NCurses::cols() * 80)/100, (NCurses::lines()*80)/100); - info->focusOkButton(); - license_confirmed = info->showInfoPopup( ) != NCursesEvent::cancel; - - YDialog::deleteTopmostDialog(); - + license_confirmed = packager->showLicensePopup( pkgName, license); } if ( !license_confirmed ) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org