Author: jsuchome Date: Mon Aug 27 12:13:26 2007 New Revision: 40494 URL: http://svn.opensuse.org/viewcvs/yast?rev=40494&view=rev Log: - do not require packages with image descriptions, include required files (originally created by ms@suse.de for kiwi-desc-buildservice and kiwi-desc-livesystem) as templates (#289552) - show kiwi error output in separate window - enable Browse button for output directory - 2.15.6 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/Kiwi.ycp trunk/product-creator/src/kiwi_dialogs.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=40494... ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Mon Aug 27 12:13:26 2007 @@ -1 +1 @@ -2.15.5 +2.15.6 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 Mon Aug 27 12:13:26 2007 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Mon Aug 27 11:18:37 CEST 2007 - jsuchome@suse.cz + +- do not require packages with image descriptions, include required + files (originally created by ms@suse.de for kiwi-desc-buildservice + and kiwi-desc-livesystem) as templates (#289552) +- show kiwi error output in separate window +- enable Browse button for output directory +- 2.15.6 + +------------------------------------------------------------------- Tue Aug 14 13:17:24 CEST 2007 - jsuchome@suse.cz - enable double-clicks in tables Modified: trunk/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/Kiwi.ycp?rev=... ============================================================================== --- trunk/product-creator/src/Kiwi.ycp (original) +++ trunk/product-creator/src/Kiwi.ycp Mon Aug 27 12:13:26 2007 @@ -465,18 +465,23 @@ // construct the dialog UI::OpenDialog(`opt(`decorated), `HBox(`HSpacing(1.5), - `VSpacing(25), `VBox( `HSpacing(85), - `VSpacing(0.5), - // label - `ReplacePoint (`id (`rpl), `Left (`Label(_("Preparing for Image Creation")))), - `VSpacing(0.5), - `LogView (`id (`log), "", 8, 0), - `VSpacing(0.5), - `ReplacePoint (`id (`rp), `PushButton (`id(`cancel),`opt(`key_F9), Label::CancelButton ())), - `VSpacing(0.5)), - `HSpacing(1.5) + `VWeight (2, `VBox ( + `VSpacing(0.5), + // label + `ReplacePoint (`id (`rpl), `Left (`Label(_("Preparing for Image Creation")))), + `VSpacing(0.5), + `LogView (`id (`log), "", 8, 0) + )), + `VWeight (1, `VBox ( + `VSpacing(0.5), + `LogView (`id (`errlog), "", 8, 0), + `VSpacing(0.5), + `ReplacePoint (`id (`rp), `PushButton (`id(`cancel),`opt(`key_F9), Label::CancelButton ())), + `VSpacing(0.5) + )) + ), `HSpacing(1.5) )); symbol ret = nil; @@ -494,7 +499,11 @@ UI::ChangeWidget (`id(`log), `LastLine, line + "\n"); }); - list script_err = (list) SCR::Read(.background.newerr); + list<string> err = (list<string>) SCR::Read(.background.newerr); + foreach (string line, err, { + line = String::Replace (line, "\r", "\n"); + UI::ChangeWidget (`id(`errlog), `LastLine, line + "\n"); + }); } else if (!(boolean)SCR::Read(.background.isrunning)) { Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs.... ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Mon Aug 27 12:13:26 2007 @@ -11,6 +11,7 @@ import "CWM"; import "CWMTab"; + import "Directory"; import "ProductCreator"; import "FileUtils"; import "Label"; @@ -721,6 +722,12 @@ if (!FileUtils::Exists (kiwi_configuration)) { + // use local template if default dir does not exist (bug #289552) + if (!FileUtils::Exists (default_dir)) + { + default_dir = Directory::datadir+"/product-creator/kiwi_templates/"; + default_dir = default_dir + (kiwi_task == "xen" ? "xen" : "iso"); + } y2warning ("directory %1 is not available, using %2", kiwi_configuration, default_dir); kiwi_configuration = default_dir; } @@ -1651,6 +1658,16 @@ repositories = remove (repositories, selected); update_repo_table (); } + else if (ret == `browse) + { + string dir = UI::AskForExistingDirectory ("", + // popup for file selection dialog + _("Path to the Output Directory")); + if (dir!= nil) + { + UI::ChangeWidget (`id (`out_dir), `Value, dir); + } + } else if (ret == `next) { out_dir = (string) UI::QueryWidget (`id (`out_dir), `Value); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org