April 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r56906 - /tags/stable-2_18_2/online-update/
by jsuchome＠svn.opensuse.org 22 Apr '09

22 Apr '09

Author: jsuchome Date: Wed Apr 22 13:07:42 2009 New Revision: 56906 URL: http://svn.opensuse.org/viewcvs/yast?rev=56906&view=rev Log: Created tag stable-2_18_2 for online-update Added: tags/stable-2_18_2/online-update/ - copied from r56905, trunk/online-update/ -- 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] r56905 - in /trunk/online-update: VERSION package/yast2-online-update.changes src/online_update.ycp
by jsuchome＠svn.opensuse.org 22 Apr '09

22 Apr '09

Author: jsuchome Date: Wed Apr 22 13:07:37 2009 New Revision: 56905 URL: http://svn.opensuse.org/viewcvs/yast?rev=56905&view=rev Log: - new check for online update source (bnc#459527) - offer registration if online update source not found (bnc#459527) - 2.18.2 Modified: trunk/online-update/VERSION trunk/online-update/package/yast2-online-update.changes trunk/online-update/src/online_update.ycp Modified: trunk/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/VERSION?rev=56905&… ============================================================================== --- trunk/online-update/VERSION (original) +++ trunk/online-update/VERSION Wed Apr 22 13:07:37 2009 @@ -1 +1 @@ -2.18.1 +2.18.2 Modified: trunk/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-onli… ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Wed Apr 22 13:07:37 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Apr 21 21:31:52 CEST 2009 - jsuchome(a)suse.cz + +- new check for online update source (bnc#459527) +- offer registration if online update source not found (bnc#459527) +- 2.18.2 + +------------------------------------------------------------------- Mon Mar 23 15:41:08 CET 2009 - jsuchome(a)suse.cz - do not reset the user locks (bnc#483648) Modified: trunk/online-update/src/online_update.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/online_update.… ============================================================================== --- trunk/online-update/src/online_update.ycp (original) +++ trunk/online-update/src/online_update.ycp Wed Apr 22 13:07:37 2009 @@ -80,24 +80,29 @@ Progress::NextStage (); - if (!OnlineUpdate::cd_update) // for CD for cd update was not initialized yet + if (!OnlineUpdate::cd_update) // CD for cd update was not initialized yet { boolean is_available = false; - // check if there is any patch for installation - foreach (map patch, Pkg::ResolvableProperties ("", `patch, ""), { - if (patch["status"]:`none == `available) + foreach (map source, Pkg::SourceEditGet (), { + integer srcid = source["SrcId"]:-1; + map data = Pkg::SourceGeneralData (srcid); + y2internal ("data source map: %1", data); + if (data["is_update_repo"]:false) { is_available = true; break; } }); - // continue/cancel message - if (!is_available && Popup::YesNo (_("No active update repository available. -Exit Online Update now? -"))) + // yes/no message + if (!is_available && Popup::YesNo (_("No update repository +configured yet. Run configuration workflow now?"))) { - Wizard::CloseDialog(); - return `abort; + any res = WFM::CallFunction ("online_update_configuration", []); + if (res != `next && res != `finish) + { + Wizard::CloseDialog(); + return `abort; + } } } -- 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] r56904 - /tags/stable-2_18_4/product-creator/
by jsuchome＠svn.opensuse.org 22 Apr '09

22 Apr '09

Author: jsuchome Date: Wed Apr 22 08:16:35 2009 New Revision: 56904 URL: http://svn.opensuse.org/viewcvs/yast?rev=56904&view=rev Log: Created tag stable-2_18_4 for product-creator Added: tags/stable-2_18_4/product-creator/ - copied from r56903, trunk/product-creator/ -- 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] r56903 - in /trunk/product-creator: VERSION package/yast2-product-creator.changes src/ProductCreator.ycp
by jsuchome＠svn.opensuse.org 22 Apr '09

22 Apr '09

Author: jsuchome Date: Wed Apr 22 08:16:30 2009 New Revision: 56903 URL: http://svn.opensuse.org/viewcvs/yast?rev=56903&view=rev Log: - look primary into base product for isolinux.cfg (bnc#496263) - 2.18.4 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/ProductCreator.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=5690… ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Wed Apr 22 08:16:30 2009 @@ -1 +1 @@ -2.18.3 +2.18.4 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Wed Apr 22 08:16:30 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 22 08:03:46 CEST 2009 - jsuchome(a)suse.cz + +- look primary into base product for isolinux.cfg (bnc#496263) +- 2.18.4 + +------------------------------------------------------------------- Tue Apr 14 15:40:03 CEST 2009 - jsuchome(a)suse.cz - Image Creator: install squashfs by default (bnc#485052) Modified: trunk/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/ProductCreat… ============================================================================== --- trunk/product-creator/src/ProductCreator.ycp (original) +++ trunk/product-creator/src/ProductCreator.ycp Wed Apr 22 08:16:30 2009 @@ -695,13 +695,18 @@ if (arch == "s390_64") arch = "s390x"; bootconfig_path = sformat("boot/%1/loader/isolinux.cfg", arch); - list<integer> srcids = [checkProductDependency()]; + + list<integer> srcids = []; + if (Config["base_repo"]:"" == "") + srcids = [checkProductDependency()]; + else + srcids = UrlToId ([Config["base_repo"]:""]); foreach(integer srcid, srcids, { y2milestone("Downloading %1 from source %2", bootconfig_path, srcid); bootconfig_path = Pkg::SourceProvideOptionalFile(srcids[0]:0, 1, bootconfig_path); - y2debug("bootconfig_path: %1", bootconfig_path); + y2debug ("bootconfig_path: %1", bootconfig_path); if (bootconfig_path == nil) { -- 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] r56902 - in /branches/tmp/SLE-11-SP1-Stash/yast2: library/packages/src/PackageCallbacks.ycp package/yast2.changes
by lslezak＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: lslezak Date: Tue Apr 21 20:34:06 2009 New Revision: 56902 URL: http://svn.opensuse.org/viewcvs/yast?rev=56902&view=rev Log: - PackageCallbacks.ycp - don't read non existing y2logRPM file (bnc#456446) Modified: branches/tmp/SLE-11-SP1-Stash/yast2/library/packages/src/PackageCallbacks.ycp branches/tmp/SLE-11-SP1-Stash/yast2/package/yast2.changes Modified: branches/tmp/SLE-11-SP1-Stash/yast2/library/packages/src/PackageCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/yast2/li… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/yast2/library/packages/src/PackageCallbacks.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/yast2/library/packages/src/PackageCallbacks.ycp Tue Apr 21 20:34:06 2009 @@ -547,11 +547,6 @@ { y2milestone("DonePackage(error: %1, reason: '%2')", error, reason); - string infopath = (string) SCR::Read (.target.tmpdir) + "/rpmlog"; - SCR::Execute (.target.bash, "/usr/bin/tail '" + String::Quote (Installation::destdir) - + Directory::logdir + "/y2logRPM' > " + infopath); - string info = reason + "\n---\n" + (string) SCR::Read (.target.string, [infopath, "-?-"]); - string message = sformat ( _deleting_package ? // error popup during package installation, %1 is the name of the package _("Removal of package %1 failed.") @@ -561,7 +556,7 @@ if (Mode::commandline()) { CommandLine::Print(message); - CommandLine::Print(info); + CommandLine::Print(reason); // ask user in the interactive mode if (CommandLine::Interactive()) @@ -599,7 +594,7 @@ if ( showLongInfo ) { UI::OpenDialog( `opt(`decorated), LayoutPopup (message, button_box, 10, true) ); - UI::ReplaceWidget(`id(`info), `RichText (`opt(`plainText), info) ); + UI::ReplaceWidget(`id(`info), `RichText (`opt(`plainText), reason) ); } else { @@ -616,7 +611,7 @@ showLongInfo = ShowLogInfo (message, button_box); if (showLongInfo) { - UI::ReplaceWidget(`id(`info), `RichText (`opt(`plainText), info) ); + UI::ReplaceWidget(`id(`info), `RichText (`opt(`plainText), reason) ); } else { @@ -645,6 +640,16 @@ // default: ignore } + else + { + // no error, there is additional info (rpm output), see bnc#456446 + y2milestone("Additional RPM otput: %1", reason); + + if (Mode::commandline()) + { + CommandLine::Print(reason); + } + } return "I"; } Modified: branches/tmp/SLE-11-SP1-Stash/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/yast2/pa… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/yast2/package/yast2.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/yast2/package/yast2.changes Tue Apr 21 20:34:06 2009 @@ -5,6 +5,12 @@ which indicates an error (bnc#157551) ------------------------------------------------------------------- +Wed Apr 8 11:27:13 CEST 2009 - lslezak(a)suse.cz + +- PackageCallbacks.ycp - don't read non existing y2logRPM file + (bnc#456446) + +------------------------------------------------------------------- Fri Apr 3 13:26:58 CEST 2009 - lslezak(a)suse.cz - Do not display "No package source" popup, just log a warning -- 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] r56901 - in /branches/tmp/SLE-11-SP1-Stash/packager: package/yast2-packager.changes src/modules/PackageInstallation.ycp src/modules/PackageSlideShow.ycp src/modules/SlideShowCallbacks.ycp
by lslezak＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: lslezak Date: Tue Apr 21 20:32:07 2009 New Revision: 56901 URL: http://svn.opensuse.org/viewcvs/yast?rev=56901&view=rev Log: - Append additional RPM output to the installation log only if it is not empty (bnc#495047) - Slideshow fixes - display additional rpm output in the installation log, do not use non-existing y2logRPM file (bnc#456446) - Avoid division by zero when total size to install is less than 1024B (converted to 0kB) Modified: branches/tmp/SLE-11-SP1-Stash/packager/package/yast2-packager.changes branches/tmp/SLE-11-SP1-Stash/packager/src/modules/PackageInstallation.ycp branches/tmp/SLE-11-SP1-Stash/packager/src/modules/PackageSlideShow.ycp branches/tmp/SLE-11-SP1-Stash/packager/src/modules/SlideShowCallbacks.ycp Modified: branches/tmp/SLE-11-SP1-Stash/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/packager… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/packager/package/yast2-packager.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/packager/package/yast2-packager.changes Tue Apr 21 20:32:07 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 21 15:34:48 CEST 2009 - lslezak(a)suse.cz + +- Append additional RPM output to the installation log only if it + is not empty (bnc#495047) + +------------------------------------------------------------------- Tue Apr 21 14:05:09 CEST 2009 - locilka(a)suse.cz - Using new function GetCachedFileFromSource from AddOnProduct @@ -13,6 +19,15 @@ repositories (bnc #496404). ------------------------------------------------------------------- +Wed Apr 8 10:38:15 CEST 2009 - lslezak(a)suse.cz + +- Slideshow fixes - display additional rpm output in the + installation log, do not use non-existing y2logRPM file + (bnc#456446) +- Avoid division by zero when total size to install is less than + 1024B (converted to 0kB) + +------------------------------------------------------------------- Fri Apr 3 14:31:20 CEST 2009 - locilka(a)suse.cz - Adjusting initial repository name according to LABEL in content Modified: branches/tmp/SLE-11-SP1-Stash/packager/src/modules/PackageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/packager… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/packager/src/modules/PackageInstallation.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/packager/src/modules/PackageInstallation.ycp Tue Apr 21 20:32:07 2009 @@ -156,9 +156,9 @@ list<string> errpacks = (list<string>) (commit_result[1]:[]); if (size (errpacks) > 0) { - string full_log = (string) SCR::Read (.target.string, Installation::destdir + - Directory::logdir + "/y2logRPM"); - ShowFailedPackages (mergestring (errpacks, "\n"), full_log); + // unfortunately the full log is not available :-( + ShowFailedPackages (mergestring (errpacks, "\n"), ""); + list<string> old_failed_packs = []; if ((integer)SCR::Read (.target.size, "/var/lib/YaST2/failed_packages") > 0) Modified: branches/tmp/SLE-11-SP1-Stash/packager/src/modules/PackageSlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/packager… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/packager/src/modules/PackageSlideShow.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/packager/src/modules/PackageSlideShow.ycp Tue Apr 21 20:32:07 2009 @@ -764,7 +764,15 @@ **/ void UpdateTotalProgress(boolean silent_check) { - SlideShow::StageProgress( ( TotalInstalledSize() >> 10 ) * 100 / ( total_size_to_install >> 10 ), nil /*, SlideShow::GetProgressLabel()*/ ); + integer total_size_to_install_kB = total_size_to_install >> 10; + + // avoid division by zero + if (total_size_to_install_kB <= 0) + { + total_size_to_install_kB = 1; + } + + SlideShow::StageProgress( ( TotalInstalledSize() >> 10 ) * 100 / total_size_to_install_kB, nil /*, SlideShow::GetProgressLabel()*/ ); UpdateCurrentCdProgress(silent_check); Modified: branches/tmp/SLE-11-SP1-Stash/packager/src/modules/SlideShowCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/packager… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/packager/src/modules/SlideShowCallbacks.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/packager/src/modules/SlideShowCallbacks.ycp Tue Apr 21 20:32:07 2009 @@ -422,6 +422,16 @@ { ret = PackageCallbacks::DonePackage( error, reason ); } + else + { + // put additional rpm output to the installation log + if (reason != nil && size(reason) > 0) + { + y2milestone("Additional RPM output: %1", reason); + SlideShow::AppendMessageToInstLog(reason); + } + } + if (size (ret) == 0 || tolower (substring (ret, 0, 1)) != "r") { PackageSlideShow::SlideDisplayDone( -- 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] r56900 - in /trunk/pkg-bindings: package/yast2-pkg-bindings.changes src/Resolvable_Properties.cc
by lslezak＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: lslezak Date: Tue Apr 21 19:27:23 2009 New Revision: 56900 URL: http://svn.opensuse.org/viewcvs/yast?rev=56900&view=rev Log: - Pkg::ResolvableDependencies() - also return raw (unresolved) dependencies in the result (key "deps"), remove duplicated dependencies in the result (bnc#479575) Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Resolvable_Properties.cc Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Tue Apr 21 19:27:23 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Apr 21 19:18:16 CEST 2009 - lslezak(a)suse.cz + +- Pkg::ResolvableDependencies() - also return raw (unresolved) + dependencies in the result (key "deps"), remove duplicated + dependencies in the result (bnc#479575) + +------------------------------------------------------------------- Mon Mar 30 16:24:58 CEST 2009 - lslezak(a)suse.cz - return "is_update_repo" flag in Pkg::SourceGeneralData() call Modified: trunk/pkg-bindings/src/Resolvable_Properties.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Resolvable_Prop… ============================================================================== --- trunk/pkg-bindings/src/Resolvable_Properties.cc (original) +++ trunk/pkg-bindings/src/Resolvable_Properties.cc Tue Apr 21 19:27:23 2009 @@ -407,6 +407,7 @@ _kinds.insert("enhances"); _kinds.insert("supplements"); YCPList ycpdeps; + YCPList rawdeps; for (std::set<std::string>::const_iterator kind_it = _kinds.begin(); kind_it != _kinds.end(); ++kind_it) { @@ -414,21 +415,50 @@ zypp::Dep depkind(*kind_it); zypp::Capabilities deps = item.resolvable()->dep(depkind); + // add raw dependencies + for_(it, deps.begin(), deps.end()) + { + YCPMap rawdep; + rawdep->add(YCPString(*kind_it), YCPString(it->asString())); + rawdeps->add(rawdep); + } + zypp::sat::WhatProvides prv(deps); + // resolve dependencies for (zypp::sat::WhatProvides::const_iterator d = prv.begin(); d != prv.end(); ++d) { - YCPMap ycpdep; - ycpdep->add (YCPString ("res_kind"), YCPString (d->kind().asString())); - ycpdep->add (YCPString ("name"), YCPString (d->name())); - ycpdep->add (YCPString ("dep_kind"), YCPString (*kind_it)); - ycpdeps->add (ycpdep); + if (d->kind().asString().empty() || d->name().empty()) + { + y2debug("Empty kind or name: kind: %s, name: %s", d->kind().asString().c_str(), d->name().c_str()); + } + else + { + YCPMap ycpdep; + ycpdep->add (YCPString ("res_kind"), YCPString (d->kind().asString())); + ycpdep->add (YCPString ("name"), YCPString (d->name())); + ycpdep->add (YCPString ("dep_kind"), YCPString (*kind_it)); + + if (!ycpdeps.contains(ycpdep)) + { + ycpdeps->add (ycpdep); + } + } } } catch (...) {} } - info->add (YCPString ("dependencies"), ycpdeps); + + if (ycpdeps.size() > 0) + { + info->add (YCPString ("dependencies"), ycpdeps); + } + + if (rawdeps.size() > 0) + { + info->add (YCPString ("deps"), rawdeps); + } } return info; -- 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] r56899 - /trunk/storage/libstorage/src/Disk.cc
by aschnell＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: aschnell Date: Tue Apr 21 18:39:28 2009 New Revision: 56899 URL: http://svn.opensuse.org/viewcvs/yast?rev=56899&view=rev Log: - use boost function Modified: trunk/storage/libstorage/src/Disk.cc Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Tue Apr 21 18:39:28 2009 @@ -36,10 +36,7 @@ init_disk = dmp_slave = iscsi = gpt_enlarge = false; nm = Name; undevDevice(nm); - logfile_name = nm; - string::size_type pos = 0; - while( (pos=logfile_name.find( '/', pos )) != string::npos ) - logfile_name[pos] = '_'; + logfile_name = boost::replace_all_copy(nm, "/", "_"); if( Name.find( "/dev/" )==0 ) dev = Name; else -- 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] r56898 - /trunk/bootloader/src/modules/BootArch.ycp
by aschnell＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: aschnell Date: Tue Apr 21 17:33:46 2009 New Revision: 56898 URL: http://svn.opensuse.org/viewcvs/yast?rev=56898&view=rev Log: - don't use StorageControllers::dasdParam which is always empty Modified: trunk/bootloader/src/modules/BootArch.ycp Modified: trunk/bootloader/src/modules/BootArch.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootArch.… ============================================================================== --- trunk/bootloader/src/modules/BootArch.ycp (original) +++ trunk/bootloader/src/modules/BootArch.ycp Tue Apr 21 17:33:46 2009 @@ -29,7 +29,6 @@ import "Linuxrc"; import "ProductFeatures"; import "Stage"; -import "StorageControllers"; /** * Get parameters for the default kernel @@ -79,8 +78,7 @@ if ( env_term == "linux\n" ) { termparm = "TERM=linux console=ttyS0 console=ttyS1"; } - string parameters = sformat ("%1 %2 %3", - StorageControllers::dasdParam, + string parameters = sformat ("%1 %2", features, termparm); return parameters; -- 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] r56897 - in /trunk/storage/storage/src/include: ep-hd.ycp ep-loop.ycp
by kmachalkova＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: kmachalkova Date: Tue Apr 21 17:05:41 2009 New Revision: 56897 URL: http://svn.opensuse.org/viewcvs/yast?rev=56897&view=rev Log: Function buttons for HDs (pretty dumb so far) Modified: trunk/storage/storage/src/include/ep-hd.ycp trunk/storage/storage/src/include/ep-loop.ycp Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Tue Apr 21 17:05:41 2009 @@ -56,6 +56,17 @@ } } + term HdButtonBox() + { + return `HBox( + // push button text + `PushButton(`id(`edit),`opt(`key_F4), _("Edit...")), + // push button text + `PushButton(`id(`resize), `opt(`key_F6), _("Resize...")), + // push button text + `PushButton(`id(`delete), `opt(`key_F5), _("Delete...")) + ); + } void CreateHdMainPanel(any user_data) { @@ -75,10 +86,6 @@ term table_header = StorageFields::TableHeader(fields); list<term> table_contents = StorageFields::TableContents(fields, target_map, Predicate); - term buttons = `HBox( - `HStretch() - ); - UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( @@ -86,9 +93,14 @@ `IconAndHeading(_("Hard Disks"), StorageIcons::hd_icon), `Table(`id(`table), `opt(`keepSorting, `notify, `notifyContextMenu), table_header, table_contents), - buttons + `HBox( + // push button text + `PushButton(`id(`add),`opt(`key_F3), _("Add Partition...")), + HdButtonBox(), + `HStretch() ) ) + ) ); // helptext @@ -128,8 +140,6 @@ `HStretch(), StorageFields::Overview(fields, target_map, device), `HBox( - // push button text - `PushButton(`id(`delete), _("Delete...")), `HStretch(), // push button text `PushButton(`id(`smart), _("Smart...")), @@ -247,12 +257,7 @@ `HBox( // push button text `PushButton(`id(`add),`opt(`key_F3), _("Add...")), - // push button text - `PushButton(`id(`edit),`opt(`key_F4), _("Edit...")), - // push button text - `PushButton(`id(`resize), `opt(`key_F6), _("Resize...")), - // push button text - `PushButton(`id(`delete), `opt(`key_F5), _("Delete...")), + HdButtonBox(), `HStretch(), // menu button text `MenuButton(`opt(`key_F7), _("Expert..."), expert_cmds) @@ -409,12 +414,7 @@ `IconAndHeading(sformat(_("Partition: %1"), device), StorageIcons::hd_part_icon), StorageFields::Overview(fields, target_map, device), `HBox( - // push button text - `PushButton(`id(`edit), `opt(`key_F4), _("Edit...")), - // push button text - `PushButton(`id(`resize), `opt(`key_F6), _("Resize...")), - // push button text - `PushButton(`id(`delete), `opt(`key_F5), _("Delete...")), + HdButtonBox(), `HStretch() ) ) Modified: trunk/storage/storage/src/include/ep-loop.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-loop.ycp (original) +++ trunk/storage/storage/src/include/ep-loop.ycp Tue Apr 21 17:05:41 2009 @@ -15,7 +15,7 @@ term LoopButtonBox() { return `HBox( - // push button text + // push button text `PushButton(`id(`edit), `opt(`key_F4), _("Edit...")), // push button text `PushButton(`id(`delete), `opt(`key_F5), _("Delete...")) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0