December 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r54354 - /trunk/packager/src/clients/repositories.ycp
by lslezak＠svn.opensuse.org 31 Dec '08

31 Dec '08

Author: lslezak Date: Wed Dec 31 15:09:47 2008 New Revision: 54354 URL: http://svn.opensuse.org/viewcvs/yast?rev=54354&view=rev Log: - fixed change of a non-existing widget, better service alias to service name conversion Modified: trunk/packager/src/clients/repositories.ycp Modified: trunk/packager/src/clients/repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositorie… ============================================================================== --- trunk/packager/src/clients/repositories.ycp (original) +++ trunk/packager/src/clients/repositories.ycp Wed Dec 31 15:09:47 2008 @@ -168,7 +168,8 @@ integer priority = source["priority"]:default_priority; string url = repository_mode ? generalData["url"]:"" : source["url"]:""; - string service_name = Pkg::ServiceGet(source["service"]:"")["name"]:""; + string service_alias = source["service"]:""; + string service_name = service_alias != "" ? Pkg::ServiceGet(service_alias)["name"]:"" : ""; term item = repository_mode ? `item( @@ -318,7 +319,6 @@ UI::ChangeWidget(`id(`name), `Label, name); UI::ChangeWidget(`id(`url), `Label, url); UI::ChangeWidget(`id(`category), `Label, category); - UI::ChangeWidget(`id(`service), `Label, service); } else { @@ -343,7 +343,6 @@ UI::ChangeWidget(`id(`name), `Label, ""); UI::ChangeWidget(`id(`url), `Label, ""); UI::ChangeWidget(`id(`category), `Label, ""); - UI::ChangeWidget(`id(`service), `Label, ""); } 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] r54353 - /trunk/packager/src/clients/repositories.ycp
by lslezak＠svn.opensuse.org 31 Dec '08

31 Dec '08

Author: lslezak Date: Wed Dec 31 14:55:15 2008 New Revision: 54353 URL: http://svn.opensuse.org/viewcvs/yast?rev=54353&view=rev Log: - preselect the correct (current) view in the combobox widget Modified: trunk/packager/src/clients/repositories.ycp Modified: trunk/packager/src/clients/repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositorie… ============================================================================== --- trunk/packager/src/clients/repositories.ycp (original) +++ trunk/packager/src/clients/repositories.ycp Wed Dec 31 14:55:15 2008 @@ -558,13 +558,13 @@ list<term> buildList() { list<term> ret = [ - `item(`id(`all_repositories), _("All repositories")), - `item(`id(`all_services), _("All services")) + `item(`id(`all_repositories), _("All repositories"), repository_view), + `item(`id(`all_services), _("All services"), !repository_view && displayed_service == "") ]; foreach(map<string,any> srv_state, serviceStatesOut, { - term t = `item(`id(srv_state["alias"]:""), sformat(_("Service '%1'"), srv_state["name"]:"")); + term t = `item(`id(srv_state["alias"]:""), sformat(_("Service '%1'"), srv_state["name"]:""), repository_view && displayed_service == srv_state["alias"]:""); ret = add(ret, t); } ); -- 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] r54352 - /trunk/packager/src/clients/repositories.ycp
by lslezak＠svn.opensuse.org 31 Dec '08

31 Dec '08

Author: lslezak Date: Wed Dec 31 14:48:30 2008 New Revision: 54352 URL: http://svn.opensuse.org/viewcvs/yast?rev=54352&view=rev Log: - repositories.ycp - display "Service" column, small layout fixes Modified: trunk/packager/src/clients/repositories.ycp Modified: trunk/packager/src/clients/repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositorie… ============================================================================== --- trunk/packager/src/clients/repositories.ycp (original) +++ trunk/packager/src/clients/repositories.ycp Wed Dec 31 14:48:30 2008 @@ -167,8 +167,8 @@ : source["name"]:""; integer priority = source["priority"]:default_priority; - string url = repository_mode ? generalData["url"]:"" : source["url"]:""; + string service_name = Pkg::ServiceGet(source["service"]:"")["name"]:""; term item = repository_mode ? `item( @@ -179,6 +179,7 @@ source[ "autorefresh" ]:true ? UI::Glyph (`CheckMark) : "", // translators: unknown name for a given source name, + service_name, url ) : `item( @@ -251,7 +252,7 @@ UI::ChangeWidget( `id( `table ), `Items, items ); } - string repoInfoRichText(string name, string raw_url, string category, string service) + string repoInfoRichText(string name, string raw_url, string category) { string schema = tolower(URL::Parse(raw_url)["scheme"]:""); string icon_tag = "<IMG SRC=\"" + Directory::icondir + "/22x22/apps/" @@ -265,27 +266,19 @@ string url = sformat (_("URL: %1"), raw_url); - string ret = sformat("%1<BIG>%2</BIG>%3%4", icon_tag, name, url, category); - - if (service != "") - { - ret = ret + sformat("%1", service); - } - - return ret; + return sformat("%1<BIG>%2</BIG>%3 %4", icon_tag, name, url, category); } - term repoInfoTerm(string name, string url, string category, string service) + term repoInfoTerm() { return textmode() ? `VBox ( - `Left(`Heading(`id(`name), `opt(`hstretch), name)), - `Left(`Label(`id(`url), `opt(`hstretch), url)), - `Left(`Label(`id(`category), `opt(`hstretch), category )), - `Left(`Label(`id(`service), `opt(`hstretch), service)) + `Left(`Heading(`id(`name), `opt(`hstretch), "")), + `Left(`Label(`id(`url), `opt(`hstretch), "")), + `Left(`Label(`id(`category), `opt(`hstretch), "")) ) : - `VSquash(`MinHeight(6, `RichText(`id(`repo_info), ""))); + `VSquash(`MinHeight(4, `RichText(`id(`repo_info), ""))); } void fillRepoInfo(integer index, map source, boolean repo_mode, string service_name) @@ -329,7 +322,7 @@ } else { - UI::ChangeWidget(`id(`repo_info), `Value, repoInfoRichText(name, info["url"]:"", category, service)); + UI::ChangeWidget(`id(`repo_info), `Value, repoInfoRichText(name, info["url"]:"", category)); } UI::ChangeWidget (`id (`enable), `Value, info["enabled"]:true); @@ -605,6 +598,8 @@ `Center(_("Autorefresh")), // table header - name of the repo _("Name"), + // table header - service to which the repo belongs + _("Service"), // table header - URL of the repo _("URL") ) : @@ -713,7 +708,7 @@ `VBox( `Right(`ReplacePoint(`id(`filter_rp), RepoFilterWidget())), `VWeight(1, `ReplacePoint(`id(`tabrp), TableWidget(repository_view))), - repoInfoTerm("", "", "", ""), + repoInfoTerm(), // label `Left (`Label (_("Properties"))), @@ -724,9 +719,14 @@ // check box `Left (`CheckBox (`id (`enable), `opt(`notify), _("&Enabled"))), // check box - `Left (`CheckBox (`id (`autorefresh), `opt(`notify), _("Automatically &Refresh"))), + `Left (`CheckBox (`id (`autorefresh), `opt(`notify), _("Automatically &Refresh"))) + ) + ), + `HSpacing(1), + `HSquash( + `Bottom( // check box - `Left(`ReplacePoint(`id(`keeppkg_rp), `CheckBox(`id(`keeppackages), `opt(`notify), keeppackages_label))) + `ReplacePoint(`id(`keeppkg_rp), `CheckBox(`id(`keeppackages), `opt(`notify), keeppackages_label)) ) ), `HSpacing(1), -- 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] r54351 - in /trunk/packager: package/yast2-packager.changes src/clients/repositories.ycp
by lslezak＠svn.opensuse.org 31 Dec '08

31 Dec '08

Author: lslezak Date: Wed Dec 31 14:00:05 2008 New Revision: 54351 URL: http://svn.opensuse.org/viewcvs/yast?rev=54351&view=rev Log: - use a combo box for switching the view (instead of the large tree widget) (bnc#433857) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/repositories.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Dec 31 14:00:05 2008 @@ -2,7 +2,8 @@ Wed Dec 31 11:47:00 CET 2008 - lslezak(a)suse.cz - repositories.ycp - better layout for too small window size - (bnc#439807) + (bnc#439807), use a combo box for switching the view (instead of + the large tree widget) (bnc#433857) ------------------------------------------------------------------- Tue Dec 30 11:48:28 CET 2008 - lslezak(a)suse.cz Modified: trunk/packager/src/clients/repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositorie… ============================================================================== --- trunk/packager/src/clients/repositories.ycp (original) +++ trunk/packager/src/clients/repositories.ycp Wed Dec 31 14:00:05 2008 @@ -265,7 +265,14 @@ string url = sformat (_("URL: %1"), raw_url); - return sformat("%1<BIG>%2</BIG>%3%4%5", icon_tag, name, url, category, service); + string ret = sformat("%1<BIG>%2</BIG>%3%4", icon_tag, name, url, category); + + if (service != "") + { + ret = ret + sformat("%1", service); + } + + return ret; } term repoInfoTerm(string name, string url, string category, string service) @@ -555,28 +562,32 @@ return success; } -list<term> buildTree() +list<term> buildList() { - list<term> ret = []; - - list<term> services_t = []; + list<term> ret = [ + `item(`id(`all_repositories), _("All repositories")), + `item(`id(`all_services), _("All services")) + ]; foreach(map<string,any> srv_state, serviceStatesOut, { - term t = `item(`id(srv_state["alias"]:""), srv_state["name"]:""); - services_t = add(services_t, t); + term t = `item(`id(srv_state["alias"]:""), sformat(_("Service '%1'"), srv_state["name"]:"")); + ret = add(ret, t); } ); - // alphabetically sort the repositories (by "name" key) - // TODO FIXME: use lsort -// repositories_t = sort(term repo1, term repo2, repositories_t, {y2internal("val: %1", repo1[1]:""); return repo1[1]:"" < repo2[1]:"";}); - - return [ - // true = open the node - `item(`id(`services), _("Services"), true, services_t), - `item(`id(`repositories), _("Repositories"), true, []) - ]; + return ret; +} + +term RepoFilterWidget() +{ + // combobox label + return `ComboBox(`id(`service_filter), `opt(`notify), _("View"), buildList()); +} + +void UpdateCombobox() +{ + UI::ReplaceWidget(`id(`filter_rp), RepoFilterWidget()); } // return table widget definition @@ -699,62 +710,59 @@ } term contents = - `HBox( - `Tree(`id(`tree), `opt(`notify), "", buildTree()), - `VBox( - `VWeight(1, `ReplacePoint(`id(`tabrp), TableWidget(repository_view))), - `VBox( - repoInfoTerm("", "", "", ""), - // label - `Left (`Label (_("Properties"))), - // check box - `HBox( - `HSquash( - `VBox( - // check box - `Left (`CheckBox (`id (`enable), `opt(`notify), _("&Enabled"))), - // check box - `Left (`CheckBox (`id (`autorefresh), `opt(`notify), _("Automatically &Refresh"))), - // check box - `Left(`ReplacePoint(`id(`keeppkg_rp), `CheckBox(`id(`keeppackages), `opt(`notify), keeppackages_label))) - ) - ), - `HSpacing(1), - `HSquash(`ReplacePoint(`id(`priorp), `IntField(`id(`priority), `opt(`notify), priority_label, 0, 200, default_priority))), - `HStretch() - ), - `VSpacing (0.4), - - (have_rug) ? - // Checkbox label - `Left (`CheckBox (`id (`zmdsync), _("Synchronize Changes with &ZENworks"), !norug && sync_zmd)) - : `Empty(), - - `HBox( - `PushButton (`id (`add), `opt(`key_F3), - Label::AddButton ()), - `PushButton(`id(`replace), `opt(`key_F4), - Label::EditButton ()), - `PushButton (`id(`delete), `opt(`key_F5), - Label::DeleteButton ()), - `HStretch (), - `PushButton (`id (`key_mgr), _("&GPG Keys...")), - // menu button label - `MenuButton (`id(`menu_button), `opt(`key_F6), _("Refresh"), [ - `item(`id(`refresh), refreshButtonLabel ), - // menu button label - `item(`id(`autorefresh_all), _("Refresh All Autor&efreshed")), - // menu button label - `item(`id(`refresh_enabled), _("Refresh All &Enabled")) - ]) + `VBox( + `Right(`ReplacePoint(`id(`filter_rp), RepoFilterWidget())), + `VWeight(1, `ReplacePoint(`id(`tabrp), TableWidget(repository_view))), + repoInfoTerm("", "", "", ""), + + // label + `Left (`Label (_("Properties"))), + + `HBox( + `HSquash( + `VBox( + // check box + `Left (`CheckBox (`id (`enable), `opt(`notify), _("&Enabled"))), + // check box + `Left (`CheckBox (`id (`autorefresh), `opt(`notify), _("Automatically &Refresh"))), + // check box + `Left(`ReplacePoint(`id(`keeppkg_rp), `CheckBox(`id(`keeppackages), `opt(`notify), keeppackages_label))) ) - ) + ), + `HSpacing(1), + `HSquash(`ReplacePoint(`id(`priorp), `IntField(`id(`priority), `opt(`notify), priority_label, 0, 200, default_priority))), + `HStretch() + ), + `VSpacing (0.4), + + (have_rug) ? + // Checkbox label + `Left (`CheckBox (`id (`zmdsync), _("Synchronize Changes with &ZENworks"), !norug && sync_zmd)) + : `Empty(), + + `HBox( + `PushButton (`id (`add), `opt(`key_F3), + Label::AddButton ()), + `PushButton(`id(`replace), `opt(`key_F4), + Label::EditButton ()), + `PushButton (`id(`delete), `opt(`key_F5), + Label::DeleteButton ()), + `HStretch (), + // push button label + `PushButton (`id (`key_mgr), _("&GPG Keys...")), + // menu button label + `MenuButton (`id(`menu_button), `opt(`key_F6), _("Refresh"), [ + `item(`id(`refresh), refreshButtonLabel ), + // menu button label + `item(`id(`autorefresh_all), _("Refresh All Autor&efreshed")), + // menu button label + `item(`id(`refresh_enabled), _("Refresh All &Enabled")) + ]) ) ); // dialog caption string title = _("Configured Software Repositories"); -// string title = _("Media Containing the Software Repository"); // help string help_text = _(" @@ -823,9 +831,6 @@ fillTable(repository_view, displayed_service); fillCurrentRepoInfo(); - // set the current view to repositories - UI::ChangeWidget(`id(`tree), `CurrentItem, `repositories); - symbol input = nil; integer current = -1; @@ -920,23 +925,23 @@ // start the GPG key manager //RunGPGKeyMgmt(); } - else if (input == `tree) + else if (input == `service_filter) { - // handle tree events here... - any current_item = UI::QueryWidget(`id(`tree), `CurrentItem); + // handle the combobox events here... + any current_item = UI::QueryWidget(`id(`service_filter), `Value); // rebuild the dialog if needed - y2milestone("Current tree item: %1", current_item); + y2milestone("Current combobox item: %1", current_item); boolean update_table_widget = false; - if (current_item == `repositories) + if (current_item == `all_repositories) { update_table_widget = !repository_view || displayed_service != ""; y2milestone("Switching to repository view"); repository_view = true; displayed_service = ""; } - else if (current_item == `services) + else if (current_item == `all_services) { update_table_widget = repository_view; y2milestone("Switching to service view"); @@ -1103,8 +1108,8 @@ fillTable(repository_view, displayed_service); fillCurrentRepoInfo(); - // refresh also the tree widget - UI::ChangeWidget(`id(`tree), `Items, buildTree()); + // refresh also the combobox widget + UpdateCombobox(); } } else @@ -1140,8 +1145,8 @@ } ); - // refresh also the tree widget - UI::ChangeWidget(`id(`tree), `Items, buildTree()); + // refresh also the combobox widget + UpdateCombobox(); } } @@ -1290,8 +1295,8 @@ fillTable(repository_view, displayed_service); fillCurrentRepoInfo(); - // refresh also the tree widget - UI::ChangeWidget(`id(`tree), `Items, buildTree()); + // refresh also the combobox widget + UpdateCombobox(); } } } -- 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] r54350 - in /trunk/packager: package/yast2-packager.changes src/clients/repositories.ycp
by lslezak＠svn.opensuse.org 31 Dec '08

31 Dec '08

Author: lslezak Date: Wed Dec 31 11:52:17 2008 New Revision: 54350 URL: http://svn.opensuse.org/viewcvs/yast?rev=54350&view=rev Log: - repositories.ycp - better layout for too small window size (bnc#439807) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/repositories.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Dec 31 11:52:17 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Dec 31 11:47:00 CET 2008 - lslezak(a)suse.cz + +- repositories.ycp - better layout for too small window size + (bnc#439807) + +------------------------------------------------------------------- Tue Dec 30 11:48:28 CET 2008 - lslezak(a)suse.cz - display the Package selector instead of the Pattern selector Modified: trunk/packager/src/clients/repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositorie… ============================================================================== --- trunk/packager/src/clients/repositories.ycp (original) +++ trunk/packager/src/clients/repositories.ycp Wed Dec 31 11:52:17 2008 @@ -278,7 +278,7 @@ `Left(`Label(`id(`service), `opt(`hstretch), service)) ) : - `VSquash(`MinHeight(7, `RichText(`id(`repo_info), ""))); + `VSquash(`MinHeight(6, `RichText(`id(`repo_info), ""))); } void fillRepoInfo(integer index, map source, boolean repo_mode, string service_name) @@ -701,71 +701,54 @@ term contents = `HBox( `Tree(`id(`tree), `opt(`notify), "", buildTree()), - `VBox( - `HBox( - `VSpacing(9), - `ReplacePoint(`id(`tabrp), TableWidget(repository_view)), - `HSpacing() - ), - `HBox ( - `HSpacing(0.35), - `HWeight (1, `Frame ("", - `HBox ( - `HSpacing (1), - `HWeight( 1, `VBox ( - repoInfoTerm("", "", "", ""), - // label - `Left (`Label (_("Properties"))), - // check box - `HBox( - `HSquash( - `VBox( - `Left (`CheckBox (`id (`enable), `opt(`notify), _("&Enabled"))), - // check box - `Left (`CheckBox (`id (`autorefresh), `opt(`notify), _("Automatically &Refresh"))) - ) - ), - `HSquash(`VBox( - `Label(""), - `ReplacePoint(`id(`keeppkg_rp), `CheckBox(`id(`keeppackages), `opt(`notify), keeppackages_label)) - ) - ), - `HSquash(`ReplacePoint(`id(`priorp), `IntField(`id(`priority), `opt(`notify), priority_label, 0, 200, default_priority))), - `HStretch() - ), - `VSpacing (0.4), - (have_rug) ? - `Left (`CheckBox (`id (`zmdsync), - // Checkbox label - _("Synchronize Changes with &ZENworks"), - !norug && sync_zmd)) - : `Empty() - )), - `HSpacing (0.4) - ) - )), - `HSpacing (1.35) - ), - `VSpacing(0.3), - `HBox( - `PushButton (`id (`add), `opt(`key_F3), - Label::AddButton ()), - `PushButton(`id(`replace), `opt(`key_F4), - Label::EditButton ()), - `PushButton (`id(`delete), `opt(`key_F5), - Label::DeleteButton ()), - `HStretch (), - `PushButton (`id (`key_mgr), _("&GPG Keys...")), - // menu button label - `MenuButton (`id(`menu_button), `opt(`key_F6), _("Refresh"), [ - `item(`id(`refresh), refreshButtonLabel ), + `VBox( + `VWeight(1, `ReplacePoint(`id(`tabrp), TableWidget(repository_view))), + `VBox( + repoInfoTerm("", "", "", ""), + // label + `Left (`Label (_("Properties"))), + // check box + `HBox( + `HSquash( + `VBox( + // check box + `Left (`CheckBox (`id (`enable), `opt(`notify), _("&Enabled"))), + // check box + `Left (`CheckBox (`id (`autorefresh), `opt(`notify), _("Automatically &Refresh"))), + // check box + `Left(`ReplacePoint(`id(`keeppkg_rp), `CheckBox(`id(`keeppackages), `opt(`notify), keeppackages_label))) + ) + ), + `HSpacing(1), + `HSquash(`ReplacePoint(`id(`priorp), `IntField(`id(`priority), `opt(`notify), priority_label, 0, 200, default_priority))), + `HStretch() + ), + `VSpacing (0.4), + + (have_rug) ? + // Checkbox label + `Left (`CheckBox (`id (`zmdsync), _("Synchronize Changes with &ZENworks"), !norug && sync_zmd)) + : `Empty(), + + `HBox( + `PushButton (`id (`add), `opt(`key_F3), + Label::AddButton ()), + `PushButton(`id(`replace), `opt(`key_F4), + Label::EditButton ()), + `PushButton (`id(`delete), `opt(`key_F5), + Label::DeleteButton ()), + `HStretch (), + `PushButton (`id (`key_mgr), _("&GPG Keys...")), // menu button label - `item(`id(`autorefresh_all), _("Refresh All Autor&efreshed")), - // menu button label - `item(`id(`refresh_enabled), _("Refresh All &Enabled")) - ]) - ), - `VSpacing( 0.5 ) + `MenuButton (`id(`menu_button), `opt(`key_F6), _("Refresh"), [ + `item(`id(`refresh), refreshButtonLabel ), + // menu button label + `item(`id(`autorefresh_all), _("Refresh All Autor&efreshed")), + // menu button label + `item(`id(`refresh_enabled), _("Refresh All &Enabled")) + ]) + ) + ) ) ); -- 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] r54349 - in /trunk/yast2: library/packages/src/SlideShow.ycp package/yast2.changes
by lslezak＠svn.opensuse.org 30 Dec '08

30 Dec '08

Author: lslezak Date: Tue Dec 30 15:44:50 2008 New Revision: 54349 URL: http://svn.opensuse.org/viewcvs/yast?rev=54349&view=rev Log: - better help text for package installation progress dialog (bnc#443142) Modified: trunk/yast2/library/packages/src/SlideShow.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/packages/src/SlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Slide… ============================================================================== --- trunk/yast2/library/packages/src/SlideShow.ycp (original) +++ trunk/yast2/library/packages/src/SlideShow.ycp Tue Dec 30 15:44:50 2008 @@ -650,7 +650,8 @@ string HelpText() { // Help text while software packages are being installed (displayed only in rare cases) - string help_text = _("Please wait while packages are being installed."); + string help_text = _("Please wait while packages are being installed.") + + _("Aborting InstallationPackage installation can be abored using the Abort button. However, the system then can be in a inconsistent or unusable state or it may not boot if a basic system component is not installed."); return help_text; } 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 Dec 30 15:44:50 2008 @@ -3,6 +3,8 @@ - use "Installed Size" label in the summary table during package installation (bnc#355326) +- better help text for package installation progress dialog + (bnc#443142) ------------------------------------------------------------------- Tue Dec 23 08:38:26 CET 2008 - lslezak(a)suse.cz -- 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] r54348 - in /trunk/yast2: library/packages/src/SlideShow.ycp package/yast2.changes
by lslezak＠svn.opensuse.org 30 Dec '08

30 Dec '08

Author: lslezak Date: Tue Dec 30 14:40:14 2008 New Revision: 54348 URL: http://svn.opensuse.org/viewcvs/yast?rev=54348&view=rev Log: - use "Installed Size" label in the summary table during package installation (bnc#355326) Modified: trunk/yast2/library/packages/src/SlideShow.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/packages/src/SlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Slide… ============================================================================== --- trunk/yast2/library/packages/src/SlideShow.ycp (original) +++ trunk/yast2/library/packages/src/SlideShow.ycp Tue Dec 30 14:40:14 2008 @@ -535,8 +535,8 @@ `header( // Table headings for CD statistics during installation _("Media"), - // Table headings for CD statistics during installation - `Right( _("Size") ), + // Table headings for CD statistics during installation - keep as short as possible! + `Right( _("Installed Size") ), // Table headings for CD statistics during installation `Right( _("Packages") ), // Table headings for CD statistics during installation 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 Dec 30 14:40:14 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Dec 30 14:37:45 CET 2008 - lslezak(a)suse.cz + +- use "Installed Size" label in the summary table during package + installation (bnc#355326) + +------------------------------------------------------------------- Tue Dec 23 08:38:26 CET 2008 - lslezak(a)suse.cz - CommandLine.ycp - fixed handling of multiline help texts in -- 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] r54347 - in /trunk/packager: package/yast2-packager.changes src/modules/SpaceCalculation.ycp
by lslezak＠svn.opensuse.org 30 Dec '08

30 Dec '08

Author: lslezak Date: Tue Dec 30 13:35:58 2008 New Revision: 54347 URL: http://svn.opensuse.org/viewcvs/yast?rev=54347&view=rev Log: - do not display the free space warning in the installation summary for the partitions which are already almost full but nothing is going to be installed there (bnc#259493) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/SpaceCalculation.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Tue Dec 30 13:35:58 2008 @@ -4,6 +4,9 @@ - display the Package selector instead of the Pattern selector if there is a resolver problem during installation/update, display the conflicts immeditely (bnc#436721) +- do not display the free space warning in the installation summary + for the partitions which are already almost full but nothing is + going to be installed there (bnc#259493) ------------------------------------------------------------------- Tue Dec 23 09:46:51 CET 2008 - lslezak(a)suse.cz Modified: trunk/packager/src/modules/SpaceCalculation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SpaceCalcul… ============================================================================== --- trunk/packager/src/modules/SpaceCalculation.ycp (original) +++ trunk/packager/src/modules/SpaceCalculation.ycp Tue Dec 30 13:35:58 2008 @@ -611,14 +611,16 @@ //$[ "dir" : [ total, usednow, usedfuture ], .... ] foreach (string dir, list sizelist, Pkg::TargetGetDU(), { - y2milestone ("%1: %2", dir, sizelist); + y2milestone ("Disk usage of directory %1: %2", dir, sizelist); integer total = sizelist[0]:0; integer used_future = sizelist[2]:0; + integer used_now = sizelist[1]:0; integer current_free_size = (total - used_future); integer current_free_percent = current_free_size*100/total; - if (current_free_size > 0) + // ignore the partitions which were already full and no files will be installed there (bnc#259493) + if (used_future > used_now && current_free_size > 0) { if (current_free_percent < free_percent && current_free_size < max_unsufficient_free_size ) { -- 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] r54346 - /trunk/yast2/library/packages/src/PackagesUI.ycp
by lslezak＠svn.opensuse.org 30 Dec '08

30 Dec '08

Author: lslezak Date: Tue Dec 30 13:16:24 2008 New Revision: 54346 URL: http://svn.opensuse.org/viewcvs/yast?rev=54346&view=rev Log: - PackagesUI.ycp - documented mode option in RunPackageSelector() Modified: trunk/yast2/library/packages/src/PackagesUI.ycp Modified: trunk/yast2/library/packages/src/PackagesUI.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Packa… ============================================================================== --- trunk/yast2/library/packages/src/PackagesUI.ycp (original) +++ trunk/yast2/library/packages/src/PackagesUI.ycp Tue Dec 30 13:16:24 2008 @@ -184,7 +184,12 @@ * // default: false (disabled) * "display_support_status" : boolean // display the support status summary dialog, * // default: depends on the Product Feature "software", "display_support_status" - * "mode" : symbol // package selector mode, no default value + * "mode" : symbol // package selector mode, no default value, supported values: + * `youMode (online update mode), + * `updateMode (update mode), + * `searchMode (search filter view), + * `summaryMode (installation summary filter view), + * `repoMode (repositories filter view * ] * * @return symbol Returns `accept or `cancel . -- 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] r54345 - in /trunk/packager: package/yast2-packager.changes src/clients/inst_sw_select.ycp
by lslezak＠svn.opensuse.org 30 Dec '08

30 Dec '08

Author: lslezak Date: Tue Dec 30 12:13:24 2008 New Revision: 54345 URL: http://svn.opensuse.org/viewcvs/yast?rev=54345&view=rev Log: - display the Package selector instead of the Pattern selector if there is a resolver problem during installation/update, display the conflicts immeditely (bnc#436721) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/inst_sw_select.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Tue Dec 30 12:13:24 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Dec 30 11:48:28 CET 2008 - lslezak(a)suse.cz + +- display the Package selector instead of the Pattern selector + if there is a resolver problem during installation/update, + display the conflicts immeditely (bnc#436721) + +------------------------------------------------------------------- Tue Dec 23 09:46:51 CET 2008 - lslezak(a)suse.cz - repositories.ycp - configure 'keeppackages' repository option Modified: trunk/packager/src/clients/inst_sw_select.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_sw_sel… ============================================================================== --- trunk/packager/src/clients/inst_sw_select.ycp (original) +++ trunk/packager/src/clients/inst_sw_select.ycp Tue Dec 30 12:13:24 2008 @@ -20,6 +20,7 @@ textdomain "packager"; import "Packages"; + import "PackagesUI"; symbol ret = `again; @@ -32,7 +33,18 @@ while ( ret == `again ) { - ret = (symbol)WFM::CallFunction( "inst_packages", [] ); + // display the installation summary in case there is a solver problem (bnc#436721) + if (Packages::solve_errors > 0) + { + y2milestone("Unresolved conflicts, using summary mode"); + ret = PackagesUI::RunPackageSelector($["mode" : `summaryMode]); + } + else + { + ret = PackagesUI::RunPatternSelector(); + } + + y2milestone("Package selector result: %1", ret); if ( ret == `accept ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0