Author: ug Date: Fri Mar 26 10:44:13 2010 New Revision: 61507 URL: http://svn.opensuse.org/viewcvs/yast?rev=61507&view=rev Log: <notification> add to scripts UI Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/dialogs/script_dialogs.ycp trunk/autoinstallation/src/modules/AutoinstScripts.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=61507&r1=61506&r2=61507&view=diff ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Fri Mar 26 10:44:13 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Mar 26 10:43:46 CET 2010 - ug@suse.de + +- <notification> add to scripts UI + +------------------------------------------------------------------- Fri Mar 26 09:57:13 CET 2010 - ug@suse.de - fixed a race when final_halt or final_reboot was used Modified: trunk/autoinstallation/src/dialogs/script_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/dialogs/script_dialogs.ycp?rev=61507&r1=61506&r2=61507&view=diff ============================================================================== --- trunk/autoinstallation/src/dialogs/script_dialogs.ycp (original) +++ trunk/autoinstallation/src/dialogs/script_dialogs.ycp Fri Mar 26 10:44:13 2010 @@ -182,6 +182,9 @@ ), `VSpacing(1), `HBox( + `TextEntry(`id(`notification), `opt(`notify), _("Text of the notification popup"), script["notification"]:"" ) + ), + `HBox( `TextEntry(`id(`location), `opt(`notify), _("Script Location"), script["location"]:"" ) ), `HBox( @@ -213,6 +216,7 @@ UI::ChangeWidget (`id(`chrooted), `Enabled, false); UI::ChangeWidget (`id(`network), `Enabled, false); UI::ChangeWidget (`id(`feedback), `Enabled, false); + UI::ChangeWidget (`id(`notification), `Enabled, false); } if( size( (string)UI::QueryWidget( `id(`location), `Value ) ) > 0 ) { @@ -246,6 +250,7 @@ boolean chrooted = (boolean)UI::QueryWidget(`id(`chrooted), `Value); boolean network = (boolean)UI::QueryWidget(`id(`network), `Value); string location = (string)UI::QueryWidget(`id(`location), `Value); + string notification = (string)UI::QueryWidget(`id(`notification), `Value); if ( (source == "" && location == "" ) || scriptName == "") { @@ -257,7 +262,7 @@ } else { - AutoinstScripts::AddEditScript( scriptName, source, interpreter, type, chrooted, debug, feedback, network, feedback_type, location); + AutoinstScripts::AddEditScript( scriptName, source, interpreter, type, chrooted, debug, feedback, network, feedback_type, location, notification); } } else if (ret == `loadsource) @@ -278,21 +283,25 @@ UI::ChangeWidget (`id(`feedback), `Value, false); UI::ChangeWidget (`id(`chrooted), `Value, false); UI::ChangeWidget (`id(`network), `Value, false); + UI::ChangeWidget (`id(`notification), `Enabled, false); } else if( type == "chroot-scripts" ) { UI::ChangeWidget (`id(`chrooted), `Enabled, true); UI::ChangeWidget (`id(`feedback), `Enabled, true); UI::ChangeWidget (`id(`network), `Enabled, false); UI::ChangeWidget (`id(`network), `Value, false); + UI::ChangeWidget (`id(`notification), `Enabled, true); } else if( type == "post-scripts" ) { UI::ChangeWidget (`id(`chrooted), `Enabled, false); UI::ChangeWidget (`id(`chrooted), `Value, false); UI::ChangeWidget (`id(`feedback), `Enabled, true); + UI::ChangeWidget (`id(`notification), `Enabled, true); UI::ChangeWidget (`id(`network), `Enabled, true); } else if( type == "pre-scripts" ) { UI::ChangeWidget (`id(`chrooted), `Enabled, false); UI::ChangeWidget (`id(`chrooted), `Value, false); UI::ChangeWidget (`id(`feedback), `Enabled, true); UI::ChangeWidget (`id(`network), `Value, false); + UI::ChangeWidget (`id(`notification), `Enabled, true); UI::ChangeWidget (`id(`network), `Enabled, false); } } else if( ret == `feedback ) { Modified: trunk/autoinstallation/src/modules/AutoinstScripts.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstScripts.ycp?rev=61507&r1=61506&r2=61507&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstScripts.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstScripts.ycp Fri Mar 26 10:44:13 2010 @@ -148,6 +148,7 @@ return ($["filename":p["filename"]:"", "interpreter": p["interpreter"]:"", "source":p["source"]:"", + "notification":p["notification"]:"", "location":p["location"]:"", "feedback":p["feedback"]:false, "feedback_type":p["feedback_type"]:"", @@ -159,6 +160,7 @@ "interpreter": p["interpreter"]:"", "source":p["source"]:"", "location":p["location"]:"", + "notification":p["notification"]:"", "feedback":p["feedback"]:false, "feedback_type":p["feedback_type"]:"", "debug":p["debug"]:true, @@ -171,6 +173,7 @@ "interpreter": p["interpreter"]:"", "source":p["source"]:"", "chrooted":p["chrooted"]:false, + "notification":p["notification"]:"", "location":p["location"]:"", "feedback":p["feedback"]:false, "feedback_type":p["feedback_type"]:"", @@ -189,6 +192,7 @@ "interpreter": p["interpreter"]:"", "source":p["source"]:"", "location":p["location"]:"", + "notification":p["notification"]:"", "feedback":p["feedback"]:false, "feedback_type":p["feedback_type"]:"", "debug":p["debug"]:true @@ -366,7 +370,8 @@ boolean feedback, boolean network, string feedback_type, - string location + string location, + string notification ) { boolean mod = false; @@ -385,6 +390,7 @@ oldScript=add(oldScript,"network_needed",network); oldScript=add(oldScript,"feedback_type", feedback_type); oldScript=add(oldScript,"location", location); + oldScript=add(oldScript,"notification", notification); mod = true; return oldScript; @@ -407,6 +413,7 @@ script=add(script,"network_needed",network); script=add(script,"feedback_type", feedback_type); script=add(script,"location", location); + script=add(script,"notification", notification); merged=add(merged,script); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org