* the message view is now a scrollwindow which is linked directly into the mail paned

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

diff --git a/src/gtk-glade/modest.glade b/src/gtk-glade/modest.glade
index 32ea10c..74b76b2 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>
@@ -1558,7 +1543,7 @@
              </child>
 
              <child>
-               <widget class="GtkEntry" id="entry2">
+               <widget class="GtkEntry" id="to_entry">
                  <property name="visible">True</property>
                  <property name="can_focus">True</property>
                  <property name="editable">True</property>
@@ -1579,7 +1564,7 @@
              </child>
 
              <child>
-               <widget class="GtkEntry" id="entry3">
+               <widget class="GtkEntry" id="subject_entry">
                  <property name="visible">True</property>
                  <property name="can_focus">True</property>
                  <property name="editable">True</property>
@@ -1615,7 +1600,7 @@
              <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
              <child>
-               <widget class="GtkTextView" id="textview1">
+               <widget class="GtkTextView" id="body_view">
                  <property name="visible">True</property>
                  <property name="can_focus">True</property>
                  <property name="editable">True</property>
@@ -2543,7 +2528,6 @@
   <property name="border_width">10</property>
   <property name="width_request">400</property>
   <property name="height_request">350</property>
-  <property name="visible">True</property>
   <property name="title" translatable="yes">Mailbox setup 1/4</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
@@ -2849,7 +2833,6 @@
   <property name="border_width">10</property>
   <property name="width_request">400</property>
   <property name="height_request">350</property>
-  <property name="visible">True</property>
   <property name="title" translatable="yes">Mailbox setup 2/4</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
@@ -3153,7 +3136,6 @@
   <property name="border_width">10</property>
   <property name="width_request">400</property>
   <property name="height_request">350</property>
-  <property name="visible">True</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>
@@ -4416,7 +4398,6 @@
   <property name="border_width">10</property>
   <property name="width_request">400</property>
   <property name="height_request">350</property>
-  <property name="visible">True</property>
   <property name="title" translatable="yes">Mailbox setup 3/4</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
@@ -4617,7 +4598,6 @@
   <property name="border_width">10</property>
   <property name="width_request">400</property>
   <property name="height_request">350</property>
-  <property name="visible">True</property>
   <property name="title" translatable="yes">Mailbox setup 4/4</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
@@ -4717,7 +4697,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>