Author: lslezak
Date: Mon Sep 8 16:41:56 2008
New Revision: 50812
URL: http://svn.opensuse.org/viewcvs/yast?rev=50812&view=rev
Log:
- preliminary support for sevices - display a tree on the left side
(does not work yet), print to which service the selected
repository belongs
- 2.17.11
Modified:
trunk/packager/VERSION
trunk/packager/package/yast2-packager.changes
trunk/packager/src/clients/repositories.ycp
trunk/packager/src/include/repositories_include.ycp
Modified: trunk/packager/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=50812&r1=50811&r2=50812&view=diff
==============================================================================
--- trunk/packager/VERSION (original)
+++ trunk/packager/VERSION Mon Sep 8 16:41:56 2008
@@ -1 +1 @@
-2.17.10
+2.17.11
Modified: trunk/packager/package/yast2-packager.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=50812&r1=50811&r2=50812&view=diff
==============================================================================
--- trunk/packager/package/yast2-packager.changes (original)
+++ trunk/packager/package/yast2-packager.changes Mon Sep 8 16:41:56 2008
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Mon Sep 8 16:36:40 CEST 2008 - lslezak@suse.cz
+
+- preliminary support for sevices - display a tree on the left side
+ (does not work yet), print to which service the selected
+ repository belongs
+- 2.17.11
+
+-------------------------------------------------------------------
Mon Sep 8 13:29:25 CEST 2008 - locilka@suse.cz
- Less confusing Add-On update/installation mode handling
Modified: trunk/packager/src/clients/repositories.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositories.ycp?rev=50812&r1=50811&r2=50812&view=diff
==============================================================================
--- trunk/packager/src/clients/repositories.ycp (original)
+++ trunk/packager/src/clients/repositories.ycp Mon Sep 8 16:41:56 2008
@@ -42,9 +42,17 @@
boolean full_mode = false;
+ // cache for textmode value
+ boolean text_mode = nil;
+
boolean textmode()
{
- return Mode::commandline() ? true : UI::GetDisplayInfo()["TextMode"]:false;
+ if (text_mode == nil)
+ {
+ text_mode = Mode::commandline() ? true : UI::GetDisplayInfo()["TextMode"]:false;
+ }
+
+ return text_mode;
}
integer numSources = 0;
@@ -59,6 +67,12 @@
// default (minimal) priority of a repository
const integer default_priority = 99;
+ // current view:
+ // selected service (or empty) if all services are selected
+ string displayed_service = "";
+ // service/repository view flag
+ boolean repository_view = true;
+
void RemoveDeletedAddNewRepos () {
list > ret = [];
@@ -183,7 +197,7 @@
UI::ChangeWidget( `id( `table ), `Items, items );
}
- string repoInfoRichText(string name, string raw_url, string category)
+ string repoInfoRichText(string name, string raw_url, string category, string service)
{
string schema = tolower(URL::Parse(raw_url)["scheme"]:"");
string icon_tag = "![](\"")
srv_state, serviceStatesOut,
+ {
+ term t = `item(`id(srv_state["name"]:""), srv_state["name"]:"");
+ services_t = add(services_t, 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, [])
+ ];
+}
+
+any SummaryDialog () {
y2milestone ("Running Summary dialog");
// push button - change URL of the selected repository
@@ -365,6 +412,8 @@
}
term contents =
+ `HBox(
+ `Tree(`id(`tree), `opt(`notify), "", buildTree()),
`VBox(
`HBox(
`VSpacing(9),
@@ -390,7 +439,7 @@
`HBox (
`HSpacing (1),
`HWeight( 1, `VBox (
- repoInfoTerm("", "", ""),
+ repoInfoTerm("", "", "", ""),
// label
`Left (`Label (_("Properties"))),
// check box
@@ -438,6 +487,7 @@
])
),
`VSpacing( 0.5 )
+ )
);
// dialog caption
@@ -792,6 +842,11 @@
// do not refresh the item in the table
current = -1;
}
+ else if (input == `tree)
+ {
+ // TODO FIXME handle tree events here...
+ // rebuild the dialog here
+ }
else
{
y2warning("Unknown user input: %1", input);
@@ -903,7 +958,10 @@
PackageCallbacks::InitPackageCallbacks ();
}
+ // read repositories
boolean restore = (!full_mode) ? Pkg::SourceRestore() : true;
+ // read services
+ restore = restore && Pkg::ServicesLoad();
if( ! restore )
{
boolean cont = Popup::AnyQuestionRichText(
@@ -927,6 +985,18 @@
y2milestone( "Found repositories: %1", sourceStatesIn);
sourceStatesOut = sourceStatesIn;
+ list<string> srv_aliases = Pkg::ServiceAliases();
+ // get the current services
+ foreach(string srv_alias, srv_aliases,
+ {
+ serviceStatesIn = add(serviceStatesIn, Pkg::ServiceGet(srv_alias));
+ }
+ );
+
+ y2milestone("Loaded services: %1", serviceStatesIn);
+
+ serviceStatesOut = serviceStatesIn;
+
map aliases = $[
"summary" : ``(SummaryDialog ()),
"type" : ``(StartTypeDialog()),
Modified: trunk/packager/src/include/repositories_include.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/include/repositories_include.ycp?rev=50812&r1=50811&r2=50812&view=diff
==============================================================================
--- trunk/packager/src/include/repositories_include.ycp (original)
+++ trunk/packager/src/include/repositories_include.ycp Mon Sep 8 16:41:56 2008
@@ -28,6 +28,9 @@
list > sourceStatesIn = [];
list > sourceStatesOut = [];
+ list > serviceStatesIn = [];
+ list > serviceStatesOut = [];
+
// constant Plaindir
const string plaindir_type = "Plaindir";
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
