Author: gs Date: Wed Apr 30 13:17:38 2008 New Revision: 47214 URL: http://svn.opensuse.org/viewcvs/yast?rev=47214&view=rev Log: improve YOU layout, show YOU help Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc trunk/ncurses-pkg/src/NCPackageSelector.h trunk/ncurses-pkg/src/NCPackageSelectorStart.cc Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelector.cc?rev=47214&r1=47213&r2=47214&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.cc Wed Apr 30 13:17:38 2008 @@ -94,6 +94,7 @@ , viewMenu( 0 ) , extrasMenu( 0 ) , helpMenu( 0 ) + , youHelpButton( 0 ) , filterMain( 0 ) , actionMenu( 0 ) , filterMenu( 0 ) @@ -110,26 +111,6 @@ , visibleInfo( 0 ) { - // FIXME - remove this code when everthiong is handled by handleEvent() ! - // (the eventHandlerMap is obsolete) - - // Fill the handler map - -#if 0 - eventHandlerMap[ NCPkgStrings::Search()->toString() ] = &NCPackageSelector::SearchHandler; -#endif - - // Information menu -> DONE - - // Action menu -> DONE - - // Etc. menu -> DONE - - // Help menu -#if 0 - eventHandlerMap[ NCPkgStrings::PatchHelp()->toString() ] = &NCPackageSelector::YouHelpHandler; -#endif - if ( modeFlags & YPkg_OnlineUpdateMode ) youMode = true; @@ -282,6 +263,8 @@ retVal = OkButtonHandler( event ); else if ( event.widget == cancelButton ) retVal = CancelHandler( event ); + else if ( event.widget == youHelpButton ) + retVal = YouHelpHandler( event ); else if ( event.widget == filterPopup ) { retVal = filterPopup->handleEvent(); @@ -995,11 +978,11 @@ text += NCPkgStrings::YouHelp3(); // open the popup with the help text - NCPopupInfo * youHelp = new NCPopupInfo( wpos( NCurses::lines()/3, NCurses::cols()/6 ), + NCPopupInfo * youHelp = new NCPopupInfo( wpos( (NCurses::lines()*8)/100, (NCurses::cols())*18/100 ), NCPkgStrings::YouHelp(), text ); - youHelp->setNiceSize( (NCurses::cols()*2)/3, NCurses::lines()/3 ); + youHelp->setNiceSize( (NCurses::cols()*65)/100, (NCurses::lines()*85)/100 ); youHelp->showInfoPopup( ); YDialog::deleteTopmostDialog(); @@ -1526,7 +1509,7 @@ viewMenu = new NCPkgMenuView( left3, NCPkgStrings::View(), this); YAlignment * left4 = YUI::widgetFactory()->createLeft( hSplit ); - extrasMenu = new NCPkgMenuExtras( left4, NCPkgStrings::Extras(), this); + depsMenu = new NCPkgMenuDeps( left4, NCPkgStrings::Deps(), this); // add the package table YTableHeader * tableHeader = new YTableHeader(); @@ -1563,10 +1546,15 @@ infoText = new NCPkgPackageDetails( replacePoint, " ", this ); YUI_CHECK_NEW( infoText ); - YLayoutBox * hSplit5 = YUI::widgetFactory()->createHBox( vSplit ); + YLayoutBox * bottom_bar = YUI::widgetFactory()->createHBox( vSplit ); + YAlignment *ll = YUI::widgetFactory()->createLeft( bottom_bar ); - helpMenu = new NCPkgMenuHelp (hSplit5, _("&Help")); - YUI_CHECK_NEW( helpMenu ); + youHelpButton = new NCPushButton ( ll, _("&Help")); + YUI_CHECK_NEW( youHelpButton ); + youHelpButton->setFunctionKey( 1 ); + + YAlignment *r = YUI::widgetFactory()->createRight( bottom_bar ); + YLayoutBox * hSplit5 = YUI::widgetFactory()->createHBox( r ); // add the Cancel button cancelButton = new NCPushButton( hSplit5, _( "&Cancel" ) ); Modified: trunk/ncurses-pkg/src/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelector.h?rev=47214&r1=47213&r2=47214&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.h (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.h Wed Apr 30 13:17:38 2008 @@ -134,6 +134,7 @@ NCPkgMenuView *viewMenu; NCPkgMenuExtras *extrasMenu; NCPkgMenuHelp *helpMenu; + NCPushButton *youHelpButton; NCPkgFilterMain *filterMain; NCPkgMenuAction *actionMenu; NCPkgMenuFilter *filterMenu; Modified: trunk/ncurses-pkg/src/NCPackageSelectorStart.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelectorStart.cc?rev=47214&r1=47213&r2=47214&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelectorStart.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelectorStart.cc Wed Apr 30 13:17:38 2008 @@ -148,8 +148,6 @@ { // show the required diskspace packager->showDiskSpace(); - // FIXME - show appropriate filter menu entries (with patterns or selections) - // This may be obsolete if selections are surely obsolete // packager->createFilterMenu(); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org