Author: gs Date: Mon Nov 12 12:15:32 2007 New Revision: 41964 URL: http://svn.opensuse.org/viewcvs/yast?rev=41964&view=rev Log: replace YCPString by string in NCPopupInfo constructor Modified: branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc branches/tmp/sh/mod-ui/ncurses/src/NCPkgTable.cc branches/tmp/sh/mod-ui/ncurses/src/NCPopupInfo.cc branches/tmp/sh/mod-ui/ncurses/src/NCPopupInfo.h branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPackageSelector.cc branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDeps.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc?rev=41964&r1=41963&r2=41964&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc Mon Nov 12 12:15:32 2007 @@ -1214,10 +1214,8 @@ helpPopup = new NCPopupInfo( wpos( NCurses::lines()/3, NCurses::cols()/3 ), // headline of the text mode help _( "Text Mode Navigation" ), - YCPString( helpIntro + - _( "<p>Function key bindings:</p>" ) + - helpText - ), + helpIntro + _( "<p>Function key bindings:</p>" ) + + helpText, "" ); } Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPkgTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCPkgTable.cc?rev=41964&r1=41963&r2=41964&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPkgTable.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPkgTable.cc Mon Nov 12 12:15:32 2007 @@ -219,7 +219,7 @@ zypp::License license; bool license_confirmed = true; ZyppPkg pkgPtr = NULL; - YCPString header( "" ); + string header; bool ok = true; int cols = NCurses::cols(); int lines = NCurses::lines(); @@ -233,7 +233,7 @@ { notify = objPtr->delnotify(); NCDBG << "DELETE message: " << notify << endl; - header = YCPString(NCPkgNames::WarningLabel()); + header = NCPkgNames::WarningLabel(); } break; case S_Install: @@ -242,7 +242,7 @@ { notify = objPtr->insnotify(); NCDBG << "NOTIFY message: " << notify << endl; - header = YCPString(NCPkgNames::NotifyLabel()); + header = NCPkgNames::NotifyLabel(); } case S_AutoInstall: case S_AutoUpdate: @@ -263,14 +263,17 @@ { if (!license_confirmed) { - NCPopupInfo info( wpos( (lines * 10)/100, (cols * 10) /100), - NCPkgNames::NotifyLabel(), - //YCPString(_("End User License Agreement") ), - YCPString( "<i>" + pkgName + "</i><br><br>" + packager->createDescrText( license ) ), - NCPkgNames::AcceptLabel(), - NCPkgNames::CancelLabel() ); - info.setNiceSize( (NCurses::cols() * 80)/100, (NCurses::lines()*80)/100); - license_confirmed = info.showInfoPopup( ) != NCursesEvent::cancel; + NCPopupInfo * info = new NCPopupInfo( wpos( (lines * 10)/100, (cols * 10) /100), + NCPkgNames::NotifyLabel(), + //_("End User License Agreement") ), + "<i>" + pkgName + "</i><br><br>" + packager->createDescrText( license ), + NCPkgNames::AcceptLabel(), + NCPkgNames::CancelLabel() + ); + info->setNiceSize( (NCurses::cols() * 80)/100, (NCurses::lines()*80)/100); + license_confirmed = info->showInfoPopup( ) != NCursesEvent::cancel; + + YDialog::deleteTopmostDialog(); } if ( !license_confirmed ) @@ -301,11 +304,14 @@ if ( ok && !notify.empty() ) { - NCPopupInfo info( wpos( (lines * 35)/100, (cols * 25)/100), - header, - YCPString( "<i>" + pkgName + "</i><br><br>" + packager->createDescrText( notify ) ) ); - info.setNiceSize( (NCurses::cols() * 50)/100, (NCurses::lines() * 30)/100); - info.showInfoPopup( ); + NCPopupInfo * info = new NCPopupInfo( wpos( (lines * 35)/100, (cols * 25)/100), + header, + "<i>" + pkgName + "</i><br><br>" + packager->createDescrText( notify ) + ); + info->setNiceSize( (NCurses::cols() * 50)/100, (NCurses::lines() * 30)/100); + info->showInfoPopup( ); + + YDialog::deleteTopmostDialog(); } // inform the package manager Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupInfo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCPopupInfo.cc?rev=41964&r1=41963&r2=41964&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopupInfo.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopupInfo.cc Mon Nov 12 12:15:32 2007 @@ -29,8 +29,8 @@ namespace { - const YCPTerm idOk( "ok" ); - const YCPTerm idCancel( "cancel" ); + const string idOk( "ok" ); + const string idCancel( "cancel" ); } /////////////////////////////////////////////////////////////////// @@ -42,8 +42,8 @@ // DESCRIPTION : // NCPopupInfo::NCPopupInfo( const wpos at, - const YCPString & headline, - const YCPString & text, + const string & headline, + const string & text, string okButtonLabel, string cancelButtonLabel ) : NCPopup( at, false ) @@ -54,7 +54,7 @@ , vDim( 20 ) , visible ( false ) { - createLayout( headline->value(), text->value(), okButtonLabel, cancelButtonLabel ); + createLayout( headline, text, okButtonLabel, cancelButtonLabel ); } /////////////////////////////////////////////////////////////////// @@ -82,17 +82,12 @@ string okButtonLabel, string cancelButtonLabel ) { - // FIXME - check all options - YWidgetOpt opt; - // the vertical split is the (only) child of the dialog NCLayoutBox * split = new NCLayoutBox( this, YD_VERT ); // addChild() is obsolete (handled by new libyui) // add the headline - // opt.isHeading.setValue( true ); - //NCLabel * head = new NCLabel( split, opt, headline ); new NCLabel( split, headline, true, false ); // isHeading = true // add the rich text widget @@ -102,32 +97,30 @@ if ( okButtonLabel != "" && cancelButtonLabel != "" ) { - opt.isHStretchable.setValue( true ); - //hSplit->addChild( new NCSpacing( hSplit, opt, 0.4, true, false ) ); new NCSpacing( hSplit, YD_HORIZ, true, 0.4 ); // stretchable = true } if ( okButtonLabel != "" ) { - opt.key_Fxx.setValue( 10 ); // FIXME // add the OK button okButton = new NCPushButton( hSplit, okButtonLabel ); - YStringWidgetID * okID = new YStringWidgetID (idOk->name() ); + okButton->setFunctionKey( 10 ); + + YStringWidgetID * okID = new YStringWidgetID (idOk ); okButton->setId( okID ); } if ( cancelButtonLabel != "" ) { - //hSplit->addChild( new NCSpacing( hSplit, opt, 0.4, true, false ) ); new NCSpacing( hSplit, YD_HORIZ, true, 0.4 ); - opt.key_Fxx.setValue( 9 ); // FIXME // add the Cancel button cancelButton = new NCPushButton( hSplit, cancelButtonLabel ); - YStringWidgetID * cancelID = new YStringWidgetID( cancelButtonLabel ); + cancelButton->setFunctionKey( 9 ); + + YStringWidgetID * cancelID = new YStringWidgetID( idCancel ); cancelButton->setId( cancelID ); - //hSplit->addChild( new NCSpacing( hSplit, opt, 0.4, true, false ) ); new NCSpacing( hSplit, YD_HORIZ, true, 0.4 ); } @@ -252,8 +245,9 @@ YWidgetID * currentId = dynamic_cast(postevent.widget)->id(); if ( currentId - && currentId->toString() == idCancel->name() ) + && currentId->toString() == idCancel ) { + NCMIL << "Cancel button pressed" << endl; // close the dialog postevent = NCursesEvent::cancel; } Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupInfo.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCPopupInfo.h?rev=41964&r1=41963&r2=41964&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopupInfo.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopupInfo.h Mon Nov 12 12:15:32 2007 @@ -37,7 +37,6 @@ Textdomain "packages" */ -class YCPValue; /////////////////////////////////////////////////////////////////// // @@ -69,8 +68,8 @@ public: NCPopupInfo( const wpos at, - const YCPString & headline, - const YCPString & text, + const string & headline, + const string & text, // the label of an OK button string okButtonLabel = _( "&OK" ), string cancelButtonLabel = "" ); Modified: branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPackageSelector.cc?rev=41964&r1=41963&r2=41964&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPackageSelector.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPackageSelector.cc Mon Nov 12 12:15:32 2007 @@ -1630,8 +1630,8 @@ return false; } - NCPopupInfo * info = new NCPopupInfo( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-35)/2 ), YCPString( "" ), - YCPString(_( "All package dependencies are OK." )), + NCPopupInfo * info = new NCPopupInfo( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-35)/2 ), "", + _( "All package dependencies are OK." ), NCPkgNames::OKLabel() ); info->setNiceSize( 35, 5 ); @@ -2078,9 +2078,9 @@ if ( success ) { NCPopupInfo * info = new NCPopupInfo( wpos( (NCurses::lines()-8)/2, (NCurses::cols()-40)/2 ), - YCPString( "" ), - YCPString( _("Dependency resolver test case written to ") - + "<br>" + testCaseDir ) + "", + _("Dependency resolver test case written to ") + "<br>" + + testCaseDir ); info->setNiceSize( 40, 8 ); info->showInfoPopup( ); @@ -2144,9 +2144,9 @@ //present error popup to the user NCPopupInfo * errorMsg = new NCPopupInfo( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-40)/2 ), - YCPString( NCPkgNames::ErrorLabel()), - YCPString( _("Error exporting list of packages and patterns to ") - + filename->toString() ), + NCPkgNames::ErrorLabel(), + _("Error exporting list of packages and patterns to ") + + filename->toString(), NCPkgNames::OKLabel(), ""); errorMsg->setNiceSize(40,5); @@ -2230,9 +2230,9 @@ NCWAR << "Error importing list of packages and patterns from" << filename->toString() << endl; NCPopupInfo * errorMsg = new NCPopupInfo( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-40)/2) , - YCPString( NCPkgNames::ErrorLabel()), - YCPString( _("Error importing list of packages and patterns from ") - + filename->toString() ), + NCPkgNames::ErrorLabel(), + _("Error importing list of packages and patterns from ") + + filename->toString(), NCPkgNames::OKLabel(), ""); errorMsg->setNiceSize(40,5); @@ -2254,7 +2254,7 @@ { NCPkgTable * packageList = getPackageList(); string text = ""; - YCPString headline = YCPString(NCPkgNames::PackageHelp()); + string headline = NCPkgNames::PackageHelp(); if ( !event.selection ) { @@ -2294,14 +2294,14 @@ // else if ( event.selection->compare( NCPkgNames::SearchHelp() ) == YO_EQUAL ) else if ( selId == NCPkgNames::SearchHelp()->toString() ) { - headline = YCPString(NCPkgNames::SearchHeadline()); + headline = NCPkgNames::SearchHeadline(); text += NCPkgNames::HelpOnSearch(); } // open the popup with the help text NCPopupInfo * pkgHelp = new NCPopupInfo( wpos( (NCurses::lines()*8)/100, (NCurses::cols()*18)/100 ), headline, - YCPString( text ) + text ); pkgHelp->setNiceSize( (NCurses::cols()*65)/100, (NCurses::lines()*85)/100 ); pkgHelp->showInfoPopup( ); @@ -2333,8 +2333,8 @@ // open the popup with the help text NCPopupInfo * youHelp = new NCPopupInfo( wpos( NCurses::lines()/3, NCurses::cols()/6 ), - YCPString(NCPkgNames::YouHelp()), - YCPString(text) + NCPkgNames::YouHelp(), + text ); youHelp->setNiceSize( (NCurses::cols()*2)/3, NCurses::lines()/3 ); youHelp->showInfoPopup( ); @@ -2362,8 +2362,8 @@ if (changes) { // show a popup and ask the user NCPopupInfo * cancelMsg = new NCPopupInfo( wpos( (NCurses::lines()-8)/2, (NCurses::cols()-45)/2 ), - YCPString( NCPkgNames::NotifyLabel() ), - YCPString( NCPkgNames::CancelText() ), + NCPkgNames::NotifyLabel(), + NCPkgNames::CancelText(), NCPkgNames::YesLabel(), NCPkgNames::NoLabel() ); @@ -2436,8 +2436,8 @@ { // open the popup e.g. with the text "/usr needs 50 MB more disk space" NCPopupInfo * spaceMsg = new NCPopupInfo( wpos( (NCurses::lines()-10)/2, (NCurses::cols()-50)/2 ), - YCPString( NCPkgNames::ErrorLabel() ), - YCPString( NCPkgNames::DiskSpaceError() + "<br>" + message ), + NCPkgNames::ErrorLabel(), + NCPkgNames::DiskSpaceError() + "<br>" + message, NCPkgNames::OKLabel(), NCPkgNames::CancelLabel() ); @@ -2546,8 +2546,8 @@ NCPopupInfo * info = new NCPopupInfo ( wpos( NCurses::lines()/10, NCurses::cols()/10), NCPkgNames::NotifyLabel(), - YCPString( "<i>" + pkgName + "</i><br><br>" - + createDescrText( licenseText ) ), + "<i>" + pkgName + "</i><br><br>" + + createDescrText( licenseText ), NCPkgNames::AcceptLabel(), NCPkgNames::CancelLabel() ); @@ -2696,8 +2696,8 @@ bool cancel = false; NCPopupInfo * info = new NCPopupInfo( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-30)/2 ), - YCPString( "" ), - YCPString(_( "System dependencies verify OK." )), + "", + _( "System dependencies verify OK." ), NCPkgNames::OKLabel() ); info->setNiceSize( 30, 5 ); Modified: branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDeps.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDeps.cc?rev=41964&r1=41963&r2=41964&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDeps.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDeps.cc Mon Nov 12 12:15:32 2007 @@ -236,13 +236,15 @@ if ( !problemw ) return false; - NCDBG << "Solving..." << endl ; + NCDBG << "Solving..." << endl; - NCPopupInfo info( wpos( (NCurses::lines()-4)/2, (NCurses::cols()-18)/2), YCPString( "" ), - YCPString(NCPkgNames::Solving()), - NCPkgNames::OKLabel() ); - info.setNiceSize( 18, 4 ); - info.popup(); + NCPopupInfo * info = new NCPopupInfo( wpos( (NCurses::lines()-4)/2, (NCurses::cols()-18)/2 ), + "", + NCPkgNames::Solving(), + NCPkgNames::OKLabel() + ); + info->setNiceSize( 18, 4 ); + info->popup(); zypp::Resolver_Ptr resolver = zypp::getZYpp()->resolver(); @@ -259,8 +261,10 @@ NCERR << "Unknown action for resolve" << endl; } - info.popdown(); + info->popdown(); + YDialog::deleteTopmostDialog(); + if (success) return true; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org