aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog7
-rw-r--r--addressbook/contact-editor/contact-editor.glade387
-rw-r--r--addressbook/contact-editor/e-contact-editor-strings.h36
-rw-r--r--addressbook/gui/contact-editor/contact-editor.glade387
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor-strings.h36
5 files changed, 319 insertions, 534 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index f10c26c2fc..1ba0c5f034 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,10 @@
+2000-05-31 Miguel de Icaza <miguel@helixcode.com>
+
+ * contact-editor/contact-editor.glade: Added accelerators for
+ the remaining items.
+
+ Add spacing, beautify the dialogs.
+
2000-06-01 Ettore Perazzoli <ettore@helixcode.com>
* gui/component/addressbook.c (control_activate): Put the toolbar
diff --git a/addressbook/contact-editor/contact-editor.glade b/addressbook/contact-editor/contact-editor.glade
index af77945c56..21ad4fd265 100644
--- a/addressbook/contact-editor/contact-editor.glade
+++ b/addressbook/contact-editor/contact-editor.glade
@@ -15,12 +15,6 @@
<output_support_files>False</output_support_files>
<output_build_files>False</output_build_files>
<backup_source_files>False</backup_source_files>
- <main_source_file>interface.c</main_source_file>
- <main_header_file>interface.h</main_header_file>
- <handler_source_file>callbacks.c</handler_source_file>
- <handler_header_file>callbacks.h</handler_header_file>
- <support_source_file>support.c</support_source_file>
- <support_header_file>support.h</support_header_file>
<output_translatable_strings>True</output_translatable_strings>
<translatable_strings_file>e-contact-editor-strings.h</translatable_strings_file>
</project>
@@ -28,7 +22,6 @@
<widget>
<class>GtkWindow</class>
<name>contact editor</name>
- <cxx_use_heap>True</cxx_use_heap>
<visible>False</visible>
<title>Contact Editor</title>
<type>GTK_WINDOW_TOPLEVEL</type>
@@ -41,7 +34,6 @@
<widget>
<class>GtkNotebook</class>
<name>notebook-contact-editor</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<show_tabs>True</show_tabs>
<show_border>True</show_border>
@@ -55,7 +47,6 @@
<class>GtkTable</class>
<name>table-contact-editor-general</name>
<border_width>7</border_width>
- <cxx_use_heap>True</cxx_use_heap>
<rows>14</rows>
<columns>8</columns>
<homogeneous>False</homogeneous>
@@ -65,7 +56,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-phone1</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -90,7 +80,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-phone2</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -115,7 +104,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-phone3</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -140,7 +128,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-phone4</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -167,7 +154,6 @@
<name>text-address</name>
<width>1</width>
<height>1</height>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text></text>
@@ -190,7 +176,6 @@
<widget>
<class>GtkButton</class>
<name>button-fullname</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<label>_Full Name...</label>
<child>
@@ -211,35 +196,7 @@
<widget>
<class>GtkAccelLabel</class>
- <name>accellabel-company</name>
- <cxx_use_heap>True</cxx_use_heap>
- <label>Company:</label>
- <justify>GTK_JUSTIFY_CENTER</justify>
- <wrap>False</wrap>
- <xalign>0</xalign>
- <yalign>0.5</yalign>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <child>
- <left_attach>1</left_attach>
- <right_attach>3</right_attach>
- <top_attach>2</top_attach>
- <bottom_attach>3</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>False</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>True</xfill>
- <yfill>True</yfill>
- </child>
- </widget>
-
- <widget>
- <class>GtkAccelLabel</class>
<name>accellabel-fileas</name>
- <cxx_use_heap>True</cxx_use_heap>
<label>File As:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
@@ -266,7 +223,6 @@
<widget>
<class>GtkAccelLabel</class>
<name>accellabel-web</name>
- <cxx_use_heap>True</cxx_use_heap>
<label>Web page address:</label>
<justify>GTK_JUSTIFY_LEFT</justify>
<wrap>False</wrap>
@@ -293,7 +249,6 @@
<widget>
<class>GtkAlignment</class>
<name>alignment3</name>
- <cxx_use_heap>True</cxx_use_heap>
<xalign>1</xalign>
<yalign>0.5</yalign>
<xscale>0</xscale>
@@ -316,7 +271,6 @@
<widget>
<class>GtkButton</class>
<name>button-email1</name>
- <cxx_use_heap>True</cxx_use_heap>
<widget>
<class>Placeholder</class>
@@ -327,7 +281,6 @@
<widget>
<class>GtkAlignment</class>
<name>alignment5</name>
- <cxx_use_heap>True</cxx_use_heap>
<xalign>1</xalign>
<yalign>0.5</yalign>
<xscale>0</xscale>
@@ -350,7 +303,6 @@
<widget>
<class>GtkButton</class>
<name>button-phone4</name>
- <cxx_use_heap>True</cxx_use_heap>
<widget>
<class>Placeholder</class>
@@ -361,7 +313,6 @@
<widget>
<class>GtkAlignment</class>
<name>alignment7</name>
- <cxx_use_heap>True</cxx_use_heap>
<xalign>1</xalign>
<yalign>0.5</yalign>
<xscale>0</xscale>
@@ -384,7 +335,6 @@
<widget>
<class>GtkButton</class>
<name>button-phone2</name>
- <cxx_use_heap>True</cxx_use_heap>
<widget>
<class>Placeholder</class>
@@ -395,7 +345,6 @@
<widget>
<class>GtkAlignment</class>
<name>alignment8</name>
- <cxx_use_heap>True</cxx_use_heap>
<xalign>1</xalign>
<yalign>0.5</yalign>
<xscale>0</xscale>
@@ -418,7 +367,6 @@
<widget>
<class>GtkButton</class>
<name>button-phone1</name>
- <cxx_use_heap>True</cxx_use_heap>
<widget>
<class>Placeholder</class>
@@ -429,7 +377,6 @@
<widget>
<class>GtkHSeparator</class>
<name>hseparator4</name>
- <cxx_use_heap>True</cxx_use_heap>
<child>
<left_attach>4</left_attach>
<right_attach>8</right_attach>
@@ -449,7 +396,6 @@
<widget>
<class>GtkAlignment</class>
<name>alignment6</name>
- <cxx_use_heap>True</cxx_use_heap>
<xalign>1</xalign>
<yalign>0.5</yalign>
<xscale>0</xscale>
@@ -472,7 +418,6 @@
<widget>
<class>GtkButton</class>
<name>button-phone3</name>
- <cxx_use_heap>True</cxx_use_heap>
<widget>
<class>Placeholder</class>
@@ -483,8 +428,9 @@
<widget>
<class>GtkEntry</class>
<name>entry-fullname</name>
- <cxx_use_heap>True</cxx_use_heap>
+ <has_default>True</has_default>
<can_focus>True</can_focus>
+ <has_focus>True</has_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
@@ -508,7 +454,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-jobtitle</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -533,7 +478,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-company</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -558,7 +502,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-email1</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -583,7 +526,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-web</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -608,7 +550,6 @@
<widget>
<class>GtkHSeparator</class>
<name>hseparator5</name>
- <cxx_use_heap>True</cxx_use_heap>
<child>
<left_attach>0</left_attach>
<right_attach>4</right_attach>
@@ -628,7 +569,6 @@
<widget>
<class>GtkCombo</class>
<name>combo-file-as</name>
- <cxx_use_heap>True</cxx_use_heap>
<value_in_list>False</value_in_list>
<ok_if_empty>True</ok_if_empty>
<case_sensitive>True</case_sensitive>
@@ -654,7 +594,6 @@
<class>GtkEntry</class>
<child_name>GtkCombo:entry</child_name>
<name>entry-file-as</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -666,7 +605,6 @@
<widget>
<class>GtkHSeparator</class>
<name>hseparator6</name>
- <cxx_use_heap>True</cxx_use_heap>
<child>
<left_attach>0</left_attach>
<right_attach>4</right_attach>
@@ -686,7 +624,6 @@
<widget>
<class>GtkAlignment</class>
<name>alignment10</name>
- <cxx_use_heap>True</cxx_use_heap>
<xalign>0.5</xalign>
<yalign>0</yalign>
<xscale>1</xscale>
@@ -709,7 +646,6 @@
<widget>
<class>GtkCheckButton</class>
<name>checkbutton-htmlmail</name>
- <cxx_use_heap>True</cxx_use_heap>
<label>Wants to receive _HTML mail</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
@@ -719,7 +655,6 @@
<widget>
<class>GtkAlignment</class>
<name>alignment4</name>
- <cxx_use_heap>True</cxx_use_heap>
<xalign>1</xalign>
<yalign>0.5</yalign>
<xscale>0</xscale>
@@ -742,7 +677,6 @@
<widget>
<class>GtkButton</class>
<name>button-address</name>
- <cxx_use_heap>True</cxx_use_heap>
<widget>
<class>Placeholder</class>
@@ -753,7 +687,6 @@
<widget>
<class>GtkLabel</class>
<name>address-label</name>
- <cxx_use_heap>True</cxx_use_heap>
<label>Address:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
@@ -781,7 +714,6 @@
<widget>
<class>GtkEventBox</class>
<name>eventbox1</name>
- <cxx_use_heap>True</cxx_use_heap>
<child>
<left_attach>5</left_attach>
<right_attach>6</right_attach>
@@ -800,7 +732,6 @@
<widget>
<class>GtkLabel</class>
<name>label-phone1</name>
- <cxx_use_heap>True</cxx_use_heap>
<label>_Business</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
@@ -815,7 +746,6 @@
<widget>
<class>GtkEventBox</class>
<name>eventbox2</name>
- <cxx_use_heap>True</cxx_use_heap>
<child>
<left_attach>5</left_attach>
<right_attach>6</right_attach>
@@ -834,7 +764,6 @@
<widget>
<class>GtkLabel</class>
<name>label-phone2</name>
- <cxx_use_heap>True</cxx_use_heap>
<label>_Home</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
@@ -849,7 +778,6 @@
<widget>
<class>GtkEventBox</class>
<name>eventbox3</name>
- <cxx_use_heap>True</cxx_use_heap>
<child>
<left_attach>5</left_attach>
<right_attach>6</right_attach>
@@ -868,7 +796,6 @@
<widget>
<class>GtkLabel</class>
<name>label-phone3</name>
- <cxx_use_heap>True</cxx_use_heap>
<label>Business _Fax</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
@@ -883,7 +810,6 @@
<widget>
<class>GtkEventBox</class>
<name>eventbox4</name>
- <cxx_use_heap>True</cxx_use_heap>
<child>
<left_attach>5</left_attach>
<right_attach>6</right_attach>
@@ -902,7 +828,6 @@
<widget>
<class>GtkLabel</class>
<name>label-phone4</name>
- <cxx_use_heap>True</cxx_use_heap>
<label>_Mobile</label>
<justify>GTK_JUSTIFY_LEFT</justify>
<wrap>False</wrap>
@@ -917,7 +842,6 @@
<widget>
<class>GtkEventBox</class>
<name>eventbox5</name>
- <cxx_use_heap>True</cxx_use_heap>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
@@ -936,7 +860,6 @@
<widget>
<class>GtkLabel</class>
<name>label-email1</name>
- <cxx_use_heap>True</cxx_use_heap>
<label>Primary Email</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
@@ -951,7 +874,6 @@
<widget>
<class>GtkEventBox</class>
<name>eventbox-business</name>
- <cxx_use_heap>True</cxx_use_heap>
<child>
<left_attach>5</left_attach>
<right_attach>6</right_attach>
@@ -970,8 +892,7 @@
<widget>
<class>GtkLabel</class>
<name>label-address</name>
- <cxx_use_heap>True</cxx_use_heap>
- <label>Business</label>
+ <label>B_usiness</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
@@ -985,7 +906,6 @@
<widget>
<class>GtkAlignment</class>
<name>alignment2</name>
- <cxx_use_heap>True</cxx_use_heap>
<xalign>0</xalign>
<yalign>0</yalign>
<xscale>0</xscale>
@@ -1008,8 +928,7 @@
<widget>
<class>GtkCheckButton</class>
<name>checkbutton-mailingaddress</name>
- <cxx_use_heap>True</cxx_use_heap>
- <label>This is the _mailing address</label>
+ <label>_This is the mailing address</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
</widget>
@@ -1018,7 +937,6 @@
<widget>
<class>GtkHSeparator</class>
<name>hseparator9</name>
- <cxx_use_heap>True</cxx_use_heap>
<child>
<left_attach>0</left_attach>
<right_attach>4</right_attach>
@@ -1038,7 +956,6 @@
<widget>
<class>GtkHSeparator</class>
<name>hseparator10</name>
- <cxx_use_heap>True</cxx_use_heap>
<child>
<left_attach>4</left_attach>
<right_attach>8</right_attach>
@@ -1058,7 +975,6 @@
<widget>
<class>GtkAlignment</class>
<name>alignment12</name>
- <cxx_use_heap>True</cxx_use_heap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xscale>1</xscale>
@@ -1081,16 +997,14 @@
<widget>
<class>GtkButton</class>
<name>button-contacts</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
- <label>_Contacts...</label>
+ <label>C_ontacts...</label>
</widget>
</widget>
<widget>
<class>GtkAlignment</class>
<name>alignment15</name>
- <cxx_use_heap>True</cxx_use_heap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xscale>1</xscale>
@@ -1113,7 +1027,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-categories</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -1125,7 +1038,6 @@
<widget>
<class>GtkAlignment</class>
<name>alignment14</name>
- <cxx_use_heap>True</cxx_use_heap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xscale>1</xscale>
@@ -1148,7 +1060,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-contacts</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -1160,7 +1071,6 @@
<widget>
<class>GtkAlignment</class>
<name>alignment16</name>
- <cxx_use_heap>True</cxx_use_heap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xscale>1</xscale>
@@ -1183,7 +1093,6 @@
<widget>
<class>GtkButton</class>
<name>button-categories</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<label>Ca_tegories...</label>
</widget>
@@ -1192,7 +1101,6 @@
<widget>
<class>GtkEventBox</class>
<name>eventbox7</name>
- <cxx_use_heap>True</cxx_use_heap>
<child>
<left_attach>1</left_attach>
<right_attach>3</right_attach>
@@ -1209,23 +1117,22 @@
</child>
<widget>
- <class>GtkAccelLabel</class>
- <name>accellabel-jobtitle</name>
- <cxx_use_heap>True</cxx_use_heap>
- <label>Job Title</label>
+ <class>GtkLabel</class>
+ <name>label34</name>
+ <label>_Job title:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
+ <focus_target>entry-jobtitle</focus_target>
</widget>
</widget>
<widget>
<class>Custom</class>
<name>custom1</name>
- <cxx_use_heap>True</cxx_use_heap>
<creation_function>e_create_image_widget</creation_function>
<string1>malehead.png</string1>
<string2></string2>
@@ -1251,7 +1158,6 @@
<widget>
<class>Custom</class>
<name>custom2</name>
- <cxx_use_heap>True</cxx_use_heap>
<creation_function>e_create_image_widget</creation_function>
<string1>cellphone.png</string1>
<string2></string2>
@@ -1277,7 +1183,6 @@
<widget>
<class>Custom</class>
<name>custom3</name>
- <cxx_use_heap>True</cxx_use_heap>
<creation_function>e_create_image_widget</creation_function>
<string1>envelope.png</string1>
<string2></string2>
@@ -1303,7 +1208,6 @@
<widget>
<class>Custom</class>
<name>custom4</name>
- <cxx_use_heap>True</cxx_use_heap>
<creation_function>e_create_image_widget</creation_function>
<string1>house.png</string1>
<string2></string2>
@@ -1329,7 +1233,6 @@
<widget>
<class>Custom</class>
<name>custom5</name>
- <cxx_use_heap>True</cxx_use_heap>
<creation_function>e_create_image_widget</creation_function>
<string1>evolution-contacts.png</string1>
<string2></string2>
@@ -1355,7 +1258,6 @@
<widget>
<class>Custom</class>
<name>custom6</name>
- <cxx_use_heap>True</cxx_use_heap>
<creation_function>e_create_image_widget</creation_function>
<string1>briefcase.png</string1>
<string2></string2>
@@ -1381,7 +1283,6 @@
<widget>
<class>Custom</class>
<name>custom10</name>
- <cxx_use_heap>True</cxx_use_heap>
<creation_function>e_create_image_widget</creation_function>
<string1>globe.png</string1>
<string2></string2>
@@ -1403,13 +1304,39 @@
<yfill>True</yfill>
</child>
</widget>
+
+ <widget>
+ <class>GtkLabel</class>
+ <name>label35</name>
+ <label>_Company:</label>
+ <justify>GTK_JUSTIFY_CENTER</justify>
+ <wrap>False</wrap>
+ <xalign>0</xalign>
+ <yalign>0.5</yalign>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <focus_target>entry-company</focus_target>
+ <child>
+ <left_attach>1</left_attach>
+ <right_attach>3</right_attach>
+ <top_attach>2</top_attach>
+ <bottom_attach>3</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>True</yfill>
+ </child>
+ </widget>
</widget>
<widget>
<class>GtkLabel</class>
<child_name>Notebook:tab</child_name>
<name>label15</name>
- <cxx_use_heap>True</cxx_use_heap>
<label>General</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
@@ -1423,7 +1350,6 @@
<class>GtkTable</class>
<name>table-contact-editor-details</name>
<border_width>7</border_width>
- <cxx_use_heap>True</cxx_use_heap>
<rows>9</rows>
<columns>6</columns>
<homogeneous>False</homogeneous>
@@ -1433,14 +1359,14 @@
<widget>
<class>GtkLabel</class>
<name>label21</name>
- <cxx_use_heap>True</cxx_use_heap>
- <label>Department:</label>
+ <label>_Department:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
+ <focus_target>entry-department</focus_target>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
@@ -1460,14 +1386,14 @@
<widget>
<class>GtkLabel</class>
<name>label22</name>
- <cxx_use_heap>True</cxx_use_heap>
- <label>Office:</label>
+ <label>_Office:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
+ <focus_target>entry-office</focus_target>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
@@ -1487,14 +1413,14 @@
<widget>
<class>GtkLabel</class>
<name>label23</name>
- <cxx_use_heap>True</cxx_use_heap>
- <label>Profession:</label>
+ <label>_Profession:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
+ <focus_target>entry-profession</focus_target>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
@@ -1514,14 +1440,14 @@
<widget>
<class>GtkLabel</class>
<name>label24</name>
- <cxx_use_heap>True</cxx_use_heap>
- <label>Nickname:</label>
+ <label>_Nickname:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
+ <focus_target>entry-nickname</focus_target>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
@@ -1541,14 +1467,14 @@
<widget>
<class>GtkLabel</class>
<name>label25</name>
- <cxx_use_heap>True</cxx_use_heap>
- <label>Spouse:</label>
+ <label>_Spouse:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
+ <focus_target>entry-spouse</focus_target>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
@@ -1568,8 +1494,7 @@
<widget>
<class>GtkLabel</class>
<name>label31</name>
- <cxx_use_heap>True</cxx_use_heap>
- <label>Birthday:</label>
+ <label>_Birthday:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
@@ -1595,14 +1520,14 @@
<widget>
<class>GtkLabel</class>
<name>label30</name>
- <cxx_use_heap>True</cxx_use_heap>
- <label>Assistant's name:</label>
+ <label>_Assistant's name:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
+ <focus_target>entry-assistant</focus_target>
<child>
<left_attach>3</left_attach>
<right_attach>4</right_attach>
@@ -1622,14 +1547,14 @@
<widget>
<class>GtkLabel</class>
<name>label29</name>
- <cxx_use_heap>True</cxx_use_heap>
- <label>Manager's Name:</label>
+ <label>_Manager's Name:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
+ <focus_target>entry-manager</focus_target>
<child>
<left_attach>3</left_attach>
<right_attach>4</right_attach>
@@ -1649,8 +1574,7 @@
<widget>
<class>GtkLabel</class>
<name>label32</name>
- <cxx_use_heap>True</cxx_use_heap>
- <label>Anniversary:</label>
+ <label>Anni_versary:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
@@ -1676,7 +1600,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-spouse</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -1701,7 +1624,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-department</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -1726,7 +1648,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-office</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -1751,7 +1672,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-profession</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -1776,7 +1696,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-nickname</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -1801,7 +1720,6 @@
<widget>
<class>GnomeDateEdit</class>
<name>dateedit-anniversary</name>
- <cxx_use_heap>True</cxx_use_heap>
<show_time>False</show_time>
<use_24_format>False</use_24_format>
<week_start_monday>False</week_start_monday>
@@ -1826,7 +1744,6 @@
<widget>
<class>GnomeDateEdit</class>
<name>dateedit-birthday</name>
- <cxx_use_heap>True</cxx_use_heap>
<show_time>False</show_time>
<use_24_format>False</use_24_format>
<week_start_monday>False</week_start_monday>
@@ -1851,7 +1768,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-assistant</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -1876,7 +1792,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-manager</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -1901,7 +1816,6 @@
<widget>
<class>GtkHSeparator</class>
<name>hseparator7</name>
- <cxx_use_heap>True</cxx_use_heap>
<child>
<left_attach>0</left_attach>
<right_attach>6</right_attach>
@@ -1921,8 +1835,7 @@
<widget>
<class>GtkLabel</class>
<name>label33</name>
- <cxx_use_heap>True</cxx_use_heap>
- <label>Notes:</label>
+ <label>No_tes:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
@@ -1948,7 +1861,6 @@
<widget>
<class>GtkHSeparator</class>
<name>hseparator8</name>
- <cxx_use_heap>True</cxx_use_heap>
<child>
<left_attach>0</left_attach>
<right_attach>6</right_attach>
@@ -1968,7 +1880,6 @@
<widget>
<class>Custom</class>
<name>custom7</name>
- <cxx_use_heap>True</cxx_use_heap>
<creation_function>e_create_image_widget</creation_function>
<string1>briefcase.png</string1>
<string2></string2>
@@ -1994,7 +1905,6 @@
<widget>
<class>Custom</class>
<name>custom8</name>
- <cxx_use_heap>True</cxx_use_heap>
<creation_function>e_create_image_widget</creation_function>
<string1>malehead.png</string1>
<string2></string2>
@@ -2020,7 +1930,6 @@
<widget>
<class>GtkScrolledWindow</class>
<name>scrolledwindow2</name>
- <cxx_use_heap>True</cxx_use_heap>
<hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
<vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
@@ -2043,7 +1952,6 @@
<widget>
<class>GtkText</class>
<name>text-comments</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text></text>
@@ -2053,7 +1961,6 @@
<widget>
<class>Custom</class>
<name>custom9</name>
- <cxx_use_heap>True</cxx_use_heap>
<creation_function>e_create_image_widget</creation_function>
<string1>globe.png</string1>
<string2></string2>
@@ -2081,7 +1988,6 @@
<class>GtkLabel</class>
<child_name>Notebook:tab</child_name>
<name>label16</name>
- <cxx_use_heap>True</cxx_use_heap>
<label>Details</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
@@ -2096,7 +2002,7 @@
<widget>
<class>GnomeDialog</class>
<name>dialog2</name>
- <cxx_use_heap>True</cxx_use_heap>
+ <border_width>2</border_width>
<visible>False</visible>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_NONE</position>
@@ -2111,9 +2017,8 @@
<class>GtkVBox</class>
<child_name>GnomeDialog:vbox</child_name>
<name>dialog-vbox2</name>
- <cxx_use_heap>True</cxx_use_heap>
<homogeneous>False</homogeneous>
- <spacing>8</spacing>
+ <spacing>4</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
@@ -2121,14 +2026,55 @@
</child>
<widget>
+ <class>GtkHButtonBox</class>
+ <child_name>GnomeDialog:action_area</child_name>
+ <name>dialog-action_area2</name>
+ <layout_style>GTK_BUTTONBOX_END</layout_style>
+ <spacing>8</spacing>
+ <child_min_width>85</child_min_width>
+ <child_min_height>27</child_min_height>
+ <child_ipad_x>7</child_ipad_x>
+ <child_ipad_y>0</child_ipad_y>
+ <child>
+ <padding>0</padding>
+ <expand>False</expand>
+ <fill>True</fill>
+ <pack>GTK_PACK_END</pack>
+ </child>
+
+ <widget>
+ <class>GtkButton</class>
+ <name>button28</name>
+ <can_default>True</can_default>
+ <can_focus>True</can_focus>
+ <stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
+ </widget>
+
+ <widget>
+ <class>GtkButton</class>
+ <name>button29</name>
+ <can_default>True</can_default>
+ <can_focus>True</can_focus>
+ <stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
+ </widget>
+
+ <widget>
+ <class>GtkButton</class>
+ <name>button30</name>
+ <can_default>True</can_default>
+ <can_focus>True</can_focus>
+ <stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
+ </widget>
+ </widget>
+
+ <widget>
<class>GtkTable</class>
<name>table2</name>
- <cxx_use_heap>True</cxx_use_heap>
<rows>2</rows>
<columns>2</columns>
<homogeneous>False</homogeneous>
<row_spacing>0</row_spacing>
- <column_spacing>0</column_spacing>
+ <column_spacing>2</column_spacing>
<child>
<padding>0</padding>
<expand>True</expand>
@@ -2138,7 +2084,6 @@
<widget>
<class>GtkEntry</class>
<name>entry2</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -2163,9 +2108,8 @@
<widget>
<class>GtkVBox</class>
<name>vbox1</name>
- <cxx_use_heap>True</cxx_use_heap>
<homogeneous>False</homogeneous>
- <spacing>0</spacing>
+ <spacing>2</spacing>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
@@ -2184,9 +2128,9 @@
<widget>
<class>GtkButton</class>
<name>button31</name>
- <cxx_use_heap>True</cxx_use_heap>
+ <border_width>2</border_width>
<can_focus>True</can_focus>
- <label>Add</label>
+ <label>_Add</label>
<child>
<padding>0</padding>
<expand>False</expand>
@@ -2197,9 +2141,9 @@
<widget>
<class>GtkButton</class>
<name>button32</name>
- <cxx_use_heap>True</cxx_use_heap>
+ <border_width>2</border_width>
<can_focus>True</can_focus>
- <label>Delete</label>
+ <label>_Delete</label>
<child>
<padding>0</padding>
<expand>False</expand>
@@ -2212,7 +2156,6 @@
<class>GtkScrolledWindow</class>
<name>scrolledwindow1</name>
<height>200</height>
- <cxx_use_heap>True</cxx_use_heap>
<hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
<vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
@@ -2235,7 +2178,6 @@
<widget>
<class>GtkCList</class>
<name>clist1</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<columns>1</columns>
<column_widths>80</column_widths>
@@ -2247,7 +2189,6 @@
<class>GtkLabel</class>
<child_name>CList:title</child_name>
<name>label20</name>
- <cxx_use_heap>True</cxx_use_heap>
<label>Phone Types</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
@@ -2259,12 +2200,39 @@
</widget>
</widget>
</widget>
+ </widget>
+</widget>
+
+<widget>
+ <class>GnomeDialog</class>
+ <name>dialog-add-phone</name>
+ <visible>False</visible>
+ <title>New phone type</title>
+ <type>GTK_WINDOW_TOPLEVEL</type>
+ <position>GTK_WIN_POS_NONE</position>
+ <modal>False</modal>
+ <allow_shrink>False</allow_shrink>
+ <allow_grow>False</allow_grow>
+ <auto_shrink>False</auto_shrink>
+ <auto_close>False</auto_close>
+ <hide_on_close>False</hide_on_close>
+
+ <widget>
+ <class>GtkVBox</class>
+ <child_name>GnomeDialog:vbox</child_name>
+ <name>vbox2</name>
+ <homogeneous>False</homogeneous>
+ <spacing>8</spacing>
+ <child>
+ <padding>4</padding>
+ <expand>True</expand>
+ <fill>True</fill>
+ </child>
<widget>
<class>GtkHButtonBox</class>
<child_name>GnomeDialog:action_area</child_name>
- <name>dialog-action_area2</name>
- <cxx_use_heap>True</cxx_use_heap>
+ <name>hbuttonbox1</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>8</spacing>
<child_min_width>85</child_min_width>
@@ -2280,67 +2248,27 @@
<widget>
<class>GtkButton</class>
- <name>button28</name>
- <cxx_use_heap>True</cxx_use_heap>
- <can_default>True</can_default>
- <can_focus>True</can_focus>
- <stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
- </widget>
-
- <widget>
- <class>GtkButton</class>
- <name>button29</name>
- <cxx_use_heap>True</cxx_use_heap>
+ <name>button43</name>
<can_default>True</can_default>
+ <has_default>True</has_default>
<can_focus>True</can_focus>
- <stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
+ <label>Add</label>
+ <stock_pixmap>GNOME_STOCK_PIXMAP_ADD</stock_pixmap>
</widget>
<widget>
<class>GtkButton</class>
- <name>button30</name>
- <cxx_use_heap>True</cxx_use_heap>
+ <name>button44</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
</widget>
</widget>
- </widget>
-</widget>
-
-<widget>
- <class>GnomeDialog</class>
- <name>dialog-add-phone</name>
- <cxx_use_heap>True</cxx_use_heap>
- <visible>False</visible>
- <title>New phone type</title>
- <type>GTK_WINDOW_TOPLEVEL</type>
- <position>GTK_WIN_POS_NONE</position>
- <modal>False</modal>
- <allow_shrink>False</allow_shrink>
- <allow_grow>False</allow_grow>
- <auto_shrink>False</auto_shrink>
- <auto_close>False</auto_close>
- <hide_on_close>False</hide_on_close>
-
- <widget>
- <class>GtkVBox</class>
- <child_name>GnomeDialog:vbox</child_name>
- <name>vbox2</name>
- <cxx_use_heap>True</cxx_use_heap>
- <homogeneous>False</homogeneous>
- <spacing>8</spacing>
- <child>
- <padding>4</padding>
- <expand>True</expand>
- <fill>True</fill>
- </child>
<widget>
<class>GtkFrame</class>
<name>frame-add-phone</name>
<border_width>4</border_width>
- <cxx_use_heap>True</cxx_use_heap>
<label>New phone type</label>
<label_xalign>0</label_xalign>
<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
@@ -2354,7 +2282,6 @@
<class>GtkAlignment</class>
<name>alignment9</name>
<border_width>9</border_width>
- <cxx_use_heap>True</cxx_use_heap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xscale>1</xscale>
@@ -2363,8 +2290,8 @@
<widget>
<class>GtkEntry</class>
<name>entry-add-phone</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
+ <has_focus>True</has_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
@@ -2372,44 +2299,6 @@
</widget>
</widget>
</widget>
-
- <widget>
- <class>GtkHButtonBox</class>
- <child_name>GnomeDialog:action_area</child_name>
- <name>hbuttonbox1</name>
- <cxx_use_heap>True</cxx_use_heap>
- <layout_style>GTK_BUTTONBOX_END</layout_style>
- <spacing>8</spacing>
- <child_min_width>85</child_min_width>
- <child_min_height>27</child_min_height>
- <child_ipad_x>7</child_ipad_x>
- <child_ipad_y>0</child_ipad_y>
- <child>
- <padding>0</padding>
- <expand>False</expand>
- <fill>True</fill>
- <pack>GTK_PACK_END</pack>
- </child>
-
- <widget>
- <class>GtkButton</class>
- <name>button43</name>
- <cxx_use_heap>True</cxx_use_heap>
- <can_default>True</can_default>
- <can_focus>True</can_focus>
- <label>Add</label>
- <stock_pixmap>GNOME_STOCK_PIXMAP_ADD</stock_pixmap>
- </widget>
-
- <widget>
- <class>GtkButton</class>
- <name>button44</name>
- <cxx_use_heap>True</cxx_use_heap>
- <can_default>True</can_default>
- <can_focus>True</can_focus>
- <stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
- </widget>
- </widget>
</widget>
</widget>
diff --git a/addressbook/contact-editor/e-contact-editor-strings.h b/addressbook/contact-editor/e-contact-editor-strings.h
index 40c2ee85a5..d5f1983573 100644
--- a/addressbook/contact-editor/e-contact-editor-strings.h
+++ b/addressbook/contact-editor/e-contact-editor-strings.h
@@ -6,7 +6,6 @@
gchar *s = N_("Contact Editor");
gchar *s = N_("_Full Name...");
-gchar *s = N_("Company:");
gchar *s = N_("File As:");
gchar *s = N_("Web page address:");
gchar *s = N_("Wants to receive _HTML mail");
@@ -16,26 +15,27 @@ gchar *s = N_("_Home");
gchar *s = N_("Business _Fax");
gchar *s = N_("_Mobile");
gchar *s = N_("Primary Email");
-gchar *s = N_("Business");
-gchar *s = N_("This is the _mailing address");
-gchar *s = N_("_Contacts...");
+gchar *s = N_("B_usiness");
+gchar *s = N_("_This is the mailing address");
+gchar *s = N_("C_ontacts...");
gchar *s = N_("Ca_tegories...");
-gchar *s = N_("Job Title");
+gchar *s = N_("_Job title:");
+gchar *s = N_("_Company:");
gchar *s = N_("General");
-gchar *s = N_("Department:");
-gchar *s = N_("Office:");
-gchar *s = N_("Profession:");
-gchar *s = N_("Nickname:");
-gchar *s = N_("Spouse:");
-gchar *s = N_("Birthday:");
-gchar *s = N_("Assistant's name:");
-gchar *s = N_("Manager's Name:");
-gchar *s = N_("Anniversary:");
-gchar *s = N_("Notes:");
+gchar *s = N_("_Department:");
+gchar *s = N_("_Office:");
+gchar *s = N_("_Profession:");
+gchar *s = N_("_Nickname:");
+gchar *s = N_("_Spouse:");
+gchar *s = N_("_Birthday:");
+gchar *s = N_("_Assistant's name:");
+gchar *s = N_("_Manager's Name:");
+gchar *s = N_("Anni_versary:");
+gchar *s = N_("No_tes:");
gchar *s = N_("Details");
-gchar *s = N_("Add");
-gchar *s = N_("Delete");
+gchar *s = N_("_Add");
+gchar *s = N_("_Delete");
gchar *s = N_("Phone Types");
gchar *s = N_("New phone type");
-gchar *s = N_("New phone type");
gchar *s = N_("Add");
+gchar *s = N_("New phone type");
diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade
index af77945c56..21ad4fd265 100644
--- a/addressbook/gui/contact-editor/contact-editor.glade
+++ b/addressbook/gui/contact-editor/contact-editor.glade
@@ -15,12 +15,6 @@
<output_support_files>False</output_support_files>
<output_build_files>False</output_build_files>
<backup_source_files>False</backup_source_files>
- <main_source_file>interface.c</main_source_file>
- <main_header_file>interface.h</main_header_file>
- <handler_source_file>callbacks.c</handler_source_file>
- <handler_header_file>callbacks.h</handler_header_file>
- <support_source_file>support.c</support_source_file>
- <support_header_file>support.h</support_header_file>
<output_translatable_strings>True</output_translatable_strings>
<translatable_strings_file>e-contact-editor-strings.h</translatable_strings_file>
</project>
@@ -28,7 +22,6 @@
<widget>
<class>GtkWindow</class>
<name>contact editor</name>
- <cxx_use_heap>True</cxx_use_heap>
<visible>False</visible>
<title>Contact Editor</title>
<type>GTK_WINDOW_TOPLEVEL</type>
@@ -41,7 +34,6 @@
<widget>
<class>GtkNotebook</class>
<name>notebook-contact-editor</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<show_tabs>True</show_tabs>
<show_border>True</show_border>
@@ -55,7 +47,6 @@
<class>GtkTable</class>
<name>table-contact-editor-general</name>
<border_width>7</border_width>
- <cxx_use_heap>True</cxx_use_heap>
<rows>14</rows>
<columns>8</columns>
<homogeneous>False</homogeneous>
@@ -65,7 +56,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-phone1</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -90,7 +80,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-phone2</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -115,7 +104,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-phone3</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -140,7 +128,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-phone4</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -167,7 +154,6 @@
<name>text-address</name>
<width>1</width>
<height>1</height>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text></text>
@@ -190,7 +176,6 @@
<widget>
<class>GtkButton</class>
<name>button-fullname</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<label>_Full Name...</label>
<child>
@@ -211,35 +196,7 @@
<widget>
<class>GtkAccelLabel</class>
- <name>accellabel-company</name>
- <cxx_use_heap>True</cxx_use_heap>
- <label>Company:</label>
- <justify>GTK_JUSTIFY_CENTER</justify>
- <wrap>False</wrap>
- <xalign>0</xalign>
- <yalign>0.5</yalign>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <child>
- <left_attach>1</left_attach>
- <right_attach>3</right_attach>
- <top_attach>2</top_attach>
- <bottom_attach>3</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>False</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>True</xfill>
- <yfill>True</yfill>
- </child>
- </widget>
-
- <widget>
- <class>GtkAccelLabel</class>
<name>accellabel-fileas</name>
- <cxx_use_heap>True</cxx_use_heap>
<label>File As:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
@@ -266,7 +223,6 @@
<widget>
<class>GtkAccelLabel</class>
<name>accellabel-web</name>
- <cxx_use_heap>True</cxx_use_heap>
<label>Web page address:</label>
<justify>GTK_JUSTIFY_LEFT</justify>
<wrap>False</wrap>
@@ -293,7 +249,6 @@
<widget>
<class>GtkAlignment</class>
<name>alignment3</name>
- <cxx_use_heap>True</cxx_use_heap>
<xalign>1</xalign>
<yalign>0.5</yalign>
<xscale>0</xscale>
@@ -316,7 +271,6 @@
<widget>
<class>GtkButton</class>
<name>button-email1</name>
- <cxx_use_heap>True</cxx_use_heap>
<widget>
<class>Placeholder</class>
@@ -327,7 +281,6 @@
<widget>
<class>GtkAlignment</class>
<name>alignment5</name>
- <cxx_use_heap>True</cxx_use_heap>
<xalign>1</xalign>
<yalign>0.5</yalign>
<xscale>0</xscale>
@@ -350,7 +303,6 @@
<widget>
<class>GtkButton</class>
<name>button-phone4</name>
- <cxx_use_heap>True</cxx_use_heap>
<widget>
<class>Placeholder</class>
@@ -361,7 +313,6 @@
<widget>
<class>GtkAlignment</class>
<name>alignment7</name>
- <cxx_use_heap>True</cxx_use_heap>
<xalign>1</xalign>
<yalign>0.5</yalign>
<xscale>0</xscale>
@@ -384,7 +335,6 @@
<widget>
<class>GtkButton</class>
<name>button-phone2</name>
- <cxx_use_heap>True</cxx_use_heap>
<widget>
<class>Placeholder</class>
@@ -395,7 +345,6 @@
<widget>
<class>GtkAlignment</class>
<name>alignment8</name>
- <cxx_use_heap>True</cxx_use_heap>
<xalign>1</xalign>
<yalign>0.5</yalign>
<xscale>0</xscale>
@@ -418,7 +367,6 @@
<widget>
<class>GtkButton</class>
<name>button-phone1</name>
- <cxx_use_heap>True</cxx_use_heap>
<widget>
<class>Placeholder</class>
@@ -429,7 +377,6 @@
<widget>
<class>GtkHSeparator</class>
<name>hseparator4</name>
- <cxx_use_heap>True</cxx_use_heap>
<child>
<left_attach>4</left_attach>
<right_attach>8</right_attach>
@@ -449,7 +396,6 @@
<widget>
<class>GtkAlignment</class>
<name>alignment6</name>
- <cxx_use_heap>True</cxx_use_heap>
<xalign>1</xalign>
<yalign>0.5</yalign>
<xscale>0</xscale>
@@ -472,7 +418,6 @@
<widget>
<class>GtkButton</class>
<name>button-phone3</name>
- <cxx_use_heap>True</cxx_use_heap>
<widget>
<class>Placeholder</class>
@@ -483,8 +428,9 @@
<widget>
<class>GtkEntry</class>
<name>entry-fullname</name>
- <cxx_use_heap>True</cxx_use_heap>
+ <has_default>True</has_default>
<can_focus>True</can_focus>
+ <has_focus>True</has_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
@@ -508,7 +454,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-jobtitle</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -533,7 +478,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-company</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -558,7 +502,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-email1</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -583,7 +526,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-web</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -608,7 +550,6 @@
<widget>
<class>GtkHSeparator</class>
<name>hseparator5</name>
- <cxx_use_heap>True</cxx_use_heap>
<child>
<left_attach>0</left_attach>
<right_attach>4</right_attach>
@@ -628,7 +569,6 @@
<widget>
<class>GtkCombo</class>
<name>combo-file-as</name>
- <cxx_use_heap>True</cxx_use_heap>
<value_in_list>False</value_in_list>
<ok_if_empty>True</ok_if_empty>
<case_sensitive>True</case_sensitive>
@@ -654,7 +594,6 @@
<class>GtkEntry</class>
<child_name>GtkCombo:entry</child_name>
<name>entry-file-as</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -666,7 +605,6 @@
<widget>
<class>GtkHSeparator</class>
<name>hseparator6</name>
- <cxx_use_heap>True</cxx_use_heap>
<child>
<left_attach>0</left_attach>
<right_attach>4</right_attach>
@@ -686,7 +624,6 @@
<widget>
<class>GtkAlignment</class>
<name>alignment10</name>
- <cxx_use_heap>True</cxx_use_heap>
<xalign>0.5</xalign>
<yalign>0</yalign>
<xscale>1</xscale>
@@ -709,7 +646,6 @@
<widget>
<class>GtkCheckButton</class>
<name>checkbutton-htmlmail</name>
- <cxx_use_heap>True</cxx_use_heap>
<label>Wants to receive _HTML mail</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
@@ -719,7 +655,6 @@
<widget>
<class>GtkAlignment</class>
<name>alignment4</name>
- <cxx_use_heap>True</cxx_use_heap>
<xalign>1</xalign>
<yalign>0.5</yalign>
<xscale>0</xscale>
@@ -742,7 +677,6 @@
<widget>
<class>GtkButton</class>
<name>button-address</name>
- <cxx_use_heap>True</cxx_use_heap>
<widget>
<class>Placeholder</class>
@@ -753,7 +687,6 @@
<widget>
<class>GtkLabel</class>
<name>address-label</name>
- <cxx_use_heap>True</cxx_use_heap>
<label>Address:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
@@ -781,7 +714,6 @@
<widget>
<class>GtkEventBox</class>
<name>eventbox1</name>
- <cxx_use_heap>True</cxx_use_heap>
<child>
<left_attach>5</left_attach>
<right_attach>6</right_attach>
@@ -800,7 +732,6 @@
<widget>
<class>GtkLabel</class>
<name>label-phone1</name>
- <cxx_use_heap>True</cxx_use_heap>
<label>_Business</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
@@ -815,7 +746,6 @@
<widget>
<class>GtkEventBox</class>
<name>eventbox2</name>
- <cxx_use_heap>True</cxx_use_heap>
<child>
<left_attach>5</left_attach>
<right_attach>6</right_attach>
@@ -834,7 +764,6 @@
<widget>
<class>GtkLabel</class>
<name>label-phone2</name>
- <cxx_use_heap>True</cxx_use_heap>
<label>_Home</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
@@ -849,7 +778,6 @@
<widget>
<class>GtkEventBox</class>
<name>eventbox3</name>
- <cxx_use_heap>True</cxx_use_heap>
<child>
<left_attach>5</left_attach>
<right_attach>6</right_attach>
@@ -868,7 +796,6 @@
<widget>
<class>GtkLabel</class>
<name>label-phone3</name>
- <cxx_use_heap>True</cxx_use_heap>
<label>Business _Fax</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
@@ -883,7 +810,6 @@
<widget>
<class>GtkEventBox</class>
<name>eventbox4</name>
- <cxx_use_heap>True</cxx_use_heap>
<child>
<left_attach>5</left_attach>
<right_attach>6</right_attach>
@@ -902,7 +828,6 @@
<widget>
<class>GtkLabel</class>
<name>label-phone4</name>
- <cxx_use_heap>True</cxx_use_heap>
<label>_Mobile</label>
<justify>GTK_JUSTIFY_LEFT</justify>
<wrap>False</wrap>
@@ -917,7 +842,6 @@
<widget>
<class>GtkEventBox</class>
<name>eventbox5</name>
- <cxx_use_heap>True</cxx_use_heap>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
@@ -936,7 +860,6 @@
<widget>
<class>GtkLabel</class>
<name>label-email1</name>
- <cxx_use_heap>True</cxx_use_heap>
<label>Primary Email</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
@@ -951,7 +874,6 @@
<widget>
<class>GtkEventBox</class>
<name>eventbox-business</name>
- <cxx_use_heap>True</cxx_use_heap>
<child>
<left_attach>5</left_attach>
<right_attach>6</right_attach>
@@ -970,8 +892,7 @@
<widget>
<class>GtkLabel</class>
<name>label-address</name>
- <cxx_use_heap>True</cxx_use_heap>
- <label>Business</label>
+ <label>B_usiness</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
@@ -985,7 +906,6 @@
<widget>
<class>GtkAlignment</class>
<name>alignment2</name>
- <cxx_use_heap>True</cxx_use_heap>
<xalign>0</xalign>
<yalign>0</yalign>
<xscale>0</xscale>
@@ -1008,8 +928,7 @@
<widget>
<class>GtkCheckButton</class>
<name>checkbutton-mailingaddress</name>
- <cxx_use_heap>True</cxx_use_heap>
- <label>This is the _mailing address</label>
+ <label>_This is the mailing address</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
</widget>
@@ -1018,7 +937,6 @@
<widget>
<class>GtkHSeparator</class>
<name>hseparator9</name>
- <cxx_use_heap>True</cxx_use_heap>
<child>
<left_attach>0</left_attach>
<right_attach>4</right_attach>
@@ -1038,7 +956,6 @@
<widget>
<class>GtkHSeparator</class>
<name>hseparator10</name>
- <cxx_use_heap>True</cxx_use_heap>
<child>
<left_attach>4</left_attach>
<right_attach>8</right_attach>
@@ -1058,7 +975,6 @@
<widget>
<class>GtkAlignment</class>
<name>alignment12</name>
- <cxx_use_heap>True</cxx_use_heap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xscale>1</xscale>
@@ -1081,16 +997,14 @@
<widget>
<class>GtkButton</class>
<name>button-contacts</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
- <label>_Contacts...</label>
+ <label>C_ontacts...</label>
</widget>
</widget>
<widget>
<class>GtkAlignment</class>
<name>alignment15</name>
- <cxx_use_heap>True</cxx_use_heap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xscale>1</xscale>
@@ -1113,7 +1027,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-categories</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -1125,7 +1038,6 @@
<widget>
<class>GtkAlignment</class>
<name>alignment14</name>
- <cxx_use_heap>True</cxx_use_heap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xscale>1</xscale>
@@ -1148,7 +1060,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-contacts</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -1160,7 +1071,6 @@
<widget>
<class>GtkAlignment</class>
<name>alignment16</name>
- <cxx_use_heap>True</cxx_use_heap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xscale>1</xscale>
@@ -1183,7 +1093,6 @@
<widget>
<class>GtkButton</class>
<name>button-categories</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<label>Ca_tegories...</label>
</widget>
@@ -1192,7 +1101,6 @@
<widget>
<class>GtkEventBox</class>
<name>eventbox7</name>
- <cxx_use_heap>True</cxx_use_heap>
<child>
<left_attach>1</left_attach>
<right_attach>3</right_attach>
@@ -1209,23 +1117,22 @@
</child>
<widget>
- <class>GtkAccelLabel</class>
- <name>accellabel-jobtitle</name>
- <cxx_use_heap>True</cxx_use_heap>
- <label>Job Title</label>
+ <class>GtkLabel</class>
+ <name>label34</name>
+ <label>_Job title:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
+ <focus_target>entry-jobtitle</focus_target>
</widget>
</widget>
<widget>
<class>Custom</class>
<name>custom1</name>
- <cxx_use_heap>True</cxx_use_heap>
<creation_function>e_create_image_widget</creation_function>
<string1>malehead.png</string1>
<string2></string2>
@@ -1251,7 +1158,6 @@
<widget>
<class>Custom</class>
<name>custom2</name>
- <cxx_use_heap>True</cxx_use_heap>
<creation_function>e_create_image_widget</creation_function>
<string1>cellphone.png</string1>
<string2></string2>
@@ -1277,7 +1183,6 @@
<widget>
<class>Custom</class>
<name>custom3</name>
- <cxx_use_heap>True</cxx_use_heap>
<creation_function>e_create_image_widget</creation_function>
<string1>envelope.png</string1>
<string2></string2>
@@ -1303,7 +1208,6 @@
<widget>
<class>Custom</class>
<name>custom4</name>
- <cxx_use_heap>True</cxx_use_heap>
<creation_function>e_create_image_widget</creation_function>
<string1>house.png</string1>
<string2></string2>
@@ -1329,7 +1233,6 @@
<widget>
<class>Custom</class>
<name>custom5</name>
- <cxx_use_heap>True</cxx_use_heap>
<creation_function>e_create_image_widget</creation_function>
<string1>evolution-contacts.png</string1>
<string2></string2>
@@ -1355,7 +1258,6 @@
<widget>
<class>Custom</class>
<name>custom6</name>
- <cxx_use_heap>True</cxx_use_heap>
<creation_function>e_create_image_widget</creation_function>
<string1>briefcase.png</string1>
<string2></string2>
@@ -1381,7 +1283,6 @@
<widget>
<class>Custom</class>
<name>custom10</name>
- <cxx_use_heap>True</cxx_use_heap>
<creation_function>e_create_image_widget</creation_function>
<string1>globe.png</string1>
<string2></string2>
@@ -1403,13 +1304,39 @@
<yfill>True</yfill>
</child>
</widget>
+
+ <widget>
+ <class>GtkLabel</class>
+ <name>label35</name>
+ <label>_Company:</label>
+ <justify>GTK_JUSTIFY_CENTER</justify>
+ <wrap>False</wrap>
+ <xalign>0</xalign>
+ <yalign>0.5</yalign>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <focus_target>entry-company</focus_target>
+ <child>
+ <left_attach>1</left_attach>
+ <right_attach>3</right_attach>
+ <top_attach>2</top_attach>
+ <bottom_attach>3</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>True</yfill>
+ </child>
+ </widget>
</widget>
<widget>
<class>GtkLabel</class>
<child_name>Notebook:tab</child_name>
<name>label15</name>
- <cxx_use_heap>True</cxx_use_heap>
<label>General</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
@@ -1423,7 +1350,6 @@
<class>GtkTable</class>
<name>table-contact-editor-details</name>
<border_width>7</border_width>
- <cxx_use_heap>True</cxx_use_heap>
<rows>9</rows>
<columns>6</columns>
<homogeneous>False</homogeneous>
@@ -1433,14 +1359,14 @@
<widget>
<class>GtkLabel</class>
<name>label21</name>
- <cxx_use_heap>True</cxx_use_heap>
- <label>Department:</label>
+ <label>_Department:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
+ <focus_target>entry-department</focus_target>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
@@ -1460,14 +1386,14 @@
<widget>
<class>GtkLabel</class>
<name>label22</name>
- <cxx_use_heap>True</cxx_use_heap>
- <label>Office:</label>
+ <label>_Office:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
+ <focus_target>entry-office</focus_target>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
@@ -1487,14 +1413,14 @@
<widget>
<class>GtkLabel</class>
<name>label23</name>
- <cxx_use_heap>True</cxx_use_heap>
- <label>Profession:</label>
+ <label>_Profession:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
+ <focus_target>entry-profession</focus_target>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
@@ -1514,14 +1440,14 @@
<widget>
<class>GtkLabel</class>
<name>label24</name>
- <cxx_use_heap>True</cxx_use_heap>
- <label>Nickname:</label>
+ <label>_Nickname:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
+ <focus_target>entry-nickname</focus_target>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
@@ -1541,14 +1467,14 @@
<widget>
<class>GtkLabel</class>
<name>label25</name>
- <cxx_use_heap>True</cxx_use_heap>
- <label>Spouse:</label>
+ <label>_Spouse:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
+ <focus_target>entry-spouse</focus_target>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
@@ -1568,8 +1494,7 @@
<widget>
<class>GtkLabel</class>
<name>label31</name>
- <cxx_use_heap>True</cxx_use_heap>
- <label>Birthday:</label>
+ <label>_Birthday:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
@@ -1595,14 +1520,14 @@
<widget>
<class>GtkLabel</class>
<name>label30</name>
- <cxx_use_heap>True</cxx_use_heap>
- <label>Assistant's name:</label>
+ <label>_Assistant's name:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
+ <focus_target>entry-assistant</focus_target>
<child>
<left_attach>3</left_attach>
<right_attach>4</right_attach>
@@ -1622,14 +1547,14 @@
<widget>
<class>GtkLabel</class>
<name>label29</name>
- <cxx_use_heap>True</cxx_use_heap>
- <label>Manager's Name:</label>
+ <label>_Manager's Name:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
+ <focus_target>entry-manager</focus_target>
<child>
<left_attach>3</left_attach>
<right_attach>4</right_attach>
@@ -1649,8 +1574,7 @@
<widget>
<class>GtkLabel</class>
<name>label32</name>
- <cxx_use_heap>True</cxx_use_heap>
- <label>Anniversary:</label>
+ <label>Anni_versary:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
@@ -1676,7 +1600,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-spouse</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -1701,7 +1624,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-department</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -1726,7 +1648,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-office</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -1751,7 +1672,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-profession</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -1776,7 +1696,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-nickname</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -1801,7 +1720,6 @@
<widget>
<class>GnomeDateEdit</class>
<name>dateedit-anniversary</name>
- <cxx_use_heap>True</cxx_use_heap>
<show_time>False</show_time>
<use_24_format>False</use_24_format>
<week_start_monday>False</week_start_monday>
@@ -1826,7 +1744,6 @@
<widget>
<class>GnomeDateEdit</class>
<name>dateedit-birthday</name>
- <cxx_use_heap>True</cxx_use_heap>
<show_time>False</show_time>
<use_24_format>False</use_24_format>
<week_start_monday>False</week_start_monday>
@@ -1851,7 +1768,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-assistant</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -1876,7 +1792,6 @@
<widget>
<class>GtkEntry</class>
<name>entry-manager</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -1901,7 +1816,6 @@
<widget>
<class>GtkHSeparator</class>
<name>hseparator7</name>
- <cxx_use_heap>True</cxx_use_heap>
<child>
<left_attach>0</left_attach>
<right_attach>6</right_attach>
@@ -1921,8 +1835,7 @@
<widget>
<class>GtkLabel</class>
<name>label33</name>
- <cxx_use_heap>True</cxx_use_heap>
- <label>Notes:</label>
+ <label>No_tes:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
@@ -1948,7 +1861,6 @@
<widget>
<class>GtkHSeparator</class>
<name>hseparator8</name>
- <cxx_use_heap>True</cxx_use_heap>
<child>
<left_attach>0</left_attach>
<right_attach>6</right_attach>
@@ -1968,7 +1880,6 @@
<widget>
<class>Custom</class>
<name>custom7</name>
- <cxx_use_heap>True</cxx_use_heap>
<creation_function>e_create_image_widget</creation_function>
<string1>briefcase.png</string1>
<string2></string2>
@@ -1994,7 +1905,6 @@
<widget>
<class>Custom</class>
<name>custom8</name>
- <cxx_use_heap>True</cxx_use_heap>
<creation_function>e_create_image_widget</creation_function>
<string1>malehead.png</string1>
<string2></string2>
@@ -2020,7 +1930,6 @@
<widget>
<class>GtkScrolledWindow</class>
<name>scrolledwindow2</name>
- <cxx_use_heap>True</cxx_use_heap>
<hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
<vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
@@ -2043,7 +1952,6 @@
<widget>
<class>GtkText</class>
<name>text-comments</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text></text>
@@ -2053,7 +1961,6 @@
<widget>
<class>Custom</class>
<name>custom9</name>
- <cxx_use_heap>True</cxx_use_heap>
<creation_function>e_create_image_widget</creation_function>
<string1>globe.png</string1>
<string2></string2>
@@ -2081,7 +1988,6 @@
<class>GtkLabel</class>
<child_name>Notebook:tab</child_name>
<name>label16</name>
- <cxx_use_heap>True</cxx_use_heap>
<label>Details</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
@@ -2096,7 +2002,7 @@
<widget>
<class>GnomeDialog</class>
<name>dialog2</name>
- <cxx_use_heap>True</cxx_use_heap>
+ <border_width>2</border_width>
<visible>False</visible>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_NONE</position>
@@ -2111,9 +2017,8 @@
<class>GtkVBox</class>
<child_name>GnomeDialog:vbox</child_name>
<name>dialog-vbox2</name>
- <cxx_use_heap>True</cxx_use_heap>
<homogeneous>False</homogeneous>
- <spacing>8</spacing>
+ <spacing>4</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
@@ -2121,14 +2026,55 @@
</child>
<widget>
+ <class>GtkHButtonBox</class>
+ <child_name>GnomeDialog:action_area</child_name>
+ <name>dialog-action_area2</name>
+ <layout_style>GTK_BUTTONBOX_END</layout_style>
+ <spacing>8</spacing>
+ <child_min_width>85</child_min_width>
+ <child_min_height>27</child_min_height>
+ <child_ipad_x>7</child_ipad_x>
+ <child_ipad_y>0</child_ipad_y>
+ <child>
+ <padding>0</padding>
+ <expand>False</expand>
+ <fill>True</fill>
+ <pack>GTK_PACK_END</pack>
+ </child>
+
+ <widget>
+ <class>GtkButton</class>
+ <name>button28</name>
+ <can_default>True</can_default>
+ <can_focus>True</can_focus>
+ <stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
+ </widget>
+
+ <widget>
+ <class>GtkButton</class>
+ <name>button29</name>
+ <can_default>True</can_default>
+ <can_focus>True</can_focus>
+ <stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
+ </widget>
+
+ <widget>
+ <class>GtkButton</class>
+ <name>button30</name>
+ <can_default>True</can_default>
+ <can_focus>True</can_focus>
+ <stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
+ </widget>
+ </widget>
+
+ <widget>
<class>GtkTable</class>
<name>table2</name>
- <cxx_use_heap>True</cxx_use_heap>
<rows>2</rows>
<columns>2</columns>
<homogeneous>False</homogeneous>
<row_spacing>0</row_spacing>
- <column_spacing>0</column_spacing>
+ <column_spacing>2</column_spacing>
<child>
<padding>0</padding>
<expand>True</expand>
@@ -2138,7 +2084,6 @@
<widget>
<class>GtkEntry</class>
<name>entry2</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -2163,9 +2108,8 @@
<widget>
<class>GtkVBox</class>
<name>vbox1</name>
- <cxx_use_heap>True</cxx_use_heap>
<homogeneous>False</homogeneous>
- <spacing>0</spacing>
+ <spacing>2</spacing>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
@@ -2184,9 +2128,9 @@
<widget>
<class>GtkButton</class>
<name>button31</name>
- <cxx_use_heap>True</cxx_use_heap>
+ <border_width>2</border_width>
<can_focus>True</can_focus>
- <label>Add</label>
+ <label>_Add</label>
<child>
<padding>0</padding>
<expand>False</expand>
@@ -2197,9 +2141,9 @@
<widget>
<class>GtkButton</class>
<name>button32</name>
- <cxx_use_heap>True</cxx_use_heap>
+ <border_width>2</border_width>
<can_focus>True</can_focus>
- <label>Delete</label>
+ <label>_Delete</label>
<child>
<padding>0</padding>
<expand>False</expand>
@@ -2212,7 +2156,6 @@
<class>GtkScrolledWindow</class>
<name>scrolledwindow1</name>
<height>200</height>
- <cxx_use_heap>True</cxx_use_heap>
<hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
<vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
@@ -2235,7 +2178,6 @@
<widget>
<class>GtkCList</class>
<name>clist1</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
<columns>1</columns>
<column_widths>80</column_widths>
@@ -2247,7 +2189,6 @@
<class>GtkLabel</class>
<child_name>CList:title</child_name>
<name>label20</name>
- <cxx_use_heap>True</cxx_use_heap>
<label>Phone Types</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
@@ -2259,12 +2200,39 @@
</widget>
</widget>
</widget>
+ </widget>
+</widget>
+
+<widget>
+ <class>GnomeDialog</class>
+ <name>dialog-add-phone</name>
+ <visible>False</visible>
+ <title>New phone type</title>
+ <type>GTK_WINDOW_TOPLEVEL</type>
+ <position>GTK_WIN_POS_NONE</position>
+ <modal>False</modal>
+ <allow_shrink>False</allow_shrink>
+ <allow_grow>False</allow_grow>
+ <auto_shrink>False</auto_shrink>
+ <auto_close>False</auto_close>
+ <hide_on_close>False</hide_on_close>
+
+ <widget>
+ <class>GtkVBox</class>
+ <child_name>GnomeDialog:vbox</child_name>
+ <name>vbox2</name>
+ <homogeneous>False</homogeneous>
+ <spacing>8</spacing>
+ <child>
+ <padding>4</padding>
+ <expand>True</expand>
+ <fill>True</fill>
+ </child>
<widget>
<class>GtkHButtonBox</class>
<child_name>GnomeDialog:action_area</child_name>
- <name>dialog-action_area2</name>
- <cxx_use_heap>True</cxx_use_heap>
+ <name>hbuttonbox1</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>8</spacing>
<child_min_width>85</child_min_width>
@@ -2280,67 +2248,27 @@
<widget>
<class>GtkButton</class>
- <name>button28</name>
- <cxx_use_heap>True</cxx_use_heap>
- <can_default>True</can_default>
- <can_focus>True</can_focus>
- <stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
- </widget>
-
- <widget>
- <class>GtkButton</class>
- <name>button29</name>
- <cxx_use_heap>True</cxx_use_heap>
+ <name>button43</name>
<can_default>True</can_default>
+ <has_default>True</has_default>
<can_focus>True</can_focus>
- <stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
+ <label>Add</label>
+ <stock_pixmap>GNOME_STOCK_PIXMAP_ADD</stock_pixmap>
</widget>
<widget>
<class>GtkButton</class>
- <name>button30</name>
- <cxx_use_heap>True</cxx_use_heap>
+ <name>button44</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
</widget>
</widget>
- </widget>
-</widget>
-
-<widget>
- <class>GnomeDialog</class>
- <name>dialog-add-phone</name>
- <cxx_use_heap>True</cxx_use_heap>
- <visible>False</visible>
- <title>New phone type</title>
- <type>GTK_WINDOW_TOPLEVEL</type>
- <position>GTK_WIN_POS_NONE</position>
- <modal>False</modal>
- <allow_shrink>False</allow_shrink>
- <allow_grow>False</allow_grow>
- <auto_shrink>False</auto_shrink>
- <auto_close>False</auto_close>
- <hide_on_close>False</hide_on_close>
-
- <widget>
- <class>GtkVBox</class>
- <child_name>GnomeDialog:vbox</child_name>
- <name>vbox2</name>
- <cxx_use_heap>True</cxx_use_heap>
- <homogeneous>False</homogeneous>
- <spacing>8</spacing>
- <child>
- <padding>4</padding>
- <expand>True</expand>
- <fill>True</fill>
- </child>
<widget>
<class>GtkFrame</class>
<name>frame-add-phone</name>
<border_width>4</border_width>
- <cxx_use_heap>True</cxx_use_heap>
<label>New phone type</label>
<label_xalign>0</label_xalign>
<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
@@ -2354,7 +2282,6 @@
<class>GtkAlignment</class>
<name>alignment9</name>
<border_width>9</border_width>
- <cxx_use_heap>True</cxx_use_heap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xscale>1</xscale>
@@ -2363,8 +2290,8 @@
<widget>
<class>GtkEntry</class>
<name>entry-add-phone</name>
- <cxx_use_heap>True</cxx_use_heap>
<can_focus>True</can_focus>
+ <has_focus>True</has_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
@@ -2372,44 +2299,6 @@
</widget>
</widget>
</widget>
-
- <widget>
- <class>GtkHButtonBox</class>
- <child_name>GnomeDialog:action_area</child_name>
- <name>hbuttonbox1</name>
- <cxx_use_heap>True</cxx_use_heap>
- <layout_style>GTK_BUTTONBOX_END</layout_style>
- <spacing>8</spacing>
- <child_min_width>85</child_min_width>
- <child_min_height>27</child_min_height>
- <child_ipad_x>7</child_ipad_x>
- <child_ipad_y>0</child_ipad_y>
- <child>
- <padding>0</padding>
- <expand>False</expand>
- <fill>True</fill>
- <pack>GTK_PACK_END</pack>
- </child>
-
- <widget>
- <class>GtkButton</class>
- <name>button43</name>
- <cxx_use_heap>True</cxx_use_heap>
- <can_default>True</can_default>
- <can_focus>True</can_focus>
- <label>Add</label>
- <stock_pixmap>GNOME_STOCK_PIXMAP_ADD</stock_pixmap>
- </widget>
-
- <widget>
- <class>GtkButton</class>
- <name>button44</name>
- <cxx_use_heap>True</cxx_use_heap>
- <can_default>True</can_default>
- <can_focus>True</can_focus>
- <stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
- </widget>
- </widget>
</widget>
</widget>
diff --git a/addressbook/gui/contact-editor/e-contact-editor-strings.h b/addressbook/gui/contact-editor/e-contact-editor-strings.h
index 40c2ee85a5..d5f1983573 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-strings.h
+++ b/addressbook/gui/contact-editor/e-contact-editor-strings.h
@@ -6,7 +6,6 @@
gchar *s = N_("Contact Editor");
gchar *s = N_("_Full Name...");
-gchar *s = N_("Company:");
gchar *s = N_("File As:");
gchar *s = N_("Web page address:");
gchar *s = N_("Wants to receive _HTML mail");
@@ -16,26 +15,27 @@ gchar *s = N_("_Home");
gchar *s = N_("Business _Fax");
gchar *s = N_("_Mobile");
gchar *s = N_("Primary Email");
-gchar *s = N_("Business");
-gchar *s = N_("This is the _mailing address");
-gchar *s = N_("_Contacts...");
+gchar *s = N_("B_usiness");
+gchar *s = N_("_This is the mailing address");
+gchar *s = N_("C_ontacts...");
gchar *s = N_("Ca_tegories...");
-gchar *s = N_("Job Title");
+gchar *s = N_("_Job title:");
+gchar *s = N_("_Company:");
gchar *s = N_("General");
-gchar *s = N_("Department:");
-gchar *s = N_("Office:");
-gchar *s = N_("Profession:");
-gchar *s = N_("Nickname:");
-gchar *s = N_("Spouse:");
-gchar *s = N_("Birthday:");
-gchar *s = N_("Assistant's name:");
-gchar *s = N_("Manager's Name:");
-gchar *s = N_("Anniversary:");
-gchar *s = N_("Notes:");
+gchar *s = N_("_Department:");
+gchar *s = N_("_Office:");
+gchar *s = N_("_Profession:");
+gchar *s = N_("_Nickname:");
+gchar *s = N_("_Spouse:");
+gchar *s = N_("_Birthday:");
+gchar *s = N_("_Assistant's name:");
+gchar *s = N_("_Manager's Name:");
+gchar *s = N_("Anni_versary:");
+gchar *s = N_("No_tes:");
gchar *s = N_("Details");
-gchar *s = N_("Add");
-gchar *s = N_("Delete");
+gchar *s = N_("_Add");
+gchar *s = N_("_Delete");
gchar *s = N_("Phone Types");
gchar *s = N_("New phone type");
-gchar *s = N_("New phone type");
gchar *s = N_("Add");
+gchar *s = N_("New phone type");