* changed container names for top containers

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

diff --git a/src/gtk-glade/modest.glade b/src/gtk-glade/modest.glade
index 7a9126e..a2518f5 100644 (file)
--- 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>
@@ -302,7 +302,7 @@
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Outbox</property>
                      <property name="use_underline">True</property>
-                     <property name="active">True</property>
+                     <property name="active">False</property>
                      <property name="group">inbox1</property>
                      <signal name="activate" handler="on_outbox1_activate" last_modification_time="Fri, 28 Apr 2006 12:15:47 GMT"/>
                    </widget>
@@ -313,7 +313,7 @@
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Drafts</property>
                      <property name="use_underline">True</property>
-                     <property name="active">True</property>
+                     <property name="active">False</property>
                      <property name="group">inbox1</property>
                      <signal name="activate" handler="on_drafts1_activate" last_modification_time="Fri, 28 Apr 2006 12:15:47 GMT"/>
                    </widget>
@@ -324,7 +324,7 @@
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Sent</property>
                      <property name="use_underline">True</property>
-                     <property name="active">True</property>
+                     <property name="active">False</property>
                      <property name="group">inbox1</property>
                      <signal name="activate" handler="on_sent1_activate" last_modification_time="Fri, 28 Apr 2006 12:15:47 GMT"/>
                    </widget>
@@ -335,7 +335,7 @@
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Archive</property>
                      <property name="use_underline">True</property>
-                     <property name="active">True</property>
+                     <property name="active">False</property>
                      <property name="group">inbox1</property>
                      <signal name="activate" handler="on_archive1_activate" last_modification_time="Fri, 28 Apr 2006 12:15:47 GMT"/>
                    </widget>
@@ -815,7 +815,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 +1334,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 +1345,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 +1356,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 +1654,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 +3817,7 @@
   <property name="has_separator">True</property>
 
   <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog1-vbox">
+    <widget class="GtkVBox" id="account_wizzard_top_container">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
       <property name="spacing">0</property>
@@ -4029,9 +4029,9 @@
                  <child>
                    <widget class="GtkComboBox" id="AWMailboxtypeComboBox">
                      <property name="visible">True</property>
-          <property name="items" context="yes" translatable="yes">IMAP
-POP
-LOCAL</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>
@@ -4350,95 +4350,104 @@ LOCAL</property>
              <property name="column_spacing">10</property>
 
              <child>
-               <widget class="GtkLabel" id="label54">
-                 <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>
-               </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="label55">
-                 <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>
-               </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="GtkComboBoxEntry" id="comboentry2">
-                 <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>
-                 <property name="y_options">fill</property>
-               </packing>
+          <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>
              </child>
 
              <child>
-               <widget class="GtkComboBoxEntry" id="comboentry1">
-                 <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>
-                 <property name="x_options">fill</property>
-                 <property name="y_options">fill</property>
-               </packing>
+          <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>
              </child>
            </widget>
            <packing>
              <property name="tab_expand">False</property>
-             <property name="tab_fill">True</property>
+             <property name="tab_fill">False</property>
            </packing>
          </child>