Author: jsuchome Date: Tue Dec 22 15:49:28 2009 New Revision: 60181 URL: http://svn.opensuse.org/viewcvs/yast?rev=60181&view=rev Log: - use menubutton for both iso image and directory tree (bnc#438223) - check for presence of autoyast profile (bnc#503047) - 2.19.0 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/complex.ycp trunk/product-creator/src/dialogs.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=60181... ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Tue Dec 22 15:49:28 2009 @@ -1 +1 @@ -2.18.11 +2.19.0 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pro... ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Tue Dec 22 15:49:28 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Dec 22 15:31:27 CET 2009 - jsuchome@suse.cz + +- use menubutton for both iso image and directory tree (bnc#438223) +- check for presence of autoyast profile (bnc#503047) +- 2.19.0 + +------------------------------------------------------------------- Fri Sep 4 15:17:06 CEST 2009 - jsuchome@suse.cz - merge changes from SLE11: Modified: trunk/product-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/complex.ycp?r... ============================================================================== --- trunk/product-creator/src/complex.ycp (original) +++ trunk/product-creator/src/complex.ycp Tue Dec 22 15:49:28 2009 @@ -137,8 +137,13 @@ term contents2 = `VBox( contents, `HBox ( - // push button label - `PushButton(`id(`create_button), _("&Create Product")), + // menu button label + `MenuButton (`id (`create_button), _("&Create Product..."), [ + // button label + `item(`id(`create_iso_button), _("ISO Image")), + // button label + `item(`id(`create_tree_button), _("Directory Tree")) + ]), // menu button label `MenuButton (`id (`kiwi), _("Cre&ate Image with KIWI..."), [ // push button label @@ -213,11 +218,25 @@ continue; } /* create */ - else if(ret == `create_button) { + else if(ret == `create_iso_button || ret == `create_tree_button) { string current = (string) UI::QueryWidget(`id(`table), `CurrentItem ); ProductCreator::Config = ProductCreator::Configs[current]:$[]; // check the needed packages if (!checkNeededPackages()) continue; + + if (ret == `create_iso_button) + { + ProductCreator::Config["result"] = "iso"; + string isofile_path = ProductCreator::Config["isofile"]:""; + if (isofile_path == "") + { + ProductCreator::Config["isofile"] = ProductCreator::Config["name"]:"" + ".iso"; + } + } + else + { + ProductCreator::Config["result"] = "tree"; + } ret = `create; break; } Modified: trunk/product-creator/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/dialogs.ycp?r... ============================================================================== --- trunk/product-creator/src/dialogs.ycp (original) +++ trunk/product-creator/src/dialogs.ycp Tue Dec 22 15:49:28 2009 @@ -11,6 +11,7 @@ textdomain "product-creator"; + import "FileUtils"; import "ProductCreator"; import "Wizard"; import "SourceManager"; @@ -231,8 +232,15 @@ if (rb == `autoyast) { + string profile_loc = (string)UI::QueryWidget(`id(`profile_loc), `Value); + if (!FileUtils::Exists (profile_loc)) + { + // error message + Report::Error (sformat (_("The file '%1' does not exist. Choose a correct one."), profile_loc)); + continue; + } ProductCreator::Config["pkgtype"] = "autoyast"; - ProductCreator::Config["profile"] = (string)UI::QueryWidget(`id(`profile_loc), `Value); + ProductCreator::Config["profile"] = profile_loc; ProductCreator::Config["copy_profile"] = (boolean)UI::QueryWidget(`id(`copyprofile), `Value); } else { @@ -256,7 +264,8 @@ continue; } else { - y2error("unexpected retcode: %1", ret); + if (ret != `autoyast && ret != `pkgmgr) + y2error("unexpected retcode: %1", ret); continue; } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org