Mailinglist Archive: yast-commit (683 mails)

[locilka@xxxxxxxxxxxxxxxx]

Author: locilka
Date: Mon Dec  3 16:52:59 2007
New Revision: 42614

URL: http://svn.opensuse.org/viewcvs/yast?rev=42614&view=rev
Log:
- Installation Mode dialog adapted to new bright and better mod_UI.
- Using informative icon in some inst_network_check script.
- 2.16.6


Modified:
    trunk/installation/VERSION
    trunk/installation/package/yast2-installation.changes
    trunk/installation/src/clients/inst_network_check.ycp
    trunk/installation/yast2-installation.spec.in

Modified: trunk/installation/VERSION
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=42614&r1=42613&r2=42614&view=diff
==============================================================================
--- trunk/installation/VERSION (original)
+++ trunk/installation/VERSION Mon Dec  3 16:52:59 2007
@@ -1 +1 @@
-2.16.5
+2.16.6

Modified: trunk/installation/package/yast2-installation.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=42614&r1=42613&r2=42614&view=diff
==============================================================================
--- trunk/installation/package/yast2-installation.changes (original)
+++ trunk/installation/package/yast2-installation.changes Mon Dec  3 16:52:59 
2007
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Mon Dec  3 16:49:46 CET 2007 - locilka@xxxxxxx
+
+- Installation Mode dialog adapted to new bright and better mod_UI.
+- Using informative icon in some inst_network_check script.
+- 2.16.6
+
+-------------------------------------------------------------------
 Mon Dec  3 14:34:38 CET 2007 - locilka@xxxxxxx
 
 - Installation Mode dialog adapted to new mod-UI and to new

Modified: trunk/installation/src/clients/inst_network_check.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_network_check.ycp?rev=42614&r1=42613&r2=42614&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_network_check.ycp (original)
+++ trunk/installation/src/clients/inst_network_check.ycp Mon Dec  3 16:52:59 
2007
@@ -19,20 +19,39 @@
     import "Wizard";
     import "Popup";
     import "GetInstArgs";
-    
+    import "Directory";
+    import "Icon";
+
     boolean enable_next = true;
     boolean enable_back = true;
 
+    /**
+     * Script can be called with some arguments
+     *
+     * @struct [$[
+     *   "dontskip" : true, // do not skipt the dialog even if network is 
configured
+     * ]]
+     */
+    map argmap = GetInstArgs::argmap();
+    y2milestone ("Script args: %1", argmap);
+
     /*
      * We don't need to run this script to setup the network
      * If some network is already running...
      */
     if (NetworkService::isNetworkRunning()) {
-       y2milestone ("Network is already running, skipping...");
-       return `next;
+       if (argmap["dontskip"]:false == true) {
+           y2milestone ("Network is already running, not skipping 
(forced)...");
+       } else {
+           y2milestone ("Network is already running, skipping...");
+           return `next;
+       }
+    } else {
+       y2milestone ("No network configuration found, offering to set it 
up...");
     }
 
-    y2milestone ("No network configuration found, offering to set it up...");
+    map displayinfo = UI::GetDisplayInfo();
+    boolean supports_images = displayinfo["HasImageSupport"]:false;
 
     Wizard::SetContents (
        // TRANSLATORS: dialog caption
@@ -45,9 +64,19 @@
                    `HStretch (),
                    `VBox (
                        // TRANSLATORS: dialog label
-                       `Left(`Label (_("No network setup has been found.
+                       `HBox (
+                           (supports_images ?
+                               `HBox (
+                                   Icon::Simple ("warning"),
+                                   `HSpacing (2)
+                               )
+                               :
+                               `Empty()
+                           ),
+                           `Left (`Label (_("No network setup has been found.
 It is vitally important for using remote repositories
-otherwise you can safely skip it."))),
+otherwise you can safely skip it.")))
+                       ),
                        `VSpacing (2),
                        // TRANSLATORS: dialog label
                        `Left(`Label (_("Would you like to configure your 
network card now?"))),

Modified: trunk/installation/yast2-installation.spec.in
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.spec.in?rev=42614&r1=42613&r2=42614&view=diff
==============================================================================
--- trunk/installation/yast2-installation.spec.in (original)
+++ trunk/installation/yast2-installation.spec.in Mon Dec  3 16:52:59 2007
@@ -8,6 +8,7 @@
 
 Requires:       autoyast2-installation
 # Progress::NewProgressIcons
+# Icon YCP module
 Requires:      yast2 >= 2.16.16
 # Required in in the first stage, after
 # switching to the installed system, bugzilla #249679

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