Author: kmachalkova Date: Wed May 23 17:40:53 2007 New Revision: 38116 URL: http://svn.opensuse.org/viewcvs/yast?rev=38116&view=rev Log: Improved usability of cancel dialog in pkg manager (#274774) Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc trunk/ncurses/src/pkg/NCPkgNames.cc trunk/ncurses/src/pkg/NCPkgNames.h Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelector.cc?rev=38116&r1=38115&r2=38116&view=diff ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelector.cc (original) +++ trunk/ncurses/src/pkg/NCPackageSelector.cc Wed May 23 17:40:53 2007 @@ -2221,9 +2221,9 @@ NCPopupInfo cancelMsg( wpos( 2, 2 ), YCPString( NCPkgNames::NotifyLabel() ), YCPString( NCPkgNames::CancelText() ), - NCPkgNames::OKLabel(), - NCPkgNames::CancelLabel() ); - cancelMsg.setNiceSize( 35, 8 ); + NCPkgNames::YesLabel(), + NCPkgNames::NoLabel() ); + cancelMsg.setNiceSize( 45, 8 ); NCursesEvent input = cancelMsg.showInfoPopup( ); if ( input == NCursesEvent::cancel ) { // don't leave the package installation dialog Modified: trunk/ncurses/src/pkg/NCPkgNames.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgNames.cc?rev=38116&r1=38115&r2=38116&view=diff ============================================================================== --- trunk/ncurses/src/pkg/NCPkgNames.cc (original) +++ trunk/ncurses/src/pkg/NCPkgNames.cc Wed May 23 17:40:53 2007 @@ -659,6 +659,13 @@ return value; } +const string NCPkgNames::YesLabel() +{ + // the label of the Yes button + static const string value = _( "&Yes" ); + return value; +} + const string NCPkgNames::AcceptLabel() { // the label of an Accept button @@ -688,6 +695,13 @@ return value; } +const string NCPkgNames::NoLabel() +{ + // the label of the No button + static const string value = _( "&No" ); + return value; +} + const string NCPkgNames::IgnAllLabel() { // the label of the Ingnore all button @@ -1803,7 +1817,7 @@ const string NCPkgNames::CancelText() { // text for a Notify popup - static const string value = _( "<p>All your choices will be lost when exiting with Cancel.<br>Really exit?</p>" ); + static const string value = _( "<p>All changes in package, patch or pattern selection will be lost.<br>Really exit?</p>" ); return value; } Modified: trunk/ncurses/src/pkg/NCPkgNames.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgNames.h?rev=38116&r1=38115&r2=38116&view=diff ============================================================================== --- trunk/ncurses/src/pkg/NCPkgNames.h (original) +++ trunk/ncurses/src/pkg/NCPkgNames.h Wed May 23 17:40:53 2007 @@ -547,6 +547,11 @@ */ static const string OKLabel(); + /** + * The label of the Yes button + */ + static const string YesLabel(); + /** * The label of the Accept button */ @@ -556,6 +561,11 @@ * The label of the Cancel button */ static const string CancelLabel(); + + /** + * The label of the No button + */ + static const string NoLabel(); /** * The label of the Cancel/Ignore button -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org