X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fgtk-glade%2Fmodest.glade;h=7a9126e6e1b3a5d2885b881481b5a699c8f63fbe;hb=08f5a8bec12917bb4039e7154cb6c349011bd0af;hp=096251fc9578fb1042e0ae51b6f0dd3ef42edcd0;hpb=75f396d6f4bd380e4783754f0eb2587f3ae9cc15;p=modest

diff --git a/src/gtk-glade/modest.glade b/src/gtk-glade/modest.glade
index 096251f..7a9126e 100644
--- a/src/gtk-glade/modest.glade
+++ b/src/gtk-glade/modest.glade
@@ -3797,7 +3797,7 @@
   </child>
 </widget>
 
-<widget class="GtkDialog" id="account_wizzard">
+<widget class="GtkDialog" id="account_wizard">
   <property name="border_width">10</property>
   <property name="title" translatable="yes"></property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -3828,46 +3828,46 @@
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 
 	  <child>
-	    <widget class="GtkButton" id="FinishButton">
+	    <widget class="GtkButton" id="AWFinishButton">
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes" context="yes">Finish</property>
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
-	      <property name="response_id">0</property>
+	      <property name="response_id">-3</property>
 	    </widget>
 	  </child>
 
 	  <child>
-	    <widget class="GtkButton" id="BackButton">
+	    <widget class="GtkButton" id="AWBackButton">
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes" context="yes">Back</property>
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
-	      <property name="response_id">0</property>
+	      <property name="response_id">2</property>
 	    </widget>
 	  </child>
 
 	  <child>
-	    <widget class="GtkButton" id="NextButton">
+	    <widget class="GtkButton" id="AWNextButton">
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes" context="yes">Next</property>
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
-	      <property name="response_id">0</property>
+	      <property name="response_id">1</property>
 	    </widget>
 	  </child>
 
 	  <child>
-	    <widget class="GtkButton" id="CancelButton">
+	    <widget class="GtkButton" id="AWCancelButton">
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes" context="yes">Cancel</property>
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
-	      <property name="response_id">0</property>
+	      <property name="response_id">-6</property>
 	    </widget>
 	  </child>
 	</widget>
@@ -3880,7 +3880,7 @@
       </child>
 
       <child>
-	<widget class="GtkNotebook" id="notebook2">
+	<widget class="GtkNotebook" id="AWNotebook">
 	  <property name="visible">True</property>
 	  <property name="show_tabs">False</property>
 	  <property name="show_border">False</property>
@@ -3946,12 +3946,13 @@
 	      <child>
 		<widget class="GtkTable" id="table3">
 		  <property name="visible">True</property>
-		  <property name="n_rows">2</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>
@@ -3978,7 +3979,7 @@
 		      <property name="x_options">fill</property>
 		    </packing>
 		  </child>
-
+-->
 		  <child>
 		    <widget class="GtkLabel" id="label15">
 		      <property name="visible">True</property>
@@ -4000,14 +4001,14 @@
 		    <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="top_attach">0</property>
+		      <property name="bottom_attach">1</property>
 		    </packing>
 		  </child>
 
+<!--
 		  <child>
-		    <widget class="GtkEntry" id="entry4">
+		    <widget class="GtkEntry" id="AWMailboxnameEntry">
 		      <property name="visible">True</property>
 		      <property name="editable">True</property>
 		      <property name="visibility">True</property>
@@ -4024,10 +4025,13 @@
 		      <property name="bottom_attach">1</property>
 		    </packing>
 		  </child>
-
+-->
 		  <child>
-		    <widget class="GtkComboBoxEntry" id="comboboxentry1">
+		    <widget class="GtkComboBox" id="AWMailboxtypeComboBox">
 		      <property name="visible">True</property>
+          <property name="items" context="yes" translatable="yes">IMAP
+POP
+LOCAL</property>
 		      <property name="add_tearoffs">False</property>
 		      <property name="has_frame">True</property>
 		      <property name="focus_on_click">True</property>
@@ -4035,10 +4039,8 @@
 		    <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>
-		      <property name="x_options">fill</property>
-		      <property name="y_options">fill</property>
+		      <property name="top_attach">0</property>
+		      <property name="bottom_attach">1</property>
 		    </packing>
 		  </child>
 		</widget>
@@ -4126,7 +4128,7 @@
 	      <property name="column_spacing">0</property>
 
 	      <child>
-		<widget class="GtkLabel" id="label16">
+		<widget class="GtkLabel" id="AWRealNameLabel">
 		  <property name="visible">True</property>
 		  <property name="label" translatable="yes" context="yes">Name:</property>
 		  <property name="use_underline">False</property>
@@ -4153,7 +4155,7 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkLabel" id="label17">
+		<widget class="GtkLabel" id="AWUserNameLabel">
 		  <property name="visible">True</property>
 		  <property name="label" translatable="yes" context="yes">User name:</property>
 		  <property name="use_underline">False</property>
@@ -4180,7 +4182,7 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkLabel" id="label19">
+		<widget class="GtkLabel" id="AWPasswordLabel">
 		  <property name="visible">True</property>
 		  <property name="label" translatable="yes" context="yes">Password:</property>
 		  <property name="use_underline">False</property>
@@ -4207,7 +4209,7 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkLabel" id="label20">
+		<widget class="GtkLabel" id="AWEMailAddressLabel">
 		  <property name="visible">True</property>
 		  <property name="label" translatable="yes" context="yes">E-mail address:</property>
 		  <property name="use_underline">False</property>
@@ -4234,7 +4236,7 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkEntry" id="entry5">
+		<widget class="GtkEntry" id="AWRealNameEntry">
 		  <property name="visible">True</property>
 		  <property name="editable">True</property>
 		  <property name="visibility">True</property>
@@ -4253,24 +4255,26 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkComboBoxEntry" id="comboboxentry2">
+		<widget class="GtkEntry" id="AWUserNameEntry">
 		  <property name="visible">True</property>
-		  <property name="add_tearoffs">False</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="focus_on_click">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>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkEntry" id="entry6">
+		<widget class="GtkEntry" id="AWPasswordEntry">
 		  <property name="visible">True</property>
 		  <property name="editable">True</property>
 		  <property name="visibility">False</property>
@@ -4289,7 +4293,7 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkEntry" id="entry7">
+		<widget class="GtkEntry" id="AWEMailAddressEntry">
 		  <property name="visible">True</property>
 		  <property name="editable">True</property>
 		  <property name="visibility">True</property>