Mailinglist Archive: yast-commit (815 mails)

< Previous Next >
[yast-commit] r40063 - in /branches/SuSE-SLE-10-SP2-Branch/autoinstallation: package/autoyast2.changes src/dialogs/ask.ycp
  • From: ug@xxxxxxxxxxxxxxxx
  • Date: Tue, 07 Aug 2007 14:40:54 -0000
  • Message-id: <20070807144054.70959CDF71@xxxxxxxxxxxxxxxx>
Author: ug
Date: Tue Aug  7 16:40:54 2007
New Revision: 40063

URL: http://svn.opensuse.org/viewcvs/yast?rev=40063&view=rev
Log:
no frame if no frametitle is defined in ask-questions

Modified:
    branches/SuSE-SLE-10-SP2-Branch/autoinstallation/package/autoyast2.changes
    branches/SuSE-SLE-10-SP2-Branch/autoinstallation/src/dialogs/ask.ycp

Modified: branches/SuSE-SLE-10-SP2-Branch/autoinstallation/package/autoyast2.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/autoinstallation/package/autoyast2.changes?rev=40063&r1=40062&r2=40063&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/autoinstallation/package/autoyast2.changes (original)
+++ branches/SuSE-SLE-10-SP2-Branch/autoinstallation/package/autoyast2.changes Tue Aug  7 16:40:54 2007
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Tue Aug  7 16:40:36 CEST 2007 - ug@xxxxxxx
+
+- no frame if no frametitle is defined in ask-questions
+
+-------------------------------------------------------------------
 Wed Jul 11 14:52:21 CEST 2007 - ug@xxxxxxx
 
 - multiple questions per ask-dialog

Modified: branches/SuSE-SLE-10-SP2-Branch/autoinstallation/src/dialogs/ask.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/autoinstallation/src/dialogs/ask.ycp?rev=40063&r1=40062&r2=40063&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/autoinstallation/src/dialogs/ask.ycp (original)
+++ branches/SuSE-SLE-10-SP2-Branch/autoinstallation/src/dialogs/ask.ycp Tue Aug  7 16:40:54 2007
@@ -54,20 +54,35 @@
                 term dlg = `Dummy();
                 if( type == "boolean" ) {
                     boolean on=(ask["default"]:nil=="true")?(true):(false);
-                    dlg = `Left( `Frame ( frametitle, `CheckBox(`id(entry_id), question,on ) ) );
+                    if( frametitle != "" ) {
+                        dlg = `Left( `Frame ( frametitle, `CheckBox(`id(entry_id), question,on ) ) );
+                    } else {
+                        dlg = `Left( `CheckBox(`id(entry_id), question,on ) );
+                    }
                 } else if( type == "symbol" ) {
                     list<any> dummy = [];
                     foreach( map<string,any> e, s, ``{
                         boolean on=(e["value"]:""==ask["default"]:nil)?(true):(false);
                         dummy = add( dummy, `item(`id(e["value"]:`none), e["label"]:"",on) );
                     });
-                    dlg = `Left( `Frame ( frametitle, `ComboBox( `id(entry_id), question, dummy ) ) );
+                    if( frametitle != "" ) {
+                        dlg = `Left( `Frame ( frametitle, `ComboBox( `id(entry_id), question, dummy ) ) );
+                    } else {
+                        dlg = `Left( `ComboBox( `id(entry_id), question, dummy ) );
+                    }
                 } else {
                     if( ask["password"]:false == true ) {
-                        dlg = `Left( `Frame ( frametitle, `VBox(
-                                 `Password(`id(entry_id), question),
-                                 `Password(`id(`pass2), question)
-                                ) ) );
+                        if( frametitle != "" ) {
+                            dlg = `Left( `Frame ( frametitle, `VBox(
+                                     `Password(`id(entry_id), question),
+                                     `Password(`id(`pass2), question)
+                                    ) ) );
+                        } else {
+                            dlg = `Left( `VBox(
+                                    `Password(`id(entry_id), question),
+                                    `Password(`id(`pass2), question)
+                                    ) );
+                        }
                     } else {
                         if( haskey( ask, "selection" ) ) {
                             list<any> dummy = [];
@@ -75,9 +90,17 @@
                                 boolean on=(e["value"]:""==ask["default"]:nil)?(true):(false);
                                 dummy = add( dummy, `item(`id(e["value"]:""), e["label"]:"",on) );
                             });
-                            dlg = `Left( `Frame ( frametitle, `ComboBox( `id(entry_id), question, dummy ) ) );
+                            if( frametitle != "" ) {
+                                dlg = `Left( `Frame ( frametitle, `ComboBox( `id(entry_id), question, dummy ) ) );
+                            } else {
+                                dlg = `Left( `ComboBox( `id(entry_id), question, dummy ) );
+                            }
                         } else {
-                            dlg = `Left( `Frame ( frametitle, `TextEntry(`id(entry_id), question, ask["default"]:"" ) ) );
+                            if( frametitle != "" ) {
+                                dlg = `Left( `Frame ( frametitle, `TextEntry(`id(entry_id), question, ask["default"]:"" ) ) );
+                            } else {
+                                dlg = `Left( `TextEntry(`id(entry_id), question, ask["default"]:"" ) );
+                            }
                         }
                     }
                 }

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

< Previous Next >
This Thread
  • No further messages