Author: jsuchome Date: Fri Nov 16 21:38:08 2007 New Revision: 42152 URL: http://svn.opensuse.org/viewcvs/yast?rev=42152&view=rev Log: - do not mention CD source in help texts (#341615) - disable Delete button when there's nothing to delete (#341932) - make the progress window smaller with small resolutions (#342046) - do not automatically remove broken sources from the table (#341634) - bigger timout before killing kiwi with SIGKILL (#341635) - 2.13.24 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/SourceDialogsLite.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION?rev=42152&r1=42151&r2=42152&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION Fri Nov 16 21:38:08 2007 @@ -1 +1 @@ -2.13.23 +2.13.24 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes?rev=42152&r1=42151&r2=42152&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Fri Nov 16 21:38:08 2007 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Fri Nov 16 12:59:17 CET 2007 - jsuchome@suse.cz + +- do not mention CD source in help texts (#341615) +- disable Delete button when there's nothing to delete (#341932) +- make the progress window smaller with small resolutions (#342046) +- do not automatically remove broken sources from the table (#341634) +- bigger timout before killing kiwi with SIGKILL (#341635) +- 2.13.24 + +------------------------------------------------------------------- Mon Nov 12 12:30:16 CET 2007 - jsuchome@suse.cz - do not allow importing non-system configurations (#340495) Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp?rev=42152&r1=42151&r2=42152&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp Fri Nov 16 21:38:08 2007 @@ -607,6 +607,11 @@ SCR::Execute (.target.bash, sformat ("rm -rf %1", chroot_dir)); } + integer height = 8; + map display_info = UI::GetDisplayInfo (); + // reduce the height with small resolutions (#342046) + if (display_info["TextMode"]:false || display_info["Height"]:0 < 600) + height = 6; // construct the dialog UI::OpenDialog(`opt(`decorated), `HBox(`HSpacing(1.5), `VBox( @@ -616,11 +621,11 @@ // label `ReplacePoint (`id (`rpl), `Left (`Label(_("Preparing for Image Creation")))), `VSpacing(0.5), - `LogView (`id (`log), "", 8, 0) + `LogView (`id (`log), "", height, 0) )), `VWeight (1, `VBox ( `VSpacing(0.5), - `LogView (`id (`errlog), "", 8, 0), + `LogView (`id (`errlog), "", height / 2, 0), `VSpacing(0.5), `ReplacePoint (`id (`rp), `PushButton (`id(`cancel),`opt(`key_F9), Label::CancelButton ())), `VSpacing(0.5) @@ -702,12 +707,27 @@ } if (ret == `cancel) { - SCR::Execute(.background.kill); + integer pid = (integer)SCR::Read (.background.pid); + if (pid != -1) + { + // first, send a sigterm + SCR::Execute (.target.bash, sformat ("kill %1", pid)); + // busy popup message + Popup::ShowFeedback (_("Closing kiwi..."), + // busy popup message + _("This will take a while...")); + sleep (5000); + if ((boolean)SCR::Read(.background.isrunning)) + // .background.kill sends a sigkill after another second + SCR::Execute(.background.kill); + Popup::ClearFeedback (); + } } sleep (100); } while (ret == nil); - SCR::Execute(.background.kill); + if ((boolean)SCR::Read(.background.isrunning)) + SCR::Execute(.background.kill); UI::CloseDialog (); return ret == `ok; } Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/SourceDialogsLite.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/SourceDialogsLite.ycp?rev=42152&r1=42151&r2=42152&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/SourceDialogsLite.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/SourceDialogsLite.ycp Fri Nov 16 21:38:08 2007 @@ -770,7 +770,7 @@ string SelectWidgetHelp () { // help text string help_text = _("<p><big><b>Catalog Media</b></big><br> -The software catalog can be located on CD, on a network server, +The software catalog can be located on a network server, or on the hard disk.</p>"); // help, continued Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp?rev=42152&r1=42151&r2=42152&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp Fri Nov 16 21:38:08 2007 @@ -612,6 +612,7 @@ Wizard::HideAbortButton(); UI::ChangeWidget (`id (`edit), `Enabled, size (overview) > 0); + UI::ChangeWidget (`id (`delete), `Enabled, size (overview) > 0); if (size (overview) > 0) { string current = (string) UI::QueryWidget(`id(`table), `CurrentItem); @@ -657,6 +658,8 @@ overview = filter (term it, (list<term>) overview, ``(it[0,0]:"" != current)); UI::ChangeWidget (`id (`table), `Items, overview); + UI::ChangeWidget (`id (`edit), `Enabled, size (overview) > 0); + UI::ChangeWidget (`id (`delete), `Enabled, size (overview) > 0); } } else if (ret == `edit) Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp?rev=42152&r1=42151&r2=42152&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Fri Nov 16 21:38:08 2007 @@ -1898,6 +1898,7 @@ kiwi_task = (string) UI::QueryWidget (`id (`type), `Value); list<string> failed_repositories = []; + map new_repositories = $[]; if (size (repositories) > 0) { map current_sources = $[]; @@ -1909,7 +1910,7 @@ current_sources[url] = srcid; }); // initialize new repos now - repositories = filter (string url, map repo, repositories, { + new_repositories = filter (string url, map repo, repositories, { if (substring (url, 0, 1) == "/") url = "dir://" + url; if (haskey (current_sources, url)) @@ -1942,9 +1943,12 @@ Continue anyway?"), mergestring (failed_repositories, "\n")))) { - update_repo_table (); continue; } + else + { + repositories = new_repositories; + } } break; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org