January 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55095 - in /trunk/installation: VERSION package/yast2-installation.changes yast2-installation.spec.in
by locilka＠svn.opensuse.org 27 Jan '09

27 Jan '09

Author: locilka Date: Tue Jan 27 17:39:38 2009 New Revision: 55095 URL: http://svn.opensuse.org/viewcvs/yast?rev=55095&view=rev Log: Updated dependencies Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/yast2-installation.spec.in Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=55095&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Tue Jan 27 17:39:38 2009 @@ -1 +1 @@ -2.18.2 +2.18.3 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Jan 27 17:39:38 2009 @@ -3,6 +3,7 @@ - Added test for checking free space when SCR switch fails (bnc #460477). +- 2.18.3 ------------------------------------------------------------------- Mon Jan 26 13:58:00 CET 2009 - locilka(a)suse.cz Modified: trunk/installation/yast2-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.… ============================================================================== --- trunk/installation/yast2-installation.spec.in (original) +++ trunk/installation/yast2-installation.spec.in Tue Jan 27 17:39:38 2009 @@ -22,8 +22,8 @@ # AutoinstConfig::getProposalList Requires: autoyast2-installation >= 2.17.1 -# PackagesUI::RunPackageSelector -Requires: yast2 >= 2.17.40 +# ag_freespace +Requires: yast2 >= 2.18.4 # Language::GetLanguageItems and other API # Language::Set (handles downloading the translation extensions) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55094 - /tags/stable-2_18_4/yast2/
by locilka＠svn.opensuse.org 27 Jan '09

27 Jan '09

Author: locilka Date: Tue Jan 27 17:38:00 2009 New Revision: 55094 URL: http://svn.opensuse.org/viewcvs/yast?rev=55094&view=rev Log: Created tag stable-2_18_4 for yast2 Added: tags/stable-2_18_4/yast2/ - copied from r55093, trunk/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55093 - /tags/stable-2_18_4/
by locilka＠svn.opensuse.org 27 Jan '09

27 Jan '09

Author: locilka Date: Tue Jan 27 17:37:58 2009 New Revision: 55093 URL: http://svn.opensuse.org/viewcvs/yast?rev=55093&view=rev Log: Created tag stable-2_18_4 Added: tags/stable-2_18_4/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55092 - in /trunk/yast2: VERSION library/agents/Makefile.am package/yast2.changes
by locilka＠svn.opensuse.org 27 Jan '09

27 Jan '09

Author: locilka Date: Tue Jan 27 17:37:31 2009 New Revision: 55092 URL: http://svn.opensuse.org/viewcvs/yast?rev=55092&view=rev Log: - Added ag_freespace - SCR agent for checking free space in directories (mounted partitions) (bnc #460477). - 2.18.4 Modified: trunk/yast2/VERSION trunk/yast2/library/agents/Makefile.am trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=55092&r1=55091… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Tue Jan 27 17:37:31 2009 @@ -1 +1 @@ -2.18.3 +2.18.4 Modified: trunk/yast2/library/agents/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/agents/Makefile.am… ============================================================================== --- trunk/yast2/library/agents/Makefile.am (original) +++ trunk/yast2/library/agents/Makefile.am Tue Jan 27 17:37:31 2009 @@ -5,7 +5,7 @@ ag_content \ ag_netd \ ag_anyxml \ - ag_free_space + ag_freespace scrconf_DATA = $(wildcard *.scr) Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Tue Jan 27 17:37:31 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jan 27 17:36:15 CET 2009 - locilka(a)suse.cz + +- Added ag_freespace - SCR agent for checking free space in + directories (mounted partitions) (bnc #460477). +- 2.18.4 + +------------------------------------------------------------------- Tue Jan 27 16:35:14 CET 2009 - aschnell(a)suse.de - added String::StartsWith() function -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55091 - in /trunk/yast2/library/agents: ag_free_space ag_freespace system_freespace.scr
by locilka＠svn.opensuse.org 27 Jan '09

27 Jan '09

Author: locilka Date: Tue Jan 27 17:34:31 2009 New Revision: 55091 URL: http://svn.opensuse.org/viewcvs/yast?rev=55091&view=rev Log: Renamed to avoid conflicts Added: trunk/yast2/library/agents/ag_freespace - copied unchanged from r55073, trunk/yast2/library/agents/ag_free_space Removed: trunk/yast2/library/agents/ag_free_space Modified: trunk/yast2/library/agents/system_freespace.scr Modified: trunk/yast2/library/agents/system_freespace.scr URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/agents/system_free… ============================================================================== --- trunk/yast2/library/agents/system_freespace.scr (original) +++ trunk/yast2/library/agents/system_freespace.scr Tue Jan 27 17:34:31 2009 @@ -32,5 +32,5 @@ */ .system.freespace -`ag_free_space () +`ag_freespace () -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55090 - /tags/branch-Code-11-2_17_52/bootloader/
by juhliarik＠svn.opensuse.org 27 Jan '09

27 Jan '09

Author: juhliarik Date: Tue Jan 27 17:18:09 2009 New Revision: 55090 URL: http://svn.opensuse.org/viewcvs/yast?rev=55090&view=rev Log: Created tag branch-Code-11-2_17_52 for bootloader Added: tags/branch-Code-11-2_17_52/bootloader/ - copied from r55089, branches/SuSE-Code-11-Branch/bootloader/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55089 - in /branches/SuSE-Code-11-Branch/bootloader: VERSION package/yast2-bootloader.changes src/modules/BootELILO.ycp
by juhliarik＠svn.opensuse.org 27 Jan '09

27 Jan '09

Author: juhliarik Date: Tue Jan 27 17:17:56 2009 New Revision: 55089 URL: http://svn.opensuse.org/viewcvs/yast?rev=55089&view=rev Log: added fix for creating boot label to EFI if "next" installation tun on different disk with same number of (boot) partition Modified: branches/SuSE-Code-11-Branch/bootloader/VERSION branches/SuSE-Code-11-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-Code-11-Branch/bootloader/src/modules/BootELILO.ycp Modified: branches/SuSE-Code-11-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/bootloade… ============================================================================== --- branches/SuSE-Code-11-Branch/bootloader/VERSION (original) +++ branches/SuSE-Code-11-Branch/bootloader/VERSION Tue Jan 27 17:17:56 2009 @@ -1 +1 @@ -2.17.51 +2.17.52 Modified: branches/SuSE-Code-11-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/bootloade… ============================================================================== --- branches/SuSE-Code-11-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-Code-11-Branch/bootloader/package/yast2-bootloader.changes Tue Jan 27 17:17:56 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Jan 27 17:14:25 CET 2009 - juhliarik(a)suse.cz + +- added fix for problem with adding boot entry to EFI if + installation run on different disk but with same boot partition + (bnc #450682) +- 2.17.52 + +------------------------------------------------------------------- Mon Jan 26 16:04:48 CET 2009 - juhliarik(a)suse.cz - updated function Dev2MountByDev() which can run long time if Modified: branches/SuSE-Code-11-Branch/bootloader/src/modules/BootELILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/bootloade… ============================================================================== --- branches/SuSE-Code-11-Branch/bootloader/src/modules/BootELILO.ycp (original) +++ branches/SuSE-Code-11-Branch/bootloader/src/modules/BootELILO.ycp Tue Jan 27 17:17:56 2009 @@ -65,6 +65,13 @@ string efi_vendor = "SuSE"; /** + * bnc #450682 - adding boot entry to EFI + * true is label was added + */ + +global boolean added_label_to_efi = false; + +/** * Is the /sys/firmware/efi directory available? */ boolean efi_available = true; @@ -450,6 +457,9 @@ // error popup - label, %1 is bootloader name _("Error Occurred while Installing %1"), BootCommon::getLoaderName (BootCommon::getLoaderType (false), `summary)), log); + } else { + added_label_to_efi = true; + y2milestone("Adding label to EFI finish successful"); } return ret; } @@ -566,13 +576,51 @@ return ret; } +/** FIXME: efibootmgr doesn't provide info about disk! + * bnc #450682 - adding boot entry to EFI + * function delete all existing boot entry with same name and partition number + * @param string name of label + * @param string number of partition + */ + +void deleteSameEFIBootEntry(string name, any part_no) +{ + boolean still_exist = true; + + string cmd = sformat("efibootmgr -v |grep \"%1.*HD(%2.*File(.\\efi.\\SuSE.\\elilo.efi)\" | cut -d \" \" -f 1", + name, tomyhexa(part_no)); + y2milestone("run command %1", cmd); + map out = (map)SCR::Execute (.target.bash_output, cmd); + y2milestone("output of command %1", out); + + string boot_entries = out["stdout"]:""; + y2milestone("EFI boot entries with \"same\" boot partition %1",boot_entries); + + list<string> list_boot_entries = splitstring(boot_entries, "\n"); + + y2milestone("list_boot_entries=%1",list_boot_entries); + + foreach(string entry, list_boot_entries, + { + if ((deletechars(entry, "\n*") != "") && (deletechars(entry, "\n*") != nil)) + { + cmd = sformat("/usr/sbin/efibootmgr --delete-bootnum --bootnum %1 -q;", + substring (deletechars(entry, "\n*"),4, 4)); + y2milestone("run command %1", cmd); + out = (map)SCR::Execute (.target.bash_output, cmd); + y2milestone("output of command %1", out); + } + }); +} /** * Write bootloader settings to disk * @return boolean true on success */ global define boolean Write () { + + y2milestone("run Write function from BootELILO"); // SCR::Execute (.target.bash, "/sbin/elilo"); boolean ret = BootCommon::UpdateBootloader (); if (ret == nil) @@ -621,10 +669,23 @@ // check number of same boot entries in efi // if boot entry is added -> don't add it again if (deletechars(out["stdout"]:"","\n") == "0") + { ret = ret && installBootLoader (bl_command, bl_logfile); - else - y2milestone("Skip adding boot entry: %1 to EFI. There already exist: %2 with same label and partition.", - BootCommon::globals["boot_efilabel"]:"", deletechars(out["stdout"]:"","\n")); + } else { + + if (added_label_to_efi) + { + y2milestone("Skip adding boot entry: %1 to EFI. There already exist and was added: %2 with + same label and partition.", BootCommon::globals["boot_efilabel"]:"", + deletechars(out["stdout"]:"","\n")); + } else { + // delete efi entry with same label name and partition + deleteSameEFIBootEntry(BootCommon::globals["boot_efilabel"]:"", boot_part); + // add new efi boot entry + ret = ret && installBootLoader (bl_command, bl_logfile); + } + + } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55088 - in /trunk/installation: package/yast2-installation.changes src/include/scr_switch_debugger.ycp src/inst_finish/switch_scr_finish.ycp
by locilka＠svn.opensuse.org 27 Jan '09

27 Jan '09

Author: locilka Date: Tue Jan 27 17:17:17 2009 New Revision: 55088 URL: http://svn.opensuse.org/viewcvs/yast?rev=55088&view=rev Log: - Added test for checking free space when SCR switch fails (bnc #460477). Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/include/scr_switch_debugger.ycp trunk/installation/src/inst_finish/switch_scr_finish.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Jan 27 17:17:17 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 27 17:13:57 CET 2009 - locilka(a)suse.cz + +- Added test for checking free space when SCR switch fails + (bnc #460477). + +------------------------------------------------------------------- Mon Jan 26 13:58:00 CET 2009 - locilka(a)suse.cz - Disabling [Back] buttons in the very first interactive dialogs Modified: trunk/installation/src/include/scr_switch_debugger.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/scr_swi… ============================================================================== --- trunk/installation/src/include/scr_switch_debugger.ycp (original) +++ trunk/installation/src/include/scr_switch_debugger.ycp Tue Jan 27 17:17:17 2009 @@ -28,6 +28,7 @@ import "Icon"; import "Installation"; import "HTML"; + import "String"; // test result (Checking for xyz... Passed) string result_ok = _("Passed"); @@ -279,6 +280,66 @@ return test_result; } + boolean RunSCRSwitchTest_FreeSpace () { + ReportProgress (_("Checking free space")); + + // Local command + map parts_cmd = (map) WFM::Execute (.local.bash_output, + "mount " + + "| grep -v '^\$/proc\$ on' " + + "| sed 's/\\/.* on \$.*\$ type .*/\\1/'" + ); + + map <string, integer> partitions = $[]; + + if (parts_cmd["exit"]:-1 != 0) { + y2error ("Cannot find out current partitions"); + // even if it is an error, we should check more + return true; + } else { + // Spash at the end or not + string inst_dir = Installation::destdir + (regexpmatch (Installation::destdir, "/$") ? "" : "/"); + integer inst_dir_length = size (inst_dir); + y2milestone ("InstDir: '%1'", inst_dir); + + foreach (string one_partition, splitstring (parts_cmd["stdout"]:"", "\n"), { + // begin of the one_partition matches the inst_dir + if (substring (one_partition, 0, inst_dir_length) == inst_dir) { + // chrooted to the Installation::destdir + partitions[substring (one_partition, inst_dir_length - 1)] = + (integer) SCR::Read (.system.freespace, one_partition); + } + }); + } + + y2milestone ("Partitions: %1", partitions); + + boolean test_result = true; + + foreach (string partition, integer free_space, partitions, { + boolean this_test = true; + + if (free_space <= 0) { + test_result = false; + this_test = false; + } + + ReportTest ( + sformat ( + // test result, %1 is replaced with the directory, e.g., /var + // %2 is replaced with the free space in that partition, e.g., 2.8 GB + _("Checking for free space in the %1 directory: %2"), + partition, + // linked to the text above (sometimes replaces the '%2') + (free_space < 0 ? _("Unable to find out"):String::FormatSize (free_space)), + ), + this_test + ); + }); + + return test_result; + } + // tries to get all installed packages from new SCR boolean RunSCRSwitchTest_DoRPMCheck () { map <string, any> test = (map <string, any>) SCR::Execute (.target.bash_output, @@ -505,6 +566,7 @@ if (! RunSCRSwitchTest_BinaryExists()) return false; if (! RunSCRSwitchTest_DoChroot()) return false; if (! RunSCRSwitchTest_Y2BASE()) return false; + if (! RunSCRSwitchTest_FreeSpace()) return false; if (! RunSCRSwitchTest_DoRPMCheck()) return false; // checking all mandatory packages Modified: trunk/installation/src/inst_finish/switch_scr_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/inst_finish/swi… ============================================================================== --- trunk/installation/src/inst_finish/switch_scr_finish.ycp (original) +++ trunk/installation/src/inst_finish/switch_scr_finish.ycp Tue Jan 27 17:17:17 2009 @@ -72,6 +72,16 @@ return true; } +void CheckFreeSpaceNow () { + map ret_exec = (map) SCR::Execute (.target.bash_output, "/bin/df -h"); + + if (ret_exec["exit"]:-1 != 0) { + y2error ("Cannot find out free space: %1", ret_exec); + } else { + y2milestone ("Free space: \n%1", mergestring (splitstring (ret_exec["stdout"]:"", "\\n"), "\n")); + } +} + boolean TestTheNewSCRHandler () { integer SCR_PID = FindSCRPID(); @@ -81,6 +91,9 @@ if (SCR_PID > 0) SwitchY2Debug (SCR_PID); + // BNC #460477 + CheckFreeSpaceNow(); + return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55087 - in /branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src: YQPackageSelector.cc YQZyppSolverDialogPluginStub.cc
by sh-sh-sh＠svn.opensuse.org 27 Jan '09

27 Jan '09

Author: sh-sh-sh Date: Tue Jan 27 17:09:40 2009 New Revision: 55087 URL: http://svn.opensuse.org/viewcvs/yast?rev=55087&view=rev Log: formatting Modified: branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPackageSelector.cc branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQZyppSolverDialogPluginStub.cc Modified: branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/tabbed-pkg-browsing/qt… ============================================================================== --- branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPackageSelector.cc (original) +++ branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPackageSelector.cc Tue Jan 27 17:09:40 2009 @@ -1,14 +1,14 @@ /*---------------------------------------------------------------------\ - | | - | __ __ ____ _____ ____ | - | \ \ / /_ _/ ___|_ _|___ \ | - | \ V / _` \___ \ | | __) | | - | | | (_| |___) || | / __/ | - | |_|\__,_|____/ |_| |_____| | - | | - | core system | - | (C) SuSE GmbH | - \----------------------------------------------------------------------/ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ File: YQPackageSelector.cc See also: YQPackageSelectorHelp.cc Modified: branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQZyppSolverDialogPluginStub.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/tabbed-pkg-browsing/qt… ============================================================================== --- branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQZyppSolverDialogPluginStub.cc (original) +++ branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQZyppSolverDialogPluginStub.cc Tue Jan 27 17:09:40 2009 @@ -18,6 +18,7 @@ /-*/ + #include <qmessagebox.h> #include "YQZyppSolverDialogPluginStub.h" -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55086 - in /branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src: YQPackageSelector.cc YQPackageSelector.h
by sh-sh-sh＠svn.opensuse.org 27 Jan '09

27 Jan '09

Author: sh-sh-sh Date: Tue Jan 27 17:06:35 2009 New Revision: 55086 URL: http://svn.opensuse.org/viewcvs/yast?rev=55086&view=rev Log: - Shortcut for all filter views - Fixed duplicate "View" menu (main menu "View" now renamed to "Options" Modified: branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPackageSelector.cc branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPackageSelector.h Modified: branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/tabbed-pkg-browsing/qt… ============================================================================== --- branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPackageSelector.cc (original) +++ branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPackageSelector.cc Tue Jan 27 17:06:35 2009 @@ -255,7 +255,7 @@ { _updateProblemFilterView = new YQPkgUpdateProblemFilterView( parent ); YUI_CHECK_NEW( _updateProblemFilterView ); - _filters->addPage( _( "Update Problems" ), _updateProblemFilterView, + _filters->addPage( _( "&Update Problems" ), _updateProblemFilterView, "update_problems", // internal name true ); // showAlways } @@ -284,7 +284,7 @@ { _patternList = new YQPkgPatternList( parent, true ); YUI_CHECK_NEW( _patternList ); - _filters->addPage( _( "Patterns" ), _patternList, "patterns" ); + _filters->addPage( _( "&Patterns" ), _patternList, "patterns" ); connect( _patternList, SIGNAL( statusChanged() ), this, SLOT ( autoResolveDependencies() ) ); @@ -306,7 +306,7 @@ _packageKitGroupsFilterView = new YQPkgPackageKitGroupsFilterView( parent ); YUI_CHECK_NEW( _packageKitGroupsFilterView ); - _filters->addPage( _( "Package Groups" ), _packageKitGroupsFilterView, "package_groups" ); + _filters->addPage( _( "Package &Groups" ), _packageKitGroupsFilterView, "package_groups" ); connect( this, SIGNAL( loadData() ), _packageKitGroupsFilterView, SLOT ( filter() ) ); @@ -318,7 +318,7 @@ _rpmGroupTagsFilterView = new YQPkgRpmGroupTagsFilterView( parent ); YUI_CHECK_NEW( _rpmGroupTagsFilterView ); - _filters->addPage( _( "RPM Groups" ), _rpmGroupTagsFilterView, "rpm_groups" ); + _filters->addPage( _( "&RPM Groups" ), _rpmGroupTagsFilterView, "rpm_groups" ); connect( this, SIGNAL( loadData() ), _rpmGroupTagsFilterView, SLOT ( filter() ) ); @@ -330,7 +330,7 @@ _langList = new YQPkgLangList( parent ); YUI_CHECK_NEW( _langList ); - _filters->addPage( _( "Languages" ), _langList, "languages" ); + _filters->addPage( _( "&Languages" ), _langList, "languages" ); _langList->setSizePolicy( QSizePolicy( QSizePolicy::Ignored, QSizePolicy::Ignored ) ); // hor/vert connect( _langList, SIGNAL( statusChanged() ), @@ -346,7 +346,7 @@ _repoFilterView = new YQPkgRepoFilterView( parent ); YUI_CHECK_NEW( _repoFilterView ); - _filters->addPage( _( "Repositories" ), _repoFilterView, "repos" ); + _filters->addPage( _( "&Repositories" ), _repoFilterView, "repos" ); // @@ -355,17 +355,15 @@ _searchFilterView = new YQPkgSearchFilterView( parent ); YUI_CHECK_NEW( _searchFilterView ); - _filters->addPage( _( "Search" ), _searchFilterView, "search", + _filters->addPage( _( "S&earch" ), _searchFilterView, "search", true ); // showAlways - _filters->addPage( _( "Keywords" ), new QLabel( "Keywords\nfilter\n\nfor future use", this ), "keywords" ); #if 0 // DEBUG - _filters->addPage( _( "Keywords" ), new QLabel( "Keywords\nfilter\n\nfor future use", this ) ); - _filters->addPage( _( "MIME Types" ), new QLabel( "MIME Types\nfilter\n\nfor future use" , this ) ); + _filters->addPage( _( "&Keywords" ), new QLabel( "Keywords\nfilter\n\nfor future use", this ), "keywords" ); #endif // @@ -374,7 +372,7 @@ _statusFilterView = new YQPkgStatusFilterView( parent ); YUI_CHECK_NEW( _statusFilterView ); - _filters->addPage( _( "Installation Summary" ), _statusFilterView, "inst_summary", + _filters->addPage( _( "&Installation Summary" ), _statusFilterView, "inst_summary", true ); // showAlways } @@ -559,7 +557,7 @@ parent->layout()->addWidget(_menuBar); _fileMenu = 0; - _viewMenu = 0; + _optionsMenu = 0; _pkgMenu = 0; _patchMenu = 0; _extrasMenu = 0; @@ -579,7 +577,7 @@ _fileMenu = new QMenu( _menuBar ); YUI_CHECK_NEW( _fileMenu ); - QAction *action = _menuBar->addMenu( _fileMenu ); + QAction * action = _menuBar->addMenu( _fileMenu ); action->setText( _( "&File" )); _fileMenu->addAction( _( "&Import..." ), this, SLOT( pkgImport() ) ); @@ -594,35 +592,6 @@ if ( _pkgList ) { // - // View menu - // - - _viewMenu = new QMenu( _menuBar ); - YUI_CHECK_NEW( _viewMenu ); - QAction *action = _menuBar->addMenu( _viewMenu ); - action->setText(_( "&View" )); - - // Translators: This is about packages ending in "-devel", so don't translate that "-devel"! - _showDevelAction = _viewMenu->addAction( _( "Show -de&vel Packages" ), - this, SLOT( pkgExcludeDevelChanged( bool ) ), Qt::Key_F7 ); - _showDevelAction->setCheckable(true); - _showDevelAction->setChecked(true); - - _excludeDevelPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*-devel(-\\d+bit)?$" ), _pkgList->nameCol() ); - YUI_CHECK_NEW( _excludeDevelPkgs ); - _excludeDevelPkgs->enable( false ); - - // Translators: This is about packages ending in "-debuginfo", so don't translate that "-debuginfo"! - _showDebugAction = _viewMenu->addAction( _( "Show -&debuginfo/-debugsource Packages" ), - this, SLOT( pkgExcludeDebugChanged( bool ) ), Qt::Key_F8 ); - _showDebugAction->setCheckable(true); - _showDebugAction->setChecked(true); - _excludeDebugInfoPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*-(debuginfo|debugsource)$" ), _pkgList->nameCol() ); - YUI_CHECK_NEW( _excludeDebugInfoPkgs ); - _excludeDebugInfoPkgs->enable( false ); - - - // // Package menu // @@ -735,8 +704,39 @@ // + // View menu + // + + _optionsMenu = new QMenu( _menuBar ); + YUI_CHECK_NEW( _optionsMenu ); + action = _menuBar->addMenu( _optionsMenu ); + // Translators: Menu for view options (Use a noun, not a verb!) + action->setText(_( "&Options" )); + + // Translators: This is about packages ending in "-devel", so don't translate that "-devel"! + _showDevelAction = _optionsMenu->addAction( _( "Show -de&vel Packages" ), + this, SLOT( pkgExcludeDevelChanged( bool ) ), Qt::Key_F7 ); + _showDevelAction->setCheckable(true); + _showDevelAction->setChecked(true); + + _excludeDevelPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*-devel(-\\d+bit)?$" ), _pkgList->nameCol() ); + YUI_CHECK_NEW( _excludeDevelPkgs ); + _excludeDevelPkgs->enable( false ); + + // Translators: This is about packages ending in "-debuginfo", so don't translate that "-debuginfo"! + _showDebugAction = _optionsMenu->addAction( _( "Show -&debuginfo/-debugsource Packages" ), + this, SLOT( pkgExcludeDebugChanged( bool ) ), Qt::Key_F8 ); + _showDebugAction->setCheckable(true); + _showDebugAction->setChecked(true); + _excludeDebugInfoPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*-(debuginfo|debugsource)$" ), _pkgList->nameCol() ); + YUI_CHECK_NEW( _excludeDebugInfoPkgs ); + _excludeDebugInfoPkgs->enable( false ); + + + // // Extras menu // + _extrasMenu = new QMenu( _menuBar ); YUI_CHECK_NEW( _extrasMenu ); action = _menuBar->addMenu( _extrasMenu ); @@ -992,7 +992,7 @@ { _patchFilterView = new YQPkgPatchFilterView( this ); YUI_CHECK_NEW( _patchFilterView ); - _filters->addPage( _( "Patches" ), _patchFilterView, "patches" ); + _filters->addPage( _( "P&atches" ), _patchFilterView, "patches" ); _patchList = _patchFilterView->patchList(); YUI_CHECK_PTR( _patchList ); @@ -1344,7 +1344,7 @@ void YQPackageSelector::pkgExcludeDebugChanged( bool on ) { - if ( _viewMenu && _pkgList ) + if ( _optionsMenu && _pkgList ) { if ( _excludeDebugInfoPkgs ) _excludeDebugInfoPkgs->enable( ! on ); @@ -1357,7 +1357,7 @@ void YQPackageSelector::pkgExcludeDevelChanged( bool on ) { - if ( _viewMenu && _pkgList ) + if ( _optionsMenu && _pkgList ) { if ( _excludeDevelPkgs ) _excludeDevelPkgs->enable( ! on ); @@ -1461,9 +1461,9 @@ _( "Added Subpackages:" ), QRegExp( ".*" + suffix + "$" ), _( "&OK" ), - QString::null, // rejectButtonLabel + QString::null, // rejectButtonLabel YQPkgChangesDialog::FilterAutomatic, - YQPkgChangesDialog::OptionNone ); // showIfEmpty + YQPkgChangesDialog::OptionNone ); // showIfEmpty } Modified: branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/tabbed-pkg-browsing/qt… ============================================================================== --- branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPackageSelector.h (original) +++ branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPackageSelector.h Tue Jan 27 17:06:35 2009 @@ -315,11 +315,11 @@ QMenuBar * _menuBar; QMenu * _fileMenu; - QMenu * _viewMenu; QMenu * _pkgMenu; QMenu * _patchMenu; QMenu * _configMenu; QMenu * _dependencyMenu; + QMenu * _optionsMenu; QMenu * _extrasMenu; QMenu * _helpMenu; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0