Author: locilka
Date: Thu Jan 10 14:56:22 2008
New Revision: 43529
URL: http://svn.opensuse.org/viewcvs/yast?rev=43529&view=rev
Log:
- Added possibility to control visibility of Online Repositories
via the installation control file (hidden by default).
- Added more control-file documentation.
Modified:
trunk/installation/control/control.openSUSE.xml
trunk/installation/control/docs/control-section.xml
trunk/installation/package/yast2-installation.changes
trunk/installation/src/clients/inst_mode.ycp
Modified: trunk/installation/control/control.openSUSE.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.openSUSE.xml?rev=43529&r1=43528&r2=43529&view=diff
==============================================================================
--- trunk/installation/control/control.openSUSE.xml (original)
+++ trunk/installation/control/control.openSUSE.xml Thu Jan 10 14:56:22 2008
@@ -26,6 +26,9 @@
true
false
+ <!-- Offer online repositories feature in the installation -->
+ false
+
<!-- FATE #301937, Save /root content from the installation system to the installed system -->
Modified: trunk/installation/control/docs/control-section.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/docs/control-section.xml?rev=43529&r1=43528&r2=43529&view=diff
==============================================================================
--- trunk/installation/control/docs/control-section.xml (original)
+++ trunk/installation/control/docs/control-section.xml Thu Jan 10 14:56:22 2008
@@ -321,7 +321,7 @@
<para>The following variables can be set:</para>
<itemizedlist>
<listitem>
- <para>Timzeone</para>
+ <para>Timezone</para>
</listitem>
<listitem>
<para>Language</para>
@@ -350,6 +350,22 @@
</programlisting>
</section>
+
+ <section id="special_globals">
+ <title>Special Installation and Product Variables</title>
+ <para>These options usually enable or disable some installation feature.</para>
+
+ <itemizedlist>
+ <listitem><para>(boolean) <emphasis>enable_firewall</emphasis> - firewall will proposed as
+ either enabled or disabled in the network proposal.</para></listitem>
+ <listitem><para>(boolean) <emphasis>enable_clone</emphasis> - clonning feature
+ will be either enabled or disabled.</para></listitem>
+ <listitem><para>(boolean) <emphasis>skip_language_dialog</emphasis> - the language
+ dialog might be skipped (if language already selected).</para></listitem>
+ <listitem><para>(boolean) <emphasis>show_online_repositories</emphasis> - either shows
+ or hides the "online repositories" feature check-box.</para></listitem>
+ </itemizedlist>
+ </section>
<!-- FATE #301937, Save /root content from the installation system to the installed system -->
<section id="control_globals_save_instsys">
Modified: trunk/installation/package/yast2-installation.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=43529&r1=43528&r2=43529&view=diff
==============================================================================
--- trunk/installation/package/yast2-installation.changes (original)
+++ trunk/installation/package/yast2-installation.changes Thu Jan 10 14:56:22 2008
@@ -4,6 +4,9 @@
- Extended system type and software selection dialog. Added base
pattern (selected desktop) description, helps, default status
for secondary selections, ...
+- Added possibility to control visibility of Online Repositories
+ via the installation control file (hidden by default).
+- Added more control-file documentation.
-------------------------------------------------------------------
Tue Dec 18 16:54:39 CET 2007 - locilka@suse.cz
Modified: trunk/installation/src/clients/inst_mode.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_mode.ycp?rev=43529&r1=43528&r2=43529&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_mode.ycp (original)
+++ trunk/installation/src/clients/inst_mode.ycp Thu Jan 10 14:56:22 2008
@@ -28,6 +28,7 @@
import "Stage";
import "Storage";
import "Wizard";
+import "ProductFeatures";
include "packager/storage_include.ycp";
include "installation/misc.ycp";
@@ -105,6 +106,12 @@
return `auto;
}
+boolean show_online_repositories = ProductFeatures::GetBooleanFeature ("globals", "show_online_repositories");
+// if not visible, internally disabled as well
+if (show_online_repositories != true) {
+ Installation::productsources_selected = false;
+}
+
// see bugzilla #156529
term InstModeDialogContent (symbol pre_selected) {
return `HBox (
@@ -149,12 +156,16 @@
)
),
`VSpacing (2),
- `Left (`CheckBox (
- `id (`productsources), `opt(`notify),
- // check box
- _("&Add Online Repositories Before Installation"),
- Installation::productsources_selected
- )),
+ (show_online_repositories == true ?
+ `Left (`CheckBox (
+ `id (`productsources), `opt(`notify),
+ // check box
+ _("&Add Online Repositories Before Installation"),
+ Installation::productsources_selected
+ ))
+ :
+ `Empty()
+ ),
`Left (`CheckBox (
`id (`add_on), `opt(`notify),
// check box
@@ -186,10 +197,10 @@
</p>") +
// help text for installation option
- _("<p>
+ (show_online_repositories == true ? _("<p>
To use suggested remote repositories during installation or update, select
<b>Add Online Repositories Before Installation</b>.</p>
-") +
+"):"") +
// help text for installation method
_("<p>
@@ -258,25 +269,32 @@
// Use-Add-On-Product status changed
if (ret == `add_on) {
- Installation::add_on_selected = (boolean) UI::QueryWidget (`id (`add_on), `Value);
+ if (UI::WidgetExists (`id (`add_on)))
+ Installation::add_on_selected = (boolean) UI::QueryWidget (`id (`add_on), `Value);
ret = nil;
continue;
}
// Use Sources defined by product
else if (ret == `productsources) {
- Installation::productsources_selected = (boolean) UI::QueryWidget (`id (`productsources), `Value);
+ if (UI::WidgetExists (`id (`productsources)))
+ Installation::productsources_selected = (boolean) UI::QueryWidget (`id (`productsources), `Value);
ret = nil;
continue;
}
// Adjusting current UI - Other Options
else if (ret == `repair) {
// Remembering add-on state, switching off and disabling
- Installation::add_on_selected = (boolean) UI::QueryWidget (`id (`add_on), `Value);
+ if (UI::WidgetExists (`id (`add_on))) {
+ Installation::add_on_selected = (boolean) UI::QueryWidget (`id (`add_on), `Value);
- UI::ChangeWidget (`id(`add_on), `Value, false);
- UI::ChangeWidget (`id(`add_on), `Enabled, false);
- UI::ChangeWidget (`id(`productsources), `Value, false);
- UI::ChangeWidget (`id(`productsources), `Enabled, false);
+ UI::ChangeWidget (`id(`add_on), `Value, false);
+ UI::ChangeWidget (`id(`add_on), `Enabled, false);
+ }
+
+ if (UI::WidgetExists (`id (`productsources))) {
+ UI::ChangeWidget (`id(`productsources), `Value, false);
+ UI::ChangeWidget (`id(`productsources), `Enabled, false);
+ }
ret = nil;
continue;
@@ -287,10 +305,15 @@
symbol selected_mode = (symbol) UI::QueryWidget (`id (`inst_mode), `CurrentButton);
// Enabling add-on, adjusting previous state (selected)
- UI::ChangeWidget (`id(`add_on), `Enabled, true);
- UI::ChangeWidget (`id(`add_on), `Value, Installation::add_on_selected);
- UI::ChangeWidget (`id(`productsources), `Enabled, true);
- UI::ChangeWidget (`id(`productsources), `Value, Installation::productsources_selected);
+ if (UI::WidgetExists (`id (`add_on))) {
+ UI::ChangeWidget (`id(`add_on), `Enabled, true);
+ UI::ChangeWidget (`id(`add_on), `Value, Installation::add_on_selected);
+ }
+
+ if (UI::WidgetExists (`id (`productsources))) {
+ UI::ChangeWidget (`id(`productsources), `Enabled, true);
+ UI::ChangeWidget (`id(`productsources), `Value, Installation::productsources_selected);
+ }
// Can be either `install or `update
UI::ChangeWidget (`id(`inst_mode), `CurrentButton, selected_mode);
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
