Author: kmachalkova Date: Tue Feb 17 17:21:58 2009 New Revision: 55569 URL: http://svn.opensuse.org/viewcvs/yast?rev=55569&view=rev Log: kbd shortcuts + help Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc trunk/ncurses-pkg/src/NCPkgMenuConfig.cc trunk/ncurses-pkg/src/NCPkgMenuHelp.cc trunk/ncurses-pkg/src/NCPkgStrings.cc trunk/ncurses-pkg/src/NCPkgStrings.h Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelector.cc?rev=55569&r1=55568&r2=55569&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.cc Tue Feb 17 17:21:58 2009 @@ -1592,7 +1592,7 @@ //Add only if requested by `opt(`repoMgr) flag - #381956 if (isRepoMgrEnabled()) - configMenu = new NCPkgMenuConfig( menu_buttons, "Configuration", this); + configMenu = new NCPkgMenuConfig( menu_buttons, "C&onfiguration", this); extrasMenu = new NCPkgMenuExtras( menu_buttons, NCPkgStrings::Extras(), this); Modified: trunk/ncurses-pkg/src/NCPkgMenuConfig.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuConfig.cc?rev=55569&r1=55568&r2=55569&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuConfig.cc (original) +++ trunk/ncurses-pkg/src/NCPkgMenuConfig.cc Tue Feb 17 17:21:58 2009 @@ -21,7 +21,7 @@ #include "NCPkgMenuConfig.h" #include "NCPackageSelector.h" -#define CHECK_BOX "[ ]" +#define CHECK_BOX "[ ] " /* Textdomain "ncurses-pkg" @@ -53,9 +53,9 @@ { exitAction = pkg->ActionAtExit(); - repoManager = new YMenuItem( _( "Launch Repository Manager") ); - onlineUpdate = new YMenuItem( _( "Launch Online Update Configuration" ) ); - actionOnExit = new YMenuItem( _( "Action on Exit" ) ); + repoManager = new YMenuItem( _( "Launch &Repository Manager") ); + onlineUpdate = new YMenuItem( _( "Launch &Online Update Configuration" ) ); + actionOnExit = new YMenuItem( _( "&Action after Package Installation" ) ); items.push_back( repoManager ); items.push_back( onlineUpdate ); @@ -64,9 +64,9 @@ { items.push_back( actionOnExit ); - restart = new YMenuItem( actionOnExit, CHECK_BOX + _( "Restart Package Manager" ) ); - close = new YMenuItem( actionOnExit,CHECK_BOX + _( "Close Package Manager" ) ); - showSummary = new YMenuItem( actionOnExit, CHECK_BOX + _( "Show Summary" ) ); + restart = new YMenuItem( actionOnExit, CHECK_BOX + _( "&Restart Package Manager" ) ); + close = new YMenuItem( actionOnExit,CHECK_BOX + _( "&Close Package Manager" ) ); + showSummary = new YMenuItem( actionOnExit, CHECK_BOX + _( "&Show Summary" ) ); idToItemPtr["restart"] = restart; idToItemPtr["close"] = close; Modified: trunk/ncurses-pkg/src/NCPkgMenuHelp.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuHelp.cc?rev=55569&r1=55568&r2=55569&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuHelp.cc (original) +++ trunk/ncurses-pkg/src/NCPkgMenuHelp.cc Tue Feb 17 17:21:58 2009 @@ -99,6 +99,7 @@ text += NCPkgStrings::HelpPkgMenu2(); text += NCPkgStrings::HelpPkgMenu3(); text += NCPkgStrings::HelpPkgMenu4(); + text += NCPkgStrings::HelpPkgMenu5(); } else if ( event.selection == filterHelp ) { Modified: trunk/ncurses-pkg/src/NCPkgStrings.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgStrings.cc?rev=55569&r1=55568&r2=55569&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgStrings.cc (original) +++ trunk/ncurses-pkg/src/NCPkgStrings.cc Tue Feb 17 17:21:58 2009 @@ -228,29 +228,30 @@ const string NCPkgStrings::HelpPkgMenu1() { - // part5 of help text package installation static const string value = _( "<p><b>Dependencies:</b> This menu offers various actions related to package dependency handling. By default, the package dependencies are checked with every status change (<i>Automatic Dependency Check</i> is on) You will be informed about package conflicts in a dialog proposing possible conflict resolution. To resolve the conflict, select one of the offered solutions and press 'OK -- Try Again'.</p>" ); return value; } const string NCPkgStrings::HelpPkgMenu2() { - // part5 of help text package installation static const string value = _( "<p>To disable dependency checking on every status change, toggle <i>Automatic Dependency Check</i> off. In that case, you can check dependencies manually by selecting <i>Check Dependencies Now</i> item. <i>Verify system</i> entry will check package dependencies and resolve conflicts non-interactively, marking missing packages for automatic installation, if necessary. For debugging purpose, you may use <i>Generate Dependency Solver Testcase</i>. It will dump package dependencies data into <tt>/var/log/YaST2/solverTestcase</tt> directory. This is usually what you need when asked for \"solver testcase\" in bugzilla.</p>" ); return value; } const string NCPkgStrings::HelpPkgMenu3() { - // part5 of help text package installation static const string value = _( "<p><b>View:</b> here you have the possibility to choose which information about the selected package will be displayed in the window below the package table. Available options are: package description, technical data (version, size, license etc.) package versions (all available), file list (all files included in the package) and dependencies (provides, requires etc.).</p>" ); return value; } const string NCPkgStrings::HelpPkgMenu4() { - // part5 of help text package installation - static const string value = _( "<p><b>Extras:</b> miscellaneous functions reside here. <i>Export Package List to File</i> will dump data on installed packages, patterns and languages into specified XML file. This file can be later read by <i>Import Package List from File</i> option e.g. on different computer. It will bring the set of packages on the target computer into the same state as described in provided XML file. <i>Show Available Disk Space</i> will show a popup table displaying disk usage and free disk space on currently mounted partition. <i>Start Repository Manager</i> will open configuration of package repositories.</p>" ); + static const string value = _("<p><b>Configuration:</b> this menu integrates package selector with the rest of package management utils. From here, you can <b>Launch Repository Manager</b> and edit configured repositories or register to update repository and configure periodic download of available updates (<b>Launch Online Update Configuration</b>). Also, you can pick one of the three possible behaviours of package selector at exit - in <b>Action after Package Installation</b> menu.</p>"); + return value; +} +const string NCPkgStrings::HelpPkgMenu5() +{ + static const string value = _( "<p><b>Extras:</b> miscellaneous functions reside here. <i>Export Package List to File</i> will dump data on installed packages, patterns and languages into specified XML file. This file can be later read by <i>Import Package List from File</i> option e.g. on different computer. It will bring the set of packages on the target computer into the same state as described in provided XML file. <i>Show Available Disk Space</i> will show a popup table displaying disk usage and free disk space on currently mounted partition.</p>" ); return value; } Modified: trunk/ncurses-pkg/src/NCPkgStrings.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgStrings.h?rev=55569&r1=55568&r2=55569&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgStrings.h (original) +++ trunk/ncurses-pkg/src/NCPkgStrings.h Tue Feb 17 17:21:58 2009 @@ -91,6 +91,7 @@ static const string HelpPkgMenu2(); static const string HelpPkgMenu3(); static const string HelpPkgMenu4(); + static const string HelpPkgMenu5(); //Search settings static const string SearchIn(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org