Author: kmachalkova Date: Fri May 25 17:18:13 2007 New Revision: 38150 URL: http://svn.opensuse.org/viewcvs/yast?rev=38150&view=rev Log: Fix disappearing 'Etc./All Packages List' submenu after unchecking AutoDependency Check 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=38150&r1=38149&r2=38150&view=diff ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelector.cc (original) +++ trunk/ncurses/src/pkg/NCPackageSelector.cc Fri May 25 17:18:13 2007 @@ -1589,23 +1589,18 @@ "`MenuButton( \"%s\", [" "`menu( \"%s\", [`item( `id(\"showdeps\"), \"%s\" ), `item( `id(\"autodeps\"), \"%s\" ), `item ( `id(\"verifysystem\"), \"%s\" ) ] )," "`item( `id(\"testcase\"), \"%s\" )" -#ifdef FIXME "," - "`menu( \"%s\", [`item( `id(\"save\"), \"%s\" ), `item( `id(\"load\"), \"%s\" ) ] )" -#endif + "`menu( \"%s\", [`item( `id(\"export\"), \"%s\" ), `item( `id(\"import\"), \"%s\" ) ] )" "] )", NCPkgNames::MenuEtc().c_str(), NCPkgNames::MenuDeps().c_str(), NCPkgNames::MenuCheckDeps().c_str(), NCPkgNames::MenuNoAutoDeps().c_str(), NCPkgNames::MenuVerifySystem().c_str(), - NCPkgNames::MenuTestCase().c_str() -#ifdef FIXME - , - NCPkgNames::MenuSel().c_str(), - NCPkgNames::MenuSaveSel().c_str(), - NCPkgNames::MenuLoadSel().c_str() -#endif + NCPkgNames::MenuTestCase().c_str(), + NCPkgNames::MenuList().c_str(), + NCPkgNames::MenuExportList().c_str(), + NCPkgNames::MenuImportList().c_str() ); @@ -1628,23 +1623,18 @@ "`MenuButton( \"%s\", [" "`menu( \"%s\", [`item( `id(\"showdeps\"), \"%s\" ), `item( `id(\"autodeps\"), \"%s\" ), `item ( `id(\"verifysystem\"), \"%s\" ) ] )," "`item( `id(\"testcase\"), \"%s\" )" -#ifdef FIXME "," - "`menu( \"%s\", [`item( `id(\"save\"), \"%s\" ), `item( `id(\"load\"), \"%s\" ) ] )" -#endif + "`menu( \"%s\", [`item( `id(\"export\"), \"%s\" ), `item( `id(\"import\"), \"%s\" ) ] )" "] )", NCPkgNames::MenuEtc().c_str(), NCPkgNames::MenuDeps().c_str(), NCPkgNames::MenuCheckDeps().c_str(), NCPkgNames::MenuAutoDeps().c_str(), NCPkgNames::MenuVerifySystem().c_str(), - NCPkgNames::MenuTestCase().c_str() -#ifdef FIXME - , - NCPkgNames::MenuSel().c_str(), - NCPkgNames::MenuSaveSel().c_str(), - NCPkgNames::MenuLoadSel().c_str() -#endif + NCPkgNames::MenuTestCase().c_str(), + NCPkgNames::MenuList().c_str(), + NCPkgNames::MenuExportList().c_str(), + NCPkgNames::MenuImportList().c_str() ); Modified: trunk/ncurses/src/pkg/NCPkgNames.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgNames.cc?rev=38150&r1=38149&r2=38150&view=diff ============================================================================== --- trunk/ncurses/src/pkg/NCPkgNames.cc (original) +++ trunk/ncurses/src/pkg/NCPkgNames.cc Fri May 25 17:18:13 2007 @@ -1339,24 +1339,24 @@ return value; } -const string NCPkgNames::MenuSel() +const string NCPkgNames::MenuList() { // submenu: selections - static const string value = _( "&Selections" ); + static const string value = _( "All &Packages List" ); return value; } -const string NCPkgNames::MenuSaveSel() +const string NCPkgNames::MenuExportList() { // menu entry - static const string value = _( "S&ave Selection" ); + static const string value = _( "&Export to File" ); return value; } -const string NCPkgNames::MenuLoadSel() +const string NCPkgNames::MenuImportList() { // last menu entry of the Etc. menu - static const string value = _( "&Load Selection" ); + static const string value = _( "&Import from File" ); return value; } Modified: trunk/ncurses/src/pkg/NCPkgNames.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgNames.h?rev=38150&r1=38149&r2=38150&view=diff ============================================================================== --- trunk/ncurses/src/pkg/NCPkgNames.h (original) +++ trunk/ncurses/src/pkg/NCPkgNames.h Fri May 25 17:18:13 2007 @@ -879,9 +879,9 @@ static const string MenuNoAutoDeps(); static const string MenuVerifySystem(); static const string MenuTestCase(); - static const string MenuSel(); - static const string MenuSaveSel(); - static const string MenuLoadSel(); + static const string MenuList(); + static const string MenuExportList(); + static const string MenuImportList(); static const string MoreText(); static const string TabooText(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org