Evolution side coding for implementing security-classification send-options for GroupWise

svn path=/trunk/; revision=32329

4 files changed, 129 insertions, 21 deletions

diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 2f8c25c8c2..75fd7d9f78 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-17  Sankar P  <psankar@novell.com>
+
+	* Replaced classification with security in the send-options
+	so that the client ui looks consistent (GW)
+	* e-send-options.[c|h|glade]:
+	
 2006-07-11  Hiroyuki Ikezoe  <poincare@ikezoe.net>
 
 	** Fixes bug #347166
diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c
index 7778d9e17b..644d054905 100644
--- a/widgets/misc/e-send-options.c
+++ b/widgets/misc/e-send-options.c
@@ -57,8 +57,8 @@ struct _ESendOptionsDialogPrivate {
 	/* priority */
 	GtkWidget *priority;
 
-	/* Classification */
-	GtkWidget *classification;
+	/* Security */
+	GtkWidget *security;
 		
 	/* Widgets for Reply Requestion options */
 	GtkWidget *reply_request;
@@ -88,7 +88,7 @@ struct _ESendOptionsDialogPrivate {
 	GtkWidget *when_completed;
 	
 	/* label widgets */
-	GtkWidget *classification_label;
+	GtkWidget *security_label;
 	GtkWidget *priority_label;
 	GtkWidget *gopts_label;
 	GtkWidget *sopts_label;
@@ -126,7 +126,7 @@ e_send_options_get_widgets_data (ESendOptionsDialog *sod)
 	sopts = sod->data->sopts;
 	
 	gopts->priority = gtk_combo_box_get_active ((GtkComboBox *) priv->priority);
-	gopts->classify = gtk_combo_box_get_active ((GtkComboBox *) priv->classification);
+	gopts->security = gtk_combo_box_get_active ((GtkComboBox *) priv->security);
 	
 	gopts->reply_enabled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->reply_request));
 	gopts->reply_convenient = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->reply_convenient));
@@ -171,7 +171,7 @@ e_send_options_fill_widgets_with_data (ESendOptionsDialog *sod)
 	tmp = time (NULL);
 
 	gtk_combo_box_set_active ((GtkComboBox *) priv->priority, gopts->priority);
-	gtk_combo_box_set_active ((GtkComboBox *) priv->classification, gopts->classify);
+	gtk_combo_box_set_active ((GtkComboBox *) priv->security, gopts->security);
 
 	if (gopts->reply_enabled) 
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->reply_request), TRUE);
@@ -417,7 +417,7 @@ get_widgets (ESendOptionsDialog *sod)
 
 	priv->priority = GW ("combo-priority");
 	priv->status = GW ("status-tracking");
-	priv->classification = GW ("classification-combo");
+	priv->security = GW ("security-combo");
 	priv->notebook = (GtkNotebook *)GW ("notebook");
 	priv->reply_request = GW ("reply-request-button");
 	priv->reply_convenient = GW ("reply-convinient");
@@ -437,7 +437,7 @@ get_widgets (ESendOptionsDialog *sod)
 	priv->when_declined = GW ("delete-combo");
 	priv->when_accepted = GW ("accept-combo");
 	priv->when_completed = GW ("complete-combo");
-	priv->classification_label = GW ("classification-label");
+	priv->security_label = GW ("security-label");
 	priv->gopts_label = GW ("gopts-label");
 	priv->sopts_label = GW ("slabel");
 	priv->priority_label = GW ("priority-label");
@@ -450,7 +450,7 @@ get_widgets (ESendOptionsDialog *sod)
 #undef GW
 
 	return (priv->priority
-		&& priv->classification
+		&& priv->security
 		&& priv->status
 		&& priv->reply_request
 		&& priv->reply_convenient
@@ -469,7 +469,7 @@ get_widgets (ESendOptionsDialog *sod)
 		&& priv->when_declined
 		&& priv->when_accepted
 		&& priv->when_completed
-		&& priv->classification_label
+		&& priv->security_label
 		&& priv->priority_label
 		&& priv->opened_label
 		&& priv->gopts_label
@@ -494,7 +494,7 @@ setup_widgets (ESendOptionsDialog *sod, Item_type type)
 		gtk_notebook_set_show_tabs (priv->notebook, TRUE);
 
 	gtk_label_set_mnemonic_widget (GTK_LABEL (priv->priority_label), priv->priority);
-	gtk_label_set_mnemonic_widget (GTK_LABEL (priv->classification_label), priv->classification);
+	gtk_label_set_mnemonic_widget (GTK_LABEL (priv->security_label), priv->security);
 	gtk_label_set_mnemonic_widget (GTK_LABEL (priv->accepted_label), priv->when_accepted);
 	gtk_label_set_mnemonic_widget (GTK_LABEL (priv->declined_label), priv->when_declined);
 	gtk_label_set_mnemonic_widget (GTK_LABEL (priv->opened_label), priv->when_opened);
@@ -527,8 +527,8 @@ setup_widgets (ESendOptionsDialog *sod, Item_type type)
 			gtk_widget_hide (priv->when_completed);
 		case E_ITEM_TASK:
 		        priv->help_section = g_strdup ("usage-calendar-todo");
-			gtk_widget_hide (priv->classification_label);
-			gtk_widget_hide (priv->classification);
+			gtk_widget_hide (priv->security_label);
+			gtk_widget_hide (priv->security);
 			gtk_widget_set_sensitive (priv->autodelete, FALSE);
 			break;
 		default:
@@ -752,7 +752,7 @@ e_sendoptions_dialog_init (GObject *object)
 	sod->priv = priv;
 	sod->data = new;
 	sod->data->initialized = FALSE;
-	sod->data->gopts->classify = 0;
+	sod->data->gopts->security = 0;
 
 	priv->gopts_needed = TRUE;
 	priv->xml = NULL;
@@ -761,7 +761,7 @@ e_sendoptions_dialog_init (GObject *object)
 	priv->notebook = NULL;
 	priv->priority = NULL;
 	priv->status = NULL;
-	priv->classification = NULL;
+	priv->security = NULL;
 	priv->reply_request = NULL;
 	priv->reply_convenient = NULL;
 	priv->within_days = NULL;
@@ -778,7 +778,7 @@ e_sendoptions_dialog_init (GObject *object)
 	priv->when_declined = NULL;
 	priv->when_accepted = NULL;
 	priv->when_completed = NULL;
-	priv->classification_label = NULL;
+	priv->security_label = NULL;
 	priv->priority_label = NULL;
 	priv->opened_label = NULL;
 	priv->gopts_label = NULL;
diff --git a/widgets/misc/e-send-options.glade b/widgets/misc/e-send-options.glade
index 2a627fb406..da19eb46ec 100644
--- a/widgets/misc/e-send-options.glade
+++ b/widgets/misc/e-send-options.glade
@@ -18,6 +18,8 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
   <property name="has_separator">True</property>
 
   <child internal-child="vbox">
@@ -112,6 +114,10 @@
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
 		</widget>
 		<packing>
 		  <property name="left_attach">2</property>
@@ -238,6 +244,10 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
 				</widget>
 				<packing>
 				  <property name="left_attach">2</property>
@@ -299,6 +309,10 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="type">label_item</property>
@@ -367,6 +381,10 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">1</property>
@@ -410,6 +428,10 @@
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
 				  <property name="mnemonic_widget">expire-after</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -450,6 +472,10 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -504,6 +530,10 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">1</property>
@@ -548,6 +578,10 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -597,6 +631,10 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="type">label_item</property>
@@ -620,6 +658,8 @@
 High
 Standard
 Low</property>
+		  <property name="add_tearoffs">False</property>
+		  <property name="focus_on_click">True</property>
 		</widget>
 		<packing>
 		  <property name="left_attach">1</property>
@@ -643,6 +683,10 @@ Low</property>
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>
@@ -654,9 +698,9 @@ Low</property>
 	      </child>
 
 	      <child>
-		<widget class="GtkLabel" id="classification-label">
+		<widget class="GtkLabel" id="security-label">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">C_lassification</property>
+		  <property name="label" translatable="yes">Classification</property>
 		  <property name="use_underline">True</property>
 		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -666,6 +710,10 @@ Low</property>
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>
@@ -678,12 +726,16 @@ Low</property>
 	      </child>
 
 	      <child>
-		<widget class="GtkComboBox" id="classification-combo">
+		<widget class="GtkComboBox" id="security-combo">
 		  <property name="visible">True</property>
-		  <property name="items" translatable="yes">Public
-Private
+		  <property name="items" translatable="yes">Normal
+Proprietary
 Confidential
-</property>
+Secret
+Top Secret
+For Your Eyes Only</property>
+		  <property name="add_tearoffs">False</property>
+		  <property name="focus_on_click">True</property>
 		</widget>
 		<packing>
 		  <property name="left_attach">1</property>
@@ -714,6 +766,10 @@ Confidential
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
 	      <property name="type">tab</property>
@@ -923,6 +979,10 @@ Confidential
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="type">label_item</property>
@@ -978,6 +1038,10 @@ Confidential
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">0</property>
@@ -1002,6 +1066,10 @@ Confidential
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">0</property>
@@ -1026,6 +1094,10 @@ Confidential
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">0</property>
@@ -1050,6 +1122,10 @@ Confidential
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">0</property>
@@ -1066,6 +1142,8 @@ Confidential
 			      <property name="visible">True</property>
 			      <property name="items" translatable="yes">None
 Mail Receipt</property>
+			      <property name="add_tearoffs">False</property>
+			      <property name="focus_on_click">True</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">1</property>
@@ -1081,6 +1159,8 @@ Mail Receipt</property>
 			      <property name="visible">True</property>
 			      <property name="items" translatable="yes">None
 Mail Receipt</property>
+			      <property name="add_tearoffs">False</property>
+			      <property name="focus_on_click">True</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">1</property>
@@ -1096,6 +1176,8 @@ Mail Receipt</property>
 			      <property name="visible">True</property>
 			      <property name="items" translatable="yes">None
 Mail Receipt</property>
+			      <property name="add_tearoffs">False</property>
+			      <property name="focus_on_click">True</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">1</property>
@@ -1111,6 +1193,8 @@ Mail Receipt</property>
 			      <property name="visible">True</property>
 			      <property name="items" translatable="yes">None
 Mail Receipt</property>
+			      <property name="add_tearoffs">False</property>
+			      <property name="focus_on_click">True</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">1</property>
@@ -1137,6 +1221,10 @@ Mail Receipt</property>
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="type">label_item</property>
@@ -1169,6 +1257,10 @@ Mail Receipt</property>
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
 	      <property name="type">tab</property>
diff --git a/widgets/misc/e-send-options.h b/widgets/misc/e-send-options.h
index 0ea71e269b..7b49ebcbd6 100644
--- a/widgets/misc/e-send-options.h
+++ b/widgets/misc/e-send-options.h
@@ -51,6 +51,15 @@ typedef enum {
 } ESendOptionsPriority;
 
 typedef enum {
+	E_SECURITY_NORMAL,
+	E_SECURITY_PROPRIETARY,
+	E_SECURITY_CONFIDENTIAL,
+	E_SECURITY_SECRET,
+	E_SECURITY_TOP_SECRET,
+	E_SECURITY_FOR_YOUR_EYES_ONLY
+} ESendOptionsSecurity;
+
+typedef enum {
 	E_RETURN_NOTIFY_NONE,
 	E_RETURN_NOTIFY_MAIL
 } ESendOptionsReturnNotify;
@@ -71,6 +80,7 @@ typedef struct {
 	gint expire_after;
 	gboolean delay_enabled;
 	time_t delay_until;
+	gint security;
 } ESendOptionsGeneral;
 
 typedef struct {