* reply and quote code complete (feature-wise), less bugs. Still lots to fix.

[modest] / src / gtk-glade / modest.glade

diff --git a/src/gtk-glade/modest.glade b/src/gtk-glade/modest.glade
index ae35599..ad9cabd 100644 (file)
--- a/src/gtk-glade/modest.glade
+++ b/src/gtk-glade/modest.glade
@@ -752,7 +752,7 @@
          </child>
 
          <child>
-           <widget class="GtkVPaned" id="vpaned1">
+           <widget class="GtkVPaned" id="mail_paned">
              <property name="visible">True</property>
              <property name="can_focus">True</property>
              <property name="position">150</property>
@@ -777,22 +777,7 @@
              </child>
 
              <child>
-               <widget class="GtkScrolledWindow" id="mail_view">
-                 <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-                 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                 <property name="shadow_type">GTK_SHADOW_NONE</property>
-                 <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-                 <child>
-                   <placeholder/>
-                 </child>
-               </widget>
-               <packing>
-                 <property name="shrink">True</property>
-                 <property name="resize">True</property>
-               </packing>
+               <placeholder/>
              </child>
            </widget>
            <packing>
@@ -1600,7 +1585,7 @@
              </child>
            </widget>
            <packing>
-             <property name="shrink">True</property>
+             <property name="shrink">False</property>
              <property name="resize">False</property>
            </packing>
          </child>
@@ -2489,7 +2474,7 @@
              </child>
            </widget>
            <packing>
-             <property name="shrink">True</property>
+             <property name="shrink">False</property>
              <property name="resize">False</property>
            </packing>
          </child>
@@ -3149,11 +3134,9 @@
 
 <widget class="GtkDialog" id="mailbox_setup_advanced">
   <property name="border_width">10</property>
-  <property name="width_request">400</property>
-  <property name="height_request">350</property>
   <property name="title" translatable="yes">Advanced E-mail settings</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
   <property name="modal">False</property>
   <property name="default_width">500</property>
   <property name="default_height">400</property>
@@ -3214,6 +3197,19 @@
       </child>
 
       <child>
+       <widget class="GtkComboBox" id="accountselector">
+         <property name="visible">True</property>
+         <property name="add_tearoffs">False</property>
+         <property name="focus_on_click">True</property>
+       </widget>
+       <packing>
+         <property name="padding">0</property>
+         <property name="expand">True</property>
+         <property name="fill">True</property>
+       </packing>
+      </child>
+
+      <child>
        <widget class="GtkNotebook" id="notebook1">
          <property name="visible">True</property>
          <property name="can_focus">True</property>
@@ -4712,7 +4708,7 @@
              <property name="visible">True</property>
              <property name="label" translatable="yes">Mailbox setup is complete.
 
-Tap 'Finnish' to save or 'Cancel' to discard the settings.
+Tap 'Finish' to save or 'Cancel' to discard the settings.
 Tap 'Advanced' to edit the advanced e-mail settings.</property>
              <property name="use_underline">False</property>
              <property name="use_markup">False</property>