From 0ddbfabe32f0d02a63a21fca5bfb015f4e56bf97 Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date: Mon, 6 Jul 2009 11:29:55 +0100
Subject: Transform profile chooser into a protocol chooser

---
 src/empathy-accounts-dialog.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/empathy-accounts-dialog.ui')

diff --git a/src/empathy-accounts-dialog.ui b/src/empathy-accounts-dialog.ui
index cf1b23ef4..a76b4ae7f 100644
--- a/src/empathy-accounts-dialog.ui
+++ b/src/empathy-accounts-dialog.ui
@@ -391,7 +391,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkFrame" id="frame_no_profile">
+                  <object class="GtkFrame" id="frame_no_protocol">
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-- 
cgit v1.2.3


From adc79c5d0574f548cfe2b89cb0e04d74a5d1e40e Mon Sep 17 00:00:00 2001
From: Jonathan Tellier <jonathan.tellier@gmail.com>
Date: Thu, 13 Aug 2009 08:56:02 -0400
Subject: First part of an overhaul of the accounts dialog

---
 src/empathy-accounts-dialog.ui | 137 +++++++++++++++--------------------------
 1 file changed, 51 insertions(+), 86 deletions(-)

(limited to 'src/empathy-accounts-dialog.ui')

diff --git a/src/empathy-accounts-dialog.ui b/src/empathy-accounts-dialog.ui
index 7c899a3cb..edd8f20a4 100644
--- a/src/empathy-accounts-dialog.ui
+++ b/src/empathy-accounts-dialog.ui
@@ -2,10 +2,6 @@
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkImage" id="add_image">
-    <property name="stock">gtk-add</property>
-    <property name="icon-size">4</property>
-  </object>
   <object class="GtkDialog" id="accounts_dialog">
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Accounts</property>
@@ -46,62 +42,18 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkVBox" id="vbox1">
+                  <object class="GtkButton" id="button_add">
+                    <property name="label" translatable="yes">_Add...</property>
                     <property name="visible">True</property>
-                    <property name="spacing">6</property>
-                    <property name="homogeneous">True</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox148">
-                        <property name="visible">True</property>
-                        <property name="spacing">6</property>
-                        <property name="homogeneous">True</property>
-                        <child>
-                          <object class="GtkButton" id="button_add">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="image">add_image</property>
-                            <property name="label" translatable="yes">_Add...</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkButton" id="button_remove">
-                            <property name="label">gtk-remove</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_stock">True</property>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="button_import">
-                        <property name="label" translatable="yes">Import Accounts...</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="image">add_image</property>
+                    <property name="use_underline">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="position">1</property>
+                    <property name="fill">False</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
               </object>
@@ -128,11 +80,11 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="label" translatable="yes">Gmail</property>
+                            <property name="selectable">True</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
-                              <attribute name="scale" value="1.2"/>
+                              <attribute name="scale" value="1.200000"/>
                             </attributes>
-                            <property name="selectable">True</property>
                           </object>
                           <packing>
                             <property name="position">0</property>
@@ -205,29 +157,6 @@
                           <object class="GtkVBox" id="vbox216">
                             <property name="visible">True</property>
                             <property name="spacing">12</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox_type">
-                                <property name="visible">True</property>
-                                <property name="spacing">6</property>
-                                <child>
-                                  <object class="GtkLabel" id="label645">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Type:</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
                             <child>
                               <object class="GtkVBox" id="vbox2">
                                 <property name="visible">True</property>
@@ -347,12 +276,45 @@
                       </object>
                     </child>
                     <child type="label">
-                      <object class="GtkLabel" id="label643">
+                      <object class="GtkHBox" id="hbox_add_account">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Add Account</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
+                        <child>
+                          <object class="GtkLabel" id="label643">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Add new</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                            </attributes>
+                          </object>
+                          <packing>
+                            <property name="padding">5</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkHBox" id="hbox_type">
+                            <property name="visible">True</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label645">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">account</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="pack_type">end</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
                       </object>
                     </child>
                   </object>
@@ -454,4 +416,7 @@
       <action-widget response="-7">button_close</action-widget>
     </action-widgets>
   </object>
+  <object class="GtkImage" id="add_image">
+    <property name="stock">gtk-add</property>
+  </object>
 </interface>
-- 
cgit v1.2.3


From fe39c811b7ef600c0262b905683f3a8966311129 Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date: Sat, 22 Aug 2009 18:20:53 +0100
Subject: Clean up the dialog a bit

---
 src/empathy-accounts-dialog.ui | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

(limited to 'src/empathy-accounts-dialog.ui')

diff --git a/src/empathy-accounts-dialog.ui b/src/empathy-accounts-dialog.ui
index edd8f20a4..cd98415d7 100644
--- a/src/empathy-accounts-dialog.ui
+++ b/src/empathy-accounts-dialog.ui
@@ -6,6 +6,7 @@
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Accounts</property>
     <property name="role">accounts</property>
+    <property name="default_width">640</property>
     <property name="type_hint">dialog</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
@@ -111,28 +112,12 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkFrame" id="frame2">
+                      <object class="GtkAlignment" id="alignment_settings">
                         <property name="visible">True</property>
-                        <property name="label_xalign">0</property>
-                        <property name="shadow_type">none</property>
+                        <property name="top_padding">6</property>
+                        <property name="left_padding">20</property>
                         <child>
-                          <object class="GtkAlignment" id="alignment_settings">
-                            <property name="visible">True</property>
-                            <property name="top_padding">6</property>
-                            <property name="left_padding">20</property>
-                            <child>
-                              <placeholder/>
-                            </child>
-                          </object>
-                        </child>
-                        <child type="label">
-                          <object class="GtkLabel" id="label599">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">Settings</property>
-                            <attributes>
-                              <attribute name="weight" value="bold"/>
-                            </attributes>
-                          </object>
+                          <placeholder/>
                         </child>
                       </object>
                       <packing>
-- 
cgit v1.2.3


From cdf5ef7743814ca18104d5dba1a04e79a3554d0e Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon, 24 Aug 2009 12:01:52 +0100
Subject: empathy-accounts-dialog: remove the hardcoded Gmail label

---
 src/empathy-accounts-dialog.ui | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/empathy-accounts-dialog.ui')

diff --git a/src/empathy-accounts-dialog.ui b/src/empathy-accounts-dialog.ui
index cd98415d7..e5226b270 100644
--- a/src/empathy-accounts-dialog.ui
+++ b/src/empathy-accounts-dialog.ui
@@ -80,7 +80,6 @@
                           <object class="GtkLabel" id="label_name">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Gmail</property>
                             <property name="selectable">True</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
-- 
cgit v1.2.3