Attachment 137935 Details for Bug 145513

[patch] proposed fix

PhoneService.diff (text/plain), 5.94 KB, created by Karsten Keil on 2007-05-07 16:17:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Karsten Keil

Created: 2007-05-07 16:17:46 UTC

Size: 5.94 KB

patch

obsolete

>diff -ur YaST2.org/include/phone-services/answering_machine.ycp YaST2/include/phone-services/answering_machine.ycp
>--- YaST2.org/include/phone-services/answering_machine.ycp	2005-09-08 10:36:24.000000000 +0200
>+++ YaST2/include/phone-services/answering_machine.ycp	2007-05-07 16:52:31.000000000 +0200
>@@ -18,6 +18,12 @@
> import "Label";
> import "Popup";
> 
>+
>+map<string,string> actionmap = $[
>+				"MailAndSave" : _("MailAndSave"),
>+				"SaveOnly"    : _("SaveOnly")
>+				];
>+
> define map AM_UserEditDialog(string uname, map uconf);
> 
> /**
>@@ -96,7 +102,7 @@
> 	    m["voice_numbers"]:"",
> 	    m["voice_delay"]:"",
> 	    m["record_length"]:"",
>-	    m["voice_action"]:"");
>+	    actionmap[m["voice_action"]:""]:"");
> 	table_items = add(table_items, item);
> 	items = items + 1;
>     });
>@@ -209,7 +215,7 @@
> 		    m["voice_numbers"]:"",
> 		    m["voice_delay"]:"",
> 		    m["record_length"]:"",
>-		    m["voice_action"]:"");
>+		    actionmap[m["voice_action"]:""]:"");
> 		table_items = add(table_items, item);
> 		items = items + 1;
> 	    });
>@@ -264,7 +270,6 @@
>     }
> 
>     y2debug("uc=%1", uc);
>-    list actions = [ "None", "MailAndSave", "SaveOnly" ];
> 
>     UI::OpenDialog(`opt(`decorated),`VBox(
> 	`HSpacing(1),
>@@ -278,7 +283,11 @@
> 	    /* ComboBox label */
> 	    `ComboBox(`id(`duration), `opt(`editable, `hstretch), _("D&uration"), rlength_val),
> 	    /* ComboBox label */
>-	    `ComboBox(`id(`action), `opt(`hstretch), _("&Action"), actions),
>+	    `ComboBox(`id(`action), `opt(`hstretch), _("&Action"), [
>+			`item(`id(`MailAndSave),actionmap["MailAndSave"]:""),
>+			`item(`id(`SaveOnly),actionmap["SaveOnly"]:"")
>+
>+		]),
> 	    /* TextEntry label */
> 	    `TextEntry(`id(`pin), _("P&in"), uc["pin"]:"")
> 	),
>@@ -293,7 +302,11 @@
> 	UI::ChangeWidget(`id(`user), `Value, uname);
>     UI::ChangeWidget(`id(`delay), `Value, uc["voice_delay"]:"10");
>     UI::ChangeWidget(`id(`duration), `Value, uc["record_length"]:"60");
>-    UI::ChangeWidget(`id(`action), `Value, uc["voice_action"]:"MailAndSave");
>+    if (uc["voice_action"]:"" == "MailAndSave")
>+    	UI::ChangeWidget(`id(`action), `Value, `MailAndSave);
>+    else
>+	UI::ChangeWidget(`id(`action), `Value, `SaveOnly);
>+	
>     UI::ChangeWidget(`id(`phone), `ValidChars, "0123456789#*,");
>     UI::ChangeWidget(`id(`delay), `ValidChars, "0123456789");
>     UI::ChangeWidget(`id(`duration), `ValidChars, "0123456789");
>@@ -303,6 +316,7 @@
>     any ret = nil;
>     string user = "";
>     string sval = "";
>+    any aval = nil;
> 
>     while(true) {
> 	ret = UI::UserInput();
>@@ -339,14 +353,16 @@
> 	/* Duration "" is OK, default value  */
> 	uc = add(uc, "record_length", sval);
> 
>-	sval = (string) UI::QueryWidget(`id(`action), `Value);
>-	if(sval == nil || sval == "") {
>+	aval =  UI::QueryWidget(`id(`action), `Value);
>+	if(aval == nil) {
> 	    /* Popup::Error text */
> 	    Popup::Error(_("Action is invalid."));
> 	    UI::SetFocus(`id(`action));
> 	    continue;
>-	}
>-	uc = add(uc, "voice_action", sval);
>+	} else if (aval == `MailAndSave)
>+	    uc = add(uc, "voice_action", "MailAndSave");
>+	else if (aval == `SaveOnly)
>+	    uc = add(uc, "voice_action", "SaveOnly");
> 
> 	sval = (string) UI::QueryWidget(`id(`pin), `Value);
> 	/* Pin "" is OK, no remote control */
>diff -ur YaST2.org/include/phone-services/fax.ycp YaST2/include/phone-services/fax.ycp
>--- YaST2.org/include/phone-services/fax.ycp	2005-09-08 10:36:24.000000000 +0200
>+++ YaST2/include/phone-services/fax.ycp	2007-05-07 16:40:25.000000000 +0200
>@@ -18,6 +18,12 @@
> import "Label";
> import "Popup";
> 
>+map<string,string> actionmap = $[
>+				"MailAndSave" : _("MailAndSaveYY"),
>+				"SaveOnly"    : _("SaveOnlyXX")
>+				];
>+
>+
> define map Fax_UserEditDialog(string uname, map uconf);
> 
> /**
>@@ -108,7 +114,7 @@
> 	    k,
> 	    m["fax_numbers"]:"",
> 	    m["outgoing_MSN"]:"",
>-	    m["fax_action"]:"",
>+	    actionmap[m["fax_action"]:""]:"",
> 	    m["fax_stationID"]:"",
> 	    m["fax_headline"]:"");
> 	table_items = add(table_items, item);
>@@ -238,7 +244,7 @@
> 		    k,
> 		    m["fax_numbers"]:"",
> 		    m["outgoing_MSN"]:"",
>-		    m["fax_action"]:"",
>+		    actionmap[m["fax_action"]:""]:"",
> 		    m["fax_stationID"]:"",
> 		    m["fax_headline"]:"");
> 		table_items = add(table_items, item);
>@@ -290,7 +296,6 @@
>     }
> 
>     y2debug("uc=%1", uc);
>-    list actions = [ "MailAndSave", "SaveOnly" ];
> 
>     UI::OpenDialog(`opt(`decorated),`HBox(
> 	`HSpacing(2),
>@@ -311,7 +316,11 @@
> 	    `TextEntry(`id(`headline), _("&Headline"), uc["fax_headline"]:""),
> 	    `VSpacing(0.5),
> 	    /* ComboBox label */
>-	    `ComboBox(`id(`action), `opt(`hstretch), _("&Action"), actions),
>+	    `ComboBox(`id(`action), `opt(`hstretch), _("&Action"), [
>+			`item(`id(`MailAndSave),actionmap["MailAndSave"]:""),
>+			`item(`id(`SaveOnly),actionmap["SaveOnly"]:"")
>+
>+		]),
> 	    `VSpacing(1),
> 	    `HBox(
> 		`PushButton(`id(`ok), `opt(`default), Label::OKButton()),
>@@ -326,13 +335,18 @@
> 	UI::ChangeWidget(`id(`user), `Value, uname);
>     UI::ChangeWidget(`id(`phone), `ValidChars, "0123456789#*,");
>     UI::ChangeWidget(`id(`station), `ValidChars, "0123456789+ ");
>-    UI::ChangeWidget(`id(`action), `Value, uc["fax_action"]:"MailAndSave");
>+    if (uc["fax_action"]:"" == "MailAndSave")
>+    	UI::ChangeWidget(`id(`action), `Value, `MailAndSave);
>+    else
>+	UI::ChangeWidget(`id(`action), `Value, `SaveOnly);
>+	
>     UI::SetFocus(`id(`user));
> 
>     any ret = nil;
>     string user = "";
>     string sval = "";
>     string oval = "";
>+    any aval = nil;
> 
>     while(true) {
> 	ret = UI::UserInput();
>@@ -384,14 +398,16 @@
> 	}
> 	uc = add(uc, "fax_headline", sval);
> 
>-	sval = (string) UI::QueryWidget(`id(`action), `Value);
>-	if(sval == nil || sval == "") {
>+	aval =  UI::QueryWidget(`id(`action), `Value);
>+	if(aval == nil) {
> 	    /* Popup::Error text */
> 	    Popup::Error(_("Action is invalid."));
> 	    UI::SetFocus(`id(`action));
> 	    continue;
>-	}
>-	uc = add(uc, "fax_action", sval);
>+	} else if (aval == `MailAndSave)
>+	    uc = add(uc, "fax_action", "MailAndSave");
>+	else if (aval == `SaveOnly)
>+	    uc = add(uc, "fax_action", "SaveOnly");
> 
> 	break;
>     }

Actions: View | Diff

Attachments on bug 145513: 65004 | 137935 | 138884