Author: kmachalkova Date: Wed Jun 25 13:40:59 2008 New Revision: 48524 URL: http://svn.opensuse.org/viewcvs/yast?rev=48524&view=rev Log: Clean this up (avoid duplication of UI strings) Modified: trunk/ncurses-pkg/src/NCPkgFilterSearch.cc trunk/ncurses-pkg/src/NCPkgSearchSettings.cc trunk/ncurses-pkg/src/NCPkgSearchSettings.h trunk/ncurses-pkg/src/NCPkgStrings.cc trunk/ncurses-pkg/src/NCPkgStrings.h Modified: trunk/ncurses-pkg/src/NCPkgFilterSearch.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterSearch... ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterSearch.cc (original) +++ trunk/ncurses-pkg/src/NCPkgFilterSearch.cc Wed Jun 25 13:40:59 2008 @@ -97,7 +97,7 @@ // add the checkBox ignore case NCAlignment *left = new NCAlignment( vSplit, YAlignBegin, YAlignUnchanged ); - ignoreCase = new NCCheckBox( left, NCPkgStrings::IgnoreCase(), true ); + ignoreCase = new NCCheckBox( left, _( "&Ignore Case" ), true ); new NCSpacing( vSplit, YD_VERT, true, 0.5 ); } Modified: trunk/ncurses-pkg/src/NCPkgSearchSettings.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgSearchSettin... ============================================================================== --- trunk/ncurses-pkg/src/NCPkgSearchSettings.cc (original) +++ trunk/ncurses-pkg/src/NCPkgSearchSettings.cc Wed Jun 25 13:40:59 2008 @@ -32,15 +32,15 @@ void NCPkgSearchSettings::createLayout() { - checkName = new YItem (NCPkgStrings::CheckName(), true); + checkName = new YItem ( _( "Name of the Package" ), true); items.push_back (checkName); - checkSummary = new YItem (NCPkgStrings::CheckSummary(), true); + checkSummary = new YItem ( _( "Summary" ), true); items.push_back (checkSummary); - checkDescr = new YItem (NCPkgStrings::CheckDescr() ); + checkDescr = new YItem ( _( "Description (time-consuming)" )); items.push_back (checkDescr); - checkProvides = new YItem (NCPkgStrings::CheckProvides() ); + checkProvides = new YItem ( _( "Provides" )); items.push_back (checkProvides); - checkRequires = new YItem (NCPkgStrings::CheckRequires() ); + checkRequires = new YItem ( _( "Requires" )); items.push_back (checkRequires); addItems( items ); Modified: trunk/ncurses-pkg/src/NCPkgSearchSettings.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgSearchSettin... ============================================================================== --- trunk/ncurses-pkg/src/NCPkgSearchSettings.h (original) +++ trunk/ncurses-pkg/src/NCPkgSearchSettings.h Wed Jun 25 13:40:59 2008 @@ -19,6 +19,10 @@ #ifndef NCPkgSearchSettings_h #define NCPkgSearchSettings_h +#include <string> + +#include "NCurses.h" +#include "NCi18n.h" #include "NCMultiSelectionBox.h" class NCPkgSearchSettings : public NCMultiSelectionBox { Modified: trunk/ncurses-pkg/src/NCPkgStrings.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgStrings.cc?r... ============================================================================== --- trunk/ncurses-pkg/src/NCPkgStrings.cc (original) +++ trunk/ncurses-pkg/src/NCPkgStrings.cc Wed Jun 25 13:40:59 2008 @@ -35,43 +35,6 @@ return value; } -const string NCPkgStrings::AutoDeps() -{ - // menu entry: dependency check off - static const string value = _( "&Automatic Dependency Check [x]" ); - return value; -} - -const string NCPkgStrings::NoAutoDeps() -{ - // menu entry: dependency check off - static const string value = _( "&Automatic Dependency Check [ ]" ); - return value; -} - -const string NCPkgStrings::CheckDeps() -{ - // menu entry: do a dependency check - // Please note: preserve the whitespaces at the beginning - static const string value = _( "Check Dependencies Now" ); - return value; -} - -const string NCPkgStrings::VerifySystem() -{ - // menu entry: verify system - // Please note: preserve the whitespaces at the beginning - static const string value = _( "Verify System" ); - return value; -} - -const string NCPkgStrings::TestCase() -{ - // menu entry: generate test case for solver - static const string value = _( "Generate Dependency Resolver &Test Case" ); - return value; -} - const string NCPkgStrings::View() { //menu entry 2 - display different kinds of info on pkgs @@ -79,41 +42,6 @@ return value; } -const string NCPkgStrings::PackageDescription() -{ - //menu entry 2 - display different kinds of info on pkgs - static const string value = _( "Package Description" ); - return value; -} - -const string NCPkgStrings::TechnicalData() -{ - //menu entry 2 - display different kinds of info on pkgs - static const string value = _( "Technical Data" ); - return value; -} - -const string NCPkgStrings::PackageVersions() -{ - //menu entry 2 - display different kinds of info on pkgs - static const string value = _( "Package Versions" ); - return value; -} - -const string NCPkgStrings::FileList() -{ - //menu entry 2 - display different kinds of info on pkgs - static const string value = _( "File List" ); - return value; -} - -const string NCPkgStrings::Dependencies() -{ - //menu entry 2 - display different kinds of info on pkgs - static const string value = _( "Dependencies" ); - return value; -} - const string NCPkgStrings::Extras() { //menu entry 3 - miscellaneous stuff @@ -121,27 +49,6 @@ return value; } -const string NCPkgStrings::ExportList() -{ - // menu entry - static const string value = _( "&Export Package List to File" ); - return value; -} - -const string NCPkgStrings::ImportList() -{ - // last menu entry of the Etc. menu - static const string value = _( "&Import Package List from File" ); - return value; -} - -const string NCPkgStrings::ShowDiskSpace() -{ - // last menu entry of the Etc. menu - static const string value = _( "Show Available Disk Space" ); - return value; -} - const string NCPkgStrings::Filter() { //pick a package filter - patterns, langs, repos, search,... @@ -149,47 +56,6 @@ return value; } -const string NCPkgStrings::Patterns() -{ - // Patterns filter - static const string value = _( "Patterns" ); - return value; -} - -const string NCPkgStrings::Languages() -{ - // Languages filter - static const string value = _( "Languages" ); - return value; -} - -const string NCPkgStrings::RPMGroups() -{ - // RpmGroups filter - static const string value = _( "RPM Groups" ); - return value; -} - -const string NCPkgStrings::Repos() -{ - // Repositories filter - static const string value = _( "Repositories" ); - return value; -} - -const string NCPkgStrings::Search() -{ - // Search filter - static const string value = _( "Search" ); - return value; -} - -const string NCPkgStrings::InstSummary() -{ - // Installation summary filter (changed packages) - static const string value = _( "Installation Summary" ); - return value; -} const string NCPkgStrings::InstPkg() { @@ -212,90 +78,6 @@ return value; } -const string NCPkgStrings::Toggle() -{ - // Actions on pkgs (install, remove,..) - static const string value = _( "&Toggle [SPACE]" ); - return value; -} - -const string NCPkgStrings::Install() -{ - // Action on pkg - install it - static const string value = _( "&Install [+]" ); - return value; -} - -const string NCPkgStrings::Delete() -{ - // Action on pkg - delete it - static const string value = _( "&Delete [-]" ); - return value; -} - -const string NCPkgStrings::Update() -{ - // Action on pkg - update it - static const string value = ( _( "&Update [>]" ) ); - return value; -} - -const string NCPkgStrings::Taboo() -{ - // Action on pkg - set it to taboo - static const string value = ( _( "T&aboo [!]" ) ); - return value; -} - -const string NCPkgStrings::Lock() -{ - // Action on pkg - lock it - static const string value = ( _( "&Lock [*]" ) ); - return value; -} - -const string NCPkgStrings::AllPkgsList() -{ - // submenu: selections - static const string value = _( "All &Packages List" ); - return value; -} - -const string NCPkgStrings::InstallAll() -{ - // Action on pkgs - install all in this list - static const string value = ( _( "Install All" ) ); - return value; -} - -const string NCPkgStrings::DeleteAll() -{ - // Action on pkgs - delete all in this list - static const string value = ( _( "Delete All" ) ); - return value; -} - -const string NCPkgStrings::KeepAll() -{ - // Action on pkgs - keep all in this list - static const string value = ( _( "Keep All" ) ); - return value; -} - -const string NCPkgStrings::UpdateAll() -{ - // Action on pkgs - update all in this list - static const string value = ( _( "Update All Unconditionally") ); - return value; -} - -const string NCPkgStrings::UpdateIfNewer() -{ - // Action on pkgs - update all in this list, if newer vers. is there - static const string value = ( _( "Update If Newer Version Available" ) ); - return value; -} - const string NCPkgStrings::Help() { // Help button @@ -472,28 +254,6 @@ return value; } -const string NCPkgStrings::SearchPhrase() -{ - // begin: text/labels for search popups (use unique hotkeys until the end:) - // text for the package search popup - static const string value = _( "Search &Phrase" ); - return value; -} - -const string NCPkgStrings::SearchButton() -{ - // Search filter - static const string value = _( "&Search" ); - return value; -} - -const string NCPkgStrings::IgnoreCase() -{ - // end: text/labels for search popups - // label of a combo box (search popup) - static const string value = _( "&Ignore Case" ); - return value; -} const string NCPkgStrings::SearchIn() { @@ -502,38 +262,11 @@ return value; } -const string NCPkgStrings::CheckName() -{ - // label of a combo box (search popup) - static const string value = _( "Name of the Package" ); - return value; -} - -const string NCPkgStrings::CheckSummary() -{ - // label of a combo box (search popup) - static const string value = _( "Summary" ); - return value; -} - -const string NCPkgStrings::CheckDescr() -{ - // label of a combo box (search popup) - static const string value = _( "Description (time-consuming)" ); - return value; -} - -const string NCPkgStrings::CheckProvides() -{ - // label of a combo box (search popup) - static const string value = _( "Provides" ); - return value; -} - -const string NCPkgStrings::CheckRequires() +const string NCPkgStrings::SearchPhrase() { - // label of a combo box (search popup) - static const string value = _( "Requires" ); + // begin: text/labels for search popups (use unique hotkeys until the end:) + // text for the package search popup + static const string value = _( "Search &Phrase" ); return value; } Modified: trunk/ncurses-pkg/src/NCPkgStrings.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgStrings.h?re... ============================================================================== --- trunk/ncurses-pkg/src/NCPkgStrings.h (original) +++ trunk/ncurses-pkg/src/NCPkgStrings.h Wed Jun 25 13:40:59 2008 @@ -33,41 +33,15 @@ // Main menu entry Dependencies static const string Deps(); - //its subentries - static const string AutoDeps(); - static const string NoAutoDeps(); - static const string CheckDeps(); - static const string VerifySystem(); - static const string TestCase(); - // Main menu entry View static const string View(); - //its subentries - static const string PackageDescription(); - static const string TechnicalData(); - static const string PackageVersions(); - static const string FileList(); - static const string Dependencies(); - // Main menu entry 'Extras' static const string Extras(); - - //its subentries - static const string ExportList(); - static const string ImportList(); - static const string ShowDiskSpace(); - + //Package Filters combo box label static const string Filter(); - //the filters itself - static const string Patterns(); - static const string Languages(); - static const string RPMGroups(); - static const string Repos(); - static const string Search(); - static const string InstSummary(); static const string InstPkg(); //Label below the table - pkg name follows @@ -76,20 +50,6 @@ //Actions menu (what to do with the pkg) static const string Actions(); - //the actions itself - static const string Toggle(); - static const string Install(); - static const string Delete(); - static const string Update(); - static const string Taboo(); - static const string Lock(); - static const string AllPkgsList(); - static const string InstallAll(); - static const string DeleteAll(); - static const string KeepAll(); - static const string UpdateAll(); - static const string UpdateIfNewer(); - static const string Help(); // The headline of the help popup @@ -132,20 +92,10 @@ static const string HelpPkgMenu3(); static const string HelpPkgMenu4(); - - //Search filter strings - static const string SearchPhrase(); - static const string SearchButton(); - static const string IgnoreCase(); - //Search settings static const string SearchIn(); - static const string CheckName(); - static const string CheckSummary(); - static const string CheckDescr(); - static const string CheckProvides(); - static const string CheckRequires(); - + static const string SearchPhrase(); + // table column headlines static const string PkgStatus(); static const string PatternsLabel(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org