X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fgtk-glade%2Fmodest.glade;h=e70b11213a02a7249c2770be30c420d338ded818;hb=9a52902ab1ed5bf02825a1eec1a0ba09b11c1a3c;hp=6ea3587baa7f9773865b904ad323adbed9ba09b3;hpb=576042358a339645a723a66f2eac502d07d6889c;p=modest

diff --git a/src/gtk-glade/modest.glade b/src/gtk-glade/modest.glade
index 6ea3587..e70b112 100644
--- a/src/gtk-glade/modest.glade
+++ b/src/gtk-glade/modest.glade
@@ -22,7 +22,7 @@
   <property name="urgency_hint">False</property>
 
   <child>
-    <widget class="GtkVBox" id="vbox1">
+    <widget class="GtkVBox" id="main_top_container">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
       <property name="spacing">0</property>
@@ -34,13 +34,13 @@
 	  <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
 
 	  <child>
-	    <widget class="GtkMenuItem" id="menuitem1">
+	    <widget class="GtkMenuItem" id="MessageMenuItem">
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes">_Message</property>
 	      <property name="use_underline">True</property>
 
 	      <child>
-		<widget class="GtkMenu" id="menuitem1_menu">
+		<widget class="GtkMenu" id="MessageMenuItem_menu">
 
 		  <child>
 		    <widget class="GtkMenuItem" id="new_e-mail1">
@@ -130,13 +130,13 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkMenuItem" id="menuitem2">
+	    <widget class="GtkMenuItem" id="EditMenuItem">
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes">_Edit</property>
 	      <property name="use_underline">True</property>
 
 	      <child>
-		<widget class="GtkMenu" id="menuitem2_menu">
+		<widget class="GtkMenu" id="EditMenuItem_menu">
 
 		  <child>
 		    <widget class="GtkMenuItem" id="undo1">
@@ -231,13 +231,13 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkMenuItem" id="menuitem3">
+	    <widget class="GtkMenuItem" id="FoldersMenuItem">
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes">_Folders</property>
 	      <property name="use_underline">True</property>
 
 	      <child>
-		<widget class="GtkMenu" id="menuitem3_menu">
+		<widget class="GtkMenu" id="FoldersMenuItem_menu">
 
 		  <child>
 		    <widget class="GtkMenuItem" id="new_folder1">
@@ -346,13 +346,13 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkMenuItem" id="menuitem4">
+	    <widget class="GtkMenuItem" id="ViewMenuItem">
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes">_View</property>
 	      <property name="use_underline">True</property>
 
 	      <child>
-		<widget class="GtkMenu" id="menuitem4_menu">
+		<widget class="GtkMenu" id="ViewMenuItem_menu">
 
 		  <child>
 		    <widget class="GtkMenuItem" id="sort1">
@@ -428,14 +428,14 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkMenuItem" id="e-mail1">
+	    <widget class="GtkMenuItem" id="EMailMenuItem">
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes">E-m_ail</property>
 	      <property name="use_underline">True</property>
 	      <signal name="activate" handler="on_e-mail1_activate" last_modification_time="Fri, 28 Apr 2006 12:12:02 GMT"/>
 
 	      <child>
-		<widget class="GtkMenu" id="e-mail1_menu">
+		<widget class="GtkMenu" id="EMailMenuItem_menu">
 
 		  <child>
 		    <widget class="GtkMenuItem" id="send_&amp;_receive1">
@@ -469,17 +469,17 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkMenuItem" id="tools1">
+	    <widget class="GtkMenuItem" id="ToolsMenuItem">
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes">_Tools</property>
 	      <property name="use_underline">True</property>
 	      <signal name="activate" handler="on_tools1_activate" last_modification_time="Fri, 28 Apr 2006 12:12:02 GMT"/>
 
 	      <child>
-		<widget class="GtkMenu" id="tools1_menu">
+		<widget class="GtkMenu" id="ToolsMenuItem_menu">
 
 		  <child>
-		    <widget class="GtkMenuItem" id="open_contacts1">
+		    <widget class="GtkMenuItem" id="OpenContactsMenuItem">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Open contacts...</property>
 		      <property name="use_underline">True</property>
@@ -494,16 +494,29 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkMenuItem" id="new_account1">
+		    <widget class="GtkMenuItem" id="AccountWizardryMenuItem">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">New account...</property>
+		      <property name="label" translatable="yes">Account Wizardry</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_new_account1_activate" last_modification_time="Fri, 28 Apr 2006 12:23:17 GMT"/>
+
+		      <child>
+			<widget class="GtkMenu" id="AccountWizardry_menu">
+
+			  <child>
+			    <widget class="GtkMenuItem" id="NewAccountWizardMenuItem">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">New account...</property>
+			      <property name="use_underline">True</property>
+			      <signal name="activate" handler="new_wizard_account" last_modification_time="Fri, 28 Apr 2006 12:23:17 GMT"/>
+			    </widget>
+			  </child>
+			</widget>
+		      </child>
 		    </widget>
 		  </child>
 
 		  <child>
-		    <widget class="GtkMenuItem" id="account_settings1">
+		    <widget class="GtkMenuItem" id="AccountSettingsMenuItem">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Account settings...</property>
 		      <property name="use_underline">True</property>
@@ -512,7 +525,7 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkMenuItem" id="options1">
+		    <widget class="GtkMenuItem" id="OptionsMenuItem">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Options</property>
 		      <property name="use_underline">True</property>
@@ -527,7 +540,7 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkMenuItem" id="search_e-mails1">
+		    <widget class="GtkMenuItem" id="SearchEMailsMenuItem">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Search e-mails...</property>
 		      <property name="use_underline">True</property>
@@ -542,7 +555,7 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkMenuItem" id="help1">
+		    <widget class="GtkMenuItem" id="HelpMenuItem">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Help</property>
 		      <property name="use_underline">True</property>
@@ -555,13 +568,13 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkMenuItem" id="close1">
+	    <widget class="GtkMenuItem" id="CloseMenuItem">
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes">_Close</property>
 	      <property name="use_underline">True</property>
 
 	      <child>
-		<widget class="GtkMenu" id="close1_menu">
+		<widget class="GtkMenu" id="CloseMenuItem_menu">
 
 		  <child>
 		    <widget class="GtkMenuItem" id="about1">
@@ -815,7 +828,7 @@
   <property name="urgency_hint">False</property>
 
   <child>
-    <widget class="GtkVBox" id="vbox2">
+    <widget class="GtkVBox" id="new_mail_top_container">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
       <property name="spacing">0</property>
@@ -1334,7 +1347,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Encrypt</property>
 		      <property name="use_underline">True</property>
-		      <property name="active">True</property>
+		      <property name="active">False</property>
 		      <property name="group">none1</property>
 		      <signal name="activate" handler="on_encrypt1_activate" last_modification_time="Fri, 28 Apr 2006 13:32:29 GMT"/>
 		    </widget>
@@ -1345,7 +1358,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Digitally sign</property>
 		      <property name="use_underline">True</property>
-		      <property name="active">True</property>
+		      <property name="active">False</property>
 		      <property name="group">none1</property>
 		      <signal name="activate" handler="on_digitally_sign1_activate" last_modification_time="Fri, 28 Apr 2006 13:32:29 GMT"/>
 		    </widget>
@@ -1356,7 +1369,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Digitally sign and encrypt</property>
 		      <property name="use_underline">True</property>
-		      <property name="active">True</property>
+		      <property name="active">False</property>
 		      <property name="group">none1</property>
 		      <signal name="activate" handler="on_digitally_sign_and_encrypt1_activate" last_modification_time="Fri, 28 Apr 2006 13:32:29 GMT"/>
 		    </widget>
@@ -1654,7 +1667,7 @@
   <property name="urgency_hint">False</property>
 
   <child>
-    <widget class="GtkVBox" id="vbox3">
+    <widget class="GtkVBox" id="viewer_top_container">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
       <property name="spacing">0</property>
@@ -3817,7 +3830,7 @@
   <property name="has_separator">True</property>
 
   <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog1-vbox">
+    <widget class="GtkVBox" id="account_wizard_top_container">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
       <property name="spacing">0</property>
@@ -3946,40 +3959,12 @@
 	      <child>
 		<widget class="GtkTable" id="table3">
 		  <property name="visible">True</property>
-<!--		  <property name="n_rows">2</property> -->
 		  <property name="n_rows">1</property>
 		  <property name="n_columns">2</property>
 		  <property name="homogeneous">False</property>
 		  <property name="row_spacing">10</property>
 		  <property name="column_spacing">10</property>
-<!--
-		  <child>
-		    <widget class="GtkLabel" id="label14">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes" context="yes">Mailbox name:</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</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>
-		      <property name="right_attach">1</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">1</property>
-		      <property name="x_options">fill</property>
-		    </packing>
-		  </child>
--->
+
 		  <child>
 		    <widget class="GtkLabel" id="label15">
 		      <property name="visible">True</property>
@@ -4006,34 +3991,13 @@
 		    </packing>
 		  </child>
 
-<!--
-		  <child>
-		    <widget class="GtkEntry" id="AWMailboxnameEntry">
-		      <property name="visible">True</property>
-		      <property name="editable">True</property>
-		      <property name="visibility">True</property>
-		      <property name="max_length">0</property>
-		      <property name="text" translatable="yes"></property>
-		      <property name="has_frame">True</property>
-		      <property name="invisible_char">*</property>
-		      <property name="activates_default">False</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">2</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">1</property>
-		    </packing>
-		  </child>
--->
 		  <child>
 		    <widget class="GtkComboBox" id="AWMailboxtypeComboBox">
 		      <property name="visible">True</property>
-          <property name="items" context="yes" translatable="yes">imap
+		      <property name="items" translatable="yes" context="yes">imap
 pop
 local</property>
 		      <property name="add_tearoffs">False</property>
-		      <property name="has_frame">True</property>
 		      <property name="focus_on_click">True</property>
 		    </widget>
 		    <packing>
@@ -4350,99 +4314,97 @@ local</property>
 	      <property name="column_spacing">10</property>
 
 	      <child>
-          <widget class="GtkLabel" id="AWInServerLabel">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes" context="yes">Incoming server:</property>
-            <property name="use_underline">False</property>
-            <property name="use_markup">False</property>
-            <property name="justify">GTK_JUSTIFY_LEFT</property>
-            <property name="wrap">False</property>
-            <property name="selectable">False</property>
-            <property name="xalign">0</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>
-            <property name="right_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="bottom_attach">1</property>
-            <property name="x_options">fill</property>
-            <property name="y_options"></property>
-          </packing>
+		<widget class="GtkLabel" id="AWInServerLabel">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes" context="yes">Incoming server:</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0</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>
+		  <property name="right_attach">1</property>
+		  <property name="top_attach">0</property>
+		  <property name="bottom_attach">1</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options"></property>
+		</packing>
 	      </child>
 
 	      <child>
-          <widget class="GtkLabel" id="AWOutServerLabel">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes" context="yes">Outgoing server:</property>
-            <property name="use_underline">False</property>
-            <property name="use_markup">False</property>
-            <property name="justify">GTK_JUSTIFY_LEFT</property>
-            <property name="wrap">False</property>
-            <property name="selectable">False</property>
-            <property name="xalign">0</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>
-            <property name="right_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="bottom_attach">2</property>
-            <property name="x_options">fill</property>
-            <property name="y_options"></property>
-          </packing>
+		<widget class="GtkLabel" id="AWOutServerLabel">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes" context="yes">Outgoing server:</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0</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>
+		  <property name="right_attach">1</property>
+		  <property name="top_attach">1</property>
+		  <property name="bottom_attach">2</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options"></property>
+		</packing>
 	      </child>
 
 	      <child>
-          <widget class="GtkEntry" id="AWInServerComboEntry">
-            <property name="visible">True</property>
-          </widget>
-          <!--
-          <widget class="GtkComboBoxEntry" id="AWInServerComboEntry">
-            <property name="visible">True</property>
-            <property name="add_tearoffs">False</property>
-            <property name="has_frame">True</property>
-            <property name="focus_on_click">True</property>
-          </widget>
-          -->
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="right_attach">2</property>
-            <property name="top_attach">0</property>
-            <property name="bottom_attach">1</property>
-          </packing>
+		<widget class="GtkEntry" id="AWInServerComboEntry">
+		  <property name="visible">True</property>
+		  <property name="editable">True</property>
+		  <property name="visibility">True</property>
+		  <property name="max_length">0</property>
+		  <property name="text" translatable="yes"></property>
+		  <property name="has_frame">True</property>
+		  <property name="invisible_char">*</property>
+		  <property name="activates_default">False</property>
+		</widget>
+		<packing>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">0</property>
+		  <property name="bottom_attach">1</property>
+		</packing>
 	      </child>
 
 	      <child>
-          <widget class="GtkEntry" id="AWOutServerComboEntry">
-            <property name="visible">True</property>
-          </widget>
-          <!--
-          <widget class="GtkComboBoxEntry" id="AWOutServerComboEntry">
-            <property name="visible">True</property>
-            <property name="add_tearoffs">False</property>
-            <property name="has_frame">True</property>
-            <property name="focus_on_click">True</property>
-          </widget>
-          -->
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="right_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="bottom_attach">2</property>
-          </packing>
+		<widget class="GtkEntry" id="AWOutServerComboEntry">
+		  <property name="visible">True</property>
+		  <property name="editable">True</property>
+		  <property name="visibility">True</property>
+		  <property name="max_length">0</property>
+		  <property name="text" translatable="yes"></property>
+		  <property name="has_frame">True</property>
+		  <property name="invisible_char">*</property>
+		  <property name="activates_default">False</property>
+		</widget>
+		<packing>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">1</property>
+		  <property name="bottom_attach">2</property>
+		</packing>
 	      </child>
 	    </widget>
 	    <packing>