Mailinglist Archive: yast-commit (683 mails)

[locilka@xxxxxxxxxxxxxxxx]

Author: locilka
Date: Mon Dec  3 14:35:46 2007
New Revision: 42598

URL: http://svn.opensuse.org/viewcvs/yast?rev=42598&view=rev
Log:
- Installation Mode dialog adapted to new mod-UI and to new
  Image-Dimming support in UI.


Modified:
    trunk/installation/package/yast2-installation.changes
    trunk/installation/src/clients/inst_system_analysis.ycp

Modified: trunk/installation/package/yast2-installation.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=42598&r1=42597&r2=42598&view=diff
==============================================================================
--- trunk/installation/package/yast2-installation.changes (original)
+++ trunk/installation/package/yast2-installation.changes Mon Dec  3 14:35:46 
2007
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Mon Dec  3 14:34:38 CET 2007 - locilka@xxxxxxx
+
+- Installation Mode dialog adapted to new mod-UI and to new
+  Image-Dimming support in UI.
+
+-------------------------------------------------------------------
 Thu Nov 29 16:27:59 CET 2007 - locilka@xxxxxxx
 
 - Using Progress::NewProgressIcons to show icons during the network

Modified: trunk/installation/src/clients/inst_system_analysis.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_system_analysis.ycp?rev=42598&r1=42597&r2=42598&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_system_analysis.ycp (original)
+++ trunk/installation/src/clients/inst_system_analysis.ycp Mon Dec  3 14:35:46 
2007
@@ -248,11 +248,21 @@
     // help text for installation method
     _("<p>Select <b>Repair Installed System</b> if you have a damaged Linux 
system on
 your hard disk. This option can try to fix problems automatically.
+</p>") +
+
+    // help text for installation method
+    _("<p>Features <b>Update</b> and <b>Repair Installed System</b> are only
+available if some Linux system has been detected.
 </p>");
 }
 
 map display_info = UI::GetDisplayInfo();
 boolean in_textmode = display_info["TextMode"]:false;
+boolean has_image_dimm_support = display_info["HasDimmImageSupport"]:false;
+
+string GenerateIconID (any icon_whatever) {
+    return sformat ("icon_%1", tostring (icon_whatever));
+}
 
 /**
  * Function creates term containing radio button and icon
@@ -269,15 +279,14 @@
            `Empty()
            :
            `HWeight (
-                   1,
-                   (icon_file == "" ? `Empty() : `Image (icon_file, ""))
+               1,
+               (icon_file == "" ?
+                   `Empty()
+                   :
+                   `Image (`id (GenerateIconID (button_id)), icon_file, "")
+               )
            )
        ),
-       (in_textmode ?
-           `Empty()
-           :
-           `HSpacing (4)
-       ),
        `HWeight(
            5,
            `Left (`RadioButton (
@@ -292,13 +301,8 @@
 
 // see bugzilla #156529
 term InstModeDialogContent (symbol pre_selected) {
-    return `VBox (
-       `VWeight (60, `HVCenter (
-           `MarginBox (
-           `leftMargin (1),
-           `rightMargin (1.5),
-           `topMargin (0.5),
-           `bottomMargin (0.5),
+    return `HBox (
+           `HStretch(),
            `VBox (
                `Frame (
                    // frame
@@ -351,11 +355,9 @@
                    _("In&clude Add-On Products from Separate Media"),
                    Installation::add_on_selected
                ))
-           )
-       )
-       )),
-       `VWeight (20, `Empty ())
-    );
+           ),
+           `HStretch()
+       );
 }
 
 Wizard::SetContents (_("Analyzing the Computer"), `Empty (), "", false, false);
@@ -537,6 +539,17 @@
 if (other_options_disabled) {
     UI::ChangeWidget (`id (`update), `Enabled, false);
     UI::ChangeWidget (`id (`repair), `Enabled, false);
+
+    // disable also icons related to options if supported by UI
+    if (has_image_dimm_support) {
+       foreach (symbol image_id, [`update, `repair], {
+           string icon_id = GenerateIconID (image_id);
+
+           if (UI::WidgetExists (`id(icon_id))) {
+               UI::ChangeWidget (`id (icon_id), `Enabled, false);
+           }
+       });
+    }
 }
 
 // --> Handling User Input in Installation Mode

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx