Author: locilka Date: Thu Jan 10 14:18:57 2008 New Revision: 43526 URL: http://svn.opensuse.org/viewcvs/yast?rev=43526&view=rev Log: - Extended system type and software selection dialog. Added base pattern (selected desktop) description, helps, default status for secondary selections, ... Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_software_selection.ycp trunk/installation/src/modules/InstData.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=43526&r1=43525&r2=43526&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Jan 10 14:18:57 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jan 10 14:08:17 CET 2008 - locilka@suse.cz + +- Extended system type and software selection dialog. Added base + pattern (selected desktop) description, helps, default status + for secondary selections, ... + +------------------------------------------------------------------- Tue Dec 18 16:54:39 CET 2007 - locilka@suse.cz - Added new desktop and software selection dialog. Modified: trunk/installation/src/clients/inst_software_selection.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_software_selection.ycp?rev=43526&r1=43525&r2=43526&view=diff ============================================================================== --- trunk/installation/src/clients/inst_software_selection.ycp (original) +++ trunk/installation/src/clients/inst_software_selection.ycp Thu Jan 10 14:18:57 2008 @@ -31,8 +31,17 @@ DefaultDesktop::Init(); string default_desktop = DefaultDesktop::Desktop (); -// TRANSLATORS: help text -string help = _("<p>FIXME: ....</p>"); +// TRANSLATORS: help text 1/3 +string help = _("<p>This is a base selection where you can decide which common +parts of the system will by installed.</p>") + + +// TRANSLATORS: help text 2/3 +_("<p>First, select a <b>Type of System</b> that allows you to choose +the base task of the system.</p>") + + +// TRANSLATORS: help text 3/3 +_("<p>Then, choose secondary system tasks - what do you want to do with +this system.</p>"); /** * @struct $[ @@ -50,42 +59,36 @@ "gnome" : $[ "order" : 1, "label" : _("GNOME Desktop"), - "description" : "FIXME...", "patterns" : ["gnome", "x11", "base"], "icon" : "pattern-gnome.png", ], "kde" : $[ "order" : 1, "label" : _("KDE Desktop"), - "description" : "FIXME...", "patterns" : ["kde", "x11", "base"], "icon" : "pattern-kde.png", ], "xfce" : $[ "order" : 4, "label" : _("XFCE Desktop"), - "description" : "FIXME...", "patterns" : ["xfce", "x11", "base"], "icon" : "yast-tv.png", ], "min_x" : $[ "order" : 6, "label" : _("Minimal X"), - "description" : "FIXME...", "patterns" : ["x11", "base"], "icon" : "yast-x11.png", ], "textmode" : $[ "order" : 8, "label" : _("Text Mode"), - "description" : "FIXME...", "patterns" : ["base"], "icon" : "yast-sshd.png", ], "base" : $[ "order" : 9, "label" : _("Base (Minimal) Selection"), - "description" : "FIXME...", "patterns" : ["base"], "icon" : "yast.png", ] @@ -98,29 +101,45 @@ "label" : _("Open and modify documents from my mother"), "patterns" : ["office"], "icon" : "yast-messages.png", - // FIXME: ... - // "default" : boolean + "default" : true, ], - "imaging" : $[ + "multimedia" : $[ "order" : 6, + "label" : _("Use multimedia"), + "patterns" : ["multimedia"], + "icon" : "yast-sound.png", + "default" : true, + ], + "imaging" : $[ + "order" : 7, "label" : _("Do some graphics"), "patterns" : ["imaging"], "icon" : "yast-autofs.png", + "default" : false, ], - "multimedia" : $[ - "order" : 9, - "label" : _("Use multimedia"), - "patterns" : ["multimedia"], - "icon" : "yast-sound.png", + "games" : $[ + "order" : 8, + "label" : _("Play games"), + "patterns" : ["games"], + "icon" : "yast-joystick.png", + "default" : false, ], "network_admin" : $[ "order" : 10, "label" : _("Administer and debug network"), "patterns" : ["network_admin"], "icon" : "yast-network.png", + "default" : false, ], ]; +foreach (string task_name, map one_task, system_tasks, { + // if not yet defined, assign a boolean value for particular + if (! haskey (InstData::current_systasks_status, task_name)) { + InstData::current_systasks_status[task_name] = one_task["default"]:false; + } +}); + string SystemTaskID (string task_name) { return sformat ("systemtask:%1", task_name); } @@ -136,12 +155,20 @@ Pkg::ResolvableInstall (one_pattern, `pattern); }); + // go through all known system tasks foreach (string one_task_name, map one_system_task, system_tasks, { + // when a task is selected if ((boolean) UI::QueryWidget (`id (SystemTaskID (one_task_name)), `Value) == true) { + // pre-select all patterns listed in it foreach (string one_pattern, (list <string>) system_tasks[one_task_name, "patterns"]:[], { y2milestone ("Marking system-task pattern to be installed: %1", one_pattern); Pkg::ResolvableInstall (one_pattern, `pattern); }); + + // and store its state for the next run + InstData::current_systasks_status[one_task_name] = true; + } else { + InstData::current_systasks_status[one_task_name] = false; } }); } @@ -157,7 +184,7 @@ `item ( `id ("-none-"), // TRANSLATORS: Combo box item - _("Please, chose one...") + _("Choose one...") ) ]; @@ -193,9 +220,11 @@ ret[counter] = `HBox ( (text_mode ? `Empty():`Image (Directory::themedir + "/current/icons/22x22/apps/" + system_tasks[task_name,"icon"]:"yast.png", "")), (text_mode ? `Empty():`HSpacing (1)), - `Left(`CheckBox ( + `Left (`CheckBox ( `id (SystemTaskID (task_name)), - system_tasks[task_name,"label"]:"" + system_tasks[task_name,"label"]:"", + // default values, need to be read on exit + InstData::current_systasks_status[task_name]:false )) ); }); @@ -203,29 +232,45 @@ return ret; } +void RedrawSelDesktopInfo (string currently_selected) { + list <string> desktop_patterns = all_desktops[currently_selected,"patterns"]:[]; + list