Re: [evolution-patches] another HIG patch
- From: Jeffrey Stedfast <fejj ximian com>
- To: mccann jhu edu
- Cc: evolution-patches lists ximian com
- Subject: Re: [evolution-patches] another HIG patch
- Date: Fri, 02 Jan 2004 19:47:51 -0500
could you split this into 1 patch for each toplevel directory?
ie, one for mail/, one for addresbsook/, one for shell/, etc
this will make it easier for us to review (since I can only OK the mail
changes, I don't wan tto have to read thru pages and pages of other
changes)
thanks,
Jeff
On Fri, 2003-12-19 at 21:13, William Jon McCann wrote:
> Hi,
>
> Here is a patch that HIG-ifies just about everything that the last one
> didn't.
>
> I really tried to only make the most minimal changes. Please let me
> know if it looks ok.
>
> Thanks,
> Jon
>
> ______________________________________________________________________
> Index: addressbook/ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
> retrieving revision 1.1510
> diff -u -r1.1510 ChangeLog
> --- addressbook/ChangeLog 20 Dec 2003 01:05:11 -0000 1.1510
> +++ addressbook/ChangeLog 20 Dec 2003 01:46:29 -0000
> @@ -1,3 +1,28 @@
> +2003-12-19 William Jon McCann <mccann jhu edu>
> +
> + * gui/search/e-addressbook-search-dialog.c (eab_search_dialog_init):
> + * gui/widgets/eab-gui-util.c (eab_error_dialog)
> + (eab_prompt_save_dialog, eab_show_multiple_contacts, file_exists)
> + (save_it):
> + * gui/contact-editor/e-contact-quick-add.c (build_quick_add_dialog):
> + * gui/contact-editor/e-contact-editor.c (categories_clicked)
> + (e_contact_editor_confirm_delete):
> + * gui/component/addressbook.c (search_result)
> + (addressbook_show_load_error_dialog, load_source_auth_cb):
> + * gui/component/addressbook-config.c (addressbook_ldap_init)
> + (addressbook_ldap_auth, addressbook_root_dse_query)
> + (do_ldap_root_dse_query):
> + * printing/e-contact-print.glade:
> + * gui/merging/eab-contact-duplicate-detected.glade:
> + * gui/merging/eab-contact-commit-duplicate-detected.glade:
> + * gui/contact-list-editor/contact-list-editor.glade:
> + * gui/contact-editor/fullname.glade:
> + * gui/contact-editor/fulladdr.glade:
> + * gui/contact-editor/contact-editor.glade:
> + * gui/component/ldap-config.glade:
> + * gui/component/select-names/select-names.glade:
> + Remove separator from dialogs. Change frame style per HIG.
> +
> 2003-12-19 Hans Petter Jansson <hpj ximian com>
>
> * gui/component/addressbook-component.c (find_first_source): Impl.
> Index: addressbook/gui/component/addressbook-config.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/addressbook/gui/component/addressbook-config.c,v
> retrieving revision 1.62
> diff -u -r1.62 addressbook-config.c
> --- addressbook/gui/component/addressbook-config.c 3 Dec 2003 15:38:32 -0000 1.62
> +++ addressbook/gui/component/addressbook-config.c 20 Dec 2003 01:46:32 -0000
> @@ -414,6 +414,7 @@
> GTK_MESSAGE_ERROR,
> GTK_BUTTONS_OK,
> _("Failed to connect to LDAP server"));
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
> g_signal_connect (dialog, "response", G_CALLBACK(gtk_widget_destroy), NULL);
> gtk_widget_show (dialog);
> }
> @@ -438,6 +439,7 @@
> GTK_MESSAGE_ERROR,
> GTK_BUTTONS_OK,
> _("Failed to authenticate with LDAP server"));
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
> g_signal_connect (dialog, "response", G_CALLBACK(gtk_widget_destroy), NULL);
> gtk_widget_show (dialog);
> }
> @@ -466,6 +468,7 @@
> GTK_MESSAGE_ERROR,
> GTK_BUTTONS_OK,
> _("Could not perform query on Root DSE"));
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
> g_signal_connect (dialog, "response", G_CALLBACK(gtk_widget_destroy), NULL);
> gtk_widget_show (dialog);
> }
> @@ -790,6 +793,7 @@
> GTK_MESSAGE_ERROR,
> GTK_BUTTONS_OK,
> _("The server responded with no supported search bases"));
> + gtk_dialog_set_has_separator (GTK_DIALOG (error_dialog), FALSE);
> g_signal_connect (error_dialog, "response", G_CALLBACK(gtk_widget_destroy), NULL);
> gtk_widget_show (error_dialog);
> goto fail;
> Index: addressbook/gui/component/addressbook.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/addressbook/gui/component/addressbook.c,v
> retrieving revision 1.221
> diff -u -r1.221 addressbook.c
> --- addressbook/gui/component/addressbook.c 17 Dec 2003 20:30:44 -0000 1.221
> +++ addressbook/gui/component/addressbook.c 20 Dec 2003 01:46:34 -0000
> @@ -299,6 +299,7 @@
> GTK_MESSAGE_WARNING,
> GTK_BUTTONS_OK,
> str);
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
> g_signal_connect (dialog, "response", G_CALLBACK(gtk_widget_destroy), NULL);
> gtk_widget_show (dialog);
> }
> @@ -621,6 +622,7 @@
> GTK_BUTTONS_CLOSE,
> label_string,
> NULL);
> + gtk_dialog_set_has_separator (GTK_DIALOG (warning_dialog), FALSE);
>
> g_signal_connect (warning_dialog,
> "response",
> @@ -698,6 +700,7 @@
> GTK_MESSAGE_WARNING,
> GTK_BUTTONS_OK,
> _("Accessing LDAP Server anonymously"));
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
> g_signal_connect (dialog, "response", G_CALLBACK(gtk_widget_destroy), NULL);
> gtk_widget_show (dialog);
> data->cb (book, E_BOOK_ERROR_OK, data->closure);
> Index: addressbook/gui/component/ldap-config.glade
> ===================================================================
> RCS file: /cvs/gnome/evolution/addressbook/gui/component/ldap-config.glade,v
> retrieving revision 1.17
> diff -u -r1.17 ldap-config.glade
> --- addressbook/gui/component/ldap-config.glade 1 Dec 2003 22:00:29 -0000 1.17
> +++ addressbook/gui/component/ldap-config.glade 20 Dec 2003 01:46:40 -0000
> @@ -221,17 +221,6 @@
> </child>
>
> <child>
> - <widget class="GtkHSeparator" id="hseparator10">
> - <property name="visible">True</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">True</property>
> - <property name="fill">True</property>
> - </packing>
> - </child>
> -
> - <child>
> <widget class="GtkHBox" id="hbox120">
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> @@ -786,7 +775,7 @@
> <property name="default_height">285</property>
> <property name="resizable">True</property>
> <property name="destroy_with_parent">False</property>
> - <property name="has_separator">True</property>
> + <property name="has_separator">False</property>
>
> <child internal-child="vbox">
> <widget class="GtkVBox" id="addressbook-sources-vbox">
> @@ -2656,7 +2645,7 @@
> <property name="default_height">200</property>
> <property name="resizable">True</property>
> <property name="destroy_with_parent">False</property>
> - <property name="has_separator">True</property>
> + <property name="has_separator">False</property>
>
> <child internal-child="vbox">
> <widget class="GtkVBox" id="dialog-vbox5">
> @@ -2670,26 +2659,26 @@
> <property name="layout_style">GTK_BUTTONBOX_END</property>
>
> <child>
> - <widget class="GtkButton" id="button107">
> + <widget class="GtkButton" id="button109">
> <property name="visible">True</property>
> <property name="can_default">True</property>
> <property name="can_focus">True</property>
> - <property name="label">gtk-ok</property>
> + <property name="label">gtk-cancel</property>
> <property name="use_stock">True</property>
> <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="response_id">-5</property>
> + <property name="response_id">-6</property>
> </widget>
> </child>
>
> <child>
> - <widget class="GtkButton" id="button109">
> + <widget class="GtkButton" id="button110">
> <property name="visible">True</property>
> <property name="can_default">True</property>
> <property name="can_focus">True</property>
> - <property name="label">gtk-cancel</property>
> + <property name="label">gtk-ok</property>
> <property name="use_stock">True</property>
> <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="response_id">-6</property>
> + <property name="response_id">-5</property>
> </widget>
> </child>
> </widget>
> Index: addressbook/gui/component/select-names/select-names.glade
> ===================================================================
> RCS file: /cvs/gnome/evolution/addressbook/gui/component/select-names/select-names.glade,v
> retrieving revision 1.21
> diff -u -r1.21 select-names.glade
> --- addressbook/gui/component/select-names/select-names.glade 5 Dec 2003 21:46:18 -0000 1.21
> +++ addressbook/gui/component/select-names/select-names.glade 20 Dec 2003 01:46:41 -0000
> @@ -14,7 +14,7 @@
> <property name="default_height">332</property>
> <property name="resizable">True</property>
> <property name="destroy_with_parent">False</property>
> - <property name="has_separator">True</property>
> + <property name="has_separator">False</property>
>
> <child internal-child="vbox">
> <widget class="GtkVBox" id="dialog-vbox1">
> @@ -301,115 +301,155 @@
> </child>
>
> <child>
> - <widget class="GtkFrame" id="frame1">
> + <widget class="GtkVBox" id="vbox7">
> <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkTable" id="show_contacts_table">
> - <property name="border_width">6</property>
> + <widget class="GtkLabel" id="label33">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"><b>Show Contacts</b></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">True</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox2">
> <property name="visible">True</property>
> - <property name="n_rows">2</property>
> - <property name="n_columns">2</property>
> <property name="homogeneous">False</property>
> - <property name="row_spacing">6</property>
> - <property name="column_spacing">6</property>
> + <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkLabel" id="label30">
> + <widget class="GtkLabel" id="label34">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">_Folder:</property>
> - <property name="use_underline">True</property>
> + <property name="label" translatable="yes"> </property>
> + <property name="use_underline">False</property>
> <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</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="xalign">0.5</property>
> <property name="yalign">0.5</property>
> <property name="xpad">0</property>
> <property name="ypad">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>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
>
> <child>
> - <widget class="GtkLabel" id="label31">
> + <widget class="GtkTable" id="show_contacts_table">
> + <property name="border_width">6</property>
> <property name="visible">True</property>
> - <property name="label" translatable="yes">_Category:</property>
> - <property name="use_underline">True</property>
> - <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</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>
> - </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>
> + <property name="n_rows">2</property>
> + <property name="n_columns">2</property>
> + <property name="homogeneous">False</property>
> + <property name="row_spacing">6</property>
> + <property name="column_spacing">6</property>
>
> - <child>
> - <widget class="GtkAlignment" id="alignment5">
> - <property name="visible">True</property>
> - <property name="xalign">7.45058e-09</property>
> - <property name="yalign">0.5</property>
> - <property name="xscale">0</property>
> - <property name="yscale">1</property>
> + <child>
> + <widget class="GtkLabel" id="label30">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">_Folder:</property>
> + <property name="use_underline">True</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</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>
> + </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="Custom" id="custom-categories">
> + <widget class="GtkLabel" id="label31">
> <property name="visible">True</property>
> - <property name="creation_function">e_select_names_create_categories</property>
> - <property name="int1">0</property>
> - <property name="int2">0</property>
> - <property name="last_modification_time">Tue, 19 Feb 2002 23:06:24 GMT</property>
> + <property name="label" translatable="yes">_Category:</property>
> + <property name="use_underline">True</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</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>
> + </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="GtkAlignment" id="alignment5">
> + <property name="visible">True</property>
> + <property name="xalign">7.45058e-09</property>
> + <property name="yalign">0.5</property>
> + <property name="xscale">0</property>
> + <property name="yscale">1</property>
> +
> + <child>
> + <widget class="Custom" id="custom-categories">
> + <property name="visible">True</property>
> + <property name="creation_function">e_select_names_create_categories</property>
> + <property name="int1">0</property>
> + <property name="int2">0</property>
> + <property name="last_modification_time">Tue, 19 Feb 2002 23:06:24 GMT</property>
> + </widget>
> + </child>
> </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="y_options">fill</property>
> + </packing>
> </child>
> </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="y_options">fill</property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label1">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Show Contacts</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.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> @@ -418,7 +458,8 @@
> <property name="right_attach">1</property>
> <property name="top_attach">0</property>
> <property name="bottom_attach">1</property>
> - <property name="y_options"></property>
> + <property name="y_padding">3</property>
> + <property name="x_options">fill</property>
> </packing>
> </child>
> </widget>
> Index: addressbook/gui/contact-editor/contact-editor.glade
> ===================================================================
> RCS file: /cvs/gnome/evolution/addressbook/gui/contact-editor/contact-editor.glade,v
> retrieving revision 1.42
> diff -u -r1.42 contact-editor.glade
> --- addressbook/gui/contact-editor/contact-editor.glade 16 Dec 2003 23:29:21 -0000 1.42
> +++ addressbook/gui/contact-editor/contact-editor.glade 20 Dec 2003 01:46:47 -0000
> @@ -13,7 +13,7 @@
> <property name="modal">False</property>
> <property name="resizable">True</property>
> <property name="destroy_with_parent">False</property>
> - <property name="has_separator">True</property>
> + <property name="has_separator">False</property>
>
> <child internal-child="vbox">
> <widget class="GtkVBox" id="dialog-vbox2">
> @@ -31,10 +31,10 @@
> <property name="visible">True</property>
> <property name="can_default">True</property>
> <property name="can_focus">True</property>
> - <property name="label">gtk-ok</property>
> + <property name="label">gtk-cancel</property>
> <property name="use_stock">True</property>
> <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="response_id">0</property>
> + <property name="response_id">-6</property>
> </widget>
> </child>
>
> @@ -55,10 +55,10 @@
> <property name="visible">True</property>
> <property name="can_default">True</property>
> <property name="can_focus">True</property>
> - <property name="label">gtk-cancel</property>
> + <property name="label">gtk-ok</property>
> <property name="use_stock">True</property>
> <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="response_id">0</property>
> + <property name="response_id">-5</property>
> </widget>
> </child>
> </widget>
> @@ -191,7 +191,7 @@
> <property name="modal">False</property>
> <property name="resizable">True</property>
> <property name="destroy_with_parent">False</property>
> - <property name="has_separator">True</property>
> + <property name="has_separator">False</property>
>
> <child internal-child="vbox">
> <widget class="GtkVBox" id="vbox2">
> @@ -210,10 +210,10 @@
> <property name="can_default">True</property>
> <property name="has_default">True</property>
> <property name="can_focus">True</property>
> - <property name="label" translatable="yes">_Add</property>
> - <property name="use_underline">True</property>
> + <property name="label">gtk-cancel</property>
> + <property name="use_stock">True</property>
> <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="response_id">0</property>
> + <property name="response_id">-6</property>
> </widget>
> </child>
>
> @@ -222,7 +222,7 @@
> <property name="visible">True</property>
> <property name="can_default">True</property>
> <property name="can_focus">True</property>
> - <property name="label">gtk-cancel</property>
> + <property name="label">gtk-add</property>
> <property name="use_stock">True</property>
> <property name="relief">GTK_RELIEF_NORMAL</property>
> <property name="response_id">0</property>
> @@ -238,60 +238,99 @@
> </child>
>
> <child>
> - <widget class="GtkFrame" id="frame-add-phone">
> - <property name="border_width">4</property>
> + <widget class="GtkVBox" id="frame-add-phone">
> <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
> -
> - <child>
> - <widget class="GtkAlignment" id="alignment9">
> - <property name="border_width">9</property>
> - <property name="visible">True</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xscale">1</property>
> - <property name="yscale">1</property>
> -
> - <child>
> - <widget class="GtkEntry" id="entry-add-phone">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="has_focus">True</property>
> - <property name="editable">True</property>
> - <property name="visibility">True</property>
> - <property name="max_length">0</property>
> - <property name="text" translatable="yes"></property>
> - <property name="has_frame">True</property>
> - <property name="invisible_char" translatable="yes">*</property>
> - <property name="activates_default">False</property>
> - </widget>
> - </child>
> - </widget>
> - </child>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkLabel" id="label21">
> + <widget class="GtkLabel" id="label25">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">New phone type</property>
> + <property name="label" translatable="yes"><b>New phone type</b></property>
> <property name="use_underline">False</property>
> - <property name="use_markup">False</property>
> + <property name="use_markup">True</property>
> <property name="justify">GTK_JUSTIFY_LEFT</property>
> <property name="wrap">False</property>
> <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> + <property name="xalign">0</property>
> <property name="yalign">0.5</property>
> <property name="xpad">0</property>
> <property name="ypad">0</property>
> </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox2">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label26">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkAlignment" id="alignment9">
> + <property name="border_width">9</property>
> + <property name="visible">True</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xscale">1</property>
> + <property name="yscale">1</property>
> +
> + <child>
> + <widget class="GtkEntry" id="entry-add-phone">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="has_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</property>
> + </widget>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> <packing>
> - <property name="padding">0</property>
> + <property name="padding">3</property>
> <property name="expand">True</property>
> <property name="fill">True</property>
> </packing>
> Index: addressbook/gui/contact-editor/e-contact-editor.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/addressbook/gui/contact-editor/e-contact-editor.c,v
> retrieving revision 1.159
> diff -u -r1.159 e-contact-editor.c
> --- addressbook/gui/contact-editor/e-contact-editor.c 18 Dec 2003 22:20:17 -0000 1.159
> +++ addressbook/gui/contact-editor/e-contact-editor.c 20 Dec 2003 01:46:52 -0000
> @@ -975,6 +975,7 @@
> GTK_RESPONSE_OK,
> _("Category editor not available."));
> g_free (categories);
> + gtk_dialog_set_has_separator (dialog, FALSE);
> gtk_widget_show (uh_oh);
> return;
> }
> @@ -1253,6 +1254,7 @@
> GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
> GTK_STOCK_DELETE, GTK_RESPONSE_ACCEPT,
> NULL);
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
>
> result = gtk_dialog_run(GTK_DIALOG (dialog));
>
> Index: addressbook/gui/contact-editor/e-contact-quick-add.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/addressbook/gui/contact-editor/e-contact-quick-add.c,v
> retrieving revision 1.34
> diff -u -r1.34 e-contact-quick-add.c
> --- addressbook/gui/contact-editor/e-contact-quick-add.c 7 Nov 2003 05:51:33 -0000 1.34
> +++ addressbook/gui/contact-editor/e-contact-quick-add.c 20 Dec 2003 01:46:52 -0000
> @@ -294,6 +294,7 @@
> GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
> GTK_STOCK_OK, GTK_RESPONSE_OK,
> NULL);
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
>
> g_signal_connect (dialog, "response", G_CALLBACK (clicked_cb), qa);
>
> Index: addressbook/gui/contact-editor/fulladdr.glade
> ===================================================================
> RCS file: /cvs/gnome/evolution/addressbook/gui/contact-editor/fulladdr.glade,v
> retrieving revision 1.14
> diff -u -r1.14 fulladdr.glade
> --- addressbook/gui/contact-editor/fulladdr.glade 16 May 2003 20:04:46 -0000 1.14
> +++ addressbook/gui/contact-editor/fulladdr.glade 20 Dec 2003 01:46:53 -0000
> @@ -2,6 +2,7 @@
> <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
>
> <glade-interface>
> +<requires lib="gnome"/>
>
> <widget class="GtkDialog" id="dialog-checkaddress">
> <property name="title" translatable="yes">Full Address</property>
> @@ -10,7 +11,7 @@
> <property name="modal">True</property>
> <property name="resizable">True</property>
> <property name="destroy_with_parent">False</property>
> - <property name="has_separator">True</property>
> + <property name="has_separator">False</property>
>
> <child internal-child="vbox">
> <widget class="GtkVBox" id="vbox-container">
> @@ -29,10 +30,10 @@
> <property name="can_default">True</property>
> <property name="has_default">True</property>
> <property name="can_focus">True</property>
> - <property name="label">gtk-ok</property>
> + <property name="label">gtk-cancel</property>
> <property name="use_stock">True</property>
> <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="response_id">0</property>
> + <property name="response_id">-6</property>
> </widget>
> </child>
>
> @@ -41,10 +42,10 @@
> <property name="visible">True</property>
> <property name="can_default">True</property>
> <property name="can_focus">True</property>
> - <property name="label">gtk-cancel</property>
> + <property name="label">gtk-ok</property>
> <property name="use_stock">True</property>
> <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="response_id">0</property>
> + <property name="response_id">-5</property>
> </widget>
> </child>
> </widget>
> Index: addressbook/gui/contact-editor/fullname.glade
> ===================================================================
> RCS file: /cvs/gnome/evolution/addressbook/gui/contact-editor/fullname.glade,v
> retrieving revision 1.10
> diff -u -r1.10 fullname.glade
> --- addressbook/gui/contact-editor/fullname.glade 16 May 2003 20:01:26 -0000 1.10
> +++ addressbook/gui/contact-editor/fullname.glade 20 Dec 2003 01:46:55 -0000
> @@ -2,6 +2,7 @@
> <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
>
> <glade-interface>
> +<requires lib="gnome"/>
>
> <widget class="GtkDialog" id="dialog-checkfullname">
> <property name="title" translatable="yes">Full Name</property>
> @@ -10,7 +11,7 @@
> <property name="modal">True</property>
> <property name="resizable">True</property>
> <property name="destroy_with_parent">False</property>
> - <property name="has_separator">True</property>
> + <property name="has_separator">False</property>
>
> <child internal-child="vbox">
> <widget class="GtkVBox" id="vbox-container">
> @@ -28,10 +29,10 @@
> <property name="visible">True</property>
> <property name="can_default">True</property>
> <property name="can_focus">True</property>
> - <property name="label">gtk-ok</property>
> + <property name="label">gtk-cancel</property>
> <property name="use_stock">True</property>
> <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="response_id">0</property>
> + <property name="response_id">-6</property>
> </widget>
> </child>
>
> @@ -40,10 +41,10 @@
> <property name="visible">True</property>
> <property name="can_default">True</property>
> <property name="can_focus">True</property>
> - <property name="label">gtk-cancel</property>
> + <property name="label">gtk-ok</property>
> <property name="use_stock">True</property>
> <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="response_id">0</property>
> + <property name="response_id">-5</property>
> </widget>
> </child>
> </widget>
> Index: addressbook/gui/contact-list-editor/contact-list-editor.glade
> ===================================================================
> RCS file: /cvs/gnome/evolution/addressbook/gui/contact-list-editor/contact-list-editor.glade,v
> retrieving revision 1.9
> diff -u -r1.9 contact-list-editor.glade
> --- addressbook/gui/contact-list-editor/contact-list-editor.glade 21 Oct 2003 18:48:48 -0000 1.9
> +++ addressbook/gui/contact-list-editor/contact-list-editor.glade 20 Dec 2003 01:46:56 -0000
> @@ -30,7 +30,6 @@
>
> <child>
> <widget class="GtkHBox" id="hbox6">
> - <property name="border_width">6</property>
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> <property name="spacing">6</property>
> @@ -101,200 +100,239 @@
> </child>
>
> <child>
> - <widget class="GtkFrame" id="frame3">
> - <property name="border_width">3</property>
> + <widget class="GtkVBox" id="vbox10">
> <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label13">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"><b>Members</b></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">True</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
>
> <child>
> <widget class="GtkHBox" id="hbox7">
> - <property name="border_width">6</property>
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">6</property>
> + <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkVBox" id="vbox9">
> + <widget class="GtkLabel" id="label14">
> <property name="visible">True</property>
> - <property name="homogeneous">False</property>
> - <property name="spacing">6</property>
> -
> - <child>
> - <widget class="GtkLabel" id="label11">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">_Type an email address or drag a contact into the list below:</property>
> - <property name="use_underline">True</property>
> - <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</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>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkEntry" id="email-entry">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="editable">True</property>
> - <property name="visibility">True</property>
> - <property name="max_length">0</property>
> - <property name="text" translatable="yes"></property>
> - <property name="has_frame">True</property>
> - <property name="invisible_char" translatable="yes">*</property>
> - <property name="activates_default">False</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="Custom" id="contact-list-table">
> - <property name="visible">True</property>
> - <property name="creation_function">e_contact_list_editor_create_table</property>
> - <property name="string1"></property>
> - <property name="int1">0</property>
> - <property name="int2">0</property>
> - <property name="last_modification_time">Sat, 23 Jun 2001 06:00:16 GMT</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">True</property>
> - <property name="fill">True</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkCheckButton" id="visible-addrs-checkbutton">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">_Hide addresses when sending mail to this list</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">False</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">True</property>
> - <property name="fill">True</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
>
> <child>
> - <widget class="GtkVBox" id="vbox10">
> + <widget class="GtkHBox" id="hbox7">
> + <property name="border_width">6</property>
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">0</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkLabel" id="label12">
> + <widget class="GtkVBox" id="vbox9">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">
> -</property>
> - <property name="use_underline">False</property>
> - <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">False</property>
> - <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label11">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">_Type an email address or drag a contact into the list below:</property>
> + <property name="use_underline">True</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkEntry" id="email-entry">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="Custom" id="contact-list-table">
> + <property name="visible">True</property>
> + <property name="creation_function">e_contact_list_editor_create_table</property>
> + <property name="string1"></property>
> + <property name="int1">0</property>
> + <property name="int2">0</property>
> + <property name="last_modification_time">Sat, 23 Jun 2001 06:00:16 GMT</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkCheckButton" id="visible-addrs-checkbutton">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">_Hide addresses when sending mail to this list</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
>
> <child>
> - <widget class="GtkVButtonBox" id="vbuttonbox4">
> + <widget class="GtkVBox" id="vbox10">
> <property name="visible">True</property>
> - <property name="layout_style">GTK_BUTTONBOX_START</property>
> - <property name="spacing">6</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkButton" id="add-email-button">
> + <widget class="GtkLabel" id="label12">
> <property name="visible">True</property>
> - <property name="can_default">True</property>
> - <property name="can_focus">True</property>
> - <property name="label">gtk-add</property>
> - <property name="use_stock">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="label" translatable="yes">
> +</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> </child>
>
> <child>
> - <widget class="GtkButton" id="remove-button">
> + <widget class="GtkVButtonBox" id="vbuttonbox4">
> <property name="visible">True</property>
> - <property name="can_default">True</property>
> - <property name="can_focus">True</property>
> - <property name="label">gtk-remove</property>
> - <property name="use_stock">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="layout_style">GTK_BUTTONBOX_START</property>
> + <property name="spacing">6</property>
> +
> + <child>
> + <widget class="GtkButton" id="add-email-button">
> + <property name="visible">True</property>
> + <property name="can_default">True</property>
> + <property name="can_focus">True</property>
> + <property name="label">gtk-add</property>
> + <property name="use_stock">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkButton" id="remove-button">
> + <property name="visible">True</property>
> + <property name="can_default">True</property>
> + <property name="can_focus">True</property>
> + <property name="label">gtk-remove</property>
> + <property name="use_stock">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + </child>
> </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> </child>
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">True</property>
> - <property name="fill">True</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label11">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Members</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.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> <packing>
> - <property name="padding">0</property>
> + <property name="padding">3</property>
> <property name="expand">True</property>
> <property name="fill">True</property>
> </packing>
> Index: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade
> ===================================================================
> RCS file: /cvs/gnome/evolution/addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade,v
> retrieving revision 1.2
> diff -u -r1.2 eab-contact-commit-duplicate-detected.glade
> --- addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade 21 Oct 2003 18:48:52 -0000 1.2
> +++ addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade 20 Dec 2003 01:46:56 -0000
> @@ -2,6 +2,7 @@
> <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
>
> <glade-interface>
> +<requires lib="gnome"/>
>
> <widget class="GtkDialog" id="dialog-duplicate-contact">
> <property name="border_width">6</property>
> @@ -12,7 +13,7 @@
> <property name="modal">False</property>
> <property name="resizable">True</property>
> <property name="destroy_with_parent">False</property>
> - <property name="has_separator">True</property>
> + <property name="has_separator">False</property>
>
> <child internal-child="vbox">
> <widget class="GtkVBox" id="dialog-vbox1">
> Index: addressbook/gui/merging/eab-contact-duplicate-detected.glade
> ===================================================================
> RCS file: /cvs/gnome/evolution/addressbook/gui/merging/eab-contact-duplicate-detected.glade,v
> retrieving revision 1.2
> diff -u -r1.2 eab-contact-duplicate-detected.glade
> --- addressbook/gui/merging/eab-contact-duplicate-detected.glade 21 Oct 2003 18:48:52 -0000 1.2
> +++ addressbook/gui/merging/eab-contact-duplicate-detected.glade 20 Dec 2003 01:46:57 -0000
> @@ -2,6 +2,7 @@
> <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
>
> <glade-interface>
> +<requires lib="gnome"/>
>
> <widget class="GtkDialog" id="dialog-duplicate-contact">
> <property name="border_width">6</property>
> @@ -12,7 +13,7 @@
> <property name="modal">False</property>
> <property name="resizable">True</property>
> <property name="destroy_with_parent">False</property>
> - <property name="has_separator">True</property>
> + <property name="has_separator">False</property>
>
> <child internal-child="vbox">
> <widget class="GtkVBox" id="dialog-vbox1">
> Index: addressbook/gui/search/e-addressbook-search-dialog.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/addressbook/gui/search/e-addressbook-search-dialog.c,v
> retrieving revision 1.29
> diff -u -r1.29 e-addressbook-search-dialog.c
> --- addressbook/gui/search/e-addressbook-search-dialog.c 21 Oct 2003 18:48:53 -0000 1.29
> +++ addressbook/gui/search/e-addressbook-search-dialog.c 20 Dec 2003 01:46:57 -0000
> @@ -124,6 +124,7 @@
> GTK_STOCK_OK, GTK_RESPONSE_OK,
> NULL);
>
> + gtk_dialog_set_has_separator (dialog, FALSE);
> gtk_dialog_set_default_response (dialog, GTK_RESPONSE_OK);
>
> g_signal_connect(dialog, "response",
> Index: addressbook/gui/widgets/eab-gui-util.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/eab-gui-util.c,v
> retrieving revision 1.4
> diff -u -r1.4 eab-gui-util.c
> --- addressbook/gui/widgets/eab-gui-util.c 3 Dec 2003 15:38:29 -0000 1.4
> +++ addressbook/gui/widgets/eab-gui-util.c 20 Dec 2003 01:46:58 -0000
> @@ -61,6 +61,7 @@
>
> dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
> error_msg);
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
>
> g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL);
>
> @@ -86,6 +87,7 @@
> GTK_STOCK_SAVE, GTK_RESPONSE_YES,
> NULL);
>
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
> gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
>
> response = gtk_dialog_run (GTK_DIALOG (dialog));
> @@ -206,6 +208,7 @@
> length,
> length);
>
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
> response = gtk_dialog_run (GTK_DIALOG (dialog));
> gtk_widget_destroy (dialog);
> if (response == GTK_RESPONSE_YES)
> @@ -233,6 +236,7 @@
> GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
> _("Overwrite"), GTK_RESPONSE_ACCEPT,
> NULL);
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
>
> response = gtk_dialog_run (GTK_DIALOG (dialog));
> gtk_widget_destroy (dialog);
> @@ -274,6 +278,7 @@
> GTK_BUTTONS_OK,
> str);
> g_free (str);
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
>
> gtk_widget_show (dialog);
>
> Index: addressbook/printing/e-contact-print.glade
> ===================================================================
> RCS file: /cvs/gnome/evolution/addressbook/printing/e-contact-print.glade,v
> retrieving revision 1.6
> diff -u -r1.6 e-contact-print.glade
> --- addressbook/printing/e-contact-print.glade 7 Nov 2002 07:38:30 -0000 1.6
> +++ addressbook/printing/e-contact-print.glade 20 Dec 2003 01:47:04 -0000
> @@ -1,2018 +1,2511 @@
> <?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"; >
> +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
>
> <glade-interface>
> - <widget class="GtkDialog" id="print-edit-style">
> - <property name="visible">no</property>
> - <property name="title" translatable="yes">Page Setup:</property>
> - <property name="type">GTK_WINDOW_TOPLEVEL</property>
> - <property name="modal">no</property>
> - <property name="allow_shrink">no</property>
> - <property name="allow_grow">no</property>
> - <property name="window-position">GTK_WIN_POS_NONE</property>
> -
> - <child internal-child="vbox">
> - <widget class="GtkVBox" id="dialog-vbox1">
> - <property name="homogeneous">no</property>
> - <property name="spacing">8</property>
> - <property name="visible">yes</property>
> -
> - <child internal-child="action_area">
> - <widget class="GtkHButtonBox" id="dialog-action_area1">
> - <property name="layout_style">GTK_BUTTONBOX_END</property>
> - <property name="spacing">8</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkButton" id="button1">
> - <property name="can_default">yes</property>
> - <property name="can_focus">yes</property>
> - <property name="visible">yes</property>
> - <property name="label">gtk-ok</property>
> - <property name="use_stock">yes</property>
> - <property name="use_underline">yes</property>
> - </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkButton" id="button2">
> - <property name="can_default">yes</property>
> - <property name="can_focus">yes</property>
> - <property name="visible">yes</property>
> - <property name="label">gtk-apply</property>
> - <property name="use_stock">yes</property>
> - <property name="use_underline">yes</property>
> - </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkButton" id="button3">
> - <property name="can_default">yes</property>
> - <property name="can_focus">yes</property>
> - <property name="visible">yes</property>
> - <property name="label">gtk-cancel</property>
> - <property name="use_stock">yes</property>
> - <property name="use_underline">yes</property>
> - </widget>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">no</property>
> - <property name="fill">yes</property>
> - <property name="pack_type">GTK_PACK_END</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkVBox" id="vbox-contact-print-style-editor">
> - <property name="homogeneous">no</property>
> - <property name="spacing">5</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkHBox" id="hbox2">
> - <property name="border_width">5</property>
> - <property name="homogeneous">no</property>
> - <property name="spacing">16</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkLabel" id="label8">
> - <property name="label" translatable="yes">Style name:</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">no</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">no</property>
> - <property name="fill">no</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkEntry" id="label-style-name">
> - <property name="can_focus">yes</property>
> - <property name="editable">no</property>
> - <property name="text" translatable="yes"></property>
> - <property name="max-length">0</property>
> - <property name="visibility">yes</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">no</property>
> - <property name="fill">no</property>
> - </packing>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkNotebook" id="notebook1">
> - <property name="can_focus">yes</property>
> - <property name="show_tabs">yes</property>
> - <property name="show_border">yes</property>
> - <property name="tab_pos">GTK_POS_TOP</property>
> - <property name="scrollable">no</property>
> - <property name="tab_hborder">2</property>
> - <property name="tab_vborder">2</property>
> - <property name="enable-popup">no</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkVBox" id="vbox2">
> - <property name="border_width">5</property>
> - <property name="homogeneous">no</property>
> - <property name="spacing">5</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkAlignment" id="alignment1">
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xscale">0</property>
> - <property name="yscale">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkFrame" id="frame5">
> - <property name="label" translatable="yes">Preview:</property>
> - <property name="label_xalign">0</property>
> - <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <placeholder />
> - </child>
> - </widget>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkHBox" id="hbox1">
> - <property name="homogeneous">yes</property>
> - <property name="spacing">7</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkFrame" id="frame6">
> - <property name="label" translatable="yes">Options</property>
> - <property name="label_xalign">0</property>
> - <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkAlignment" id="alignment4">
> - <property name="xalign">0</property>
> - <property name="yalign">0</property>
> - <property name="xscale">0</property>
> - <property name="yscale">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkTable" id="table1">
> - <property name="border_width">8</property>
> - <property name="homogeneous">no</property>
> - <property name="row_spacing">0</property>
> - <property name="column_spacing">0</property>
> - <property name="n-rows">6</property>
> - <property name="n-columns">5</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkLabel" id="label5">
> - <property name="label" translatable="yes">Include:</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">no</property>
> - <property name="xalign">0</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="left_attach">0</property>
> - <property name="right_attach">1</property>
> - <property name="top_attach">4</property>
> - <property name="bottom_attach">5</property>
> - <property name="x_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">fill</property>
> - <property name="y_options">fill</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label4">
> - <property name="label" translatable="yes">Sections:</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">no</property>
> - <property name="xalign">0</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="visible">yes</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_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">fill</property>
> - <property name="y_options">fill</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkAlignment" id="alignment2">
> - <property name="xalign">0</property>
> - <property name="yalign">0.5</property>
> - <property name="xscale">0</property>
> - <property name="yscale">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkRadioButton" id="radiobutton1">
> - <property name="can_focus">yes</property>
> - <property name="label" translatable="yes">Immediately follow each other</property>
> - <property name="active">yes</property>
> - <property name="draw_indicator">yes</property>
> - <property name="visible">yes</property>
> - </widget>
> - </child>
> - </widget>
> - <packing>
> - <property name="left_attach">1</property>
> - <property name="right_attach">5</property>
> - <property name="top_attach">0</property>
> - <property name="bottom_attach">1</property>
> - <property name="x_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">fill</property>
> - <property name="y_options">fill</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkCheckButton" id="checkbutton1">
> - <property name="can_focus">yes</property>
> - <property name="label" translatable="yes">Letter tabs on side</property>
> - <property name="active">no</property>
> - <property name="draw_indicator">yes</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="left_attach">1</property>
> - <property name="right_attach">5</property>
> - <property name="top_attach">4</property>
> - <property name="bottom_attach">5</property>
> - <property name="x_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">fill</property>
> - <property name="y_options">fill</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkCheckButton" id="checkbutton2">
> - <property name="can_focus">yes</property>
> - <property name="label" translatable="yes">Headings for each letter</property>
> - <property name="active">no</property>
> - <property name="draw_indicator">yes</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="left_attach">1</property>
> - <property name="right_attach">5</property>
> - <property name="top_attach">5</property>
> - <property name="bottom_attach">6</property>
> - <property name="x_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">fill</property>
> - <property name="y_options">fill</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkAlignment" id="alignment3">
> - <property name="xalign">0</property>
> - <property name="yalign">0.5</property>
> - <property name="xscale">0</property>
> - <property name="yscale">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkRadioButton" id="radiobutton2">
> - <property name="can_focus">yes</property>
> - <property name="label" translatable="yes">Start on a new page</property>
> - <property name="active">no</property>
> - <property name="draw_indicator">yes</property>
> - <property name="visible">yes</property>
> - </widget>
> - </child>
> - </widget>
> - <packing>
> - <property name="left_attach">1</property>
> - <property name="right_attach">5</property>
> - <property name="top_attach">1</property>
> - <property name="bottom_attach">2</property>
> - <property name="x_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">fill</property>
> - <property name="y_options">fill</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label6">
> - <property name="label" translatable="yes">Number of columns:</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">no</property>
> - <property name="xalign">0</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="left_attach">0</property>
> - <property name="right_attach">3</property>
> - <property name="top_attach">2</property>
> - <property name="bottom_attach">3</property>
> - <property name="x_padding">0</property>
> - <property name="y_padding">2</property>
> - <property name="x_options">fill</property>
> - <property name="y_options">fill</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label7">
> - <property name="label" translatable="yes">Blank forms at end:</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">no</property>
> - <property name="xalign">0</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="left_attach">0</property>
> - <property name="right_attach">3</property>
> - <property name="top_attach">3</property>
> - <property name="bottom_attach">4</property>
> - <property name="x_padding">0</property>
> - <property name="y_padding">2</property>
> - <property name="x_options">fill</property>
> - <property name="y_options">fill</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkAlignment" id="alignment6">
> - <property name="xalign">0</property>
> - <property name="yalign">0.5</property>
> - <property name="xscale">0</property>
> - <property name="yscale">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkSpinButton" id="spinbutton2">
> - <property name="can_focus">yes</property>
> - <property name="climb_rate">1</property>
> - <property name="digits">0</property>
> - <property name="numeric">no</property>
> - <property name="update_policy">GTK_UPDATE_ALWAYS</property>
> - <property name="wrap">no</property>
> - <property name="snap_to_ticks">no</property>
> - <property name="visible">yes</property>
> - <property name="adjustment">2 0 100 1 10 10</property>
> - </widget>
> - </child>
> - </widget>
> - <packing>
> - <property name="left_attach">3</property>
> - <property name="right_attach">4</property>
> - <property name="top_attach">3</property>
> - <property name="bottom_attach">4</property>
> - <property name="x_padding">0</property>
> - <property name="y_padding">2</property>
> - <property name="x_options">fill</property>
> - <property name="y_options">fill</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkAlignment" id="alignment5">
> - <property name="xalign">0</property>
> - <property name="yalign">0.5</property>
> - <property name="xscale">0</property>
> - <property name="yscale">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkSpinButton" id="spinbutton1">
> - <property name="can_focus">yes</property>
> - <property name="climb_rate">1</property>
> - <property name="digits">0</property>
> - <property name="numeric">no</property>
> - <property name="update_policy">GTK_UPDATE_ALWAYS</property>
> - <property name="wrap">no</property>
> - <property name="width-request">45</property>
> - <property name="snap_to_ticks">no</property>
> - <property name="visible">yes</property>
> - <property name="adjustment">1 0 100 1 10 10</property>
> - </widget>
> - </child>
> - </widget>
> - <packing>
> - <property name="left_attach">3</property>
> - <property name="right_attach">4</property>
> - <property name="top_attach">2</property>
> - <property name="bottom_attach">3</property>
> - <property name="x_padding">0</property>
> - <property name="y_padding">2</property>
> - <property name="x_options">fill</property>
> - <property name="y_options">fill</property>
> - </packing>
> - </child>
> - </widget>
> - </child>
> - </widget>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkVBox" id="vbox3">
> - <property name="homogeneous">no</property>
> - <property name="spacing">8</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkFrame" id="frame7">
> - <property name="label" translatable="yes">Fonts</property>
> - <property name="label_xalign">0</property>
> - <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkTable" id="table2">
> - <property name="border_width">8</property>
> - <property name="homogeneous">no</property>
> - <property name="row_spacing">13</property>
> - <property name="column_spacing">8</property>
> - <property name="n-rows">2</property>
> - <property name="n-columns">2</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkAlignment" id="alignment7">
> - <property name="xalign">0.5</property>
> - <property name="yalign">1</property>
> - <property name="xscale">1</property>
> - <property name="yscale">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkButton" id="button6">
> - <property name="can_focus">yes</property>
> - <property name="label" translatable="yes">F_ont...</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="visible">yes</property>
> - <property name="use_underline">yes</property>
> - </widget>
> - </child>
> - </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_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">fill</property>
> - <property name="y_options">fill</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkAlignment" id="alignment8">
> - <property name="xalign">0.5</property>
> - <property name="yalign">1</property>
> - <property name="xscale">1</property>
> - <property name="yscale">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkButton" id="button5">
> - <property name="can_focus">yes</property>
> - <property name="label" translatable="yes">_Font...</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="width-request">90</property>
> - <property name="visible">yes</property>
> - <property name="use_underline">yes</property>
> - </widget>
> - </child>
> - </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="x_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">fill</property>
> - <property name="y_options">fill</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkVBox" id="vbox4">
> - <property name="homogeneous">no</property>
> - <property name="spacing">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkLabel" id="label10">
> - <property name="label" translatable="yes">Headings</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">no</property>
> - <property name="xalign">0</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">no</property>
> - <property name="fill">no</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkEntry" id="entry3">
> - <property name="can_focus">yes</property>
> - <property name="editable">yes</property>
> - <property name="text" translatable="yes">10 pt. Tahoma</property>
> - <property name="width-request">100</property>
> - <property name="max-length">0</property>
> - <property name="visibility">yes</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">no</property>
> - <property name="fill">no</property>
> - </packing>
> - </child>
> - </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_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">expand|fill</property>
> - <property name="y_options">fill</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkVBox" id="vbox5">
> - <property name="homogeneous">no</property>
> - <property name="spacing">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkLabel" id="label9">
> - <property name="label" translatable="yes">Body</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">no</property>
> - <property name="xalign">0</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">no</property>
> - <property name="fill">no</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkEntry" id="entry2">
> - <property name="can_focus">yes</property>
> - <property name="editable">yes</property>
> - <property name="text" translatable="yes">8 pt. Tahoma</property>
> - <property name="width-request">100</property>
> - <property name="max-length">0</property>
> - <property name="visibility">yes</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">no</property>
> - <property name="fill">no</property>
> - </packing>
> - </child>
> - </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_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">expand|fill</property>
> - <property name="y_options">fill</property>
> - </packing>
> - </child>
> - </widget>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkFrame" id="frame8">
> - <property name="label" translatable="yes">Shading</property>
> - <property name="label_xalign">0</property>
> - <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkCheckButton" id="checkbutton3">
> - <property name="can_focus">yes</property>
> - <property name="label" translatable="yes">Print using gray shading</property>
> - <property name="active">no</property>
> - <property name="draw_indicator">yes</property>
> - <property name="visible">yes</property>
> - </widget>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> - </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label1">
> - <property name="label" translatable="yes">Format</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">no</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="type">tab</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkHBox" id="hbox3">
> - <property name="homogeneous">yes</property>
> - <property name="spacing">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkVBox" id="vbox6">
> - <property name="homogeneous">no</property>
> - <property name="spacing">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkFrame" id="frame9">
> - <property name="label" translatable="yes">Paper</property>
> - <property name="label_xalign">0</property>
> - <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkVBox" id="vbox16">
> - <property name="border_width">10</property>
> - <property name="homogeneous">no</property>
> - <property name="spacing">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkVBox" id="vbox17">
> - <property name="homogeneous">no</property>
> - <property name="spacing">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkLabel" id="label21">
> - <property name="label" translatable="yes">Type:</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">no</property>
> - <property name="xalign">0</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">no</property>
> - <property name="fill">no</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkScrolledWindow" id="scrolledwindow1">
> - <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
> - <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
> - <property name="shadow_type">GTK_SHADOW_IN</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkTreeView" id="clist1">
> - <property name="can_focus">yes</property>
> - <property name="headers-visible">no</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkLabel" id="label26">
> - <property name="child_name">CList:title</property>
> - <property name="label" translatable="yes">label26</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">no</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="visible">yes</property>
> - </widget>
> - </child>
> - </widget>
> - </child>
> -
> - <child internal-child="hscrollbar">
> - <widget class="GtkHScrollbar" id="convertwidget1">
> - <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
> - <property name="visible">yes</property>
> - </widget>
> - </child>
> -
> - <child internal-child="vscrollbar">
> - <widget class="GtkVScrollbar" id="convertwidget2">
> - <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
> - <property name="visible">yes</property>
> - </widget>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkVBox" id="vbox18">
> - <property name="homogeneous">no</property>
> - <property name="spacing">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkLabel" id="label24">
> - <property name="label" translatable="yes">Dimensions:</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">no</property>
> - <property name="xalign">0</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">no</property>
> - <property name="fill">no</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkHBox" id="hbox5">
> - <property name="homogeneous">yes</property>
> - <property name="spacing">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkLabel" id="label27">
> - <property name="label" translatable="yes">Width:</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">no</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">no</property>
> - <property name="fill">no</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkEntry" id="entry9">
> - <property name="can_focus">yes</property>
> - <property name="editable">yes</property>
> - <property name="text" translatable="yes"></property>
> - <property name="width-request">1</property>
> - <property name="max-length">0</property>
> - <property name="visibility">yes</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label28">
> - <property name="label" translatable="yes">Height:</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">no</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">no</property>
> - <property name="fill">no</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkEntry" id="entry10">
> - <property name="can_focus">yes</property>
> - <property name="editable">yes</property>
> - <property name="text" translatable="yes"></property>
> - <property name="width-request">1</property>
> - <property name="max-length">0</property>
> - <property name="visibility">yes</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkVBox" id="vbox19">
> - <property name="homogeneous">no</property>
> - <property name="spacing">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkLabel" id="label25">
> - <property name="label" translatable="yes">Paper source:</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">no</property>
> - <property name="xalign">0</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">no</property>
> - <property name="fill">no</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkCombo" id="combo1">
> - <property name="value_in_list">no</property>
> - <property name="case_sensitive">no</property>
> - <property name="enable_arrow_keys">yes</property>
> - <property name="enable_arrows_always">no</property>
> - <property name="allow_empty">yes</property>
> - <property name="visible">yes</property>
> -
> - <child internal-child="entry">
> - <widget class="GtkEntry" id="combo-entry1">
> - <property name="can_focus">yes</property>
> - <property name="editable">yes</property>
> - <property name="text" translatable="yes"></property>
> - <property name="max-length">0</property>
> - <property name="visibility">yes</property>
> - <property name="visible">yes</property>
> - </widget>
> - </child>
> -
> - <child internal-child="list">
> - <widget class="GtkList" id="convertwidget3">
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkListItem" id="convertwidget4">
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkLabel" id="convertwidget5">
> - <property name="label" translatable="yes"></property>
> - <property name="xalign">0.0</property>
> - <property name="visible">yes</property>
> - </widget>
> - </child>
> - </widget>
> - </child>
> - </widget>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">no</property>
> - <property name="fill">no</property>
> - </packing>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> - </widget>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkFrame" id="frame10">
> - <property name="label" translatable="yes">Margins</property>
> - <property name="label_xalign">0</property>
> - <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkTable" id="table4">
> - <property name="border_width">15</property>
> - <property name="homogeneous">yes</property>
> - <property name="row_spacing">6</property>
> - <property name="column_spacing">9</property>
> - <property name="n-rows">2</property>
> - <property name="n-columns">4</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkLabel" id="label29">
> - <property name="label" translatable="yes">Top:</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">no</property>
> - <property name="xalign">0</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="visible">yes</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_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">fill</property>
> - <property name="y_options">expand|fill</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label30">
> - <property name="label" translatable="yes">Bottom:</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">no</property>
> - <property name="xalign">0</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="visible">yes</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_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">fill</property>
> - <property name="y_options">expand|fill</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label31">
> - <property name="label" translatable="yes">Left:</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">no</property>
> - <property name="xalign">0</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="left_attach">2</property>
> - <property name="right_attach">3</property>
> - <property name="top_attach">0</property>
> - <property name="bottom_attach">1</property>
> - <property name="x_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">fill</property>
> - <property name="y_options">expand|fill</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkEntry" id="entry11">
> - <property name="can_focus">yes</property>
> - <property name="editable">yes</property>
> - <property name="text" translatable="yes"></property>
> - <property name="width-request">1</property>
> - <property name="max-length">0</property>
> - <property name="visibility">yes</property>
> - <property name="visible">yes</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="x_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">expand|fill</property>
> - <property name="y_options"></property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkEntry" id="entry12">
> - <property name="can_focus">yes</property>
> - <property name="editable">yes</property>
> - <property name="text" translatable="yes"></property>
> - <property name="width-request">1</property>
> - <property name="max-length">0</property>
> - <property name="visibility">yes</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="left_attach">3</property>
> - <property name="right_attach">4</property>
> - <property name="top_attach">0</property>
> - <property name="bottom_attach">1</property>
> - <property name="x_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">expand|fill</property>
> - <property name="y_options"></property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkEntry" id="entry13">
> - <property name="can_focus">yes</property>
> - <property name="editable">yes</property>
> - <property name="text" translatable="yes"></property>
> - <property name="width-request">1</property>
> - <property name="max-length">0</property>
> - <property name="visibility">yes</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="left_attach">3</property>
> - <property name="right_attach">4</property>
> - <property name="top_attach">1</property>
> - <property name="bottom_attach">2</property>
> - <property name="x_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">expand|fill</property>
> - <property name="y_options"></property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkEntry" id="entry14">
> - <property name="can_focus">yes</property>
> - <property name="editable">yes</property>
> - <property name="text" translatable="yes"></property>
> - <property name="width-request">1</property>
> - <property name="max-length">0</property>
> - <property name="visibility">yes</property>
> - <property name="visible">yes</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_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">expand|fill</property>
> - <property name="y_options"></property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label32">
> - <property name="label" translatable="yes">Right:</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">no</property>
> - <property name="xalign">0</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="left_attach">2</property>
> - <property name="right_attach">3</property>
> - <property name="top_attach">1</property>
> - <property name="bottom_attach">2</property>
> - <property name="x_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">fill</property>
> - <property name="y_options">expand|fill</property>
> - </packing>
> - </child>
> - </widget>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkVBox" id="vbox7">
> - <property name="homogeneous">no</property>
> - <property name="spacing">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkFrame" id="frame11">
> - <property name="label" translatable="yes">Page</property>
> - <property name="label_xalign">0</property>
> - <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkVBox" id="vbox8">
> - <property name="border_width">10</property>
> - <property name="homogeneous">no</property>
> - <property name="spacing">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkVBox" id="vbox20">
> - <property name="homogeneous">no</property>
> - <property name="spacing">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkLabel" id="label33">
> - <property name="label" translatable="yes">Size:</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">no</property>
> - <property name="xalign">0</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">no</property>
> - <property name="fill">no</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkScrolledWindow" id="scrolledwindow2">
> - <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
> - <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
> - <property name="shadow_type">GTK_SHADOW_IN</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkTreeView" id="clist2">
> - <property name="can_focus">yes</property>
> - <property name="headers-visible">no</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkLabel" id="label35">
> - <property name="child_name">CList:title</property>
> - <property name="label" translatable="yes">label26</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">no</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="visible">yes</property>
> - </widget>
> - </child>
> - </widget>
> - </child>
> -
> - <child internal-child="hscrollbar">
> - <widget class="GtkHScrollbar" id="convertwidget6">
> - <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
> - <property name="visible">yes</property>
> - </widget>
> - </child>
> -
> - <child internal-child="vscrollbar">
> - <widget class="GtkVScrollbar" id="convertwidget7">
> - <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
> - <property name="visible">yes</property>
> - </widget>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkVBox" id="vbox21">
> - <property name="homogeneous">no</property>
> - <property name="spacing">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkLabel" id="label34">
> - <property name="label" translatable="yes">Dimensions:</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">no</property>
> - <property name="xalign">0</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">no</property>
> - <property name="fill">no</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkHBox" id="hbox6">
> - <property name="homogeneous">yes</property>
> - <property name="spacing">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkLabel" id="label36">
> - <property name="label" translatable="yes">Width:</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">no</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">no</property>
> - <property name="fill">no</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkEntry" id="entry15">
> - <property name="can_focus">yes</property>
> - <property name="editable">yes</property>
> - <property name="text" translatable="yes"></property>
> - <property name="width-request">1</property>
> - <property name="max-length">0</property>
> - <property name="visibility">yes</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label37">
> - <property name="label" translatable="yes">Height:</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">no</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">no</property>
> - <property name="fill">no</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkEntry" id="entry16">
> - <property name="can_focus">yes</property>
> - <property name="editable">yes</property>
> - <property name="text" translatable="yes"></property>
> - <property name="width-request">1</property>
> - <property name="max-length">0</property>
> - <property name="visibility">yes</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> - </widget>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkFrame" id="frame12">
> - <property name="label" translatable="yes">Orientation</property>
> - <property name="label_xalign">0</property>
> - <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkHBox" id="hbox4">
> - <property name="homogeneous">no</property>
> - <property name="spacing">10</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <placeholder />
> - </child>
> -
> - <child>
> - <widget class="GtkVBox" id="vbox9">
> - <property name="homogeneous">no</property>
> - <property name="spacing">5</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkAlignment" id="alignment9">
> - <property name="xalign">0</property>
> - <property name="yalign">1</property>
> - <property name="xscale">0</property>
> - <property name="yscale">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkRadioButton" id="radiobutton3">
> - <property name="can_focus">yes</property>
> - <property name="label" translatable="yes">Portrait</property>
> - <property name="active">no</property>
> - <property name="draw_indicator">yes</property>
> - <property name="visible">yes</property>
> - </widget>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkAlignment" id="alignment10">
> - <property name="xalign">0</property>
> - <property name="yalign">0</property>
> - <property name="xscale">0</property>
> - <property name="yscale">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkRadioButton" id="radiobutton4">
> - <property name="can_focus">yes</property>
> - <property name="label" translatable="yes">Landscape</property>
> - <property name="active">no</property>
> - <property name="draw_indicator">yes</property>
> - <property name="visible">yes</property>
> - </widget>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> - </widget>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> - </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label2">
> - <property name="label" translatable="yes">Paper</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">no</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="type">tab</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkVBox" id="vbox10">
> - <property name="border_width">8</property>
> - <property name="homogeneous">no</property>
> - <property name="spacing">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkTable" id="table5">
> - <property name="homogeneous">yes</property>
> - <property name="row_spacing">4</property>
> - <property name="column_spacing">4</property>
> - <property name="n-rows">4</property>
> - <property name="n-columns">3</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkAlignment" id="alignment15">
> - <property name="xalign">0</property>
> - <property name="yalign">1</property>
> - <property name="xscale">0</property>
> - <property name="yscale">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkButton" id="button11">
> - <property name="can_focus">yes</property>
> - <property name="label" translatable="yes">F_ont...</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="visible">yes</property>
> - <property name="use_underline">yes</property>
> - </widget>
> - </child>
> - </widget>
> - <packing>
> - <property name="left_attach">1</property>
> - <property name="right_attach">2</property>
> - <property name="top_attach">2</property>
> - <property name="bottom_attach">3</property>
> - <property name="x_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">fill</property>
> - <property name="y_options">fill</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkTextView" id="text10">
> - <property name="can_focus">yes</property>
> - <property name="editable">no</property>
> - <property name="text" translatable="yes"></property>
> - <property name="wrap_mode">GTK_WRAP_WORD</property>
> - <property name="height-request">50</property>
> - <property name="visible">yes</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_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">fill</property>
> - <property name="y_options">expand|fill</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkTextView" id="text11">
> - <property name="can_focus">yes</property>
> - <property name="editable">no</property>
> - <property name="text" translatable="yes"></property>
> - <property name="wrap_mode">GTK_WRAP_WORD</property>
> - <property name="height-request">50</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="left_attach">2</property>
> - <property name="right_attach">3</property>
> - <property name="top_attach">1</property>
> - <property name="bottom_attach">2</property>
> - <property name="x_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">expand|fill</property>
> - <property name="y_options">fill</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkTextView" id="text12">
> - <property name="can_focus">yes</property>
> - <property name="editable">no</property>
> - <property name="text" translatable="yes"></property>
> - <property name="wrap_mode">GTK_WRAP_WORD</property>
> - <property name="height-request">50</property>
> - <property name="visible">yes</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_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">fill</property>
> - <property name="y_options">fill</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkTextView" id="text13">
> - <property name="can_focus">yes</property>
> - <property name="editable">no</property>
> - <property name="text" translatable="yes"></property>
> - <property name="wrap_mode">GTK_WRAP_WORD</property>
> - <property name="height-request">50</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="left_attach">0</property>
> - <property name="right_attach">1</property>
> - <property name="top_attach">3</property>
> - <property name="bottom_attach">4</property>
> - <property name="x_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">fill</property>
> - <property name="y_options">expand|fill</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkTextView" id="text14">
> - <property name="can_focus">yes</property>
> - <property name="editable">no</property>
> - <property name="text" translatable="yes"></property>
> - <property name="wrap_mode">GTK_WRAP_WORD</property>
> - <property name="height-request">5</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="left_attach">1</property>
> - <property name="right_attach">2</property>
> - <property name="top_attach">3</property>
> - <property name="bottom_attach">4</property>
> - <property name="x_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">fill</property>
> - <property name="y_options">fill</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkTextView" id="text15">
> - <property name="can_focus">yes</property>
> - <property name="editable">no</property>
> - <property name="text" translatable="yes"></property>
> - <property name="wrap_mode">GTK_WRAP_WORD</property>
> - <property name="height-request">50</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="left_attach">2</property>
> - <property name="right_attach">3</property>
> - <property name="top_attach">3</property>
> - <property name="bottom_attach">4</property>
> - <property name="x_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">fill</property>
> - <property name="y_options">fill</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkAlignment" id="alignment16">
> - <property name="xalign">0.5</property>
> - <property name="yalign">1</property>
> - <property name="xscale">1</property>
> - <property name="yscale">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkVBox" id="vbox14">
> - <property name="homogeneous">no</property>
> - <property name="spacing">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkLabel" id="label14">
> - <property name="label" translatable="yes">Header</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">no</property>
> - <property name="xalign">0</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">no</property>
> - <property name="fill">no</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkEntry" id="entry7">
> - <property name="can_focus">yes</property>
> - <property name="editable">yes</property>
> - <property name="text" translatable="yes"></property>
> - <property name="max-length">0</property>
> - <property name="visibility">yes</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">no</property>
> - <property name="fill">no</property>
> - </packing>
> - </child>
> - </widget>
> - </child>
> - </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_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">expand|fill</property>
> - <property name="y_options">fill</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkAlignment" id="alignment17">
> - <property name="xalign">0.5</property>
> - <property name="yalign">1</property>
> - <property name="xscale">1</property>
> - <property name="yscale">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkVBox" id="vbox15">
> - <property name="homogeneous">no</property>
> - <property name="spacing">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkLabel" id="label15">
> - <property name="label" translatable="yes">Footer:</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">no</property>
> - <property name="xalign">0</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">no</property>
> - <property name="fill">no</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkEntry" id="entry8">
> - <property name="can_focus">yes</property>
> - <property name="editable">yes</property>
> - <property name="text" translatable="yes"></property>
> - <property name="max-length">0</property>
> - <property name="visibility">yes</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">no</property>
> - <property name="fill">no</property>
> - </packing>
> - </child>
> - </widget>
> - </child>
> - </widget>
> - <packing>
> - <property name="left_attach">0</property>
> - <property name="right_attach">1</property>
> - <property name="top_attach">2</property>
> - <property name="bottom_attach">3</property>
> - <property name="x_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">expand|fill</property>
> - <property name="y_options">fill</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkAlignment" id="alignment14">
> - <property name="xalign">0</property>
> - <property name="yalign">1</property>
> - <property name="xscale">0</property>
> - <property name="yscale">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkButton" id="button10">
> - <property name="can_focus">yes</property>
> - <property name="label" translatable="yes">_Font...</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="visible">yes</property>
> - <property name="use_underline">yes</property>
> - </widget>
> - </child>
> - </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="x_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">fill</property>
> - <property name="y_options">fill</property>
> - </packing>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkHBox" id="hbox7">
> - <property name="homogeneous">no</property>
> - <property name="spacing">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkToolbar" id="toolbar1">
> - <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
> - <property name="toolbar-style">GTK_TOOLBAR_ICONS</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <placeholder />
> - </child>
> -
> - <child>
> - <placeholder />
> - </child>
> -
> - <child>
> - <placeholder />
> - </child>
> -
> - <child>
> - <placeholder />
> - </child>
> -
> - <child>
> - <placeholder />
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">no</property>
> - </packing>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">no</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkCheckButton" id="checkbutton4">
> - <property name="can_focus">yes</property>
> - <property name="label" translatable="yes">Reverse on even pages</property>
> - <property name="active">no</property>
> - <property name="draw_indicator">yes</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">no</property>
> - <property name="fill">no</property>
> - </packing>
> - </child>
> - </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label3">
> - <property name="label" translatable="yes">Header/Footer</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">no</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="visible">yes</property>
> - </widget>
> - <packing>
> - <property name="type">tab</property>
> - </packing>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">4</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> - </widget>
> +<requires lib="gnome"/>
> +
> +<widget class="GtkDialog" id="print-edit-style">
> + <property name="title" translatable="yes">Page Setup:</property>
> + <property name="type">GTK_WINDOW_TOPLEVEL</property>
> + <property name="window_position">GTK_WIN_POS_NONE</property>
> + <property name="modal">False</property>
> + <property name="resizable">True</property>
> + <property name="destroy_with_parent">False</property>
> + <property name="has_separator">False</property>
> +
> + <child internal-child="vbox">
> + <widget class="GtkVBox" id="dialog-vbox1">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">8</property>
> +
> + <child internal-child="action_area">
> + <widget class="GtkHButtonBox" id="dialog-action_area1">
> + <property name="visible">True</property>
> + <property name="layout_style">GTK_BUTTONBOX_END</property>
> +
> + <child>
> + <widget class="GtkButton" id="button1">
> + <property name="visible">True</property>
> + <property name="can_default">True</property>
> + <property name="can_focus">True</property>
> + <property name="label">gtk-cancel</property>
> + <property name="use_stock">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="response_id">-6</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkButton" id="button2">
> + <property name="visible">True</property>
> + <property name="can_default">True</property>
> + <property name="can_focus">True</property>
> + <property name="label">gtk-apply</property>
> + <property name="use_stock">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="response_id">0</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkButton" id="button3">
> + <property name="visible">True</property>
> + <property name="can_default">True</property>
> + <property name="can_focus">True</property>
> + <property name="label">gtk-ok</property>
> + <property name="use_stock">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="response_id">-5</property>
> + </widget>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">True</property>
> + <property name="pack_type">GTK_PACK_END</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox-contact-print-style-editor">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">5</property>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox2">
> + <property name="border_width">5</property>
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">16</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label8">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Style name:</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkEntry" id="label-style-name">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">False</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkNotebook" id="notebook1">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="show_tabs">True</property>
> + <property name="show_border">True</property>
> + <property name="tab_pos">GTK_POS_TOP</property>
> + <property name="scrollable">False</property>
> + <property name="enable_popup">False</property>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox2">
> + <property name="border_width">12</property>
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
> +
> + <child>
> + <widget class="GtkAlignment" id="alignment1">
> + <property name="visible">True</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xscale">0</property>
> + <property name="yscale">0</property>
> +
> + <child>
> + <widget class="GtkFrame" id="frame5">
> + <property name="visible">True</property>
> + <property name="label_xalign">0</property>
> + <property name="label_yalign">0.5</property>
> + <property name="shadow_type">GTK_SHADOW_NONE</property>
> +
> + <child>
> + <placeholder/>
> + </child>
> +
> + <child>
> + <widget class="GtkLabel" id="label9">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"><b>Preview</b></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">True</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>
> + </widget>
> + <packing>
> + <property name="type">label_item</property>
> + </packing>
> + </child>
> + </widget>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox1">
> + <property name="visible">True</property>
> + <property name="homogeneous">True</property>
> + <property name="spacing">7</property>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox22">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label39">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"><b>Options</b></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">True</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox8">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label40">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkAlignment" id="alignment4">
> + <property name="visible">True</property>
> + <property name="xalign">0</property>
> + <property name="yalign">0</property>
> + <property name="xscale">0</property>
> + <property name="yscale">0</property>
> +
> + <child>
> + <widget class="GtkTable" id="table1">
> + <property name="border_width">8</property>
> + <property name="visible">True</property>
> + <property name="n_rows">6</property>
> + <property name="n_columns">5</property>
> + <property name="homogeneous">False</property>
> + <property name="row_spacing">6</property>
> + <property name="column_spacing">0</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label5">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Include:</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</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>
> + </widget>
> + <packing>
> + <property name="left_attach">0</property>
> + <property name="right_attach">1</property>
> + <property name="top_attach">4</property>
> + <property name="bottom_attach">5</property>
> + <property name="x_options">fill</property>
> + <property name="y_options">fill</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkLabel" id="label4">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Sections:</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</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>
> + </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">fill</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkAlignment" id="alignment2">
> + <property name="visible">True</property>
> + <property name="xalign">0</property>
> + <property name="yalign">0.5</property>
> + <property name="xscale">0</property>
> + <property name="yscale">0</property>
> +
> + <child>
> + <widget class="GtkRadioButton" id="radiobutton1">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">Immediately follow each other</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">True</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> + </widget>
> + </child>
> + </widget>
> + <packing>
> + <property name="left_attach">1</property>
> + <property name="right_attach">5</property>
> + <property name="top_attach">0</property>
> + <property name="bottom_attach">1</property>
> + <property name="x_options">fill</property>
> + <property name="y_options">fill</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkCheckButton" id="checkbutton1">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">Letter tabs on side</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> + </widget>
> + <packing>
> + <property name="left_attach">1</property>
> + <property name="right_attach">5</property>
> + <property name="top_attach">4</property>
> + <property name="bottom_attach">5</property>
> + <property name="x_options">fill</property>
> + <property name="y_options">fill</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkCheckButton" id="checkbutton2">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">Headings for each letter</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> + </widget>
> + <packing>
> + <property name="left_attach">1</property>
> + <property name="right_attach">5</property>
> + <property name="top_attach">5</property>
> + <property name="bottom_attach">6</property>
> + <property name="x_options">fill</property>
> + <property name="y_options">fill</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkAlignment" id="alignment3">
> + <property name="visible">True</property>
> + <property name="xalign">0</property>
> + <property name="yalign">0.5</property>
> + <property name="xscale">0</property>
> + <property name="yscale">0</property>
> +
> + <child>
> + <widget class="GtkRadioButton" id="radiobutton2">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">Start on a new page</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> + </widget>
> + </child>
> + </widget>
> + <packing>
> + <property name="left_attach">1</property>
> + <property name="right_attach">5</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>
> + </child>
> +
> + <child>
> + <widget class="GtkLabel" id="label6">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Number of columns:</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</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>
> + </widget>
> + <packing>
> + <property name="left_attach">0</property>
> + <property name="right_attach">3</property>
> + <property name="top_attach">2</property>
> + <property name="bottom_attach">3</property>
> + <property name="y_padding">2</property>
> + <property name="x_options">fill</property>
> + <property name="y_options">fill</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkLabel" id="label7">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Blank forms at end:</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</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>
> + </widget>
> + <packing>
> + <property name="left_attach">0</property>
> + <property name="right_attach">3</property>
> + <property name="top_attach">3</property>
> + <property name="bottom_attach">4</property>
> + <property name="y_padding">2</property>
> + <property name="x_options">fill</property>
> + <property name="y_options">fill</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkAlignment" id="alignment6">
> + <property name="visible">True</property>
> + <property name="xalign">0</property>
> + <property name="yalign">0.5</property>
> + <property name="xscale">0</property>
> + <property name="yscale">0</property>
> +
> + <child>
> + <widget class="GtkSpinButton" id="spinbutton2">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="climb_rate">1</property>
> + <property name="digits">0</property>
> + <property name="numeric">False</property>
> + <property name="update_policy">GTK_UPDATE_ALWAYS</property>
> + <property name="snap_to_ticks">False</property>
> + <property name="wrap">False</property>
> + <property name="adjustment">2 0 100 1 10 10</property>
> + </widget>
> + </child>
> + </widget>
> + <packing>
> + <property name="left_attach">3</property>
> + <property name="right_attach">4</property>
> + <property name="top_attach">3</property>
> + <property name="bottom_attach">4</property>
> + <property name="y_padding">2</property>
> + <property name="x_options">fill</property>
> + <property name="y_options">fill</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkAlignment" id="alignment5">
> + <property name="visible">True</property>
> + <property name="xalign">0</property>
> + <property name="yalign">0.5</property>
> + <property name="xscale">0</property>
> + <property name="yscale">0</property>
> +
> + <child>
> + <widget class="GtkSpinButton" id="spinbutton1">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="climb_rate">1</property>
> + <property name="digits">0</property>
> + <property name="numeric">False</property>
> + <property name="update_policy">GTK_UPDATE_ALWAYS</property>
> + <property name="snap_to_ticks">False</property>
> + <property name="wrap">False</property>
> + <property name="adjustment">1 0 100 1 10 10</property>
> + </widget>
> + </child>
> + </widget>
> + <packing>
> + <property name="left_attach">3</property>
> + <property name="right_attach">4</property>
> + <property name="top_attach">2</property>
> + <property name="bottom_attach">3</property>
> + <property name="y_padding">2</property>
> + <property name="x_options">fill</property>
> + <property name="y_options">fill</property>
> + </packing>
> + </child>
> + </widget>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">3</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox3">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">8</property>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox23">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label41">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"><b>Fonts</b></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">True</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox9">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label42">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkTable" id="table2">
> + <property name="visible">True</property>
> + <property name="n_rows">2</property>
> + <property name="n_columns">2</property>
> + <property name="homogeneous">False</property>
> + <property name="row_spacing">13</property>
> + <property name="column_spacing">8</property>
> +
> + <child>
> + <widget class="GtkAlignment" id="alignment7">
> + <property name="visible">True</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">1</property>
> + <property name="xscale">1</property>
> + <property name="yscale">0</property>
> +
> + <child>
> + <widget class="GtkButton" id="button6">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">F_ont...</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + </child>
> + </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>
> + </child>
> +
> + <child>
> + <widget class="GtkAlignment" id="alignment8">
> + <property name="visible">True</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">1</property>
> + <property name="xscale">1</property>
> + <property name="yscale">0</property>
> +
> + <child>
> + <widget class="GtkButton" id="button5">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">_Font...</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + </child>
> + </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="x_options">fill</property>
> + <property name="y_options">fill</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox4">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label10">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Headings</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkEntry" id="entry3">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes">10 pt. Tahoma</property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> + </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="y_options">fill</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox5">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label9">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Body</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkEntry" id="entry2">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes">8 pt. Tahoma</property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> + </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="y_options">fill</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">3</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox24">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label43">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"><b>Shading</b></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">True</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox10">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label44">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkCheckButton" id="checkbutton3">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">Print using gray shading</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">3</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="tab_expand">False</property>
> + <property name="tab_fill">True</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkLabel" id="label1">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Format</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="type">tab</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox3">
> + <property name="visible">True</property>
> + <property name="homogeneous">True</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox6">
> + <property name="border_width">12</property>
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox25">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label45">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"><b>Paper</b></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">True</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox11">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label46">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox16">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox17">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label21">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Type:</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkScrolledWindow" id="scrolledwindow1">
> + <property name="visible">True</property>
> + <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
> + <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
> + <property name="shadow_type">GTK_SHADOW_IN</property>
> + <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
> +
> + <child>
> + <widget class="GtkTreeView" id="clist1">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="headers_visible">True</property>
> + <property name="rules_hint">False</property>
> + <property name="reorderable">False</property>
> + <property name="enable_search">True</property>
> + </widget>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox18">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label24">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Dimensions:</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox5">
> + <property name="visible">True</property>
> + <property name="homogeneous">True</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label27">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Width:</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkEntry" id="entry9">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkLabel" id="label28">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Height:</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkEntry" id="entry10">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox19">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label25">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Paper source:</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkCombo" id="combo1">
> + <property name="visible">True</property>
> + <property name="value_in_list">False</property>
> + <property name="allow_empty">True</property>
> + <property name="case_sensitive">False</property>
> + <property name="enable_arrow_keys">True</property>
> + <property name="enable_arrows_always">False</property>
> +
> + <child internal-child="entry">
> + <widget class="GtkEntry" id="combo-entry1">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</property>
> + </widget>
> + </child>
> +
> + <child internal-child="list">
> + <widget class="GtkList" id="convertwidget3">
> + <property name="visible">True</property>
> + <property name="selection_mode">GTK_SELECTION_BROWSE</property>
> +
> + <child>
> + <widget class="GtkListItem" id="convertwidget4">
> + <property name="visible">True</property>
> +
> + <child>
> + <widget class="GtkLabel" id="convertwidget5">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"></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>
> + </widget>
> + </child>
> + </widget>
> + </child>
> + </widget>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">3</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox26">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label47">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"><b>Margins</b></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">True</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox12">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label48">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkTable" id="table4">
> + <property name="visible">True</property>
> + <property name="n_rows">2</property>
> + <property name="n_columns">4</property>
> + <property name="homogeneous">True</property>
> + <property name="row_spacing">6</property>
> + <property name="column_spacing">9</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label29">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Top:</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</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>
> + </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>
> + </child>
> +
> + <child>
> + <widget class="GtkLabel" id="label30">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Bottom:</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</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>
> + </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>
> + </child>
> +
> + <child>
> + <widget class="GtkLabel" id="label31">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Left:</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</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>
> + </widget>
> + <packing>
> + <property name="left_attach">2</property>
> + <property name="right_attach">3</property>
> + <property name="top_attach">0</property>
> + <property name="bottom_attach">1</property>
> + <property name="x_options">fill</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkEntry" id="entry11">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</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"></property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkEntry" id="entry12">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</property>
> + </widget>
> + <packing>
> + <property name="left_attach">3</property>
> + <property name="right_attach">4</property>
> + <property name="top_attach">0</property>
> + <property name="bottom_attach">1</property>
> + <property name="y_options"></property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkEntry" id="entry13">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</property>
> + </widget>
> + <packing>
> + <property name="left_attach">3</property>
> + <property name="right_attach">4</property>
> + <property name="top_attach">1</property>
> + <property name="bottom_attach">2</property>
> + <property name="y_options"></property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkEntry" id="entry14">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</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="y_options"></property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkLabel" id="label32">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Right:</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</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>
> + </widget>
> + <packing>
> + <property name="left_attach">2</property>
> + <property name="right_attach">3</property>
> + <property name="top_attach">1</property>
> + <property name="bottom_attach">2</property>
> + <property name="x_options">fill</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">3</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox7">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox27">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label49">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"><b>Page</b></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">True</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox13">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label50">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox8">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox20">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label33">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Size:</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkScrolledWindow" id="scrolledwindow2">
> + <property name="visible">True</property>
> + <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
> + <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
> + <property name="shadow_type">GTK_SHADOW_IN</property>
> + <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
> +
> + <child>
> + <widget class="GtkTreeView" id="clist2">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="headers_visible">True</property>
> + <property name="rules_hint">False</property>
> + <property name="reorderable">False</property>
> + <property name="enable_search">True</property>
> + </widget>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox21">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label34">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Dimensions:</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox6">
> + <property name="visible">True</property>
> + <property name="homogeneous">True</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label36">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Width:</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkEntry" id="entry15">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkLabel" id="label37">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Height:</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkEntry" id="entry16">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">3</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox28">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label51">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"><b>Orientation</b></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">True</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox14">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox4">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">10</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label52">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox9">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">5</property>
> +
> + <child>
> + <widget class="GtkAlignment" id="alignment9">
> + <property name="visible">True</property>
> + <property name="xalign">0</property>
> + <property name="yalign">1</property>
> + <property name="xscale">0</property>
> + <property name="yscale">0</property>
> +
> + <child>
> + <widget class="GtkRadioButton" id="radiobutton3">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">Portrait</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> + </widget>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkAlignment" id="alignment10">
> + <property name="visible">True</property>
> + <property name="xalign">0</property>
> + <property name="yalign">0</property>
> + <property name="xscale">0</property>
> + <property name="yscale">0</property>
> +
> + <child>
> + <widget class="GtkRadioButton" id="radiobutton4">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">Landscape</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> + </widget>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">3</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="tab_expand">False</property>
> + <property name="tab_fill">True</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkLabel" id="label2">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Paper</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="type">tab</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox10">
> + <property name="border_width">12</property>
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
> +
> + <child>
> + <widget class="GtkTable" id="table5">
> + <property name="visible">True</property>
> + <property name="n_rows">4</property>
> + <property name="n_columns">3</property>
> + <property name="homogeneous">True</property>
> + <property name="row_spacing">4</property>
> + <property name="column_spacing">4</property>
> +
> + <child>
> + <widget class="GtkAlignment" id="alignment15">
> + <property name="visible">True</property>
> + <property name="xalign">0</property>
> + <property name="yalign">1</property>
> + <property name="xscale">0</property>
> + <property name="yscale">0</property>
> +
> + <child>
> + <widget class="GtkButton" id="button11">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">F_ont...</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + </child>
> + </widget>
> + <packing>
> + <property name="left_attach">1</property>
> + <property name="right_attach">2</property>
> + <property name="top_attach">2</property>
> + <property name="bottom_attach">3</property>
> + <property name="x_options">fill</property>
> + <property name="y_options">fill</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkTextView" id="text10">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">False</property>
> + <property name="justification">GTK_JUSTIFY_LEFT</property>
> + <property name="wrap_mode">GTK_WRAP_WORD</property>
> + <property name="cursor_visible">True</property>
> + <property name="pixels_above_lines">0</property>
> + <property name="pixels_below_lines">0</property>
> + <property name="pixels_inside_wrap">0</property>
> + <property name="left_margin">0</property>
> + <property name="right_margin">0</property>
> + <property name="indent">0</property>
> + <property name="text" translatable="yes"></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>
> + </child>
> +
> + <child>
> + <widget class="GtkTextView" id="text11">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">False</property>
> + <property name="justification">GTK_JUSTIFY_LEFT</property>
> + <property name="wrap_mode">GTK_WRAP_WORD</property>
> + <property name="cursor_visible">True</property>
> + <property name="pixels_above_lines">0</property>
> + <property name="pixels_below_lines">0</property>
> + <property name="pixels_inside_wrap">0</property>
> + <property name="left_margin">0</property>
> + <property name="right_margin">0</property>
> + <property name="indent">0</property>
> + <property name="text" translatable="yes"></property>
> + </widget>
> + <packing>
> + <property name="left_attach">2</property>
> + <property name="right_attach">3</property>
> + <property name="top_attach">1</property>
> + <property name="bottom_attach">2</property>
> + <property name="y_options">fill</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkTextView" id="text12">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">False</property>
> + <property name="justification">GTK_JUSTIFY_LEFT</property>
> + <property name="wrap_mode">GTK_WRAP_WORD</property>
> + <property name="cursor_visible">True</property>
> + <property name="pixels_above_lines">0</property>
> + <property name="pixels_below_lines">0</property>
> + <property name="pixels_inside_wrap">0</property>
> + <property name="left_margin">0</property>
> + <property name="right_margin">0</property>
> + <property name="indent">0</property>
> + <property name="text" translatable="yes"></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>
> + </child>
> +
> + <child>
> + <widget class="GtkTextView" id="text13">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">False</property>
> + <property name="justification">GTK_JUSTIFY_LEFT</property>
> + <property name="wrap_mode">GTK_WRAP_WORD</property>
> + <property name="cursor_visible">True</property>
> + <property name="pixels_above_lines">0</property>
> + <property name="pixels_below_lines">0</property>
> + <property name="pixels_inside_wrap">0</property>
> + <property name="left_margin">0</property>
> + <property name="right_margin">0</property>
> + <property name="indent">0</property>
> + <property name="text" translatable="yes"></property>
> + </widget>
> + <packing>
> + <property name="left_attach">0</property>
> + <property name="right_attach">1</property>
> + <property name="top_attach">3</property>
> + <property name="bottom_attach">4</property>
> + <property name="x_options">fill</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkTextView" id="text14">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">False</property>
> + <property name="justification">GTK_JUSTIFY_LEFT</property>
> + <property name="wrap_mode">GTK_WRAP_WORD</property>
> + <property name="cursor_visible">True</property>
> + <property name="pixels_above_lines">0</property>
> + <property name="pixels_below_lines">0</property>
> + <property name="pixels_inside_wrap">0</property>
> + <property name="left_margin">0</property>
> + <property name="right_margin">0</property>
> + <property name="indent">0</property>
> + <property name="text" translatable="yes"></property>
> + </widget>
> + <packing>
> + <property name="left_attach">1</property>
> + <property name="right_attach">2</property>
> + <property name="top_attach">3</property>
> + <property name="bottom_attach">4</property>
> + <property name="x_options">fill</property>
> + <property name="y_options">fill</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkTextView" id="text15">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">False</property>
> + <property name="justification">GTK_JUSTIFY_LEFT</property>
> + <property name="wrap_mode">GTK_WRAP_WORD</property>
> + <property name="cursor_visible">True</property>
> + <property name="pixels_above_lines">0</property>
> + <property name="pixels_below_lines">0</property>
> + <property name="pixels_inside_wrap">0</property>
> + <property name="left_margin">0</property>
> + <property name="right_margin">0</property>
> + <property name="indent">0</property>
> + <property name="text" translatable="yes"></property>
> + </widget>
> + <packing>
> + <property name="left_attach">2</property>
> + <property name="right_attach">3</property>
> + <property name="top_attach">3</property>
> + <property name="bottom_attach">4</property>
> + <property name="x_options">fill</property>
> + <property name="y_options">fill</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkAlignment" id="alignment16">
> + <property name="visible">True</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">1</property>
> + <property name="xscale">1</property>
> + <property name="yscale">0</property>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox14">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label14">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Header</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkEntry" id="entry7">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> + </widget>
> + </child>
> + </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="y_options">fill</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkAlignment" id="alignment17">
> + <property name="visible">True</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">1</property>
> + <property name="xscale">1</property>
> + <property name="yscale">0</property>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox15">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label15">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Footer:</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkEntry" id="entry8">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> + </widget>
> + </child>
> + </widget>
> + <packing>
> + <property name="left_attach">0</property>
> + <property name="right_attach">1</property>
> + <property name="top_attach">2</property>
> + <property name="bottom_attach">3</property>
> + <property name="y_options">fill</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkAlignment" id="alignment14">
> + <property name="visible">True</property>
> + <property name="xalign">0</property>
> + <property name="yalign">1</property>
> + <property name="xscale">0</property>
> + <property name="yscale">0</property>
> +
> + <child>
> + <widget class="GtkButton" id="button10">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">_Font...</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + </child>
> + </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="x_options">fill</property>
> + <property name="y_options">fill</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox7">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkToolbar" id="toolbar1">
> + <property name="visible">True</property>
> + <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
> + <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
> + <property name="tooltips">True</property>
> +
> + <child>
> + <placeholder/>
> + </child>
> +
> + <child>
> + <placeholder/>
> + </child>
> +
> + <child>
> + <placeholder/>
> + </child>
> +
> + <child>
> + <placeholder/>
> + </child>
> +
> + <child>
> + <placeholder/>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkCheckButton" id="checkbutton4">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">Reverse on even pages</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="tab_expand">False</property>
> + <property name="tab_fill">True</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkLabel" id="label3">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Header/Footer</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="type">tab</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + </child>
> +</widget>
> +
> </glade-interface>
> Index: composer/ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/evolution/composer/ChangeLog,v
> retrieving revision 1.589
> diff -u -r1.589 ChangeLog
> --- composer/ChangeLog 4 Dec 2003 17:24:22 -0000 1.589
> +++ composer/ChangeLog 20 Dec 2003 01:47:09 -0000
> @@ -1,3 +1,12 @@
> +2003-12-19 William Jon McCann <mccann jhu edu>
> +
> + * e-msg-composer-attachment.glade:
> + * e-msg-composer.c (build_message, get_file_content, save)
> + (autosave_manager_query_load_orphans, do_exit):
> + * e-msg-composer-hdrs.c (account_removed_cb):
> + * e-msg-composer-attachment-bar.c (add_from_file):
> + Remove separator from dialogs per HIG.
> +
> 2003-12-04 Jeffrey Stedfast <fejj ximian com>
>
> * e-msg-composer-hdrs.c (create_headers): Unifdef out the post-to
> Index: composer/e-msg-composer-attachment-bar.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/composer/e-msg-composer-attachment-bar.c,v
> retrieving revision 1.80
> diff -u -r1.80 e-msg-composer-attachment-bar.c
> --- composer/e-msg-composer-attachment-bar.c 24 Sep 2003 20:12:02 -0000 1.80
> +++ composer/e-msg-composer-attachment-bar.c 20 Dec 2003 01:47:10 -0000
> @@ -182,6 +182,7 @@
> GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
> GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
> "%s", camel_exception_get_description (&ex));
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
> gtk_dialog_run(GTK_DIALOG(dialog));
> gtk_widget_destroy(dialog);
> camel_exception_clear (&ex);
> Index: composer/e-msg-composer-attachment.glade
> ===================================================================
> RCS file: /cvs/gnome/evolution/composer/e-msg-composer-attachment.glade,v
> retrieving revision 1.10
> diff -u -r1.10 e-msg-composer-attachment.glade
> --- composer/e-msg-composer-attachment.glade 21 Apr 2003 17:45:52 -0000 1.10
> +++ composer/e-msg-composer-attachment.glade 20 Dec 2003 01:47:11 -0000
> @@ -12,7 +12,7 @@
> <property name="modal">False</property>
> <property name="resizable">True</property>
> <property name="destroy_with_parent">False</property>
> - <property name="has_separator">True</property>
> + <property name="has_separator">False</property>
>
> <child internal-child="vbox">
> <widget class="GtkVBox" id="dialog-vbox1">
> Index: composer/e-msg-composer-hdrs.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/composer/e-msg-composer-hdrs.c,v
> retrieving revision 1.121
> diff -u -r1.121 e-msg-composer-hdrs.c
> --- composer/e-msg-composer-hdrs.c 4 Dec 2003 17:24:23 -0000 1.121
> +++ composer/e-msg-composer-hdrs.c 20 Dec 2003 01:47:14 -0000
> @@ -285,6 +285,7 @@
> GTK_DIALOG_DESTROY_WITH_PARENT,
> GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "%s",
> _("You need to configure an account before you can compose mail."));
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
> }
> }
> }
> Index: composer/e-msg-composer.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/composer/e-msg-composer.c,v
> retrieving revision 1.425
> diff -u -r1.425 e-msg-composer.c
> --- composer/e-msg-composer.c 1 Dec 2003 15:20:49 -0000 1.425
> +++ composer/e-msg-composer.c 20 Dec 2003 01:47:22 -0000
> @@ -749,6 +749,7 @@
> GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
> GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
> "%s", camel_exception_get_description (&ex));
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
> gtk_dialog_run(GTK_DIALOG(dialog));
> gtk_widget_destroy(dialog);
> }
> @@ -787,6 +788,7 @@
> GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
> _("Error while reading file %s:\n%s"),
> file_name, g_strerror (errno));
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
> gtk_dialog_run(GTK_DIALOG(dialog));
> gtk_widget_destroy(dialog);
> }
> @@ -1151,6 +1153,7 @@
> GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
> GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
> _("File exists, overwrite?"));
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
> resp = gtk_dialog_run (GTK_DIALOG (dialog));
> gtk_widget_destroy (dialog);
> if (resp != GTK_RESPONSE_YES) {
> @@ -1162,6 +1165,7 @@
> GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
> GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
> _("Error saving file: %s"), g_strerror (errnosav));
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
> gtk_dialog_run (GTK_DIALOG (dialog));
> gtk_widget_destroy (dialog);
> g_free (filename);
> @@ -1385,6 +1389,7 @@
> GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
> _("Ximian Evolution has found unsaved files from a previous session.\n"
> "Would you like to try to recover them?"));
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
> gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
> load = gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES;
> gtk_widget_destroy (dialog);
> @@ -1557,6 +1562,7 @@
> GTK_STOCK_SAVE, GTK_RESPONSE_YES,
> NULL);
> gtk_window_set_title (GTK_WINDOW (dialog), _("Warning: Modified Message"));
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
> gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
> button = gtk_dialog_run (GTK_DIALOG (dialog));
> gtk_widget_destroy (dialog);
> Index: e-util/ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/evolution/e-util/ChangeLog,v
> retrieving revision 1.427
> diff -u -r1.427 ChangeLog
> --- e-util/ChangeLog 6 Dec 2003 18:15:20 -0000 1.427
> +++ e-util/ChangeLog 20 Dec 2003 01:47:23 -0000
> @@ -1,3 +1,10 @@
> +2003-12-19 William Jon McCann <mccann jhu edu>
> +
> + * e-dialog-utils.c (e_notice, e_notice_with_xid, save_ok):
> + * e-request.c (e_request_string):
> + * e-passwords.c (e_passwords_ask_password):
> + Remove separator from dialogs per HIG.
> +
> 2003-12-06 JP Rosevear <jpr ximian com>
>
> * Makefile.am: Remove hard coded disable deprecated flags
> Index: e-util/e-dialog-utils.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/e-util/e-dialog-utils.c,v
> retrieving revision 1.17
> diff -u -r1.17 e-dialog-utils.c
> --- e-util/e-dialog-utils.c 25 Mar 2003 16:28:33 -0000 1.17
> +++ e-util/e-dialog-utils.c 20 Dec 2003 01:47:24 -0000
> @@ -59,6 +59,7 @@
> GTK_BUTTONS_OK,
> "%s",
> str);
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
> va_end (args);
> g_free (str);
>
> @@ -93,6 +94,7 @@
> GTK_BUTTONS_OK,
> "%s",
> str);
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
> va_end (args);
> g_free (str);
>
> @@ -247,6 +249,7 @@
> _("A file by that name already exists.\n"
> "Overwrite it?"));
> gtk_window_set_title (GTK_WINDOW (dlg), _("Overwrite file?"));
> + gtk_dialog_set_has_separator (GTK_DIALOG (dlg), FALSE);
>
> btn = gtk_dialog_run (GTK_DIALOG (dlg));
> gtk_widget_destroy (dlg);
> Index: e-util/e-passwords.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/e-util/e-passwords.c,v
> retrieving revision 1.17
> diff -u -r1.17 e-passwords.c
> --- e-util/e-passwords.c 6 Apr 2003 00:18:09 -0000 1.17
> +++ e-util/e-passwords.c 20 Dec 2003 01:47:25 -0000
> @@ -334,6 +334,7 @@
>
> gtk_window_set_title (GTK_WINDOW (dialog), title);
>
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
> gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
>
> /* Password entry */
> Index: e-util/e-request.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/e-util/e-request.c,v
> retrieving revision 1.12
> diff -u -r1.12 e-request.c
> --- e-util/e-request.c 5 May 2003 00:56:34 -0000 1.12
> +++ e-util/e-request.c 20 Dec 2003 01:47:25 -0000
> @@ -65,6 +65,7 @@
> GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
> GTK_STOCK_OK, GTK_RESPONSE_OK,
> NULL);
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
> gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
> gtk_window_set_default_size (GTK_WINDOW (dialog), 275, -1);
> gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
> Index: filter/ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/evolution/filter/ChangeLog,v
> retrieving revision 1.383
> diff -u -r1.383 ChangeLog
> --- filter/ChangeLog 6 Dec 2003 18:08:00 -0000 1.383
> +++ filter/ChangeLog 20 Dec 2003 01:47:25 -0000
> @@ -1,3 +1,20 @@
> +2003-12-19 William Jon McCann <mccann jhu edu>
> +
> + * score-rule.c (get_widget):
> + * filter-filter.c (get_widget):
> + * vfolder-rule.c (validate):
> + * rule-editor.c (add_editor_response, rule_add)
> + (edit_editor_response, rule_edit):
> + * rule-context.c (new_rule_response, rule_context_add_rule_gui):
> + * filter-rule.c (validate, get_widget):
> + * filter-part.c (main):
> + * filter-input.c (validate):
> + * filter-folder.c (validate):
> + * filter-file.c (validate):
> + * filter-datespec.c (validate, button_clicked):
> + * filter.glade: Remove separator from dialogs. Use HIG
> + recommended frame style.
> +
> 2003-12-06 JP Rosevear <jpr ximian com>
>
> * */Makefile.am: Remove hard coded disable deprecated flags
> Index: filter/filter-datespec.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/filter/filter-datespec.c,v
> retrieving revision 1.32
> diff -u -r1.32 filter-datespec.c
> --- filter/filter-datespec.c 27 Mar 2003 23:54:16 -0000 1.32
> +++ filter/filter-datespec.c 20 Dec 2003 01:47:26 -0000
> @@ -175,6 +175,7 @@
> GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
> "%s", _("You must choose a date."));
>
> + gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
> gtk_dialog_run ((GtkDialog *) dialog);
> gtk_widget_destroy (dialog);
> }
> @@ -408,6 +409,7 @@
> GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
> GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
> NULL);
> + gtk_dialog_set_has_separator (dialog, FALSE);
>
> p->notebook_type = glade_xml_get_widget (gui, "notebook_type");
> p->option_type = glade_xml_get_widget (gui, "option_type");
> Index: filter/filter-file.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/filter/filter-file.c,v
> retrieving revision 1.17
> diff -u -r1.17 filter-file.c
> --- filter/filter-file.c 9 Jun 2003 18:17:10 -0000 1.17
> +++ filter/filter-file.c 20 Dec 2003 01:47:27 -0000
> @@ -165,6 +165,7 @@
> GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
> "%s", _("You must specify a file name."));
>
> + gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
> gtk_dialog_run ((GtkDialog *) dialog);
> gtk_widget_destroy (dialog);
>
> @@ -184,6 +185,7 @@
> _("File '%s' does not exist or is not a regular file."),
> file->path);
>
> + gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
> gtk_dialog_run ((GtkDialog *) dialog);
> gtk_widget_destroy (dialog);
>
> Index: filter/filter-filter.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/filter/filter-filter.c,v
> retrieving revision 1.26
> diff -u -r1.26 filter-filter.c
> --- filter/filter-filter.c 11 Apr 2003 19:11:50 -0000 1.26
> +++ filter/filter-filter.c 20 Dec 2003 01:47:28 -0000
> @@ -484,11 +484,17 @@
> struct _rule_data *data;
> FilterFilter *ff = (FilterFilter *)fr;
> int rows, i = 0;
> + char *text;
>
> widget = FILTER_RULE_CLASS (parent_class)->get_widget (fr, rc);
>
> /* and now for the action area */
> - frame = gtk_frame_new (_("Then"));
> + text = g_strdup_printf ("<b>%s</b>", _("Then"));
> + frame = gtk_frame_new (text);
> + g_free (text);
> + gtk_label_set_use_markup (GTK_LABEL (gtk_frame_get_label_widget (GTK_FRAME (frame))),
> + TRUE);
> + gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
> inframe = gtk_vbox_new (FALSE, 3);
> gtk_container_add (GTK_CONTAINER (frame), inframe);
> gtk_container_set_border_width (GTK_CONTAINER (inframe), 6);
> Index: filter/filter-folder.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/filter/filter-folder.c,v
> retrieving revision 1.37
> diff -u -r1.37 filter-folder.c
> --- filter/filter-folder.c 21 Oct 2003 18:51:23 -0000 1.37
> +++ filter/filter-folder.c 20 Dec 2003 01:47:28 -0000
> @@ -151,7 +151,8 @@
> dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT,
> GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
> "%s", _("You must specify a folder."));
> -
> +
> + gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
> gtk_dialog_run ((GtkDialog *) dialog);
> gtk_widget_destroy (dialog);
>
> Index: filter/filter-input.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/filter/filter-input.c,v
> retrieving revision 1.27
> diff -u -r1.27 filter-input.c
> --- filter/filter-input.c 26 Nov 2002 11:25:51 -0000 1.27
> +++ filter/filter-input.c 20 Dec 2003 01:47:29 -0000
> @@ -191,6 +191,7 @@
> _("Error in regular expression '%s':\n%s"),
> pattern, regmsg);
>
> + gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
> gtk_dialog_run ((GtkDialog *) dialog);
> gtk_widget_destroy (dialog);
> g_free (regmsg);
> Index: filter/filter-part.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/filter/filter-part.c,v
> retrieving revision 1.25
> diff -u -r1.25 filter-part.c
> --- filter/filter-part.c 2 Jan 2003 18:33:06 -0000 1.25
> +++ filter/filter-part.c 20 Dec 2003 01:47:29 -0000
> @@ -528,6 +528,7 @@
>
> dialog = gtk_dialog_new ();
> gtk_dialog_add_buttons ((GtkDialog *) dialog, GTK_BUTTONS_OK, NULL);
> + gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
> gtk_window_set_title ((GtkWindow *) dialog, _("Test"));
> gtk_window_set_policy ((GtkWindow *) dialog, FALSE, TRUE, FALSE);
> gtk_box_pack_start ((GtkBox *) dialog->vbox, w, TRUE, TRUE, 0);
> Index: filter/filter-rule.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/filter/filter-rule.c,v
> retrieving revision 1.57
> diff -u -r1.57 filter-rule.c
> --- filter/filter-rule.c 11 Apr 2003 19:11:50 -0000 1.57
> +++ filter/filter-rule.c 20 Dec 2003 01:47:31 -0000
> @@ -218,6 +218,7 @@
> GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
> "%s", _("You must name this filter."));
>
> + gtk_dialog_set_has_separators ((GtkDialog *) dialog, FALSE);
> gtk_dialog_run ((GtkDialog *) dialog);
> gtk_widget_destroy (dialog);
>
> @@ -743,6 +744,7 @@
> FilterPart *part;
> struct _rule_data *data;
> int rows, i = 0;
> + char *text;
>
> /* this stuff should probably be a table, but the
> rule parts need to be a vbox */
> @@ -768,8 +770,13 @@
> gtk_box_pack_start (GTK_BOX (hbox), name, TRUE, TRUE, 0);
> gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
> g_signal_connect (name, "changed", G_CALLBACK (name_changed), fr);
> -
> - frame = gtk_frame_new (_("If"));
> +
> + text = g_strdup_printf ("<b>%s</b>", _("If"));
> + frame = gtk_frame_new (text);
> + g_free (text);
> + gtk_label_set_use_markup (GTK_LABEL (gtk_frame_get_label_widget (GTK_FRAME (frame))),
> + TRUE);
> + gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
> inframe = gtk_vbox_new (FALSE, 3);
> gtk_container_add (GTK_CONTAINER (frame), inframe);
> gtk_container_set_border_width (GTK_CONTAINER (inframe), 6);
> Index: filter/filter.glade
> ===================================================================
> RCS file: /cvs/gnome/evolution/filter/filter.glade,v
> retrieving revision 1.19
> diff -u -r1.19 filter.glade
> --- filter/filter.glade 22 Oct 2003 19:26:40 -0000 1.19
> +++ filter/filter.glade 20 Dec 2003 01:47:34 -0000
> @@ -2,6 +2,7 @@
> <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
>
> <glade-interface>
> +<requires lib="gnome"/>
>
> <widget class="GtkDialog" id="filter-editor">
> <property name="border_width">6</property>
> @@ -12,7 +13,7 @@
> <property name="modal">False</property>
> <property name="resizable">True</property>
> <property name="destroy_with_parent">False</property>
> - <property name="has_separator">True</property>
> + <property name="has_separator">False</property>
>
> <child internal-child="vbox">
> <widget class="GtkVBox" id="dialog-vbox1">
> @@ -93,109 +94,163 @@
> </child>
>
> <child>
> - <widget class="GtkFrame" id="frame1">
> + <widget class="GtkVBox" id="vbox10">
> <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkHBox" id="hbox1">
> - <property name="border_width">6</property>
> + <widget class="GtkLabel" id="label9">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"><b>Filter Rules</b></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">True</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox7">
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">6</property>
> + <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkScrolledWindow" id="scrolledwindow1">
> + <widget class="GtkLabel" id="label10">
> <property name="visible">True</property>
> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
> - <property name="shadow_type">GTK_SHADOW_NONE</property>
> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
> -
> - <child>
> - <widget class="Custom" id="rule_list">
> - <property name="visible">True</property>
> - <property name="creation_function">rule_editor_treeview_new</property>
> - <property name="int1">0</property>
> - <property name="int2">0</property>
> - <property name="last_modification_time">Thu, 12 Dec 2002 23:41:46 GMT</property>
> - </widget>
> - </child>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">True</property>
> - <property name="fill">True</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
>
> <child>
> - <widget class="GtkVBox" id="vbox1">
> + <widget class="GtkHBox" id="hbox1">
> + <property name="border_width">6</property>
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">0</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkVButtonBox" id="vbuttonbox1">
> + <widget class="GtkScrolledWindow" id="scrolledwindow1">
> <property name="visible">True</property>
> - <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
> - <property name="spacing">6</property>
> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
> + <property name="shadow_type">GTK_SHADOW_NONE</property>
> + <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
>
> <child>
> - <widget class="GtkButton" id="rule_add">
> + <widget class="Custom" id="rule_list">
> <property name="visible">True</property>
> - <property name="can_default">True</property>
> - <property name="can_focus">True</property>
> - <property name="label">gtk-add</property>
> - <property name="use_stock">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="creation_function">rule_editor_treeview_new</property>
> + <property name="int1">0</property>
> + <property name="int2">0</property>
> + <property name="last_modification_time">Thu, 12 Dec 2002 23:41:46 GMT</property>
> </widget>
> </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
>
> - <child>
> - <widget class="GtkButton" id="rule_edit">
> - <property name="visible">True</property>
> - <property name="can_default">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">_Edit</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - </widget>
> - </child>
> + <child>
> + <widget class="GtkVBox" id="vbox1">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkButton" id="rule_delete">
> + <widget class="GtkVButtonBox" id="vbuttonbox1">
> <property name="visible">True</property>
> - <property name="can_default">True</property>
> - <property name="can_focus">True</property>
> - <property name="label">gtk-remove</property>
> - <property name="use_stock">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - </widget>
> - </child>
> + <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
> + <property name="spacing">6</property>
>
> - <child>
> - <widget class="GtkButton" id="rule_up">
> - <property name="visible">True</property>
> - <property name="can_default">True</property>
> - <property name="can_focus">True</property>
> - <property name="label">gtk-go-up</property>
> - <property name="use_stock">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - </widget>
> - </child>
> + <child>
> + <widget class="GtkButton" id="rule_add">
> + <property name="visible">True</property>
> + <property name="can_default">True</property>
> + <property name="can_focus">True</property>
> + <property name="label">gtk-add</property>
> + <property name="use_stock">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + </child>
>
> - <child>
> - <widget class="GtkButton" id="rule_down">
> - <property name="visible">True</property>
> - <property name="can_default">True</property>
> - <property name="can_focus">True</property>
> - <property name="label">gtk-go-down</property>
> - <property name="use_stock">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> + <child>
> + <widget class="GtkButton" id="rule_edit">
> + <property name="visible">True</property>
> + <property name="can_default">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">_Edit</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkButton" id="rule_delete">
> + <property name="visible">True</property>
> + <property name="can_default">True</property>
> + <property name="can_focus">True</property>
> + <property name="label">gtk-remove</property>
> + <property name="use_stock">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkButton" id="rule_up">
> + <property name="visible">True</property>
> + <property name="can_default">True</property>
> + <property name="can_focus">True</property>
> + <property name="label">gtk-go-up</property>
> + <property name="use_stock">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkButton" id="rule_down">
> + <property name="visible">True</property>
> + <property name="can_default">True</property>
> + <property name="can_focus">True</property>
> + <property name="label">gtk-go-down</property>
> + <property name="use_stock">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + </child>
> </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> </child>
> </widget>
> <packing>
> @@ -207,34 +262,20 @@
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label1">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Filter Rules</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.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> <packing>
> - <property name="padding">0</property>
> + <property name="padding">3</property>
> <property name="expand">True</property>
> <property name="fill">True</property>
> </packing>
> @@ -252,7 +293,7 @@
> <property name="modal">False</property>
> <property name="resizable">True</property>
> <property name="destroy_with_parent">False</property>
> - <property name="has_separator">True</property>
> + <property name="has_separator">False</property>
>
> <child internal-child="vbox">
> <widget class="GtkVBox" id="dialog-vbox2">
> @@ -298,109 +339,163 @@
> </child>
>
> <child>
> - <widget class="GtkFrame" id="frame2">
> + <widget class="GtkVBox" id="vbox11">
> <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkHBox" id="hbox2">
> - <property name="border_width">6</property>
> + <widget class="GtkLabel" id="label11">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"><b>Virtual Folders</b></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">True</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox8">
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">6</property>
> + <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkScrolledWindow" id="scrolledwindow2">
> + <widget class="GtkLabel" id="label12">
> <property name="visible">True</property>
> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
> - <property name="shadow_type">GTK_SHADOW_NONE</property>
> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
> -
> - <child>
> - <widget class="Custom" id="rule_list">
> - <property name="visible">True</property>
> - <property name="creation_function">rule_editor_treeview_new</property>
> - <property name="int1">0</property>
> - <property name="int2">0</property>
> - <property name="last_modification_time">Fri, 13 Dec 2002 00:15:04 GMT</property>
> - </widget>
> - </child>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">True</property>
> - <property name="fill">True</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
>
> <child>
> - <widget class="GtkVBox" id="vbox2">
> + <widget class="GtkHBox" id="hbox2">
> + <property name="border_width">6</property>
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">0</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkVButtonBox" id="vbuttonbox2">
> + <widget class="GtkScrolledWindow" id="scrolledwindow2">
> <property name="visible">True</property>
> - <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
> - <property name="spacing">6</property>
> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
> + <property name="shadow_type">GTK_SHADOW_NONE</property>
> + <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
>
> <child>
> - <widget class="GtkButton" id="rule_add">
> + <widget class="Custom" id="rule_list">
> <property name="visible">True</property>
> - <property name="can_default">True</property>
> - <property name="can_focus">True</property>
> - <property name="label">gtk-add</property>
> - <property name="use_stock">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="creation_function">rule_editor_treeview_new</property>
> + <property name="int1">0</property>
> + <property name="int2">0</property>
> + <property name="last_modification_time">Fri, 13 Dec 2002 00:15:04 GMT</property>
> </widget>
> </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
>
> - <child>
> - <widget class="GtkButton" id="rule_edit">
> - <property name="visible">True</property>
> - <property name="can_default">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">_Edit</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - </widget>
> - </child>
> + <child>
> + <widget class="GtkVBox" id="vbox2">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkButton" id="rule_delete">
> + <widget class="GtkVButtonBox" id="vbuttonbox2">
> <property name="visible">True</property>
> - <property name="can_default">True</property>
> - <property name="can_focus">True</property>
> - <property name="label">gtk-remove</property>
> - <property name="use_stock">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - </widget>
> - </child>
> + <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
> + <property name="spacing">6</property>
>
> - <child>
> - <widget class="GtkButton" id="rule_up">
> - <property name="visible">True</property>
> - <property name="can_default">True</property>
> - <property name="can_focus">True</property>
> - <property name="label">gtk-go-up</property>
> - <property name="use_stock">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - </widget>
> - </child>
> + <child>
> + <widget class="GtkButton" id="rule_add">
> + <property name="visible">True</property>
> + <property name="can_default">True</property>
> + <property name="can_focus">True</property>
> + <property name="label">gtk-add</property>
> + <property name="use_stock">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + </child>
>
> - <child>
> - <widget class="GtkButton" id="rule_down">
> - <property name="visible">True</property>
> - <property name="can_default">True</property>
> - <property name="can_focus">True</property>
> - <property name="label">gtk-go-down</property>
> - <property name="use_stock">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> + <child>
> + <widget class="GtkButton" id="rule_edit">
> + <property name="visible">True</property>
> + <property name="can_default">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">_Edit</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkButton" id="rule_delete">
> + <property name="visible">True</property>
> + <property name="can_default">True</property>
> + <property name="can_focus">True</property>
> + <property name="label">gtk-remove</property>
> + <property name="use_stock">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkButton" id="rule_up">
> + <property name="visible">True</property>
> + <property name="can_default">True</property>
> + <property name="can_focus">True</property>
> + <property name="label">gtk-go-up</property>
> + <property name="use_stock">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkButton" id="rule_down">
> + <property name="visible">True</property>
> + <property name="can_default">True</property>
> + <property name="can_focus">True</property>
> + <property name="label">gtk-go-down</property>
> + <property name="use_stock">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + </child>
> </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> </child>
> </widget>
> <packing>
> @@ -412,34 +507,20 @@
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label2">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Virtual Folders</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.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> <packing>
> - <property name="padding">0</property>
> + <property name="padding">3</property>
> <property name="expand">True</property>
> <property name="fill">True</property>
> </packing>
> @@ -457,13 +538,13 @@
> <property name="modal">False</property>
> <property name="resizable">True</property>
> <property name="destroy_with_parent">False</property>
> - <property name="has_separator">True</property>
> + <property name="has_separator">False</property>
>
> <child internal-child="vbox">
> <widget class="GtkVBox" id="dialog-vbox3">
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">8</property>
> + <property name="spacing">6</property>
>
> <child internal-child="action_area">
> <widget class="GtkHButtonBox" id="dialog-action_area3">
> @@ -515,62 +596,51 @@
> </child>
>
> <child>
> - <widget class="GtkFrame" id="vfolder_source_frame">
> + <widget class="GtkVBox" id="vbox12">
> <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkVBox" id="vbox3">
> - <property name="border_width">6</property>
> + <widget class="GtkLabel" id="label13">
> <property name="visible">True</property>
> - <property name="homogeneous">False</property>
> - <property name="spacing">6</property>
> -
> - <child>
> - <widget class="GtkOptionMenu" id="source_option">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="history">0</property>
> -
> - <child internal-child="menu">
> - <widget class="GtkMenu" id="convertwidget8">
> - <property name="visible">True</property>
> -
> - <child>
> - <widget class="GtkMenuItem" id="convertwidget9">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">specific folders only</property>
> - <property name="use_underline">True</property>
> - </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkMenuItem" id="convertwidget10">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">with all local folders</property>
> - <property name="use_underline">True</property>
> - </widget>
> - </child>
> + <property name="label" translatable="yes"><b>vFolder Sources</b></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">True</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
>
> - <child>
> - <widget class="GtkMenuItem" id="convertwidget11">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">with all active remote folders</property>
> - <property name="use_underline">True</property>
> - </widget>
> - </child>
> + <child>
> + <widget class="GtkHBox" id="hbox9">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
>
> - <child>
> - <widget class="GtkMenuItem" id="convertwidget12">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">with all local and active remote folders</property>
> - <property name="use_underline">True</property>
> - </widget>
> - </child>
> - </widget>
> - </child>
> + <child>
> + <widget class="GtkLabel" id="label14">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> </widget>
> <packing>
> <property name="padding">0</property>
> @@ -580,68 +650,133 @@
> </child>
>
> <child>
> - <widget class="GtkHBox" id="hbox3">
> + <widget class="GtkVBox" id="vbox3">
> + <property name="border_width">6</property>
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkScrolledWindow" id="scrolledwindow3">
> + <widget class="GtkOptionMenu" id="source_option">
> <property name="visible">True</property>
> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
> - <property name="shadow_type">GTK_SHADOW_NONE</property>
> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
> + <property name="can_focus">True</property>
> + <property name="history">0</property>
> +
> + <child internal-child="menu">
> + <widget class="GtkMenu" id="convertwidget8">
> + <property name="visible">True</property>
>
> <child>
> - <widget class="Custom" id="source_list">
> + <widget class="GtkMenuItem" id="convertwidget9">
> <property name="visible">True</property>
> - <property name="creation_function">vfolder_editor_sourcelist_new</property>
> - <property name="int1">0</property>
> - <property name="int2">0</property>
> - <property name="last_modification_time">Fri, 13 Dec 2002 00:22:39 GMT</property>
> + <property name="label" translatable="yes">specific folders only</property>
> + <property name="use_underline">True</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkMenuItem" id="convertwidget10">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">with all local folders</property>
> + <property name="use_underline">True</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkMenuItem" id="convertwidget11">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">with all active remote folders</property>
> + <property name="use_underline">True</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkMenuItem" id="convertwidget12">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">with all local and active remote folders</property>
> + <property name="use_underline">True</property>
> </widget>
> </child>
> + </widget>
> + </child>
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">True</property>
> - <property name="fill">True</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
>
> <child>
> - <widget class="GtkVBox" id="vbox3">
> + <widget class="GtkHBox" id="hbox3">
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">1</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkVButtonBox" id="vbuttonbox3">
> + <widget class="GtkScrolledWindow" id="scrolledwindow3">
> <property name="visible">True</property>
> - <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
> - <property name="spacing">6</property>
> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
> + <property name="shadow_type">GTK_SHADOW_NONE</property>
> + <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
>
> <child>
> - <widget class="GtkButton" id="source_add">
> + <widget class="Custom" id="source_list">
> <property name="visible">True</property>
> - <property name="can_default">True</property>
> - <property name="can_focus">True</property>
> - <property name="label">gtk-add</property>
> - <property name="use_stock">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="creation_function">vfolder_editor_sourcelist_new</property>
> + <property name="int1">0</property>
> + <property name="int2">0</property>
> + <property name="last_modification_time">Fri, 13 Dec 2002 00:22:39 GMT</property>
> </widget>
> </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox3">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">1</property>
>
> <child>
> - <widget class="GtkButton" id="source_remove">
> + <widget class="GtkVButtonBox" id="vbuttonbox3">
> <property name="visible">True</property>
> - <property name="can_default">True</property>
> - <property name="can_focus">True</property>
> - <property name="label">gtk-remove</property>
> - <property name="use_stock">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
> + <property name="spacing">6</property>
> +
> + <child>
> + <widget class="GtkButton" id="source_add">
> + <property name="visible">True</property>
> + <property name="can_default">True</property>
> + <property name="can_focus">True</property>
> + <property name="label">gtk-add</property>
> + <property name="use_stock">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkButton" id="source_remove">
> + <property name="visible">True</property>
> + <property name="can_default">True</property>
> + <property name="can_focus">True</property>
> + <property name="label">gtk-remove</property>
> + <property name="use_stock">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + </child>
> </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> </child>
> </widget>
> <packing>
> @@ -653,8 +788,8 @@
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> @@ -665,29 +800,15 @@
> </packing>
> </child>
> </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label3">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">vFolder Sources</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.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> <packing>
> - <property name="padding">0</property>
> + <property name="padding">3</property>
> <property name="expand">True</property>
> <property name="fill">True</property>
> </packing>
> @@ -739,109 +860,163 @@
> </child>
>
> <child>
> - <widget class="GtkFrame" id="rule_frame">
> + <widget class="GtkVBox" id="rule_frame">
> <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label15">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"><b>Filter Rules</b></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">True</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
>
> <child>
> - <widget class="GtkHBox" id="hbox4">
> - <property name="border_width">6</property>
> + <widget class="GtkHBox" id="hbox10">
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">6</property>
> + <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkScrolledWindow" id="scrolledwindow4">
> + <widget class="GtkLabel" id="label16">
> <property name="visible">True</property>
> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
> - <property name="shadow_type">GTK_SHADOW_NONE</property>
> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
> -
> - <child>
> - <widget class="Custom" id="rule_list">
> - <property name="visible">True</property>
> - <property name="creation_function">rule_editor_treeview_new</property>
> - <property name="int1">0</property>
> - <property name="int2">0</property>
> - <property name="last_modification_time">Thu, 12 Dec 2002 23:50:05 GMT</property>
> - </widget>
> - </child>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">True</property>
> - <property name="fill">True</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
>
> <child>
> - <widget class="GtkVBox" id="vbox5">
> + <widget class="GtkHBox" id="hbox4">
> + <property name="border_width">6</property>
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">0</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkVButtonBox" id="vbuttonbox4">
> + <widget class="GtkScrolledWindow" id="scrolledwindow4">
> <property name="visible">True</property>
> - <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
> - <property name="spacing">6</property>
> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
> + <property name="shadow_type">GTK_SHADOW_NONE</property>
> + <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
>
> <child>
> - <widget class="GtkButton" id="rule_add">
> + <widget class="Custom" id="rule_list">
> <property name="visible">True</property>
> - <property name="can_default">True</property>
> - <property name="can_focus">True</property>
> - <property name="label">gtk-add</property>
> - <property name="use_stock">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="creation_function">rule_editor_treeview_new</property>
> + <property name="int1">0</property>
> + <property name="int2">0</property>
> + <property name="last_modification_time">Thu, 12 Dec 2002 23:50:05 GMT</property>
> </widget>
> </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
>
> - <child>
> - <widget class="GtkButton" id="rule_edit">
> - <property name="visible">True</property>
> - <property name="can_default">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">_Edit</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - </widget>
> - </child>
> + <child>
> + <widget class="GtkVBox" id="vbox5">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkButton" id="rule_delete">
> + <widget class="GtkVButtonBox" id="vbuttonbox4">
> <property name="visible">True</property>
> - <property name="can_default">True</property>
> - <property name="can_focus">True</property>
> - <property name="label">gtk-remove</property>
> - <property name="use_stock">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - </widget>
> - </child>
> + <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
> + <property name="spacing">6</property>
>
> - <child>
> - <widget class="GtkButton" id="rule_up">
> - <property name="visible">True</property>
> - <property name="can_default">True</property>
> - <property name="can_focus">True</property>
> - <property name="label">gtk-go-up</property>
> - <property name="use_stock">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - </widget>
> - </child>
> + <child>
> + <widget class="GtkButton" id="rule_add">
> + <property name="visible">True</property>
> + <property name="can_default">True</property>
> + <property name="can_focus">True</property>
> + <property name="label">gtk-add</property>
> + <property name="use_stock">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + </child>
>
> - <child>
> - <widget class="GtkButton" id="rule_down">
> - <property name="visible">True</property>
> - <property name="can_default">True</property>
> - <property name="can_focus">True</property>
> - <property name="label">gtk-go-down</property>
> - <property name="use_stock">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> + <child>
> + <widget class="GtkButton" id="rule_edit">
> + <property name="visible">True</property>
> + <property name="can_default">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">_Edit</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkButton" id="rule_delete">
> + <property name="visible">True</property>
> + <property name="can_default">True</property>
> + <property name="can_focus">True</property>
> + <property name="label">gtk-remove</property>
> + <property name="use_stock">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkButton" id="rule_up">
> + <property name="visible">True</property>
> + <property name="can_default">True</property>
> + <property name="can_focus">True</property>
> + <property name="label">gtk-go-up</property>
> + <property name="use_stock">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkButton" id="rule_down">
> + <property name="visible">True</property>
> + <property name="can_default">True</property>
> + <property name="can_focus">True</property>
> + <property name="label">gtk-go-down</property>
> + <property name="use_stock">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + </child>
> </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> </child>
> </widget>
> <packing>
> @@ -853,34 +1028,20 @@
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label4">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Filter Rules</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.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> <packing>
> - <property name="padding">0</property>
> + <property name="padding">3</property>
> <property name="expand">True</property>
> <property name="fill">True</property>
> </packing>
> Index: filter/rule-context.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/filter/rule-context.c,v
> retrieving revision 1.51
> diff -u -r1.51 rule-context.c
> --- filter/rule-context.c 16 Sep 2003 21:15:38 -0000 1.51
> +++ filter/rule-context.c 20 Dec 2003 01:47:35 -0000
> @@ -684,6 +684,7 @@
> _("Rule name '%s' is not unique, choose another."),
> rule->name);
>
> + gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
> gtk_dialog_run ((GtkDialog *) dialog);
> gtk_widget_destroy (dialog);
>
> @@ -719,6 +720,7 @@
> GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
> GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
> NULL);
> + gtk_dialog_set_has_separator (dialog, FALSE);
>
> gtk_window_set_title((GtkWindow *) dialog, title);
> gtk_window_set_default_size((GtkWindow *) dialog, 600, 400);
> Index: filter/rule-editor.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/filter/rule-editor.c,v
> retrieving revision 1.55
> diff -u -r1.55 rule-editor.c
> --- filter/rule-editor.c 22 Oct 2003 19:26:40 -0000 1.55
> +++ filter/rule-editor.c 20 Dec 2003 01:47:36 -0000
> @@ -241,6 +241,7 @@
> _("Rule name '%s' is not unique, choose another."),
> re->edit->name);
>
> + gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
> gtk_dialog_run ((GtkDialog *) dialog);
> gtk_widget_destroy (dialog);
>
> @@ -287,6 +288,7 @@
> GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
> GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
> NULL);
> + gtk_dialog_set_has_separator ((GtkDialog *) re->dialog, FALSE);
>
> gtk_window_set_title ((GtkWindow *) re->dialog, _("Add Rule"));
> gtk_window_set_default_size (GTK_WINDOW (re->dialog), 650, 400);
> @@ -326,6 +328,7 @@
> _("Rule name '%s' is not unique, choose another."),
> re->edit->name);
>
> + gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
> gtk_dialog_run ((GtkDialog *) dialog);
> gtk_widget_destroy (dialog);
>
> @@ -369,6 +372,7 @@
> GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
> GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
> NULL);
> + gtk_dialog_set_has_separator ((GtkDialog *) re->dialog, FALSE);
>
> gtk_window_set_title ((GtkWindow *) re->dialog, _("Edit Rule"));
> gtk_window_set_default_size (GTK_WINDOW (re->dialog), 650, 400);
> Index: filter/score-rule.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/filter/score-rule.c,v
> retrieving revision 1.11
> diff -u -r1.11 score-rule.c
> --- filter/score-rule.c 26 Nov 2002 11:25:51 -0000 1.11
> +++ filter/score-rule.c 20 Dec 2003 01:47:37 -0000
> @@ -178,10 +178,17 @@
> GtkAdjustment *adj;
> ScoreRule *sr = (ScoreRule *)fr;
> GtkWidget *spin;
> + char *text;
>
> widget = FILTER_RULE_CLASS (parent_class)->get_widget (fr, f);
>
> - frame = gtk_frame_new (_("Score"));
> + text = g_strdup_printf ("<b>%s</b>", _("Score"));
> + frame = gtk_frame_new (text);
> + g_free (text);
> + gtk_label_set_use_markup (GTK_LABEL (gtk_frame_get_label_widget (GTK_FRAME (frame))),
> + TRUE);
> + gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
> +
> hbox = gtk_hbox_new (FALSE, 3);
> label = gtk_label_new (_("Score"));
>
> Index: filter/vfolder-rule.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/filter/vfolder-rule.c,v
> retrieving revision 1.40
> diff -u -r1.40 vfolder-rule.c
> --- filter/vfolder-rule.c 17 Nov 2003 05:58:21 -0000 1.40
> +++ filter/vfolder-rule.c 20 Dec 2003 01:47:38 -0000
> @@ -208,6 +208,7 @@
> GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
> "%s", _("You must name this vfolder."));
>
> + gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
> gtk_dialog_run ((GtkDialog *) dialog);
> gtk_widget_destroy (dialog);
>
> @@ -222,6 +223,7 @@
> GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
> "%s", _("You need to to specify at least one folder as a source."));
>
> + gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
> gtk_dialog_run ((GtkDialog *) dialog);
> gtk_widget_destroy (dialog);
>
> Index: mail/ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
> retrieving revision 1.2963
> diff -u -r1.2963 ChangeLog
> --- mail/ChangeLog 18 Dec 2003 19:13:32 -0000 1.2963
> +++ mail/ChangeLog 20 Dec 2003 01:47:45 -0000
> @@ -1,3 +1,32 @@
> +2003-12-19 William Jon McCann <mccann jhu edu>
> +
> + * em-folder-selector.c (em_folder_selector_construct):
> + * mail-account-editor.c (construct):
> + * mail-vfolder.c (mail_vfolder_delete_uri, vfolder_edit_rule)
> + (new_rule_clicked, vfolder_gui_add_rule):
> + * mail-signature-editor.c (do_exit):
> + * mail-session.c (request_password, do_user_message):
> + * mail-send-recv.c (build_dialogue):
> + * mail-mt.c (mail_msg_check_error):
> + * mail-config.c (mail_config_check_service):
> + * mail-component.c (mail_component_init):
> + * mail-autofilter.c (mail_filter_delete_uri):
> + * em-utils.c (em_utils_prompt_user):
> + * em-folder-tree.c (emft_popup_copy_folder_selected)
> + (em_folder_tree_create_folder, emft_popup_delete_folder)
> + (emft_popup_properties_got_folder):
> + * em-composer-prefs.c (sig_add_script_response)
> + (em_composer_prefs_construct):
> + * em-account-prefs.c (account_delete_clicked):
> + * mail-account-gui.c (mail_account_gui_build_extra_conf):
> + * local-config.glade:
> + * mail-config.glade:
> + * mail-search.glade:
> + * mail-security.glade:
> + * message-tags.glade:
> + * subscribe-dialog.glade:
> + Remove separator from dialogs. Changed frame style per HIG.
> +
> 2003-12-18 Rodney Dawes <dobey ximian com>
>
> * em-message-browser.c (emmb_init): Merge in
> Index: mail/em-account-prefs.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/em-account-prefs.c,v
> retrieving revision 1.2
> diff -u -r1.2 em-account-prefs.c
> --- mail/em-account-prefs.c 13 Nov 2003 22:33:02 -0000 1.2
> +++ mail/em-account-prefs.c 20 Dec 2003 01:47:47 -0000
> @@ -231,6 +231,7 @@
> GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
> GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
> _("Are you sure you want to delete this account?"));
> + gtk_dialog_set_has_separator (GTK_DIALOG (confirm), FALSE);
>
> button = (GtkButton *) gtk_button_new_from_stock (GTK_STOCK_YES);
> gtk_button_set_label (button, _("Delete"));
> Index: mail/em-composer-prefs.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/em-composer-prefs.c,v
> retrieving revision 1.1
> diff -u -r1.1 em-composer-prefs.c
> --- mail/em-composer-prefs.c 24 Oct 2003 19:31:22 -0000 1.1
> +++ mail/em-composer-prefs.c 20 Dec 2003 01:47:48 -0000
> @@ -332,6 +332,7 @@
> GTK_DIALOG_DESTROY_WITH_PARENT,
> GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
> "%s", _("You must specify a valid script name."));
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
>
> gtk_dialog_run ((GtkDialog *) dialog);
> gtk_widget_destroy (dialog);
> @@ -894,6 +895,7 @@
>
> /* Signatures */
> dialog = (GtkDialog *) gtk_dialog_new ();
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
> prefs->sig_script_dialog = (GtkWidget *) dialog;
> gtk_dialog_add_buttons (dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
> GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
> Index: mail/em-folder-selector.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/em-folder-selector.c,v
> retrieving revision 1.9
> diff -u -r1.9 em-folder-selector.c
> --- mail/em-folder-selector.c 4 Dec 2003 20:04:43 -0000 1.9
> +++ mail/em-folder-selector.c 20 Dec 2003 01:47:49 -0000
> @@ -200,6 +200,7 @@
>
> gtk_dialog_set_response_sensitive (GTK_DIALOG (emfs), GTK_RESPONSE_OK, FALSE);
> gtk_dialog_set_default_response (GTK_DIALOG (emfs), GTK_RESPONSE_OK);
> + gtk_dialog_set_has_separator (GTK_DIALOG (emfs), FALSE);
>
> emfs->emft = emft;
> gtk_widget_show ((GtkWidget *) emft);
> Index: mail/em-folder-tree.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/em-folder-tree.c,v
> retrieving revision 1.43
> diff -u -r1.43 em-folder-tree.c
> --- mail/em-folder-tree.c 15 Dec 2003 00:09:47 -0000 1.43
> +++ mail/em-folder-tree.c 20 Dec 2003 01:47:52 -0000
> @@ -967,6 +967,7 @@
>
> dialog = gtk_message_dialog_new ((GtkWindow *) cfd->emft, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
> GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("%s"), ex.desc);
> + gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
> g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog);
> camel_exception_clear (&ex);
> gtk_widget_show (dialog);
> @@ -1054,6 +1055,7 @@
>
> dialog = gtk_message_dialog_new ((GtkWindow *) emft, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
> GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("%s"), ex.desc);
> + gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
> g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog);
> camel_exception_clear (&ex);
> g_free (namebuf);
> @@ -1206,6 +1208,7 @@
> gtk_dialog_add_button ((GtkDialog *) dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
> gtk_dialog_add_button ((GtkDialog *) dialog, GTK_STOCK_DELETE, GTK_RESPONSE_OK);
>
> + gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
> gtk_dialog_set_default_response ((GtkDialog *) dialog, GTK_RESPONSE_OK);
> gtk_container_set_border_width ((GtkContainer *) dialog, 6);
> gtk_box_set_spacing ((GtkBox *) ((GtkDialog *) dialog)->vbox, 6);
> @@ -1360,7 +1363,7 @@
> CamelArgV *argv;
> GSList *list, *l;
> gint32 count, i;
> - char *name;
> + char *name, *text;
> int row = 1;
>
> if (folder == NULL)
> @@ -1372,9 +1375,15 @@
> GTK_DIALOG_DESTROY_WITH_PARENT,
> GTK_STOCK_OK, GTK_RESPONSE_OK,
> NULL);
> + gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
>
> /* TODO: maybe we want some basic properties here, like message counts/approximate size/etc */
> - w = gtk_frame_new (_("Properties"));
> + text = g_strdup_printf ("<b>%s</b>", _("Properties"));
> + w = gtk_frame_new (text);
> + g_free (text);
> + gtk_label_set_use_markup ((GtkLabel *) gtk_frame_get_label_widget ((GtkFrame *) w),
> + TRUE);
> + gtk_frame_set_shadow_type ((GtkFrame *) w, GTK_SHADOW_NONE);
> gtk_widget_show (w);
> gtk_box_pack_start ((GtkBox *) ((GtkDialog *) dialog)->vbox, w, TRUE, TRUE, 6);
>
> Index: mail/em-utils.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/em-utils.c,v
> retrieving revision 1.10
> diff -u -r1.10 em-utils.c
> --- mail/em-utils.c 3 Dec 2003 00:27:52 -0000 1.10
> +++ mail/em-utils.c 20 Dec 2003 01:47:56 -0000
> @@ -88,6 +88,7 @@
> GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
> "%s", str);
> g_free (str);
> + gtk_dialog_set_has_separator ((GtkDialog *) mbox, FALSE);
> gtk_dialog_set_default_response ((GtkDialog *) mbox, def);
> if (promptkey) {
> check = gtk_check_button_new_with_label (_("Don't show this message again."));
> Index: mail/local-config.glade
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/local-config.glade,v
> retrieving revision 1.10
> diff -u -r1.10 local-config.glade
> --- mail/local-config.glade 15 Apr 2003 17:29:17 -0000 1.10
> +++ mail/local-config.glade 20 Dec 2003 01:47:56 -0000
> @@ -2,6 +2,7 @@
> <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
>
> <glade-interface>
> +<requires lib="gnome"/>
>
> <widget class="GtkDialog" id="dialog_format">
> <property name="border_width">6</property>
> @@ -12,7 +13,7 @@
> <property name="modal">False</property>
> <property name="resizable">True</property>
> <property name="destroy_with_parent">False</property>
> - <property name="has_separator">True</property>
> + <property name="has_separator">False</property>
>
> <child internal-child="vbox">
> <widget class="GtkVBox" id="dialog-vbox1">
> @@ -121,14 +122,7 @@
> </child>
>
> <child>
> - <widget class="GtkHSeparator" id="hseparator1">
> - <property name="visible">True</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">True</property>
> - <property name="fill">True</property>
> - </packing>
> + <placeholder/>
> </child>
>
> <child>
> Index: mail/mail-account-editor.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/mail-account-editor.c,v
> retrieving revision 1.59
> diff -u -r1.59 mail-account-editor.c
> --- mail/mail-account-editor.c 1 Dec 2003 01:32:24 -0000 1.59
> +++ mail/mail-account-editor.c 20 Dec 2003 01:47:57 -0000
> @@ -155,6 +155,7 @@
> gtk_window_set_title (GTK_WINDOW (editor), _("Evolution Account Editor"));
> gtk_window_set_resizable (GTK_WINDOW (editor), TRUE);
> gtk_window_set_modal (GTK_WINDOW (editor), FALSE);
> + gtk_dialog_set_has_separator (GTK_DIALOG (editor), FALSE);
> gtk_dialog_add_buttons (GTK_DIALOG (editor),
> GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
> GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL,
> Index: mail/mail-account-gui.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/mail-account-gui.c,v
> retrieving revision 1.142
> diff -u -r1.142 mail-account-gui.c
> --- mail/mail-account-gui.c 13 Nov 2003 22:33:02 -0000 1.142
> +++ mail/mail-account-gui.c 20 Dec 2003 01:48:01 -0000
> @@ -815,16 +815,31 @@
> switch (entries[i].type) {
> case CAMEL_PROVIDER_CONF_SECTION_START:
> {
> - GtkWidget *frame;
> + GtkWidget *vbox, *hbox, *label;
> + char *markup;
>
> if (entries[i].name && !strcmp (entries[i].name, "mailcheck"))
> cur_table = (GtkTable *)glade_xml_get_widget (gui->xml, "extra_mailcheck_table");
> else {
> - frame = gtk_frame_new (entries[i].text);
> - gtk_container_set_border_width (GTK_CONTAINER (frame), 3);
> - gtk_table_attach (main_table, frame, 0, 2,
> + vbox = gtk_vbox_new (FALSE, 6);
> +
> + gtk_table_attach (main_table, vbox, 0, 2,
> rows, rows + 1,
> GTK_EXPAND | GTK_FILL, 0, 0, 0);
> + markup = g_strdup_printf ("<b>%s</b>", entries[i].text);
> + label = gtk_label_new (markup);
> + gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
> + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
> + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
> + gtk_widget_show (label);
> + g_free (markup);
> +
> + hbox = gtk_hbox_new (FALSE, 0);
> + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
> + gtk_widget_show (hbox);
> + label = gtk_label_new (" ");
> + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
> + gtk_widget_show (label);
>
> cur_table = (GtkTable *)gtk_table_new (0, 2, FALSE);
> rows = 0;
> @@ -832,7 +847,8 @@
> gtk_table_set_col_spacings (cur_table, 8);
> gtk_container_set_border_width (GTK_CONTAINER (cur_table), 3);
>
> - gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (cur_table));
> + gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (cur_table),
> + FALSE, FALSE, 0);
> }
> break;
> }
> Index: mail/mail-autofilter.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/mail-autofilter.c,v
> retrieving revision 1.44
> diff -u -r1.44 mail-autofilter.c
> --- mail/mail-autofilter.c 3 Dec 2003 00:27:52 -0000 1.44
> +++ mail/mail-autofilter.c 20 Dec 2003 01:48:02 -0000
> @@ -427,6 +427,7 @@
>
> dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO,
> GTK_BUTTONS_CLOSE, "%s", s->str);
> + gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
> g_signal_connect_swapped (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog);
>
> g_string_free (s, TRUE);
> Index: mail/mail-component.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/mail-component.c,v
> retrieving revision 1.36
> diff -u -r1.36 mail-component.c
> --- mail/mail-component.c 10 Dec 2003 20:54:21 -0000 1.36
> +++ mail/mail-component.c 20 Dec 2003 01:48:03 -0000
> @@ -495,6 +495,7 @@
> dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE,
> _("The following error occured while migrating your mail data:\n%s"),
> camel_exception_get_description (&ex));
> + gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
>
> g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog);
> gtk_widget_show (dialog);
> Index: mail/mail-config.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/mail-config.c,v
> retrieving revision 1.295
> diff -u -r1.295 mail-config.c
> --- mail/mail-config.c 12 Dec 2003 00:05:00 -0000 1.295
> +++ mail/mail-config.c 20 Dec 2003 01:48:06 -0000
> @@ -1169,6 +1169,7 @@
> GTK_DIALOG_DESTROY_WITH_PARENT,
> GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
> NULL);
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
> label = gtk_label_new (_("Connecting to server..."));
> gtk_box_pack_start (GTK_BOX(GTK_DIALOG (dialog)->vbox),
> label, TRUE, TRUE, 10);
> Index: mail/mail-config.glade
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/mail-config.glade,v
> retrieving revision 1.126
> diff -u -r1.126 mail-config.glade
> --- mail/mail-config.glade 11 Dec 2003 04:56:12 -0000 1.126
> +++ mail/mail-config.glade 20 Dec 2003 01:48:22 -0000
> @@ -184,672 +184,792 @@
> <property name="spacing">3</property>
>
> <child>
> - <widget class="GtkFrame" id="management_frame">
> + <widget class="GtkVBox" id="management_frame">
> <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkVBox" id="account_vbox">
> - <property name="border_width">6</property>
> + <widget class="GtkLabel" id="label476">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"><b>Account Information</b></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">True</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox177">
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">3</property>
> + <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkLabel" id="management_description_label">
> + <widget class="GtkLabel" id="label475">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Type the name by which you would like to refer to this account.
> -For example: "Work" or "Personal"</property>
> + <property name="label" translatable="yes"> </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="xalign">0.5</property>
> <property name="yalign">0.5</property>
> - <property name="xpad">3</property>
> - <property name="ypad">3</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> </widget>
> <packing>
> <property name="padding">0</property>
> <property name="expand">False</property>
> - <property name="fill">True</property>
> + <property name="fill">False</property>
> </packing>
> </child>
>
> <child>
> - <widget class="GtkHBox" id="hboxIdentityName">
> - <property name="border_width">3</property>
> + <widget class="GtkVBox" id="account_vbox">
> + <property name="border_width">6</property>
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">4</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkLabel" id="management_name_label">
> + <widget class="GtkLabel" id="management_description_label">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">_Name:</property>
> - <property name="use_underline">True</property>
> + <property name="label" translatable="yes">Type the name by which you would like to refer to this account.
> +For example: "Work" or "Personal"</property>
> + <property name="use_underline">False</property>
> <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_RIGHT</property>
> + <property name="justify">GTK_JUSTIFY_LEFT</property>
> <property name="wrap">False</property>
> <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> + <property name="xalign">0</property>
> <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="mnemonic_widget">management_name</property>
> + <property name="xpad">3</property>
> + <property name="ypad">3</property>
> </widget>
> <packing>
> <property name="padding">0</property>
> <property name="expand">False</property>
> - <property name="fill">False</property>
> + <property name="fill">True</property>
> </packing>
> </child>
>
> <child>
> - <widget class="GtkEntry" id="management_name">
> + <widget class="GtkHBox" id="hboxIdentityName">
> + <property name="border_width">3</property>
> <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="editable">True</property>
> - <property name="visibility">True</property>
> - <property name="max_length">0</property>
> - <property name="text" translatable="yes"></property>
> - <property name="has_frame">True</property>
> - <property name="invisible_char" translatable="yes">*</property>
> - <property name="activates_default">False</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">4</property>
> +
> + <child>
> + <widget class="GtkLabel" id="management_name_label">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">_Name:</property>
> + <property name="use_underline">True</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_RIGHT</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + <property name="mnemonic_widget">management_name</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkEntry" id="management_name">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">True</property>
> + <property name="expand">False</property>
> <property name="fill">True</property>
> </packing>
> </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">True</property>
> - </packing>
> - </child>
>
> - <child>
> - <widget class="GtkCheckButton" id="management_default">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">_Make this my default account</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">False</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> + <child>
> + <widget class="GtkCheckButton" id="management_default">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">_Make this my default account</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label1">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Account Information</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.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> <packing>
> - <property name="padding">0</property>
> + <property name="padding">3</property>
> <property name="expand">False</property>
> <property name="fill">False</property>
> </packing>
> </child>
>
> <child>
> - <widget class="GtkFrame" id="identity_required_frame">
> + <widget class="GtkVBox" id="identity_required_frame">
> <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
> -
> - <child>
> - <widget class="GtkTable" id="identity_required_table">
> - <property name="border_width">6</property>
> - <property name="visible">True</property>
> - <property name="n_rows">2</property>
> - <property name="n_columns">2</property>
> - <property name="homogeneous">False</property>
> - <property name="row_spacing">6</property>
> - <property name="column_spacing">6</property>
> -
> - <child>
> - <widget class="GtkEntry" id="identity_address">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="editable">True</property>
> - <property name="visibility">True</property>
> - <property name="max_length">0</property>
> - <property name="text" translatable="yes"></property>
> - <property name="has_frame">True</property>
> - <property name="invisible_char" translatable="yes">*</property>
> - <property name="activates_default">False</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="y_options"></property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="identity_address_label">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Email _address:</property>
> - <property name="use_underline">True</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="mnemonic_widget">identity_address</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="GtkLabel" id="identity_full_name_label">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">_Full name:</property>
> - <property name="use_underline">True</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="mnemonic_widget">identity_full_name</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="GtkEntry" id="identity_full_name">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="editable">True</property>
> - <property name="visibility">True</property>
> - <property name="max_length">0</property>
> - <property name="text" translatable="yes"></property>
> - <property name="has_frame">True</property>
> - <property name="invisible_char" translatable="yes">*</property>
> - <property name="activates_default">False</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"></property>
> - </packing>
> - </child>
> - </widget>
> - </child>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkLabel" id="label2">
> + <widget class="GtkLabel" id="label478">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Required Information</property>
> + <property name="label" translatable="yes"><b>Required Information</b></property>
> <property name="use_underline">False</property>
> - <property name="use_markup">False</property>
> + <property name="use_markup">True</property>
> <property name="justify">GTK_JUSTIFY_LEFT</property>
> <property name="wrap">False</property>
> <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> + <property name="xalign">0</property>
> <property name="yalign">0.5</property>
> <property name="xpad">0</property>
> <property name="ypad">0</property>
> </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">True</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkFrame" id="identity_optional_frame">
> - <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
>
> <child>
> - <widget class="GtkTable" id="identity_optional_table">
> - <property name="border_width">6</property>
> + <widget class="GtkHBox" id="hbox178">
> <property name="visible">True</property>
> - <property name="n_rows">3</property>
> - <property name="n_columns">2</property>
> <property name="homogeneous">False</property>
> - <property name="row_spacing">6</property>
> - <property name="column_spacing">6</property>
> + <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkLabel" id="identity_organization_label">
> + <widget class="GtkLabel" id="label477">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Or_ganization:</property>
> - <property name="use_underline">True</property>
> + <property name="label" translatable="yes"> </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="xalign">0.5</property>
> <property name="yalign">0.5</property>
> <property name="xpad">0</property>
> <property name="ypad">0</property>
> - <property name="mnemonic_widget">identity_organization</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="GtkLabel" id="sigLabel">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">_Default signature:</property>
> - <property name="use_underline">True</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>
> - </widget>
> - <packing>
> - <property name="left_attach">0</property>
> - <property name="right_attach">1</property>
> - <property name="top_attach">2</property>
> - <property name="bottom_attach">3</property>
> - <property name="x_options">fill</property>
> - <property name="y_options"></property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkEntry" id="identity_organization">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="editable">True</property>
> - <property name="visibility">True</property>
> - <property name="max_length">0</property>
> - <property name="text" translatable="yes"></property>
> - <property name="has_frame">True</property>
> - <property name="invisible_char" translatable="yes">*</property>
> - <property name="activates_default">False</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="y_options"></property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="reply_to_label">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Re_ply-To:</property>
> - <property name="use_underline">True</property>
> - <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</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="mnemonic_widget">identity_reply_to</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="GtkEntry" id="identity_reply_to">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="editable">True</property>
> - <property name="visibility">True</property>
> - <property name="max_length">0</property>
> - <property name="text" translatable="yes"></property>
> - <property name="has_frame">True</property>
> - <property name="invisible_char" translatable="yes">*</property>
> - <property name="activates_default">False</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"></property>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
>
> <child>
> - <widget class="GtkHBox" id="hbox169">
> + <widget class="GtkTable" id="identity_required_table">
> + <property name="border_width">6</property>
> <property name="visible">True</property>
> + <property name="n_rows">2</property>
> + <property name="n_columns">2</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">5</property>
> + <property name="row_spacing">6</property>
> + <property name="column_spacing">6</property>
>
> <child>
> - <widget class="GtkOptionMenu" id="sigOption">
> + <widget class="GtkEntry" id="identity_address">
> <property name="visible">True</property>
> <property name="can_focus">True</property>
> - <property name="history">0</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</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="y_options"></property>
> + </packing>
> + </child>
>
> - <child internal-child="menu">
> - <widget class="GtkMenu" id="convertwidget1">
> - <property name="visible">True</property>
> + <child>
> + <widget class="GtkLabel" id="identity_address_label">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Email _address:</property>
> + <property name="use_underline">True</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="mnemonic_widget">identity_address</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="GtkMenuItem" id="convertwidget2">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Default</property>
> - <property name="use_underline">True</property>
> - </widget>
> - </child>
> - </widget>
> - </child>
> + <child>
> + <widget class="GtkLabel" id="identity_full_name_label">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">_Full name:</property>
> + <property name="use_underline">True</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="mnemonic_widget">identity_full_name</property>
> </widget>
> <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> + <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="GtkButton" id="sigAddNew">
> + <widget class="GtkEntry" id="identity_full_name">
> <property name="visible">True</property>
> <property name="can_focus">True</property>
> - <property name="label" translatable="yes">Add new signature...</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <signal name="clicked" handler="sigAddNewClicked"/>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</property>
> </widget>
> <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - <property name="pack_type">GTK_PACK_END</property>
> + <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"></property>
> </packing>
> </child>
> </widget>
> <packing>
> - <property name="left_attach">1</property>
> - <property name="right_attach">2</property>
> - <property name="top_attach">2</property>
> - <property name="bottom_attach">3</property>
> - <property name="x_options">fill</property>
> - <property name="y_options">fill</property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label3">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Optional Information</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.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> <packing>
> - <property name="padding">0</property>
> + <property name="padding">3</property>
> <property name="expand">False</property>
> <property name="fill">True</property>
> </packing>
> </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">True</property>
> - <property name="fill">True</property>
> - </packing>
> - </child>
> - </widget>
> - <packing>
> - <property name="tab_expand">False</property>
> - <property name="tab_fill">True</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label31">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">_Identity</property>
> - <property name="use_underline">True</property>
> - <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">False</property>
> - <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> - <packing>
> - <property name="type">tab</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkVBox" id="vboxSourceBorder">
> - <property name="border_width">6</property>
> - <property name="visible">True</property>
> - <property name="homogeneous">False</property>
> - <property name="spacing">3</property>
> -
> - <child>
> - <widget class="GtkVBox" id="source_vbox">
> - <property name="visible">True</property>
> - <property name="homogeneous">False</property>
> - <property name="spacing">3</property>
>
> <child>
> - <widget class="GtkTable" id="table3">
> + <widget class="GtkVBox" id="identity_optional_frame">
> <property name="visible">True</property>
> - <property name="n_rows">1</property>
> - <property name="n_columns">2</property>
> <property name="homogeneous">False</property>
> - <property name="row_spacing">0</property>
> - <property name="column_spacing">3</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkLabel" id="source_type_label">
> + <widget class="GtkLabel" id="label480">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Server _Type: </property>
> - <property name="use_underline">True</property>
> - <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_RIGHT</property>
> + <property name="label" translatable="yes"><b>Optional Information</b></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">True</property>
> + <property name="justify">GTK_JUSTIFY_LEFT</property>
> <property name="wrap">False</property>
> <property name="selectable">False</property>
> - <property name="xalign">1</property>
> + <property name="xalign">0</property>
> <property name="yalign">0.5</property>
> <property name="xpad">0</property>
> <property name="ypad">0</property>
> - <property name="mnemonic_widget">source_type_omenu</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>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
>
> <child>
> - <widget class="GtkOptionMenu" id="source_type_omenu">
> + <widget class="GtkHBox" id="hbox179">
> <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="history">0</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
>
> - <child internal-child="menu">
> - <widget class="GtkMenu" id="convertwidget3">
> + <child>
> + <widget class="GtkLabel" id="label479">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkTable" id="identity_optional_table">
> + <property name="border_width">6</property>
> <property name="visible">True</property>
> + <property name="n_rows">3</property>
> + <property name="n_columns">2</property>
> + <property name="homogeneous">False</property>
> + <property name="row_spacing">6</property>
> + <property name="column_spacing">6</property>
>
> <child>
> - <widget class="GtkMenuItem" id="convertwidget4">
> + <widget class="GtkLabel" id="identity_organization_label">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">POP</property>
> + <property name="label" translatable="yes">Or_ganization:</property>
> <property name="use_underline">True</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="mnemonic_widget">identity_organization</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="GtkMenuItem" id="convertwidget5">
> + <widget class="GtkLabel" id="sigLabel">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">IMAPv4 </property>
> + <property name="label" translatable="yes">_Default signature:</property>
> <property name="use_underline">True</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>
> + </widget>
> + <packing>
> + <property name="left_attach">0</property>
> + <property name="right_attach">1</property>
> + <property name="top_attach">2</property>
> + <property name="bottom_attach">3</property>
> + <property name="x_options">fill</property>
> + <property name="y_options"></property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkEntry" id="identity_organization">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</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="y_options"></property>
> + </packing>
> </child>
>
> <child>
> - <widget class="GtkMenuItem" id="convertwidget6">
> + <widget class="GtkLabel" id="reply_to_label">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Standard Unix mbox</property>
> + <property name="label" translatable="yes">Re_ply-To:</property>
> <property name="use_underline">True</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</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="mnemonic_widget">identity_reply_to</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="GtkMenuItem" id="convertwidget7">
> + <widget class="GtkEntry" id="identity_reply_to">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Qmail maildir </property>
> - <property name="use_underline">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</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"></property>
> + </packing>
> </child>
>
> <child>
> - <widget class="GtkMenuItem" id="convertwidget8">
> + <widget class="GtkHBox" id="hbox169">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">None</property>
> - <property name="use_underline">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">5</property>
> +
> + <child>
> + <widget class="GtkOptionMenu" id="sigOption">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="history">0</property>
> +
> + <child internal-child="menu">
> + <widget class="GtkMenu" id="convertwidget1">
> + <property name="visible">True</property>
> +
> + <child>
> + <widget class="GtkMenuItem" id="convertwidget2">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Default</property>
> + <property name="use_underline">True</property>
> + </widget>
> + </child>
> + </widget>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkButton" id="sigAddNew">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">Add new signature...</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <signal name="clicked" handler="sigAddNewClicked"/>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + <property name="pack_type">GTK_PACK_END</property>
> + </packing>
> + </child>
> </widget>
> + <packing>
> + <property name="left_attach">1</property>
> + <property name="right_attach">2</property>
> + <property name="top_attach">2</property>
> + <property name="bottom_attach">3</property>
> + <property name="x_options">fill</property>
> + <property name="y_options">fill</property>
> + </packing>
> </child>
> </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> </child>
> </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="x_options"></property>
> - <property name="y_options"></property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> <packing>
> - <property name="padding">0</property>
> + <property name="padding">3</property>
> <property name="expand">False</property>
> - <property name="fill">False</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="tab_expand">False</property>
> + <property name="tab_fill">True</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkLabel" id="label31">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">_Identity</property>
> + <property name="use_underline">True</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="type">tab</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="vboxSourceBorder">
> + <property name="border_width">6</property>
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">3</property>
> +
> + <child>
> + <widget class="GtkVBox" id="source_vbox">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkHBox" id="hboxSourceDescription">
> + <widget class="GtkTable" id="table3">
> <property name="visible">True</property>
> + <property name="n_rows">1</property>
> + <property name="n_columns">2</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">3</property>
> + <property name="row_spacing">0</property>
> + <property name="column_spacing">6</property>
>
> <child>
> - <widget class="GtkLabel" id="label442">
> + <widget class="GtkLabel" id="source_type_label">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Description:</property>
> - <property name="use_underline">False</property>
> + <property name="label" translatable="yes">Server _Type: </property>
> + <property name="use_underline">True</property>
> <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="justify">GTK_JUSTIFY_RIGHT</property>
> <property name="wrap">False</property>
> <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> + <property name="xalign">1</property>
> <property name="yalign">0.5</property>
> <property name="xpad">0</property>
> <property name="ypad">0</property>
> + <property name="mnemonic_widget">source_type_omenu</property>
> </widget>
> <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">True</property>
> + <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="GtkOptionMenu" id="source_type_omenu">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="history">0</property>
> +
> + <child internal-child="menu">
> + <widget class="GtkMenu" id="convertwidget3">
> + <property name="visible">True</property>
> +
> + <child>
> + <widget class="GtkMenuItem" id="convertwidget4">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">POP</property>
> + <property name="use_underline">True</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkMenuItem" id="convertwidget5">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">IMAPv4 </property>
> + <property name="use_underline">True</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkMenuItem" id="convertwidget6">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Standard Unix mbox</property>
> + <property name="use_underline">True</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkMenuItem" id="convertwidget7">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Qmail maildir </property>
> + <property name="use_underline">True</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkMenuItem" id="convertwidget8">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">None</property>
> + <property name="use_underline">True</property>
> + </widget>
> + </child>
> + </widget>
> + </child>
> + </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="x_options"></property>
> + <property name="y_options"></property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hboxSourceDescription">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">3</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label442">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Description:</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">True</property>
> </packing>
> </child>
>
> @@ -882,403 +1002,319 @@
> </child>
>
> <child>
> - <widget class="GtkFrame" id="source_frame">
> + <widget class="GtkVBox" id="source_frame">
> <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkTable" id="table4">
> - <property name="border_width">6</property>
> + <widget class="GtkLabel" id="label481">
> <property name="visible">True</property>
> - <property name="n_rows">5</property>
> - <property name="n_columns">2</property>
> - <property name="homogeneous">False</property>
> - <property name="row_spacing">6</property>
> - <property name="column_spacing">6</property>
> -
> - <child>
> - <widget class="GtkLabel" id="source_host_label">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">_Host:</property>
> - <property name="use_underline">True</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="mnemonic_widget">source_host</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="source_user_label">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">User_name:</property>
> - <property name="use_underline">True</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="mnemonic_widget">source_user</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="GtkEntry" id="source_host">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="editable">True</property>
> - <property name="visibility">True</property>
> - <property name="max_length">0</property>
> - <property name="text" translatable="yes"></property>
> - <property name="has_frame">True</property>
> - <property name="invisible_char" translatable="yes">*</property>
> - <property name="activates_default">False</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"></property>
> - </packing>
> - </child>
> + <property name="label" translatable="yes"><b>Configuration</b></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">True</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
>
> - <child>
> - <widget class="GtkEntry" id="source_user">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="editable">True</property>
> - <property name="visibility">True</property>
> - <property name="max_length">0</property>
> - <property name="text" translatable="yes"></property>
> - <property name="has_frame">True</property>
> - <property name="invisible_char" translatable="yes">*</property>
> - <property name="activates_default">False</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="y_options"></property>
> - </packing>
> - </child>
> + <child>
> + <widget class="GtkHBox" id="hbox180">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkLabel" id="source_path_label">
> + <widget class="GtkLabel" id="label482">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">_Path:</property>
> - <property name="use_underline">True</property>
> + <property name="label" translatable="yes"> </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="xalign">0.5</property>
> <property name="yalign">0.5</property>
> <property name="xpad">0</property>
> <property name="ypad">0</property>
> - <property name="mnemonic_widget">source_path</property>
> </widget>
> <packing>
> - <property name="left_attach">0</property>
> - <property name="right_attach">1</property>
> - <property name="top_attach">2</property>
> - <property name="bottom_attach">3</property>
> - <property name="x_options">fill</property>
> - <property name="y_options"></property>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
>
> <child>
> - <widget class="GnomeFileEntry" id="source_path_entry">
> + <widget class="GtkTable" id="table4">
> + <property name="border_width">6</property>
> <property name="visible">True</property>
> - <property name="max_saved">10</property>
> - <property name="browse_dialog_title" translatable="yes">Mailbox location</property>
> - <property name="directory_entry">False</property>
> - <property name="modal">False</property>
> + <property name="n_rows">5</property>
> + <property name="n_columns">2</property>
> + <property name="homogeneous">False</property>
> + <property name="row_spacing">6</property>
> + <property name="column_spacing">6</property>
>
> - <child internal-child="entry">
> - <widget class="GtkEntry" id="source_path">
> + <child>
> + <widget class="GtkLabel" id="source_host_label">
> <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="editable">True</property>
> - <property name="visibility">True</property>
> - <property name="max_length">0</property>
> - <property name="text" translatable="yes"></property>
> - <property name="has_frame">True</property>
> - <property name="invisible_char" translatable="yes">*</property>
> - <property name="activates_default">False</property>
> + <property name="label" translatable="yes">_Host:</property>
> + <property name="use_underline">True</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="mnemonic_widget">source_host</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>
> - </widget>
> - <packing>
> - <property name="left_attach">1</property>
> - <property name="right_attach">2</property>
> - <property name="top_attach">2</property>
> - <property name="bottom_attach">3</property>
> - <property name="y_options"></property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="source_ssl_disabled">
> - <property name="visible">True</property>
> - <property name="sensitive">False</property>
> - <property name="label" translatable="yes">(SSL is not supported in this build of Evolution)</property>
> - <property name="use_underline">False</property>
> - <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">False</property>
> - <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> - <packing>
> - <property name="left_attach">0</property>
> - <property name="right_attach">2</property>
> - <property name="top_attach">4</property>
> - <property name="bottom_attach">5</property>
> - <property name="x_options">fill</property>
> - <property name="y_options"></property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkHBox" id="source_ssl_hbox">
> - <property name="visible">True</property>
> - <property name="homogeneous">False</property>
> - <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkLabel" id="lblSourceUseSSL">
> + <widget class="GtkLabel" id="source_user_label">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">_Use secure connection (SSL):</property>
> + <property name="label" translatable="yes">User_name:</property>
> <property name="use_underline">True</property>
> <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="justify">GTK_JUSTIFY_LEFT</property>
> <property name="wrap">False</property>
> <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> + <property name="xalign">0</property>
> <property name="yalign">0.5</property>
> <property name="xpad">0</property>
> <property name="ypad">0</property>
> - <property name="mnemonic_widget">source_use_ssl</property>
> + <property name="mnemonic_widget">source_user</property>
> </widget>
> <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> + <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="GtkOptionMenu" id="source_use_ssl">
> + <widget class="GtkEntry" id="source_host">
> <property name="visible">True</property>
> <property name="can_focus">True</property>
> - <property name="history">0</property>
> -
> - <child internal-child="menu">
> - <widget class="GtkMenu" id="convertwidget9">
> - <property name="visible">True</property>
> -
> - <child>
> - <widget class="GtkMenuItem" id="convertwidget10">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Always</property>
> - <property name="use_underline">True</property>
> - </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkMenuItem" id="convertwidget11">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Whenever Possible</property>
> - <property name="use_underline">True</property>
> - </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkMenuItem" id="convertwidget12">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Never</property>
> - <property name="use_underline">True</property>
> - </widget>
> - </child>
> - </widget>
> - </child>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</property>
> </widget>
> <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> + <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"></property>
> </packing>
> </child>
> - </widget>
> - <packing>
> - <property name="left_attach">0</property>
> - <property name="right_attach">2</property>
> - <property name="top_attach">3</property>
> - <property name="bottom_attach">4</property>
> - <property name="x_options">fill</property>
> - </packing>
> - </child>
> - </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label443">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Configuration</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.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> - <packing>
> - <property name="type">label_item</property>
> - </packing>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkFrame" id="source_auth_frame">
> - <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
> -
> - <child>
> - <widget class="GtkVBox" id="vbox60">
> - <property name="border_width">6</property>
> - <property name="visible">True</property>
> - <property name="homogeneous">False</property>
> - <property name="spacing">6</property>
>
> - <child>
> - <widget class="GtkHBox" id="hbox44">
> - <property name="visible">True</property>
> - <property name="homogeneous">False</property>
> - <property name="spacing">3</property>
> + <child>
> + <widget class="GtkEntry" id="source_user">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</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="y_options"></property>
> + </packing>
> + </child>
>
> <child>
> - <widget class="GtkLabel" id="source_auth_label">
> + <widget class="GtkLabel" id="source_path_label">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">_Authentication type: </property>
> + <property name="label" translatable="yes">_Path:</property>
> <property name="use_underline">True</property>
> <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="justify">GTK_JUSTIFY_LEFT</property>
> <property name="wrap">False</property>
> <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> + <property name="xalign">0</property>
> <property name="yalign">0.5</property>
> <property name="xpad">0</property>
> <property name="ypad">0</property>
> - <property name="mnemonic_widget">source_auth_omenu</property>
> + <property name="mnemonic_widget">source_path</property>
> </widget>
> <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> + <property name="left_attach">0</property>
> + <property name="right_attach">1</property>
> + <property name="top_attach">2</property>
> + <property name="bottom_attach">3</property>
> + <property name="x_options">fill</property>
> + <property name="y_options"></property>
> </packing>
> </child>
>
> <child>
> - <widget class="GtkOptionMenu" id="source_auth_omenu">
> + <widget class="GnomeFileEntry" id="source_path_entry">
> <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="history">0</property>
> + <property name="max_saved">10</property>
> + <property name="browse_dialog_title" translatable="yes">Mailbox location</property>
> + <property name="directory_entry">False</property>
> + <property name="modal">False</property>
>
> - <child internal-child="menu">
> - <widget class="GtkMenu" id="convertwidget13">
> + <child internal-child="entry">
> + <widget class="GtkEntry" id="source_path">
> <property name="visible">True</property>
> -
> - <child>
> - <widget class="GtkMenuItem" id="convertwidget14">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Password</property>
> - <property name="use_underline">True</property>
> - </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkMenuItem" id="convertwidget15">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Kerberos </property>
> - <property name="use_underline">True</property>
> - </widget>
> - </child>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</property>
> </widget>
> </child>
> </widget>
> <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> + <property name="left_attach">1</property>
> + <property name="right_attach">2</property>
> + <property name="top_attach">2</property>
> + <property name="bottom_attach">3</property>
> + <property name="y_options"></property>
> </packing>
> </child>
>
> <child>
> - <widget class="GtkAlignment" id="alignment1">
> + <widget class="GtkLabel" id="source_ssl_disabled">
> <property name="visible">True</property>
> - <property name="xalign">1</property>
> + <property name="sensitive">False</property>
> + <property name="label" translatable="yes">(SSL is not supported in this build of Evolution)</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">0.5</property>
> <property name="yalign">0.5</property>
> - <property name="xscale">1</property>
> - <property name="yscale">1</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="left_attach">0</property>
> + <property name="right_attach">2</property>
> + <property name="top_attach">4</property>
> + <property name="bottom_attach">5</property>
> + <property name="x_options">fill</property>
> + <property name="y_options"></property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="source_ssl_hbox">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkButton" id="source_check_supported">
> + <widget class="GtkLabel" id="lblSourceUseSSL">
> <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes"> _Check for supported types </property>
> + <property name="label" translatable="yes">_Use secure connection (SSL):</property>
> <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + <property name="mnemonic_widget">source_use_ssl</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkOptionMenu" id="source_use_ssl">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="history">0</property>
> +
> + <child internal-child="menu">
> + <widget class="GtkMenu" id="convertwidget9">
> + <property name="visible">True</property>
> +
> + <child>
> + <widget class="GtkMenuItem" id="convertwidget10">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Always</property>
> + <property name="use_underline">True</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkMenuItem" id="convertwidget11">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Whenever Possible</property>
> + <property name="use_underline">True</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkMenuItem" id="convertwidget12">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Never</property>
> + <property name="use_underline">True</property>
> + </widget>
> + </child>
> + </widget>
> + </child>
> </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> </child>
> </widget>
> <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - <property name="pack_type">GTK_PACK_END</property>
> + <property name="left_attach">0</property>
> + <property name="right_attach">2</property>
> + <property name="top_attach">3</property>
> + <property name="bottom_attach">4</property>
> + <property name="x_options">fill</property>
> </packing>
> </child>
> </widget>
> @@ -1288,174 +1324,188 @@
> <property name="fill">True</property>
> </packing>
> </child>
> -
> - <child>
> - <widget class="GtkCheckButton" id="source_remember_password">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">Re_member this password</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">False</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="lblNote">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Note: you will not be prompted for a password until you connect for the first time</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.03</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> </child>
> + </widget>
> + <packing>
> + <property name="padding">3</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="source_auth_frame">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkLabel" id="label444">
> + <widget class="GtkLabel" id="label484">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Authentication</property>
> + <property name="label" translatable="yes"><b>Authentication</b></property>
> <property name="use_underline">False</property>
> - <property name="use_markup">False</property>
> + <property name="use_markup">True</property>
> <property name="justify">GTK_JUSTIFY_LEFT</property>
> <property name="wrap">False</property>
> <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> + <property name="xalign">0</property>
> <property name="yalign">0.5</property>
> <property name="xpad">0</property>
> <property name="ypad">0</property>
> </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">True</property>
> - <property name="fill">True</property>
> - </packing>
> - </child>
> - </widget>
> - <packing>
> - <property name="tab_expand">False</property>
> - <property name="tab_fill">True</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label32">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">_Receiving Mail</property>
> - <property name="use_underline">True</property>
> - <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">False</property>
> - <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> - <packing>
> - <property name="type">tab</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkVBox" id="vboxExtraTableBorder">
> - <property name="border_width">6</property>
> - <property name="visible">True</property>
> - <property name="homogeneous">False</property>
> - <property name="spacing">3</property>
> -
> - <child>
> - <widget class="GtkTable" id="extra_table">
> - <property name="visible">True</property>
> - <property name="n_rows">1</property>
> - <property name="n_columns">2</property>
> - <property name="homogeneous">False</property>
> - <property name="row_spacing">4</property>
> - <property name="column_spacing">8</property>
> -
> - <child>
> - <widget class="GtkFrame" id="extra_mailcheck_frame">
> - <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
>
> <child>
> - <widget class="GtkTable" id="extra_mailcheck_table">
> - <property name="border_width">6</property>
> + <widget class="GtkHBox" id="hbox181">
> <property name="visible">True</property>
> - <property name="n_rows">1</property>
> - <property name="n_columns">2</property>
> <property name="homogeneous">False</property>
> - <property name="row_spacing">6</property>
> - <property name="column_spacing">6</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label483">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
>
> <child>
> - <widget class="GtkHBox" id="extra_mailcheck_hbox">
> + <widget class="GtkVBox" id="vbox60">
> + <property name="border_width">6</property>
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkCheckButton" id="extra_auto_check">
> + <widget class="GtkHBox" id="hbox44">
> <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">_Automatically check for new mail every</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">False</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">3</property>
> +
> + <child>
> + <widget class="GtkLabel" id="source_auth_label">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">_Authentication type: </property>
> + <property name="use_underline">True</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + <property name="mnemonic_widget">source_auth_omenu</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkOptionMenu" id="source_auth_omenu">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="history">0</property>
> +
> + <child internal-child="menu">
> + <widget class="GtkMenu" id="convertwidget13">
> + <property name="visible">True</property>
> +
> + <child>
> + <widget class="GtkMenuItem" id="convertwidget14">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Password</property>
> + <property name="use_underline">True</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkMenuItem" id="convertwidget15">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Kerberos </property>
> + <property name="use_underline">True</property>
> + </widget>
> + </child>
> + </widget>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkAlignment" id="alignment1">
> + <property name="visible">True</property>
> + <property name="xalign">1</property>
> + <property name="yalign">0.5</property>
> + <property name="xscale">1</property>
> + <property name="yscale">1</property>
> +
> + <child>
> + <widget class="GtkButton" id="source_check_supported">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes"> _Check for supported types </property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + <property name="pack_type">GTK_PACK_END</property>
> + </packing>
> + </child>
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
>
> <child>
> - <widget class="GtkSpinButton" id="extra_auto_check_min">
> + <widget class="GtkCheckButton" id="source_remember_password">
> <property name="visible">True</property>
> <property name="can_focus">True</property>
> - <property name="climb_rate">1</property>
> - <property name="digits">0</property>
> - <property name="numeric">True</property>
> - <property name="update_policy">GTK_UPDATE_ALWAYS</property>
> - <property name="snap_to_ticks">False</property>
> - <property name="wrap">False</property>
> - <property name="adjustment">10 1 1440 1 10 10</property>
> + <property name="label" translatable="yes">Re_member this password</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> </widget>
> <packing>
> <property name="padding">0</property>
> @@ -1465,15 +1515,15 @@
> </child>
>
> <child>
> - <widget class="GtkLabel" id="label36">
> + <widget class="GtkLabel" id="lblNote">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">minute(s)</property>
> + <property name="label" translatable="yes">Note: you will not be prompted for a password until you connect for the first time</property>
> <property name="use_underline">False</property>
> <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="justify">GTK_JUSTIFY_LEFT</property>
> <property name="wrap">False</property>
> <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> + <property name="xalign">0.03</property>
> <property name="yalign">0.5</property>
> <property name="xpad">0</property>
> <property name="ypad">0</property>
> @@ -1486,46 +1536,29 @@
> </child>
> </widget>
> <packing>
> - <property name="left_attach">0</property>
> - <property name="right_attach">2</property>
> - <property name="top_attach">0</property>
> - <property name="bottom_attach">1</property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label445">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Checking for New Mail</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.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> <packing>
> - <property name="left_attach">0</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>
> + <property name="padding">3</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">False</property>
> + <property name="expand">True</property>
> <property name="fill">True</property>
> </packing>
> </child>
> @@ -1537,9 +1570,9 @@
> </child>
>
> <child>
> - <widget class="GtkLabel" id="label33">
> + <widget class="GtkLabel" id="label32">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Receiving _Options</property>
> + <property name="label" translatable="yes">_Receiving Mail</property>
> <property name="use_underline">True</property>
> <property name="use_markup">False</property>
> <property name="justify">GTK_JUSTIFY_CENTER</property>
> @@ -1556,26 +1589,233 @@
> </child>
>
> <child>
> - <widget class="GtkVBox" id="vboxTransportBorder">
> + <widget class="GtkVBox" id="vboxExtraTableBorder">
> <property name="border_width">6</property>
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> <property name="spacing">3</property>
>
> <child>
> - <widget class="GtkVBox" id="transport_vbox">
> + <widget class="GtkTable" id="extra_table">
> <property name="visible">True</property>
> + <property name="n_rows">1</property>
> + <property name="n_columns">2</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">3</property>
> -
> + <property name="row_spacing">4</property>
> + <property name="column_spacing">8</property>
> +
> + <child>
> + <widget class="GtkVBox" id="extra_mailcheck_frame">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label486">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"><b>Checking for New Mail</b></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">True</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox182">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label485">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkTable" id="extra_mailcheck_table">
> + <property name="border_width">6</property>
> + <property name="visible">True</property>
> + <property name="n_rows">1</property>
> + <property name="n_columns">2</property>
> + <property name="homogeneous">False</property>
> + <property name="row_spacing">6</property>
> + <property name="column_spacing">6</property>
> +
> + <child>
> + <widget class="GtkHBox" id="extra_mailcheck_hbox">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
> +
> + <child>
> + <widget class="GtkCheckButton" id="extra_auto_check">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">_Automatically check for new mail every</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkSpinButton" id="extra_auto_check_min">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="climb_rate">1</property>
> + <property name="digits">0</property>
> + <property name="numeric">True</property>
> + <property name="update_policy">GTK_UPDATE_ALWAYS</property>
> + <property name="snap_to_ticks">False</property>
> + <property name="wrap">False</property>
> + <property name="adjustment">10 1 1440 1 10 10</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkLabel" id="label36">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">minute(s)</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="left_attach">0</property>
> + <property name="right_attach">2</property>
> + <property name="top_attach">0</property>
> + <property name="bottom_attach">1</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="left_attach">0</property>
> + <property name="right_attach">2</property>
> + <property name="top_attach">0</property>
> + <property name="bottom_attach">1</property>
> + <property name="y_padding">3</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="tab_expand">False</property>
> + <property name="tab_fill">True</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkLabel" id="label33">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Receiving _Options</property>
> + <property name="use_underline">True</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="type">tab</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="vboxTransportBorder">
> + <property name="border_width">6</property>
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">3</property>
> +
> + <child>
> + <widget class="GtkVBox" id="transport_vbox">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
> +
> <child>
> <widget class="GtkTable" id="table5">
> <property name="visible">True</property>
> <property name="n_rows">1</property>
> <property name="n_columns">2</property>
> <property name="homogeneous">False</property>
> - <property name="row_spacing">0</property>
> - <property name="column_spacing">3</property>
> + <property name="row_spacing">6</property>
> + <property name="column_spacing">6</property>
>
> <child>
> <widget class="GtkLabel" id="transport_type_label">
> @@ -1651,7 +1891,7 @@
> <widget class="GtkHBox" id="hboxTransportDescription">
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">3</property>
> + <property name="spacing">6</property>
>
> <child>
> <widget class="GtkLabel" id="label50">
> @@ -1703,92 +1943,212 @@
> </child>
>
> <child>
> - <widget class="GtkFrame" id="transport_frame">
> + <widget class="GtkVBox" id="transport_frame">
> <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkVBox" id="vbox12">
> - <property name="border_width">6</property>
> + <widget class="GtkLabel" id="label488">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"><b>Server Configuration</b></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">True</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox183">
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">3</property>
> + <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkTable" id="table6">
> + <widget class="GtkLabel" id="label487">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox12">
> + <property name="border_width">6</property>
> <property name="visible">True</property>
> - <property name="n_rows">1</property>
> - <property name="n_columns">2</property>
> <property name="homogeneous">False</property>
> - <property name="row_spacing">4</property>
> - <property name="column_spacing">4</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkLabel" id="transport_host_label">
> + <widget class="GtkTable" id="table6">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">_Host:</property>
> - <property name="use_underline">True</property>
> - <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_RIGHT</property>
> - <property name="wrap">False</property>
> - <property name="selectable">False</property>
> - <property name="xalign">1</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="mnemonic_widget">transport_host</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>
> + <property name="n_rows">1</property>
> + <property name="n_columns">2</property>
> + <property name="homogeneous">False</property>
> + <property name="row_spacing">4</property>
> + <property name="column_spacing">4</property>
>
> - <child>
> - <widget class="GtkEntry" id="transport_host">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="editable">True</property>
> - <property name="visibility">True</property>
> - <property name="max_length">0</property>
> - <property name="text" translatable="yes"></property>
> - <property name="has_frame">True</property>
> - <property name="invisible_char" translatable="yes">*</property>
> - <property name="activates_default">False</property>
> + <child>
> + <widget class="GtkLabel" id="transport_host_label">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">_Host:</property>
> + <property name="use_underline">True</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_RIGHT</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">1</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + <property name="mnemonic_widget">transport_host</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="GtkEntry" id="transport_host">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</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"></property>
> + </packing>
> + </child>
> </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"></property>
> + <property name="padding">4</property>
> + <property name="expand">False</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> - </widget>
> - <packing>
> - <property name="padding">4</property>
> - <property name="expand">False</property>
> - <property name="fill">True</property>
> - </packing>
> - </child>
>
> - <child>
> - <widget class="GtkHBox" id="transport_ssl_hbox">
> - <property name="visible">True</property>
> - <property name="homogeneous">False</property>
> - <property name="spacing">6</property>
> + <child>
> + <widget class="GtkHBox" id="transport_ssl_hbox">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
> +
> + <child>
> + <widget class="GtkLabel" id="lblTransportUseSSL">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">_Use secure connection (SSL):</property>
> + <property name="use_underline">True</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + <property name="mnemonic_widget">transport_use_ssl</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkOptionMenu" id="transport_use_ssl">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="history">0</property>
> +
> + <child internal-child="menu">
> + <widget class="GtkMenu" id="convertwidget19">
> + <property name="visible">True</property>
> +
> + <child>
> + <widget class="GtkMenuItem" id="convertwidget20">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Always</property>
> + <property name="use_underline">True</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkMenuItem" id="convertwidget21">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Whenever Possible</property>
> + <property name="use_underline">True</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkMenuItem" id="convertwidget22">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Never</property>
> + <property name="use_underline">True</property>
> + </widget>
> + </child>
> + </widget>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
>
> <child>
> - <widget class="GtkLabel" id="lblTransportUseSSL">
> + <widget class="GtkLabel" id="transport_ssl_disabled">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">_Use secure connection (SSL):</property>
> - <property name="use_underline">True</property>
> + <property name="sensitive">False</property>
> + <property name="label" translatable="yes">(SSL is not supported in this build of evolution)</property>
> + <property name="use_underline">False</property>
> <property name="use_markup">False</property>
> <property name="justify">GTK_JUSTIFY_CENTER</property>
> <property name="wrap">False</property>
> @@ -1797,7 +2157,6 @@
> <property name="yalign">0.5</property>
> <property name="xpad">0</property>
> <property name="ypad">0</property>
> - <property name="mnemonic_widget">transport_use_ssl</property>
> </widget>
> <packing>
> <property name="padding">0</property>
> @@ -1807,40 +2166,15 @@
> </child>
>
> <child>
> - <widget class="GtkOptionMenu" id="transport_use_ssl">
> + <widget class="GtkCheckButton" id="transport_needs_auth">
> <property name="visible">True</property>
> <property name="can_focus">True</property>
> - <property name="history">0</property>
> -
> - <child internal-child="menu">
> - <widget class="GtkMenu" id="convertwidget19">
> - <property name="visible">True</property>
> -
> - <child>
> - <widget class="GtkMenuItem" id="convertwidget20">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Always</property>
> - <property name="use_underline">True</property>
> - </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkMenuItem" id="convertwidget21">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Whenever Possible</property>
> - <property name="use_underline">True</property>
> - </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkMenuItem" id="convertwidget22">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Never</property>
> - <property name="use_underline">True</property>
> - </widget>
> - </child>
> - </widget>
> - </child>
> + <property name="label" translatable="yes">Ser_ver requires authentication</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> </widget>
> <packing>
> <property name="padding">0</property>
> @@ -1851,209 +2185,246 @@
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="transport_ssl_disabled">
> - <property name="visible">True</property>
> - <property name="sensitive">False</property>
> - <property name="label" translatable="yes">(SSL is not supported in this build of evolution)</property>
> - <property name="use_underline">False</property>
> - <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">False</property>
> - <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkCheckButton" id="transport_needs_auth">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">Ser_ver requires authentication</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">False</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> </child>
> + </widget>
> + <packing>
> + <property name="padding">3</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="transport_auth_frame">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkLabel" id="label446">
> + <widget class="GtkLabel" id="label490">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Server Configuration</property>
> + <property name="label" translatable="yes"><b>Authentication</b></property>
> <property name="use_underline">False</property>
> - <property name="use_markup">False</property>
> + <property name="use_markup">True</property>
> <property name="justify">GTK_JUSTIFY_LEFT</property>
> <property name="wrap">False</property>
> <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> + <property name="xalign">0</property>
> <property name="yalign">0.5</property>
> <property name="xpad">0</property>
> <property name="ypad">0</property>
> </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">True</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkFrame" id="transport_auth_frame">
> - <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
>
> <child>
> - <widget class="GtkVBox" id="vbox61">
> - <property name="border_width">6</property>
> + <widget class="GtkHBox" id="hbox184">
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">3</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label489">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
>
> <child>
> - <widget class="GtkHBox" id="hbox49">
> + <widget class="GtkVBox" id="vbox61">
> + <property name="border_width">6</property>
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">3</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkLabel" id="transport_auth_label">
> + <widget class="GtkHBox" id="hbox49">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">_Authentication Type: </property>
> - <property name="use_underline">True</property>
> - <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">False</property>
> - <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="mnemonic_widget">transport_auth_omenu</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> + <property name="homogeneous">False</property>
> + <property name="spacing">3</property>
>
> - <child>
> - <widget class="GtkOptionMenu" id="transport_auth_omenu">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="history">0</property>
> + <child>
> + <widget class="GtkLabel" id="transport_auth_label">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">_Authentication Type: </property>
> + <property name="use_underline">True</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + <property name="mnemonic_widget">transport_auth_omenu</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
>
> - <child internal-child="menu">
> - <widget class="GtkMenu" id="convertwidget23">
> + <child>
> + <widget class="GtkOptionMenu" id="transport_auth_omenu">
> <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="history">0</property>
>
> - <child>
> - <widget class="GtkMenuItem" id="convertwidget24">
> + <child internal-child="menu">
> + <widget class="GtkMenu" id="convertwidget23">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Password</property>
> - <property name="use_underline">True</property>
> +
> + <child>
> + <widget class="GtkMenuItem" id="convertwidget24">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Password</property>
> + <property name="use_underline">True</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkMenuItem" id="convertwidget25">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Kerberos </property>
> + <property name="use_underline">True</property>
> + </widget>
> + </child>
> </widget>
> </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkAlignment" id="alignment2">
> + <property name="visible">True</property>
> + <property name="xalign">1</property>
> + <property name="yalign">0.5</property>
> + <property name="xscale">1</property>
> + <property name="yscale">1</property>
>
> <child>
> - <widget class="GtkMenuItem" id="convertwidget25">
> + <widget class="GtkButton" id="transport_check_supported">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Kerberos </property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes"> _Check for supported types </property>
> <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> </widget>
> </child>
> </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + <property name="pack_type">GTK_PACK_END</property>
> + </packing>
> </child>
> </widget>
> <packing>
> <property name="padding">0</property>
> <property name="expand">False</property>
> - <property name="fill">False</property>
> + <property name="fill">True</property>
> </packing>
> </child>
>
> <child>
> - <widget class="GtkAlignment" id="alignment2">
> + <widget class="GtkHBox" id="hbox52">
> <property name="visible">True</property>
> - <property name="xalign">1</property>
> - <property name="yalign">0.5</property>
> - <property name="xscale">1</property>
> - <property name="yscale">1</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">3</property>
>
> <child>
> - <widget class="GtkButton" id="transport_check_supported">
> + <widget class="GtkLabel" id="transport_user_label">
> <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes"> _Check for supported types </property>
> + <property name="label" translatable="yes">User_name:</property>
> <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_RIGHT</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">1</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + <property name="mnemonic_widget">transport_user</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkEntry" id="transport_user">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</property>
> </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> </child>
> </widget>
> <packing>
> <property name="padding">0</property>
> <property name="expand">False</property>
> <property name="fill">False</property>
> - <property name="pack_type">GTK_PACK_END</property>
> </packing>
> </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">True</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkHBox" id="hbox52">
> - <property name="visible">True</property>
> - <property name="homogeneous">False</property>
> - <property name="spacing">3</property>
>
> <child>
> - <widget class="GtkLabel" id="transport_user_label">
> + <widget class="GtkCheckButton" id="transport_remember_password">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">User_name:</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">Remember this _password</property>
> <property name="use_underline">True</property>
> - <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_RIGHT</property>
> - <property name="wrap">False</property>
> - <property name="selectable">False</property>
> - <property name="xalign">1</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="mnemonic_widget">transport_user</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> </widget>
> <packing>
> <property name="padding">0</property>
> @@ -2061,76 +2432,25 @@
> <property name="fill">False</property>
> </packing>
> </child>
> -
> - <child>
> - <widget class="GtkEntry" id="transport_user">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="editable">True</property>
> - <property name="visibility">True</property>
> - <property name="max_length">0</property>
> - <property name="text" translatable="yes"></property>
> - <property name="has_frame">True</property>
> - <property name="invisible_char" translatable="yes">*</property>
> - <property name="activates_default">False</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">True</property>
> - <property name="fill">True</property>
> - </packing>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkCheckButton" id="transport_remember_password">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">Remember this _password</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">False</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label447">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Authentication</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.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> <packing>
> - <property name="padding">0</property>
> + <property name="padding">3</property>
> <property name="expand">False</property>
> - <property name="fill">True</property>
> + <property name="fill">False</property>
> </packing>
> </child>
> </widget>
> @@ -2180,262 +2500,356 @@
> <property name="spacing">3</property>
>
> <child>
> - <widget class="GtkFrame" id="folders_frame">
> + <widget class="GtkVBox" id="folders_frame">
> <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkTable" id="folders_table">
> - <property name="border_width">6</property>
> + <widget class="GtkLabel" id="label492">
> <property name="visible">True</property>
> - <property name="n_rows">3</property>
> - <property name="n_columns">2</property>
> - <property name="homogeneous">False</property>
> - <property name="row_spacing">6</property>
> - <property name="column_spacing">6</property>
> + <property name="label" translatable="yes"><b>Sent and Draft Folders</b></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">True</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
>
> - <child>
> - <widget class="GtkLabel" id="drafts_label">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Drafts _folder:</property>
> - <property name="use_underline">True</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="mnemonic_widget">drafts_button</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="GtkHBox" id="hbox185">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkLabel" id="sent_label">
> + <widget class="GtkLabel" id="label491">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Sent _messages folder:</property>
> - <property name="use_underline">True</property>
> + <property name="label" translatable="yes"> </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="xalign">0.5</property>
> <property name="yalign">0.5</property>
> <property name="xpad">0</property>
> <property name="ypad">0</property>
> - <property name="mnemonic_widget">sent_button</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>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
>
> <child>
> - <widget class="Custom" id="drafts_button">
> + <widget class="GtkTable" id="folders_table">
> + <property name="border_width">6</property>
> <property name="visible">True</property>
> - <property name="creation_function">mail_account_gui_folder_selector_button_new</property>
> - <property name="int1">0</property>
> - <property name="int2">0</property>
> - <property name="last_modification_time">Wed, 03 Apr 2002 23:03:41 GMT</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>
> - </child>
> + <property name="n_rows">3</property>
> + <property name="n_columns">2</property>
> + <property name="homogeneous">False</property>
> + <property name="row_spacing">6</property>
> + <property name="column_spacing">6</property>
>
> - <child>
> - <widget class="Custom" id="sent_button">
> - <property name="visible">True</property>
> - <property name="creation_function">mail_account_gui_folder_selector_button_new</property>
> - <property name="int1">0</property>
> - <property name="int2">0</property>
> - <property name="last_modification_time">Wed, 03 Apr 2002 23:03:59 GMT</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="y_options">fill</property>
> - </packing>
> - </child>
> + <child>
> + <widget class="GtkLabel" id="drafts_label">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Drafts _folder:</property>
> + <property name="use_underline">True</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="mnemonic_widget">drafts_button</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="GtkButton" id="default_folders_button">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">Restore Defaults</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> + <child>
> + <widget class="GtkLabel" id="sent_label">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Sent _messages folder:</property>
> + <property name="use_underline">True</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="mnemonic_widget">sent_button</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="Custom" id="drafts_button">
> + <property name="visible">True</property>
> + <property name="creation_function">mail_account_gui_folder_selector_button_new</property>
> + <property name="int1">0</property>
> + <property name="int2">0</property>
> + <property name="last_modification_time">Wed, 03 Apr 2002 23:03:41 GMT</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>
> + </child>
> +
> + <child>
> + <widget class="Custom" id="sent_button">
> + <property name="visible">True</property>
> + <property name="creation_function">mail_account_gui_folder_selector_button_new</property>
> + <property name="int1">0</property>
> + <property name="int2">0</property>
> + <property name="last_modification_time">Wed, 03 Apr 2002 23:03:59 GMT</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="y_options">fill</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkButton" id="default_folders_button">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">Restore Defaults</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + <packing>
> + <property name="left_attach">1</property>
> + <property name="right_attach">2</property>
> + <property name="top_attach">2</property>
> + <property name="bottom_attach">3</property>
> + <property name="x_options">fill</property>
> + <property name="y_options"></property>
> + </packing>
> + </child>
> </widget>
> <packing>
> - <property name="left_attach">1</property>
> - <property name="right_attach">2</property>
> - <property name="top_attach">2</property>
> - <property name="bottom_attach">3</property>
> - <property name="x_options">fill</property>
> - <property name="y_options"></property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> </child>
> + </widget>
> + <packing>
> + <property name="padding">3</property>
> + <property name="expand">False</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox173">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkLabel" id="label448">
> + <widget class="GtkLabel" id="label494">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Sent and Draft Messages</property>
> + <property name="label" translatable="yes"><b>Composing Messages</b></property>
> <property name="use_underline">False</property>
> - <property name="use_markup">False</property>
> + <property name="use_markup">True</property>
> <property name="justify">GTK_JUSTIFY_LEFT</property>
> <property name="wrap">False</property>
> <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> + <property name="xalign">0</property>
> <property name="yalign">0.5</property>
> <property name="xpad">0</property>
> <property name="ypad">0</property>
> </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">True</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkFrame" id="frame2">
> - <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
>
> <child>
> - <widget class="GtkVBox" id="vbox67">
> + <widget class="GtkHBox" id="hbox186">
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkHBox" id="hbox61">
> + <widget class="GtkLabel" id="label493">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox67">
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkTable" id="table8">
> - <property name="border_width">6</property>
> + <widget class="GtkHBox" id="hbox61">
> <property name="visible">True</property>
> - <property name="n_rows">2</property>
> - <property name="n_columns">2</property>
> <property name="homogeneous">False</property>
> - <property name="row_spacing">6</property>
> - <property name="column_spacing">6</property>
> + <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkCheckButton" id="always_cc">
> + <widget class="GtkTable" id="table8">
> + <property name="border_width">6</property>
> <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">Always _carbon-copy (Cc) to:</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">False</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</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>
> + <property name="n_rows">2</property>
> + <property name="n_columns">2</property>
> + <property name="homogeneous">False</property>
> + <property name="row_spacing">6</property>
> + <property name="column_spacing">6</property>
>
> - <child>
> - <widget class="GtkCheckButton" id="always_bcc">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">Always _blind carbon-copy (Bcc) to:</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">False</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</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="GtkCheckButton" id="always_cc">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">Always _carbon-copy (Cc) to:</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</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="GtkEntry" id="cc_addrs">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="editable">True</property>
> - <property name="visibility">True</property>
> - <property name="max_length">0</property>
> - <property name="text" translatable="yes"></property>
> - <property name="has_frame">True</property>
> - <property name="invisible_char" translatable="yes">*</property>
> - <property name="activates_default">False</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"></property>
> - </packing>
> - </child>
> + <child>
> + <widget class="GtkCheckButton" id="always_bcc">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">Always _blind carbon-copy (Bcc) to:</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</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="GtkEntry" id="bcc_addrs">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="editable">True</property>
> - <property name="visibility">True</property>
> - <property name="max_length">0</property>
> - <property name="text" translatable="yes"></property>
> - <property name="has_frame">True</property>
> - <property name="invisible_char" translatable="yes">*</property>
> - <property name="activates_default">False</property>
> + <child>
> + <widget class="GtkEntry" id="cc_addrs">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</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"></property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkEntry" id="bcc_addrs">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</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="y_options"></property>
> + </packing>
> + </child>
> </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="y_options"></property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> @@ -2453,29 +2867,15 @@
> </packing>
> </child>
> </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label449">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Composing Messages</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.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> <packing>
> - <property name="padding">0</property>
> + <property name="padding">3</property>
> <property name="expand">False</property>
> <property name="fill">True</property>
> </packing>
> @@ -2524,43 +2924,116 @@
> <widget class="GtkVBox" id="security_vbox">
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">3</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkFrame" id="pgp_frame">
> + <widget class="GtkVBox" id="pgp_frame">
> <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkVBox" id="vboxPGP">
> - <property name="border_width">6</property>
> + <widget class="GtkLabel" id="label495">
> <property name="visible">True</property>
> - <property name="homogeneous">False</property>
> - <property name="spacing">3</property>
> -
> - <child>
> - <widget class="GtkHBox" id="hbox63">
> - <property name="border_width">3</property>
> - <property name="visible">True</property>
> - <property name="homogeneous">False</property>
> - <property name="spacing">6</property>
> -
> - <child>
> - <widget class="GtkLabel" id="pgp_key_id_label">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">PGP/GPG _Key ID:</property>
> - <property name="use_underline">True</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="mnemonic_widget">pgp_key</property>
> + <property name="label" translatable="yes"><b>Pretty Good Privacy (PGP/GPG)</b></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">True</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox187">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label496">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="vboxPGP">
> + <property name="border_width">6</property>
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox63">
> + <property name="border_width">3</property>
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
> +
> + <child>
> + <widget class="GtkLabel" id="pgp_key_id_label">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">PGP/GPG _Key ID:</property>
> + <property name="use_underline">True</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="mnemonic_widget">pgp_key</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkEntry" id="pgp_key">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> </widget>
> <packing>
> <property name="padding">0</property>
> @@ -2570,527 +3043,528 @@
> </child>
>
> <child>
> - <widget class="GtkEntry" id="pgp_key">
> + <widget class="GtkCheckButton" id="pgp_always_sign">
> <property name="visible">True</property>
> <property name="can_focus">True</property>
> - <property name="editable">True</property>
> - <property name="visibility">True</property>
> - <property name="max_length">0</property>
> - <property name="text" translatable="yes"></property>
> - <property name="has_frame">True</property>
> - <property name="invisible_char" translatable="yes">*</property>
> - <property name="activates_default">False</property>
> + <property name="label" translatable="yes">_Always sign outgoing messages when using this account</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">True</property>
> - <property name="fill">True</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkCheckButton" id="pgp_always_sign">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">_Always sign outgoing messages when using this account</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">False</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
>
> - <child>
> - <widget class="GtkCheckButton" id="pgp_no_imip_sign">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">Don't sign _meeting requests (for Outlook compatibility)</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">False</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> + <child>
> + <widget class="GtkCheckButton" id="pgp_no_imip_sign">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">Don't sign _meeting requests (for Outlook compatibility)</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
>
> - <child>
> - <widget class="GtkCheckButton" id="pgp_encrypt_to_self">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">Al_ways encrypt to myself when sending encrypted mail</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">True</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> + <child>
> + <widget class="GtkCheckButton" id="pgp_encrypt_to_self">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">Al_ways encrypt to myself when sending encrypted mail</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">True</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
>
> - <child>
> - <widget class="GtkCheckButton" id="pgp_always_trust">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">Always _trust keys in my keyring when encrypting</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">False</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> + <child>
> + <widget class="GtkCheckButton" id="pgp_always_trust">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">Always _trust keys in my keyring when encrypting</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> </child>
> + </widget>
> + <packing>
> + <property name="padding">3</property>
> + <property name="expand">False</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="smime_frame">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkLabel" id="label450">
> + <widget class="GtkLabel" id="label497">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Pretty Good Privacy (PGP/GPG)</property>
> + <property name="label" translatable="yes"><b>Secure MIME (SMIME)</b></property>
> <property name="use_underline">False</property>
> - <property name="use_markup">False</property>
> + <property name="use_markup">True</property>
> <property name="justify">GTK_JUSTIFY_LEFT</property>
> <property name="wrap">False</property>
> <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> + <property name="xalign">0</property>
> <property name="yalign">0.5</property>
> <property name="xpad">0</property>
> <property name="ypad">0</property>
> </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">True</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkFrame" id="smime_frame">
> - <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
>
> <child>
> - <widget class="GtkTable" id="smime_table">
> - <property name="border_width">6</property>
> + <widget class="GtkHBox" id="hbox188">
> <property name="visible">True</property>
> - <property name="n_rows">6</property>
> - <property name="n_columns">4</property>
> <property name="homogeneous">False</property>
> - <property name="row_spacing">5</property>
> - <property name="column_spacing">9</property>
> + <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkLabel" id="label469">
> + <widget class="GtkLabel" id="label498">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Si_gning certificate:</property>
> - <property name="use_underline">True</property>
> + <property name="label" translatable="yes"> </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="xalign">0.5</property>
> <property name="yalign">0.5</property>
> <property name="xpad">0</property>
> <property name="ypad">0</property>
> - <property name="mnemonic_widget">smime_sign_key</property>
> - <accessibility>
> - <atkrelation target="smime_sign_key" type="label-for"/>
> - </accessibility>
> </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>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
>
> <child>
> - <widget class="GtkEntry" id="smime_sign_key">
> + <widget class="GtkTable" id="smime_table">
> + <property name="border_width">6</property>
> <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="editable">True</property>
> - <property name="visibility">True</property>
> - <property name="max_length">0</property>
> - <property name="text" translatable="yes"></property>
> - <property name="has_frame">True</property>
> - <property name="invisible_char" translatable="yes">*</property>
> - <property name="activates_default">False</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="y_options"></property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label470">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Encry_ption certificate:</property>
> - <property name="use_underline">True</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="mnemonic_widget">smime_encrypt_key</property>
> - <accessibility>
> - <atkrelation target="smime_encrypt_key" type="label-for"/>
> - </accessibility>
> - </widget>
> - <packing>
> - <property name="left_attach">0</property>
> - <property name="right_attach">1</property>
> - <property name="top_attach">5</property>
> - <property name="bottom_attach">6</property>
> - <property name="x_options">fill</property>
> - <property name="y_options"></property>
> - </packing>
> - </child>
> + <property name="n_rows">6</property>
> + <property name="n_columns">4</property>
> + <property name="homogeneous">False</property>
> + <property name="row_spacing">6</property>
> + <property name="column_spacing">9</property>
>
> - <child>
> - <widget class="GtkEntry" id="smime_encrypt_key">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="editable">True</property>
> - <property name="visibility">True</property>
> - <property name="max_length">0</property>
> - <property name="text" translatable="yes"></property>
> - <property name="has_frame">True</property>
> - <property name="invisible_char" translatable="yes">*</property>
> - <property name="activates_default">False</property>
> - </widget>
> - <packing>
> - <property name="left_attach">1</property>
> - <property name="right_attach">2</property>
> - <property name="top_attach">5</property>
> - <property name="bottom_attach">6</property>
> - <property name="y_options"></property>
> - </packing>
> - </child>
> + <child>
> + <widget class="GtkLabel" id="label469">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Si_gning certificate:</property>
> + <property name="use_underline">True</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="mnemonic_widget">smime_sign_key</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="GtkButton" id="smime_encrypt_key_select">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> + <child>
> + <widget class="GtkEntry" id="smime_sign_key">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</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="y_options"></property>
> + </packing>
> + </child>
>
> <child>
> - <widget class="GtkAlignment" id="alignment28">
> + <widget class="GtkLabel" id="label470">
> <property name="visible">True</property>
> - <property name="xalign">0.5</property>
> + <property name="label" translatable="yes">Encry_ption certificate:</property>
> + <property name="use_underline">True</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="xscale">0</property>
> - <property name="yscale">0</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + <property name="mnemonic_widget">smime_encrypt_key</property>
> + </widget>
> + <packing>
> + <property name="left_attach">0</property>
> + <property name="right_attach">1</property>
> + <property name="top_attach">5</property>
> + <property name="bottom_attach">6</property>
> + <property name="x_options">fill</property>
> + <property name="y_options"></property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkEntry" id="smime_encrypt_key">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</property>
> + </widget>
> + <packing>
> + <property name="left_attach">1</property>
> + <property name="right_attach">2</property>
> + <property name="top_attach">5</property>
> + <property name="bottom_attach">6</property>
> + <property name="y_options"></property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkButton" id="smime_encrypt_key_select">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
>
> <child>
> - <widget class="GtkHBox" id="hbox175">
> + <widget class="GtkAlignment" id="alignment28">
> <property name="visible">True</property>
> - <property name="homogeneous">False</property>
> - <property name="spacing">2</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xscale">0</property>
> + <property name="yscale">0</property>
>
> <child>
> - <widget class="GtkImage" id="image3">
> + <widget class="GtkHBox" id="hbox175">
> <property name="visible">True</property>
> - <property name="stock">gtk-open</property>
> - <property name="icon_size">4</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> + <property name="homogeneous">False</property>
> + <property name="spacing">2</property>
>
> - <child>
> - <widget class="GtkLabel" id="button98">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">_Select...</property>
> - <property name="use_underline">True</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.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> + <child>
> + <widget class="GtkImage" id="image3">
> + <property name="visible">True</property>
> + <property name="stock">gtk-open</property>
> + <property name="icon_size">4</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkLabel" id="button98">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">_Select...</property>
> + <property name="use_underline">True</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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> </child>
> </widget>
> </child>
> </widget>
> + <packing>
> + <property name="left_attach">2</property>
> + <property name="right_attach">3</property>
> + <property name="top_attach">5</property>
> + <property name="bottom_attach">6</property>
> + <property name="x_options">fill</property>
> + <property name="y_options"></property>
> + </packing>
> </child>
> - </widget>
> - <packing>
> - <property name="left_attach">2</property>
> - <property name="right_attach">3</property>
> - <property name="top_attach">5</property>
> - <property name="bottom_attach">6</property>
> - <property name="x_options">fill</property>
> - <property name="y_options"></property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkButton" id="smime_sign_key_select">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
>
> <child>
> - <widget class="GtkAlignment" id="alignment29">
> + <widget class="GtkButton" id="smime_sign_key_select">
> <property name="visible">True</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xscale">0</property>
> - <property name="yscale">0</property>
> + <property name="can_focus">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
>
> <child>
> - <widget class="GtkHBox" id="hbox176">
> + <widget class="GtkAlignment" id="alignment29">
> <property name="visible">True</property>
> - <property name="homogeneous">False</property>
> - <property name="spacing">2</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xscale">0</property>
> + <property name="yscale">0</property>
>
> <child>
> - <widget class="GtkImage" id="image4">
> + <widget class="GtkHBox" id="hbox176">
> <property name="visible">True</property>
> - <property name="stock">gtk-open</property>
> - <property name="icon_size">4</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> + <property name="homogeneous">False</property>
> + <property name="spacing">2</property>
>
> - <child>
> - <widget class="GtkLabel" id="label472">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">_Select...</property>
> - <property name="use_underline">True</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.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> + <child>
> + <widget class="GtkImage" id="image4">
> + <property name="visible">True</property>
> + <property name="stock">gtk-open</property>
> + <property name="icon_size">4</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkLabel" id="label472">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">_Select...</property>
> + <property name="use_underline">True</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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> </child>
> </widget>
> </child>
> </widget>
> + <packing>
> + <property name="left_attach">2</property>
> + <property name="right_attach">3</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>
> - </widget>
> - <packing>
> - <property name="left_attach">2</property>
> - <property name="right_attach">3</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="GtkButton" id="smime_sign_key_clear">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label">gtk-clear</property>
> - <property name="use_stock">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - </widget>
> - <packing>
> - <property name="left_attach">3</property>
> - <property name="right_attach">4</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="GtkButton" id="smime_sign_key_clear">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label">gtk-clear</property>
> + <property name="use_stock">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + <packing>
> + <property name="left_attach">3</property>
> + <property name="right_attach">4</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="GtkButton" id="smime_encrypt_key_clear">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label">gtk-clear</property>
> - <property name="use_stock">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - </widget>
> - <packing>
> - <property name="left_attach">3</property>
> - <property name="right_attach">4</property>
> - <property name="top_attach">5</property>
> - <property name="bottom_attach">6</property>
> - <property name="x_options">fill</property>
> - <property name="y_options"></property>
> - </packing>
> - </child>
> + <child>
> + <widget class="GtkButton" id="smime_encrypt_key_clear">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label">gtk-clear</property>
> + <property name="use_stock">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + <packing>
> + <property name="left_attach">3</property>
> + <property name="right_attach">4</property>
> + <property name="top_attach">5</property>
> + <property name="bottom_attach">6</property>
> + <property name="x_options">fill</property>
> + <property name="y_options"></property>
> + </packing>
> + </child>
>
> - <child>
> - <widget class="GtkCheckButton" id="smime_encrypt_to_self">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">A_lso encrypt to self when sending encrypted mail</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">False</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> - </widget>
> - <packing>
> - <property name="left_attach">0</property>
> - <property name="right_attach">4</property>
> - <property name="top_attach">4</property>
> - <property name="bottom_attach">5</property>
> - <property name="x_options">fill</property>
> - <property name="y_options"></property>
> - </packing>
> - </child>
> + <child>
> + <widget class="GtkCheckButton" id="smime_encrypt_to_self">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">A_lso encrypt to self when sending encrypted mail</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> + </widget>
> + <packing>
> + <property name="left_attach">0</property>
> + <property name="right_attach">4</property>
> + <property name="top_attach">4</property>
> + <property name="bottom_attach">5</property>
> + <property name="x_options">fill</property>
> + <property name="y_options"></property>
> + </packing>
> + </child>
>
> - <child>
> - <widget class="GtkCheckButton" id="smime_encrypt_default">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">_Encrypt outgoing messages (by default)</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">False</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> - </widget>
> - <packing>
> - <property name="left_attach">0</property>
> - <property name="right_attach">4</property>
> - <property name="top_attach">3</property>
> - <property name="bottom_attach">4</property>
> - <property name="x_options">fill</property>
> - <property name="y_options"></property>
> - </packing>
> - </child>
> + <child>
> + <widget class="GtkCheckButton" id="smime_encrypt_default">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">_Encrypt outgoing messages (by default)</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> + </widget>
> + <packing>
> + <property name="left_attach">0</property>
> + <property name="right_attach">4</property>
> + <property name="top_attach">3</property>
> + <property name="bottom_attach">4</property>
> + <property name="x_options">fill</property>
> + <property name="y_options"></property>
> + </packing>
> + </child>
>
> - <child>
> - <widget class="GtkHSeparator" id="hseparator3">
> - <property name="visible">True</property>
> - </widget>
> - <packing>
> - <property name="left_attach">0</property>
> - <property name="right_attach">4</property>
> - <property name="top_attach">2</property>
> - <property name="bottom_attach">3</property>
> - <property name="y_padding">3</property>
> - <property name="x_options">fill</property>
> - <property name="y_options">fill</property>
> - </packing>
> - </child>
> + <child>
> + <widget class="GtkHSeparator" id="hseparator3">
> + <property name="visible">True</property>
> + </widget>
> + <packing>
> + <property name="left_attach">0</property>
> + <property name="right_attach">4</property>
> + <property name="top_attach">2</property>
> + <property name="bottom_attach">3</property>
> + <property name="y_padding">3</property>
> + <property name="x_options">fill</property>
> + <property name="y_options">fill</property>
> + </packing>
> + </child>
>
> - <child>
> - <widget class="GtkCheckButton" id="smime_sign_default">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">Digitally _sign outgoing messages (by default)</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">False</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> + <child>
> + <widget class="GtkCheckButton" id="smime_sign_default">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">Digitally _sign outgoing messages (by default)</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> + </widget>
> + <packing>
> + <property name="left_attach">0</property>
> + <property name="right_attach">4</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>
> </widget>
> <packing>
> - <property name="left_attach">0</property>
> - <property name="right_attach">4</property>
> - <property name="top_attach">0</property>
> - <property name="bottom_attach">1</property>
> - <property name="x_options">fill</property>
> - <property name="y_options"></property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label451">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Secure MIME (S/MIME)</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.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> <packing>
> - <property name="padding">0</property>
> + <property name="padding">3</property>
> <property name="expand">False</property>
> <property name="fill">True</property>
> </packing>
> @@ -3332,29 +3806,51 @@
> <property name="spacing">3</property>
>
> <child>
> - <widget class="GtkFrame" id="frame3">
> + <widget class="GtkVBox" id="vbox176">
> <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkVBox" id="vboxMessageFonts">
> - <property name="border_width">6</property>
> + <widget class="GtkLabel" id="label499">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"><b>Message Fonts</b></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">True</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox189">
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">3</property>
> + <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkCheckButton" id="radFontUseSame">
> + <widget class="GtkLabel" id="label500">
> <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">_Use the same fonts as other applications</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">False</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> </widget>
> <packing>
> <property name="padding">0</property>
> @@ -3364,103 +3860,135 @@
> </child>
>
> <child>
> - <widget class="GtkTable" id="tblScreen">
> + <widget class="GtkVBox" id="vboxMessageFonts">
> + <property name="border_width">6</property>
> <property name="visible">True</property>
> - <property name="n_rows">2</property>
> - <property name="n_columns">2</property>
> <property name="homogeneous">False</property>
> - <property name="row_spacing">3</property>
> - <property name="column_spacing">3</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkLabel" id="lblScreenVariable">
> + <widget class="GtkCheckButton" id="radFontUseSame">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">_Standard Font:</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">_Use the same fonts as other applications</property>
> <property name="use_underline">True</property>
> - <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_RIGHT</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="mnemonic_widget">radFontVariable</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</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>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
>
> <child>
> - <widget class="GnomeFontPicker" id="radFontFixed">
> + <widget class="GtkTable" id="tblScreen">
> <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="title" translatable="yes">Select HTML fixed width font</property>
> - <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
> - <property name="show_size">True</property>
> - <property name="use_font_in_label">False</property>
> - <property name="label_font_size">14</property>
> - <signal name="font_set" handler="changed"/>
> - </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"></property>
> - </packing>
> - </child>
> + <property name="n_rows">2</property>
> + <property name="n_columns">2</property>
> + <property name="homogeneous">False</property>
> + <property name="row_spacing">3</property>
> + <property name="column_spacing">3</property>
>
> - <child>
> - <widget class="GnomeFontPicker" id="radFontVariable">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="title" translatable="yes">Select HTML variable width font</property>
> - <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
> - <property name="show_size">True</property>
> - <property name="use_font_in_label">False</property>
> - <property name="label_font_size">14</property>
> - <signal name="font_set" handler="changed"/>
> - </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="x_options">fill</property>
> - <property name="y_options"></property>
> - </packing>
> - </child>
> + <child>
> + <widget class="GtkLabel" id="lblScreenVariable">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">_Standard Font:</property>
> + <property name="use_underline">True</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_RIGHT</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="mnemonic_widget">radFontVariable</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="label444">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">_Terminal Font:</property>
> - <property name="use_underline">True</property>
> - <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_RIGHT</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="mnemonic_widget">radFontFixed</property>
> + <child>
> + <widget class="GnomeFontPicker" id="radFontFixed">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="title" translatable="yes">Select HTML fixed width font</property>
> + <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
> + <property name="show_size">True</property>
> + <property name="use_font_in_label">False</property>
> + <property name="label_font_size">14</property>
> + <signal name="font_set" handler="changed"/>
> + </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"></property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GnomeFontPicker" id="radFontVariable">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="title" translatable="yes">Select HTML variable width font</property>
> + <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
> + <property name="show_size">True</property>
> + <property name="use_font_in_label">False</property>
> + <property name="label_font_size">14</property>
> + <signal name="font_set" handler="changed"/>
> + </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="x_options">fill</property>
> + <property name="y_options"></property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkLabel" id="label444">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">_Terminal Font:</property>
> + <property name="use_underline">True</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_RIGHT</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="mnemonic_widget">radFontFixed</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>
> </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>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> @@ -3471,246 +3999,286 @@
> </packing>
> </child>
> </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> </child>
> + </widget>
> + <packing>
> + <property name="padding">3</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="frameMessageDisplay">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkLabel" id="label460">
> + <widget class="GtkLabel" id="label501">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Message Fonts</property>
> + <property name="label" translatable="yes"><b>Message Display</b></property>
> <property name="use_underline">False</property>
> - <property name="use_markup">False</property>
> + <property name="use_markup">True</property>
> <property name="justify">GTK_JUSTIFY_LEFT</property>
> <property name="wrap">False</property>
> <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> + <property name="xalign">0</property>
> <property name="yalign">0.5</property>
> <property name="xpad">0</property>
> <property name="ypad">0</property>
> </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkFrame" id="frameMessageDisplay">
> - <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
>
> <child>
> - <widget class="GtkVBox" id="vboxMessageDisplay">
> - <property name="border_width">6</property>
> + <widget class="GtkHBox" id="hbox190">
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">3</property>
> + <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkHBox" id="hboxReadTimeout">
> + <widget class="GtkLabel" id="label502">
> <property name="visible">True</property>
> - <property name="homogeneous">False</property>
> - <property name="spacing">3</property>
> -
> - <child>
> - <widget class="GtkCheckButton" id="chkMarkTimeout">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">_Mark messages as read after</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">False</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkSpinButton" id="spinMarkTimeout">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="climb_rate">1</property>
> - <property name="digits">1</property>
> - <property name="numeric">True</property>
> - <property name="update_policy">GTK_UPDATE_IF_VALID</property>
> - <property name="snap_to_ticks">False</property>
> - <property name="wrap">False</property>
> - <property name="adjustment">1.5 0 10 1 1 1</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="lblSeconds">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">seconds</property>
> - <property name="use_underline">False</property>
> - <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">False</property>
> - <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">True</property>
> - <property name="fill">True</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
>
> <child>
> - <widget class="GtkHBox" id="hboxDefaultCharset">
> + <widget class="GtkVBox" id="vboxMessageDisplay">
> + <property name="border_width">6</property>
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">3</property>
> -
> - <child>
> - <widget class="GtkLabel" id="lblDefaultCharset">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Default character _encoding:</property>
> - <property name="use_underline">True</property>
> - <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">False</property>
> - <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="mnemonic_widget">omenuCharset</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkOptionMenu" id="omenuCharset">
> + <widget class="GtkHBox" id="hboxReadTimeout">
> <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="history">0</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">3</property>
>
> - <child internal-child="menu">
> - <widget class="GtkMenu" id="convertwidget26">
> + <child>
> + <widget class="GtkCheckButton" id="chkMarkTimeout">
> <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">_Mark messages as read after</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
>
> - <child>
> - <widget class="GtkMenuItem" id="convertwidget27">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Baltic (ISO-8859-13)</property>
> - <property name="use_underline">True</property>
> - </widget>
> - </child>
> + <child>
> + <widget class="GtkSpinButton" id="spinMarkTimeout">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="climb_rate">1</property>
> + <property name="digits">1</property>
> + <property name="numeric">True</property>
> + <property name="update_policy">GTK_UPDATE_IF_VALID</property>
> + <property name="snap_to_ticks">False</property>
> + <property name="wrap">False</property>
> + <property name="adjustment">1.5 0 10 1 1 1</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
>
> - <child>
> - <widget class="GtkMenuItem" id="convertwidget28">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Baltic (ISO-8859-4)</property>
> - <property name="use_underline">True</property>
> - </widget>
> - </child>
> + <child>
> + <widget class="GtkLabel" id="lblSeconds">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">seconds</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> </child>
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">True</property>
> - <property name="fill">True</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkHBox" id="hboxHighlightColor">
> - <property name="visible">True</property>
> - <property name="homogeneous">False</property>
> - <property name="spacing">3</property>
>
> <child>
> - <widget class="GtkCheckButton" id="chkHighlightCitations">
> + <widget class="GtkHBox" id="hboxDefaultCharset">
> <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">Highlight _quotations with</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">True</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> + <property name="homogeneous">False</property>
> + <property name="spacing">3</property>
>
> - <child>
> - <widget class="GnomeColorPicker" id="colorpickerHighlightCitations">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="dither">True</property>
> - <property name="use_alpha">False</property>
> - <property name="title" translatable="yes">Pick a color</property>
> + <child>
> + <widget class="GtkLabel" id="lblDefaultCharset">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Default character _encoding:</property>
> + <property name="use_underline">True</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + <property name="mnemonic_widget">omenuCharset</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkOptionMenu" id="omenuCharset">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="history">0</property>
> +
> + <child internal-child="menu">
> + <widget class="GtkMenu" id="convertwidget26">
> + <property name="visible">True</property>
> +
> + <child>
> + <widget class="GtkMenuItem" id="convertwidget27">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Baltic (ISO-8859-13)</property>
> + <property name="use_underline">True</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkMenuItem" id="convertwidget28">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Baltic (ISO-8859-4)</property>
> + <property name="use_underline">True</property>
> + </widget>
> + </child>
> + </widget>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
>
> <child>
> - <widget class="GtkLabel" id="lblColor">
> + <widget class="GtkHBox" id="hboxHighlightColor">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">color</property>
> - <property name="use_underline">False</property>
> - <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">False</property>
> - <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">3</property>
> +
> + <child>
> + <widget class="GtkCheckButton" id="chkHighlightCitations">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">Highlight _quotations with</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">True</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GnomeColorPicker" id="colorpickerHighlightCitations">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="dither">True</property>
> + <property name="use_alpha">False</property>
> + <property name="title" translatable="yes">Pick a color</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkLabel" id="lblColor">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">color</property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> @@ -3721,58 +4289,66 @@
> </packing>
> </child>
> </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> </child>
> + </widget>
> + <packing>
> + <property name="padding">3</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="frameDeletingMail">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkLabel" id="label452">
> + <widget class="GtkLabel" id="label503">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Message Display</property>
> + <property name="label" translatable="yes"><b>Deleting Mail</b></property>
> <property name="use_underline">False</property>
> - <property name="use_markup">False</property>
> + <property name="use_markup">True</property>
> <property name="justify">GTK_JUSTIFY_LEFT</property>
> <property name="wrap">False</property>
> <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> + <property name="xalign">0</property>
> <property name="yalign">0.5</property>
> <property name="xpad">0</property>
> <property name="ypad">0</property>
> </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkFrame" id="frameDeletingMail">
> - <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
>
> <child>
> - <widget class="GtkVBox" id="vboxDeletingMail">
> - <property name="border_width">6</property>
> + <widget class="GtkHBox" id="hbox191">
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">3</property>
> + <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkCheckButton" id="chkEmptyTrashOnExit">
> + <widget class="GtkLabel" id="label504">
> <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">Empty _trash folders on exit</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">False</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> </widget>
> <packing>
> <property name="padding">0</property>
> @@ -3782,113 +4358,115 @@
> </child>
>
> <child>
> - <widget class="GtkCheckButton" id="chkConfirmExpunge">
> + <widget class="GtkVBox" id="vboxDeletingMail">
> + <property name="border_width">6</property>
> <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">_Confirm when expunging a folder</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">False</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
> +
> + <child>
> + <widget class="GtkCheckButton" id="chkEmptyTrashOnExit">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">Empty _trash folders on exit</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkCheckButton" id="chkConfirmExpunge">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">_Confirm when expunging a folder</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> </child>
> + </widget>
> + <packing>
> + <property name="padding">3</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="frameNewMailNotify">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkLabel" id="label453">
> + <widget class="GtkLabel" id="label505">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Deleting Mail</property>
> + <property name="label" translatable="yes"><b>New Mail Notification</b></property>
> <property name="use_underline">False</property>
> - <property name="use_markup">False</property>
> + <property name="use_markup">True</property>
> <property name="justify">GTK_JUSTIFY_LEFT</property>
> <property name="wrap">False</property>
> <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> + <property name="xalign">0</property>
> <property name="yalign">0.5</property>
> <property name="xpad">0</property>
> <property name="ypad">0</property>
> </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">True</property>
> - <property name="fill">True</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkFrame" id="frameNewMailNotify">
> - <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
>
> <child>
> - <widget class="GtkVBox" id="vboxNewMailNotify">
> - <property name="border_width">6</property>
> + <widget class="GtkHBox" id="hbox192">
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">3</property>
> + <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkRadioButton" id="radNotifyNot">
> + <widget class="GtkLabel" id="label506">
> <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">_Do not notify me when new mail arrives</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">True</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkRadioButton" id="radNotifyBeep">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">_Beep when new mail arrives</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">False</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> - <property name="group">radNotifyNot</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkRadioButton" id="radNotifyPlaySound">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">_Play sound file when new mail arrives</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">False</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> - <property name="group">radNotifyNot</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> </widget>
> <packing>
> <property name="padding">0</property>
> @@ -3898,26 +4476,60 @@
> </child>
>
> <child>
> - <widget class="GtkHBox" id="hbox154">
> - <property name="border_width">3</property>
> + <widget class="GtkVBox" id="vboxNewMailNotify">
> + <property name="border_width">6</property>
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">3</property>
> + <property name="spacing">6</property>
> +
> + <child>
> + <widget class="GtkRadioButton" id="radNotifyNot">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">_Do not notify me when new mail arrives</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">True</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
>
> <child>
> - <widget class="GtkLabel" id="lblNotifyFilename">
> + <widget class="GtkRadioButton" id="radNotifyBeep">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Specify _filename:</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">_Beep when new mail arrives</property>
> <property name="use_underline">True</property>
> - <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">False</property>
> - <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="mnemonic_widget">txtNotifyPlaySound</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> + <property name="group">radNotifyNot</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkRadioButton" id="radNotifyPlaySound">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">_Play sound file when new mail arrives</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> + <property name="group">radNotifyNot</property>
> </widget>
> <packing>
> <property name="padding">0</property>
> @@ -3927,64 +4539,86 @@
> </child>
>
> <child>
> - <widget class="GnomeFileEntry" id="fileNotifyPlaySound">
> + <widget class="GtkHBox" id="hbox154">
> + <property name="border_width">3</property>
> <property name="visible">True</property>
> - <property name="max_saved">10</property>
> - <property name="browse_dialog_title" translatable="yes">Execute Command...</property>
> - <property name="directory_entry">False</property>
> - <property name="modal">False</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">3</property>
>
> - <child internal-child="entry">
> - <widget class="GtkEntry" id="txtNotifyPlaySound">
> + <child>
> + <widget class="GtkLabel" id="lblNotifyFilename">
> <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="editable">True</property>
> - <property name="visibility">True</property>
> - <property name="max_length">0</property>
> - <property name="text" translatable="yes"></property>
> - <property name="has_frame">True</property>
> - <property name="invisible_char" translatable="yes">*</property>
> - <property name="activates_default">False</property>
> + <property name="label" translatable="yes">Specify _filename:</property>
> + <property name="use_underline">True</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + <property name="mnemonic_widget">txtNotifyPlaySound</property>
> </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GnomeFileEntry" id="fileNotifyPlaySound">
> + <property name="visible">True</property>
> + <property name="max_saved">10</property>
> + <property name="browse_dialog_title" translatable="yes">Execute Command...</property>
> + <property name="directory_entry">False</property>
> + <property name="modal">False</property>
> +
> + <child internal-child="entry">
> + <widget class="GtkEntry" id="txtNotifyPlaySound">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</property>
> + </widget>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> </child>
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">True</property>
> - <property name="fill">True</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label454">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">New Mail Notification</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.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> <packing>
> - <property name="padding">0</property>
> + <property name="padding">3</property>
> <property name="expand">True</property>
> <property name="fill">True</property>
> </packing>
> @@ -4020,32 +4654,54 @@
> <property name="border_width">6</property>
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">3</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkFrame" id="frameLoadingImages">
> + <widget class="GtkVBox" id="frameLoadingImages">
> <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkVBox" id="vboxLoadingImages">
> - <property name="border_width">6</property>
> + <widget class="GtkLabel" id="label508">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"><b>Loading Images </b></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">True</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox193">
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">3</property>
> + <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkRadioButton" id="radImagesNever">
> + <widget class="GtkLabel" id="label507">
> <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">_Never load images off the net</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">True</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> </widget>
> <packing>
> <property name="padding">0</property>
> @@ -4055,66 +4711,84 @@
> </child>
>
> <child>
> - <widget class="GtkRadioButton" id="radImagesSometimes">
> + <widget class="GtkVBox" id="vboxLoadingImages">
> + <property name="border_width">6</property>
> <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">_Load images if sender is in addressbook</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">False</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> - <property name="group">radImagesNever</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> - <child>
> - <widget class="GtkRadioButton" id="radImagesAlways">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">_Always load images off the net</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">False</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> - <property name="group">radImagesNever</property>
> + <child>
> + <widget class="GtkRadioButton" id="radImagesNever">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">_Never load images off the net</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">True</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkRadioButton" id="radImagesSometimes">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">_Load images if sender is in addressbook</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> + <property name="group">radImagesNever</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkRadioButton" id="radImagesAlways">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">_Always load images off the net</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> + <property name="group">radImagesNever</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label455">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Loading Images</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.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> <packing>
> - <property name="padding">0</property>
> + <property name="padding">3</property>
> <property name="expand">False</property>
> <property name="fill">False</property>
> </packing>
> @@ -4189,263 +4863,303 @@
> <property name="spacing">3</property>
>
> <child>
> - <widget class="GtkFrame" id="frameColours">
> + <widget class="GtkVBox" id="frameColours">
> <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkTable" id="tableColours">
> - <property name="border_width">6</property>
> + <widget class="GtkLabel" id="label509">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"><b>Labels and Colors</b></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">True</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox194">
> <property name="visible">True</property>
> - <property name="n_rows">6</property>
> - <property name="n_columns">3</property>
> <property name="homogeneous">False</property>
> - <property name="row_spacing">3</property>
> - <property name="column_spacing">3</property>
> + <property name="spacing">0</property>
>
> <child>
> - <widget class="GnomeColorPicker" id="colorLabel0">
> + <widget class="GtkLabel" id="label510">
> <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="dither">True</property>
> - <property name="use_alpha">False</property>
> - <property name="title" translatable="yes">Pick a color</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</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="x_options">fill</property>
> - <property name="y_options"></property>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
>
> <child>
> - <widget class="GnomeColorPicker" id="colorLabel1">
> + <widget class="GtkTable" id="tableColours">
> + <property name="border_width">6</property>
> <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="dither">True</property>
> - <property name="use_alpha">False</property>
> - <property name="title" translatable="yes">Pick a color</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"></property>
> - </packing>
> - </child>
> + <property name="n_rows">6</property>
> + <property name="n_columns">3</property>
> + <property name="homogeneous">False</property>
> + <property name="row_spacing">3</property>
> + <property name="column_spacing">3</property>
>
> - <child>
> - <widget class="GnomeColorPicker" id="colorLabel2">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="dither">True</property>
> - <property name="use_alpha">False</property>
> - <property name="title" translatable="yes">Pick a color</property>
> - </widget>
> - <packing>
> - <property name="left_attach">1</property>
> - <property name="right_attach">2</property>
> - <property name="top_attach">2</property>
> - <property name="bottom_attach">3</property>
> - <property name="x_options">fill</property>
> - <property name="y_options"></property>
> - </packing>
> - </child>
> + <child>
> + <widget class="GnomeColorPicker" id="colorLabel0">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="dither">True</property>
> + <property name="use_alpha">False</property>
> + <property name="title" translatable="yes">Pick a color</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="x_options">fill</property>
> + <property name="y_options"></property>
> + </packing>
> + </child>
>
> - <child>
> - <widget class="GnomeColorPicker" id="colorLabel3">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="dither">True</property>
> - <property name="use_alpha">False</property>
> - <property name="title" translatable="yes">Pick a color</property>
> - </widget>
> - <packing>
> - <property name="left_attach">1</property>
> - <property name="right_attach">2</property>
> - <property name="top_attach">3</property>
> - <property name="bottom_attach">4</property>
> - <property name="x_options">fill</property>
> - <property name="y_options"></property>
> - </packing>
> - </child>
> + <child>
> + <widget class="GnomeColorPicker" id="colorLabel1">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="dither">True</property>
> + <property name="use_alpha">False</property>
> + <property name="title" translatable="yes">Pick a color</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"></property>
> + </packing>
> + </child>
>
> - <child>
> - <widget class="GnomeColorPicker" id="colorLabel4">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="dither">True</property>
> - <property name="use_alpha">False</property>
> - <property name="title" translatable="yes">Pick a color</property>
> - </widget>
> - <packing>
> - <property name="left_attach">1</property>
> - <property name="right_attach">2</property>
> - <property name="top_attach">4</property>
> - <property name="bottom_attach">5</property>
> - <property name="x_options">fill</property>
> - <property name="y_options"></property>
> - </packing>
> - </child>
> + <child>
> + <widget class="GnomeColorPicker" id="colorLabel2">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="dither">True</property>
> + <property name="use_alpha">False</property>
> + <property name="title" translatable="yes">Pick a color</property>
> + </widget>
> + <packing>
> + <property name="left_attach">1</property>
> + <property name="right_attach">2</property>
> + <property name="top_attach">2</property>
> + <property name="bottom_attach">3</property>
> + <property name="x_options">fill</property>
> + <property name="y_options"></property>
> + </packing>
> + </child>
>
> - <child>
> - <widget class="GtkEntry" id="txtLabel0">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="editable">True</property>
> - <property name="visibility">True</property>
> - <property name="max_length">0</property>
> - <property name="text" translatable="yes">Important</property>
> - <property name="has_frame">True</property>
> - <property name="invisible_char" translatable="yes">*</property>
> - <property name="activates_default">False</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="GnomeColorPicker" id="colorLabel3">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="dither">True</property>
> + <property name="use_alpha">False</property>
> + <property name="title" translatable="yes">Pick a color</property>
> + </widget>
> + <packing>
> + <property name="left_attach">1</property>
> + <property name="right_attach">2</property>
> + <property name="top_attach">3</property>
> + <property name="bottom_attach">4</property>
> + <property name="x_options">fill</property>
> + <property name="y_options"></property>
> + </packing>
> + </child>
>
> - <child>
> - <widget class="GtkEntry" id="txtLabel1">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="editable">True</property>
> - <property name="visibility">True</property>
> - <property name="max_length">0</property>
> - <property name="text" translatable="yes">Work</property>
> - <property name="has_frame">True</property>
> - <property name="invisible_char" translatable="yes">*</property>
> - <property name="activates_default">False</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="GnomeColorPicker" id="colorLabel4">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="dither">True</property>
> + <property name="use_alpha">False</property>
> + <property name="title" translatable="yes">Pick a color</property>
> + </widget>
> + <packing>
> + <property name="left_attach">1</property>
> + <property name="right_attach">2</property>
> + <property name="top_attach">4</property>
> + <property name="bottom_attach">5</property>
> + <property name="x_options">fill</property>
> + <property name="y_options"></property>
> + </packing>
> + </child>
>
> - <child>
> - <widget class="GtkEntry" id="txtLabel2">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="editable">True</property>
> - <property name="visibility">True</property>
> - <property name="max_length">0</property>
> - <property name="text" translatable="yes">Personal</property>
> - <property name="has_frame">True</property>
> - <property name="invisible_char" translatable="yes">*</property>
> - <property name="activates_default">False</property>
> - </widget>
> - <packing>
> - <property name="left_attach">0</property>
> - <property name="right_attach">1</property>
> - <property name="top_attach">2</property>
> - <property name="bottom_attach">3</property>
> - <property name="x_options">fill</property>
> - <property name="y_options"></property>
> - </packing>
> - </child>
> + <child>
> + <widget class="GtkEntry" id="txtLabel0">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes">Important</property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</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="GtkEntry" id="txtLabel1">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes">Work</property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</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="GtkEntry" id="txtLabel3">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="editable">True</property>
> - <property name="visibility">True</property>
> - <property name="max_length">0</property>
> - <property name="text" translatable="yes">To Do</property>
> - <property name="has_frame">True</property>
> - <property name="invisible_char" translatable="yes">*</property>
> - <property name="activates_default">False</property>
> - </widget>
> - <packing>
> - <property name="left_attach">0</property>
> - <property name="right_attach">1</property>
> - <property name="top_attach">3</property>
> - <property name="bottom_attach">4</property>
> - <property name="x_options">fill</property>
> - <property name="y_options"></property>
> - </packing>
> - </child>
> + <child>
> + <widget class="GtkEntry" id="txtLabel2">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes">Personal</property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</property>
> + </widget>
> + <packing>
> + <property name="left_attach">0</property>
> + <property name="right_attach">1</property>
> + <property name="top_attach">2</property>
> + <property name="bottom_attach">3</property>
> + <property name="x_options">fill</property>
> + <property name="y_options"></property>
> + </packing>
> + </child>
>
> - <child>
> - <widget class="GtkEntry" id="txtLabel4">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="editable">True</property>
> - <property name="visibility">True</property>
> - <property name="max_length">0</property>
> - <property name="text" translatable="yes">Later</property>
> - <property name="has_frame">True</property>
> - <property name="invisible_char" translatable="yes">*</property>
> - <property name="activates_default">False</property>
> - </widget>
> - <packing>
> - <property name="left_attach">0</property>
> - <property name="right_attach">1</property>
> - <property name="top_attach">4</property>
> - <property name="bottom_attach">5</property>
> - <property name="x_options">fill</property>
> - <property name="y_options"></property>
> - </packing>
> - </child>
> + <child>
> + <widget class="GtkEntry" id="txtLabel3">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes">To Do</property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</property>
> + </widget>
> + <packing>
> + <property name="left_attach">0</property>
> + <property name="right_attach">1</property>
> + <property name="top_attach">3</property>
> + <property name="bottom_attach">4</property>
> + <property name="x_options">fill</property>
> + <property name="y_options"></property>
> + </packing>
> + </child>
>
> - <child>
> - <widget class="GtkButton" id="cmdRestoreLabels">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">_Restore defaults</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> + <child>
> + <widget class="GtkEntry" id="txtLabel4">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes">Later</property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</property>
> + </widget>
> + <packing>
> + <property name="left_attach">0</property>
> + <property name="right_attach">1</property>
> + <property name="top_attach">4</property>
> + <property name="bottom_attach">5</property>
> + <property name="x_options">fill</property>
> + <property name="y_options"></property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkButton" id="cmdRestoreLabels">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">_Restore defaults</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + <packing>
> + <property name="left_attach">2</property>
> + <property name="right_attach">3</property>
> + <property name="top_attach">5</property>
> + <property name="bottom_attach">6</property>
> + <property name="x_options">fill</property>
> + <property name="y_options"></property>
> + </packing>
> + </child>
> </widget>
> <packing>
> - <property name="left_attach">2</property>
> - <property name="right_attach">3</property>
> - <property name="top_attach">5</property>
> - <property name="bottom_attach">6</property>
> - <property name="x_options">fill</property>
> - <property name="y_options"></property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label456">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Labels and Colors</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.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> <packing>
> - <property name="padding">0</property>
> + <property name="padding">3</property>
> <property name="expand">False</property>
> <property name="fill">False</property>
> </packing>
> @@ -4481,7 +5195,7 @@
> <property name="border_width">6</property>
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">0</property>
> + <property name="spacing">6</property>
>
> <child>
> <widget class="GtkLabel" id="lblHeaders">
> @@ -4506,55 +5220,89 @@
> </child>
>
> <child>
> - <widget class="GtkHBox" id="hboxTreeButtons">
> - <property name="border_width">6</property>
> + <widget class="GtkHBox" id="hbox195">
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkVBox" id="vboxEntryTree">
> + <widget class="GtkLabel" id="label511">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hboxTreeButtons">
> + <property name="border_width">6</property>
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">6</property>
> + <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkEntry" id="txtHeaders">
> + <widget class="GtkVBox" id="vboxEntryTree">
> <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="editable">True</property>
> - <property name="visibility">True</property>
> - <property name="max_length">0</property>
> - <property name="text" translatable="yes"></property>
> - <property name="has_frame">True</property>
> - <property name="invisible_char" translatable="yes">*</property>
> - <property name="activates_default">False</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> - <child>
> - <widget class="GtkScrolledWindow" id="scrolledwindow49">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
> - <property name="shadow_type">GTK_SHADOW_NONE</property>
> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
> + <child>
> + <widget class="GtkEntry" id="txtHeaders">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
>
> <child>
> - <widget class="GtkTreeView" id="treeHeaders">
> + <widget class="GtkScrolledWindow" id="scrolledwindow49">
> <property name="visible">True</property>
> <property name="can_focus">True</property>
> - <property name="headers_visible">False</property>
> - <property name="rules_hint">False</property>
> - <property name="reorderable">False</property>
> - <property name="enable_search">True</property>
> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
> + <property name="shadow_type">GTK_SHADOW_NONE</property>
> + <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
> +
> + <child>
> + <widget class="GtkTreeView" id="treeHeaders">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="headers_visible">False</property>
> + <property name="rules_hint">False</property>
> + <property name="reorderable">False</property>
> + <property name="enable_search">True</property>
> + </widget>
> + </child>
> </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> </child>
> </widget>
> <packing>
> @@ -4563,54 +5311,54 @@
> <property name="fill">True</property>
> </packing>
> </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">True</property>
> - <property name="fill">True</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkVBox" id="vbox162">
> - <property name="visible">True</property>
> - <property name="homogeneous">False</property>
> - <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkButton" id="cmdHeadersAdd">
> + <widget class="GtkVBox" id="vbox162">
> <property name="visible">True</property>
> - <property name="sensitive">False</property>
> - <property name="can_focus">True</property>
> - <property name="label">gtk-add</property>
> - <property name="use_stock">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkButton" id="cmdHeadersAdd">
> + <property name="visible">True</property>
> + <property name="sensitive">False</property>
> + <property name="can_focus">True</property>
> + <property name="label">gtk-add</property>
> + <property name="use_stock">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + <packing>
> + <property name="padding">6</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkButton" id="cmdHeadersRemove">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label">gtk-remove</property>
> + <property name="use_stock">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> </widget>
> <packing>
> <property name="padding">6</property>
> <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkButton" id="cmdHeadersRemove">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label">gtk-remove</property>
> - <property name="use_stock">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> <packing>
> - <property name="padding">6</property>
> - <property name="expand">False</property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> <property name="fill">True</property>
> </packing>
> </child>
> @@ -4687,37 +5435,72 @@
> </child>
>
> <child>
> - <widget class="GtkFrame" id="frameFilterOptions">
> + <widget class="GtkVBox" id="frameFilterOptions">
> <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
> -
> - <child>
> - <placeholder/>
> - </child>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkLabel" id="label474">
> + <widget class="GtkLabel" id="label512">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Filter Options</property>
> + <property name="label" translatable="yes"><b>Filter Options</b></property>
> <property name="use_underline">False</property>
> - <property name="use_markup">False</property>
> + <property name="use_markup">True</property>
> <property name="justify">GTK_JUSTIFY_LEFT</property>
> <property name="wrap">False</property>
> <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> + <property name="xalign">0</property>
> <property name="yalign">0.5</property>
> <property name="xpad">0</property>
> <property name="ypad">0</property>
> </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox196">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label513">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <placeholder/>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> <packing>
> - <property name="padding">0</property>
> + <property name="padding">3</property>
> <property name="expand">False</property>
> <property name="fill">True</property>
> </packing>
> @@ -4777,120 +5560,228 @@
> <property name="spacing">3</property>
>
> <child>
> - <widget class="GtkFrame" id="frameBehavior">
> + <widget class="GtkVBox" id="frameBehavior">
> <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkVBox" id="vboxBehavior">
> - <property name="border_width">6</property>
> + <widget class="GtkLabel" id="label514">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"><b>Default Behavior</b></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">True</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox197">
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">3</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label515">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
>
> <child>
> - <widget class="GtkTable" id="tableForwardsReplies">
> + <widget class="GtkVBox" id="vboxBehavior">
> + <property name="border_width">6</property>
> <property name="visible">True</property>
> - <property name="n_rows">3</property>
> - <property name="n_columns">2</property>
> <property name="homogeneous">False</property>
> - <property name="row_spacing">3</property>
> - <property name="column_spacing">3</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkLabel" id="lblForwardStyle">
> + <widget class="GtkTable" id="tableForwardsReplies">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">_Forward style:</property>
> - <property name="use_underline">True</property>
> - <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</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>
> - </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>
> + <property name="n_rows">3</property>
> + <property name="n_columns">2</property>
> + <property name="homogeneous">False</property>
> + <property name="row_spacing">6</property>
> + <property name="column_spacing">3</property>
>
> - <child>
> - <widget class="GtkLabel" id="lblReplyStyle">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">_Reply style:</property>
> - <property name="use_underline">True</property>
> - <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</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>
> - </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="GtkLabel" id="lblForwardStyle">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">_Forward style:</property>
> + <property name="use_underline">True</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</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>
> + </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="GtkAlignment" id="alignment25">
> - <property name="visible">True</property>
> - <property name="xalign">7.45058e-09</property>
> - <property name="yalign">0.5</property>
> - <property name="xscale">0</property>
> - <property name="yscale">1</property>
> + <child>
> + <widget class="GtkLabel" id="lblReplyStyle">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">_Reply style:</property>
> + <property name="use_underline">True</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</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>
> + </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="GtkAlignment" id="alignment25">
> + <property name="visible">True</property>
> + <property name="xalign">7.45058e-09</property>
> + <property name="yalign">0.5</property>
> + <property name="xscale">0</property>
> + <property name="yscale">1</property>
> +
> + <child>
> + <widget class="GtkHBox" id="hboxReplyStyle">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkOptionMenu" id="omenuReplyStyle">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="history">0</property>
> +
> + <child internal-child="menu">
> + <widget class="GtkMenu" id="convertwidget33">
> + <property name="visible">True</property>
> +
> + <child>
> + <widget class="GtkMenuItem" id="convertwidget34">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Quote original message</property>
> + <property name="use_underline">True</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkMenuItem" id="convertwidget35">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Do not quote original message</property>
> + <property name="use_underline">True</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkMenuItem" id="convertwidget36">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Attach original message</property>
> + <property name="use_underline">True</property>
> + </widget>
> + </child>
> + </widget>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> + </widget>
> + </child>
> + </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"></property>
> + </packing>
> + </child>
>
> <child>
> - <widget class="GtkHBox" id="hboxReplyStyle">
> + <widget class="GtkHBox" id="hboxForwardStyle">
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkOptionMenu" id="omenuReplyStyle">
> + <widget class="GtkOptionMenu" id="omenuForwardStyle">
> <property name="visible">True</property>
> <property name="can_focus">True</property>
> <property name="history">0</property>
>
> <child internal-child="menu">
> - <widget class="GtkMenu" id="convertwidget33">
> + <widget class="GtkMenu" id="convertwidget37">
> <property name="visible">True</property>
>
> <child>
> - <widget class="GtkMenuItem" id="convertwidget34">
> + <widget class="GtkMenuItem" id="convertwidget38">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Quote original message</property>
> + <property name="label" translatable="yes">Attachment</property>
> <property name="use_underline">True</property>
> </widget>
> </child>
>
> <child>
> - <widget class="GtkMenuItem" id="convertwidget35">
> + <widget class="GtkMenuItem" id="convertwidget39">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Do not quote original message</property>
> + <property name="label" translatable="yes">Inline</property>
> <property name="use_underline">True</property>
> </widget>
> </child>
>
> <child>
> - <widget class="GtkMenuItem" id="convertwidget36">
> + <widget class="GtkMenuItem" id="convertwidget40">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Attach original message</property>
> + <property name="label" translatable="yes">Quoted</property>
> <property name="use_underline">True</property>
> </widget>
> </child>
> @@ -4904,54 +5795,63 @@
> </packing>
> </child>
> </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="x_options">fill</property>
> + <property name="y_options">fill</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkLabel" id="lblCharset">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">C_haracter set:</property>
> + <property name="use_underline">True</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + <property name="mnemonic_widget">omenuCharset</property>
> + </widget>
> + <packing>
> + <property name="left_attach">0</property>
> + <property name="right_attach">1</property>
> + <property name="top_attach">2</property>
> + <property name="bottom_attach">3</property>
> + <property name="x_options">fill</property>
> + <property name="y_options"></property>
> + </packing>
> </child>
> - </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"></property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkHBox" id="hboxForwardStyle">
> - <property name="visible">True</property>
> - <property name="homogeneous">False</property>
> - <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkOptionMenu" id="omenuForwardStyle">
> + <widget class="GtkOptionMenu" id="omenuCharset">
> <property name="visible">True</property>
> <property name="can_focus">True</property>
> <property name="history">0</property>
>
> <child internal-child="menu">
> - <widget class="GtkMenu" id="convertwidget37">
> + <widget class="GtkMenu" id="convertwidget41">
> <property name="visible">True</property>
>
> <child>
> - <widget class="GtkMenuItem" id="convertwidget38">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Attachment</property>
> - <property name="use_underline">True</property>
> - </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkMenuItem" id="convertwidget39">
> + <widget class="GtkMenuItem" id="convertwidget42">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Inline</property>
> + <property name="label" translatable="yes">Baltic (ISO-8859-13)</property>
> <property name="use_underline">True</property>
> </widget>
> </child>
>
> <child>
> - <widget class="GtkMenuItem" id="convertwidget40">
> + <widget class="GtkMenuItem" id="convertwidget43">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Quoted</property>
> + <property name="label" translatable="yes">Baltic (ISO-8859-4)</property>
> <property name="use_underline">True</property>
> </widget>
> </child>
> @@ -4959,180 +5859,125 @@
> </child>
> </widget>
> <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> + <property name="left_attach">1</property>
> + <property name="right_attach">2</property>
> + <property name="top_attach">2</property>
> + <property name="bottom_attach">3</property>
> + <property name="x_options">fill</property>
> + <property name="y_options"></property>
> </packing>
> </child>
> </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="x_options">fill</property>
> - <property name="y_options">fill</property>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
>
> <child>
> - <widget class="GtkLabel" id="lblCharset">
> + <widget class="GtkCheckButton" id="chkSendHTML">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">C_haracter set:</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">Format messages in _HTML</property>
> <property name="use_underline">True</property>
> - <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">False</property>
> - <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="mnemonic_widget">omenuCharset</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> </widget>
> <packing>
> - <property name="left_attach">0</property>
> - <property name="right_attach">1</property>
> - <property name="top_attach">2</property>
> - <property name="bottom_attach">3</property>
> - <property name="x_options">fill</property>
> - <property name="y_options"></property>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
>
> <child>
> - <widget class="GtkOptionMenu" id="omenuCharset">
> + <widget class="GtkCheckButton" id="chkAutoSmileys">
> <property name="visible">True</property>
> <property name="can_focus">True</property>
> - <property name="history">0</property>
> -
> - <child internal-child="menu">
> - <widget class="GtkMenu" id="convertwidget41">
> - <property name="visible">True</property>
> -
> - <child>
> - <widget class="GtkMenuItem" id="convertwidget42">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Baltic (ISO-8859-13)</property>
> - <property name="use_underline">True</property>
> - </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkMenuItem" id="convertwidget43">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Baltic (ISO-8859-4)</property>
> - <property name="use_underline">True</property>
> - </widget>
> - </child>
> - </widget>
> - </child>
> + <property name="label" translatable="yes">_Automatically insert smiley images</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> </widget>
> <packing>
> - <property name="left_attach">1</property>
> - <property name="right_attach">2</property>
> - <property name="top_attach">2</property>
> - <property name="bottom_attach">3</property>
> - <property name="x_options">fill</property>
> - <property name="y_options"></property>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkCheckButton" id="chkSendHTML">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">Format messages in _HTML</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">False</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkCheckButton" id="chkAutoSmileys">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">_Automatically insert smiley images</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">False</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="frameAlerts">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkLabel" id="label457">
> + <widget class="GtkLabel" id="label517">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Default Behavior</property>
> + <property name="label" translatable="yes"><b>Alerts</b></property>
> <property name="use_underline">False</property>
> - <property name="use_markup">False</property>
> + <property name="use_markup">True</property>
> <property name="justify">GTK_JUSTIFY_LEFT</property>
> <property name="wrap">False</property>
> <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> + <property name="xalign">0</property>
> <property name="yalign">0.5</property>
> <property name="xpad">0</property>
> <property name="ypad">0</property>
> </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkFrame" id="frameAlerts">
> - <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
>
> <child>
> - <widget class="GtkVBox" id="vboxAlerts">
> - <property name="border_width">6</property>
> + <widget class="GtkHBox" id="hbox198">
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">3</property>
> + <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkCheckButton" id="chkPromptEmptySubject">
> + <widget class="GtkLabel" id="label516">
> <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">_Prompt when sending messages with an empty subject line</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">False</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> </widget>
> <packing>
> <property name="padding">0</property>
> @@ -5142,46 +5987,64 @@
> </child>
>
> <child>
> - <widget class="GtkCheckButton" id="chkPromptBccOnly">
> + <widget class="GtkVBox" id="vboxAlerts">
> + <property name="border_width">6</property>
> <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">Pr_ompt when sending messages with only Bcc recipients defined</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">False</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
> +
> + <child>
> + <widget class="GtkCheckButton" id="chkPromptEmptySubject">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">_Prompt when sending messages with an empty subject line</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkCheckButton" id="chkPromptBccOnly">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">Pr_ompt when sending messages with only Bcc recipients defined</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label458">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Alerts</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.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> <packing>
> - <property name="padding">0</property>
> + <property name="padding">3</property>
> <property name="expand">False</property>
> <property name="fill">True</property>
> </packing>
> @@ -5474,14 +6337,7 @@
> </child>
>
> <child>
> - <widget class="GtkHSeparator" id="hseparator1">
> - <property name="visible">True</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">True</property>
> - </packing>
> + <placeholder/>
> </child>
>
> <child>
> @@ -5574,41 +6430,63 @@
> <packing>
> <property name="padding">0</property>
> <property name="expand">False</property>
> - <property name="fill">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="frameSpellCheckingOptions">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label519">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"><b>Options</b></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">True</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">True</property>
> - <property name="fill">True</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkFrame" id="frameSpellChecking">
> - <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
>
> <child>
> - <widget class="GtkVBox" id="vboxOptions">
> - <property name="border_width">6</property>
> + <widget class="GtkHBox" id="hbox199">
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">3</property>
> + <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkCheckButton" id="chkEnableSpellChecking">
> + <widget class="GtkLabel" id="label518">
> <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">Check spelling while I _type</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">False</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> </widget>
> <packing>
> <property name="padding">0</property>
> @@ -5618,25 +6496,22 @@
> </child>
>
> <child>
> - <widget class="GtkHBox" id="hboxSpellCheckColor">
> + <widget class="GtkVBox" id="vboxOptions">
> + <property name="border_width">6</property>
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkLabel" id="lblSpellCheckColor">
> + <widget class="GtkCheckButton" id="chkEnableSpellChecking">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Color for _misspelled words:</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">Check spelling while I _type</property>
> <property name="use_underline">True</property>
> - <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">False</property>
> - <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="mnemonic_widget">colorpickerSpellCheckColor</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> </widget>
> <packing>
> <property name="padding">0</property>
> @@ -5646,51 +6521,72 @@
> </child>
>
> <child>
> - <widget class="GnomeColorPicker" id="colorpickerSpellCheckColor">
> + <widget class="GtkHBox" id="hboxSpellCheckColor">
> <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="dither">True</property>
> - <property name="use_alpha">False</property>
> - <property name="title" translatable="yes">Pick a color</property>
> - <signal name="color_set" handler="spellColorSet"/>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
> +
> + <child>
> + <widget class="GtkLabel" id="lblSpellCheckColor">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Color for _misspelled words:</property>
> + <property name="use_underline">True</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + <property name="mnemonic_widget">colorpickerSpellCheckColor</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GnomeColorPicker" id="colorpickerSpellCheckColor">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="dither">True</property>
> + <property name="use_alpha">False</property>
> + <property name="title" translatable="yes">Pick a color</property>
> + <signal name="color_set" handler="spellColorSet"/>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> </widget>
> <packing>
> <property name="padding">0</property>
> <property name="expand">False</property>
> - <property name="fill">False</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">False</property>
> + <property name="expand">True</property>
> <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label459">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Options</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.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> <packing>
> - <property name="padding">0</property>
> + <property name="padding">3</property>
> <property name="expand">False</property>
> <property name="fill">False</property>
> </packing>
> @@ -5744,137 +6640,177 @@
> </child>
>
> <child>
> - <widget class="GtkFrame" id="frame4">
> + <widget class="GtkVBox" id="vbox186">
> <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkTable" id="tblPrint">
> - <property name="border_width">4</property>
> + <widget class="GtkLabel" id="label520">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"><b>Printed Fonts</b></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">True</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox200">
> <property name="visible">True</property>
> - <property name="n_rows">2</property>
> - <property name="n_columns">2</property>
> <property name="homogeneous">False</property>
> - <property name="row_spacing">4</property>
> - <property name="column_spacing">6</property>
> + <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkLabel" id="lblPrintVariable">
> + <widget class="GtkLabel" id="label521">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">V_ariable-width:</property>
> - <property name="use_underline">True</property>
> + <property name="label" translatable="yes"> </property>
> + <property name="use_underline">False</property>
> <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</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="xalign">0.5</property>
> <property name="yalign">0.5</property>
> <property name="xpad">0</property>
> <property name="ypad">0</property>
> - <property name="mnemonic_widget">print_variable</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>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
>
> <child>
> - <widget class="GtkLabel" id="lblPrintFixed">
> + <widget class="GtkTable" id="tblPrint">
> + <property name="border_width">4</property>
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Fi_xed -width:</property>
> - <property name="use_underline">True</property>
> - <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</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="mnemonic_widget">print_fixed</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>
> + <property name="n_rows">2</property>
> + <property name="n_columns">2</property>
> + <property name="homogeneous">False</property>
> + <property name="row_spacing">4</property>
> + <property name="column_spacing">6</property>
>
> - <child>
> - <widget class="GnomeFontPicker" id="print_fixed">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="title" translatable="yes">Select HTML fixed width font for printing</property>
> - <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
> - <property name="show_size">True</property>
> - <property name="use_font_in_label">False</property>
> - <property name="label_font_size">14</property>
> - <signal name="font_set" handler="changed"/>
> - </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"></property>
> - </packing>
> - </child>
> + <child>
> + <widget class="GtkLabel" id="lblPrintVariable">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">V_ariable-width:</property>
> + <property name="use_underline">True</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</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="mnemonic_widget">print_variable</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="GnomeFontPicker" id="print_variable">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="title" translatable="yes">Select HTML variable width font for printing</property>
> - <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
> - <property name="show_size">True</property>
> - <property name="use_font_in_label">False</property>
> - <property name="label_font_size">14</property>
> - <signal name="font_set" handler="changed"/>
> + <child>
> + <widget class="GtkLabel" id="lblPrintFixed">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Fi_xed -width:</property>
> + <property name="use_underline">True</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</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="mnemonic_widget">print_fixed</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="GnomeFontPicker" id="print_fixed">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="title" translatable="yes">Select HTML fixed width font for printing</property>
> + <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
> + <property name="show_size">True</property>
> + <property name="use_font_in_label">False</property>
> + <property name="label_font_size">14</property>
> + <signal name="font_set" handler="changed"/>
> + </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"></property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GnomeFontPicker" id="print_variable">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="title" translatable="yes">Select HTML variable width font for printing</property>
> + <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
> + <property name="show_size">True</property>
> + <property name="use_font_in_label">False</property>
> + <property name="label_font_size">14</property>
> + <signal name="font_set" handler="changed"/>
> + </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="x_options">fill</property>
> + <property name="y_options"></property>
> + </packing>
> + </child>
> </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="x_options">fill</property>
> - <property name="y_options"></property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label461">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Printed Fonts</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.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> <packing>
> - <property name="padding">0</property>
> + <property name="padding">3</property>
> <property name="expand">False</property>
> <property name="fill">False</property>
> </packing>
> @@ -5890,7 +6826,7 @@
> <property name="modal">False</property>
> <property name="resizable">True</property>
> <property name="destroy_with_parent">False</property>
> - <property name="has_separator">True</property>
> + <property name="has_separator">False</property>
>
> <child internal-child="vbox">
> <widget class="GtkVBox" id="dialog-vbox1">
> Index: mail/mail-mt.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/mail-mt.c,v
> retrieving revision 1.76
> diff -u -r1.76 mail-mt.c
> --- mail/mail-mt.c 2 Dec 2003 04:13:18 -0000 1.76
> +++ mail/mail-mt.c 20 Dec 2003 01:48:23 -0000
> @@ -272,6 +272,7 @@
> }
>
> gd = (GtkDialog *)gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", text);
> + gtk_dialog_set_has_separator (gd, FALSE);
> g_hash_table_insert(active_errors, m->ops, gd);
> g_signal_connect(gd, "response", G_CALLBACK(error_response), m->ops);
> g_signal_connect(gd, "destroy", G_CALLBACK(error_destroy), m->ops);
> Index: mail/mail-search.glade
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/mail-search.glade,v
> retrieving revision 1.2
> diff -u -r1.2 mail-search.glade
> --- mail/mail-search.glade 17 Sep 2003 21:19:03 -0000 1.2
> +++ mail/mail-search.glade 20 Dec 2003 01:48:24 -0000
> @@ -2,6 +2,7 @@
> <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
>
> <glade-interface>
> +<requires lib="gnome"/>
>
> <widget class="GtkDialog" id="search_message_dialog">
> <property name="visible">True</property>
> @@ -11,7 +12,7 @@
> <property name="modal">False</property>
> <property name="resizable">False</property>
> <property name="destroy_with_parent">False</property>
> - <property name="has_separator">True</property>
> + <property name="has_separator">False</property>
>
> <child internal-child="vbox">
> <widget class="GtkVBox" id="dialog-vbox1">
> @@ -57,33 +58,126 @@
> </child>
>
> <child>
> - <widget class="GtkFrame" id="frame1">
> - <property name="border_width">6</property>
> + <widget class="GtkVBox" id="vbox1">
> <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkVBox" id="vbox1">
> - <property name="border_width">6</property>
> + <widget class="GtkLabel" id="label4">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"><b>Search</b></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">True</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox1">
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">6</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label3">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
>
> <child>
> - <widget class="GtkHBox" id="hbox1">
> + <widget class="GtkVBox" id="vbox1">
> + <property name="border_width">6</property>
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkLabel" id="label2">
> + <widget class="GtkHBox" id="hbox1">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label2">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Find:</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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkEntry" id="search_entry">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkLabel" id="search_matches_label">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Find:</property>
> + <property name="label" translatable="yes"></property>
> <property name="use_underline">False</property>
> <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_LEFT</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</property>
> <property name="wrap">False</property>
> <property name="selectable">False</property>
> <property name="xalign">0.5</property>
> @@ -99,93 +193,39 @@
> </child>
>
> <child>
> - <widget class="GtkEntry" id="search_entry">
> + <widget class="GtkCheckButton" id="search_case_check">
> <property name="visible">True</property>
> <property name="can_focus">True</property>
> - <property name="editable">True</property>
> - <property name="visibility">True</property>
> - <property name="max_length">0</property>
> - <property name="text" translatable="yes"></property>
> - <property name="has_frame">True</property>
> - <property name="invisible_char" translatable="yes">*</property>
> - <property name="activates_default">False</property>
> + <property name="label" translatable="yes">Case Sensitive</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="active">False</property>
> + <property name="inconsistent">False</property>
> + <property name="draw_indicator">True</property>
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">True</property>
> - <property name="fill">True</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="search_matches_label">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes"></property>
> - <property name="use_underline">False</property>
> - <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">False</property>
> - <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkCheckButton" id="search_case_check">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="label" translatable="yes">Case Sensitive</property>
> - <property name="use_underline">True</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="active">False</property>
> - <property name="inconsistent">False</property>
> - <property name="draw_indicator">True</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="search_subject_label">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Search</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.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> <packing>
> - <property name="padding">0</property>
> + <property name="padding">3</property>
> <property name="expand">True</property>
> <property name="fill">True</property>
> </packing>
> Index: mail/mail-security.glade
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/mail-security.glade,v
> retrieving revision 1.2
> diff -u -r1.2 mail-security.glade
> --- mail/mail-security.glade 1 Dec 2003 05:52:38 -0000 1.2
> +++ mail/mail-security.glade 20 Dec 2003 01:48:24 -0000
> @@ -2,6 +2,7 @@
> <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
>
> <glade-interface>
> +<requires lib="gnome"/>
>
> <widget class="GtkDialog" id="message_security_dialog">
> <property name="visible">True</property>
> @@ -11,7 +12,7 @@
> <property name="modal">False</property>
> <property name="resizable">True</property>
> <property name="destroy_with_parent">False</property>
> - <property name="has_separator">True</property>
> + <property name="has_separator">False</property>
>
> <child internal-child="vbox">
> <widget class="GtkVBox" id="dialog-vbox2">
> @@ -62,92 +63,172 @@
> <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkFrame" id="frame5">
> + <widget class="GtkVBox" id="vbox162">
> <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkVBox" id="signature_vbox">
> - <property name="border_width">6</property>
> + <widget class="GtkLabel" id="label478">
> <property name="visible">True</property>
> - <property name="homogeneous">False</property>
> - <property name="spacing">0</property>
> -
> - <child>
> - <placeholder/>
> - </child>
> - </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label475">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Digital Signature</property>
> + <property name="label" translatable="yes"><b>Digital SIgnature</b></property>
> <property name="use_underline">False</property>
> - <property name="use_markup">False</property>
> + <property name="use_markup">True</property>
> <property name="justify">GTK_JUSTIFY_LEFT</property>
> <property name="wrap">False</property>
> <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> + <property name="xalign">0</property>
> <property name="yalign">0.5</property>
> <property name="xpad">0</property>
> <property name="ypad">0</property>
> </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">True</property>
> - <property name="fill">True</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkFrame" id="frame6">
> - <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
>
> <child>
> - <widget class="GtkVBox" id="encryption_vbox">
> - <property name="border_width">6</property>
> + <widget class="GtkHBox" id="hbox1">
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> <property name="spacing">0</property>
>
> <child>
> - <placeholder/>
> + <widget class="GtkLabel" id="label477">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="signature_vbox">
> + <property name="border_width">6</property>
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <placeholder/>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> </child>
> </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> </child>
> + </widget>
> + <packing>
> + <property name="padding">3</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox163">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkLabel" id="label476">
> + <widget class="GtkLabel" id="label479">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Encryption</property>
> + <property name="label" translatable="yes"><b>Encryption</b></property>
> <property name="use_underline">False</property>
> - <property name="use_markup">False</property>
> + <property name="use_markup">True</property>
> <property name="justify">GTK_JUSTIFY_LEFT</property>
> <property name="wrap">False</property>
> <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> + <property name="xalign">0</property>
> <property name="yalign">0.5</property>
> <property name="xpad">0</property>
> <property name="ypad">0</property>
> </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox2">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label480">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="encryption_vbox">
> + <property name="border_width">6</property>
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <placeholder/>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> <packing>
> - <property name="padding">0</property>
> + <property name="padding">3</property>
> <property name="expand">True</property>
> <property name="fill">True</property>
> </packing>
> Index: mail/mail-send-recv.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/mail-send-recv.c,v
> retrieving revision 1.79
> diff -u -r1.79 mail-send-recv.c
> --- mail/mail-send-recv.c 17 Nov 2003 03:32:41 -0000 1.79
> +++ mail/mail-send-recv.c 20 Dec 2003 01:48:26 -0000
> @@ -304,6 +304,7 @@
> EIterator *iter;
>
> gd = (GtkDialog *)send_recv_dialogue = gtk_dialog_new_with_buttons(_("Send & Receive Mail"), NULL, GTK_DIALOG_NO_SEPARATOR, NULL);
> + gtk_dialog_set_has_separator (gd, FALSE);
> stop = (GtkButton *)e_gtk_button_new_with_icon(_("Cancel _All"), GTK_STOCK_CANCEL);
> gtk_widget_show((GtkWidget *)stop);
> gtk_dialog_add_action_widget(gd, (GtkWidget *)stop, GTK_RESPONSE_CANCEL);
> Index: mail/mail-session.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/mail-session.c,v
> retrieving revision 1.79
> diff -u -r1.79 mail-session.c
> --- mail/mail-session.c 4 Dec 2003 14:14:36 -0000 1.79
> +++ mail/mail-session.c 20 Dec 2003 01:48:27 -0000
> @@ -271,6 +271,7 @@
> password_dialog = (GtkDialog *) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_QUESTION,
> GTK_BUTTONS_OK_CANCEL, "%s", m->prompt);
> gtk_window_set_title (GTK_WINDOW (password_dialog), title);
> + gtk_dialog_set_has_separator (password_dialog, FALSE);
> gtk_dialog_set_default_response (password_dialog, GTK_RESPONSE_OK);
> g_free (title);
>
> @@ -480,6 +481,7 @@
> NULL, 0, msg_type,
> m->allow_cancel ? GTK_BUTTONS_OK_CANCEL : GTK_BUTTONS_OK,
> "%s", m->prompt);
> + gtk_dialog_set_has_separator (message_dialog, FALSE);
> gtk_dialog_set_default_response (message_dialog, m->allow_cancel ? GTK_RESPONSE_CANCEL : GTK_RESPONSE_OK);
> g_object_set ((GObject *) message_dialog, "allow_shrink", TRUE, "allow_grow", TRUE, NULL);
>
> Index: mail/mail-signature-editor.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/mail-signature-editor.c,v
> retrieving revision 1.36
> diff -u -r1.36 mail-signature-editor.c
> --- mail/mail-signature-editor.c 21 Oct 2003 18:27:50 -0000 1.36
> +++ mail/mail-signature-editor.c 20 Dec 2003 01:48:28 -0000
> @@ -231,6 +231,7 @@
> GTK_STOCK_SAVE, GTK_RESPONSE_YES,
> NULL);
> gtk_window_set_title ((GtkWindow *) dialog, _("Save signature"));
> + gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
> gtk_dialog_set_default_response ((GtkDialog *) dialog, GTK_RESPONSE_YES);
>
> button = gtk_dialog_run ((GtkDialog *) dialog);
> Index: mail/mail-vfolder.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/mail-vfolder.c,v
> retrieving revision 1.107
> diff -u -r1.107 mail-vfolder.c
> --- mail/mail-vfolder.c 3 Dec 2003 15:37:54 -0000 1.107
> +++ mail/mail-vfolder.c 20 Dec 2003 01:48:30 -0000
> @@ -464,6 +464,7 @@
> "Used the removed folder:\n '%s'\n"
> "And have been updated."),
> changed->str, uri);
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
> g_signal_connect_swapped (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog);
> gtk_widget_show (dialog);
>
> @@ -878,6 +879,7 @@
> NULL);
> gtk_container_set_border_width (GTK_CONTAINER (gd), 6);
> gtk_box_set_spacing ((GtkBox *) gd->vbox, 6);
> + gtk_dialog_set_has_separator (gd, FALSE);
> gtk_dialog_set_default_response(gd, GTK_RESPONSE_OK);
> g_object_set(gd, "allow_shrink", FALSE, "allow_grow", TRUE, NULL);
> gtk_window_set_default_size (GTK_WINDOW (gd), 500, 500);
> @@ -914,6 +916,7 @@
> GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
> _("Rule name '%s' is not unique, choose another."),
> rule->name);
> + gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
>
> gtk_dialog_run ((GtkDialog *) dialog);
> gtk_widget_destroy (dialog);
> @@ -969,6 +972,7 @@
> GTK_STOCK_OK,
> GTK_RESPONSE_OK,
> NULL);
> + gtk_dialog_set_has_separator (gd, FALSE);
> gtk_dialog_set_default_response(gd, GTK_RESPONSE_OK);
> gtk_container_set_border_width (GTK_CONTAINER (gd), 6);
> gtk_box_set_spacing ((GtkBox *) gd->vbox, 6);
> Index: mail/message-tags.glade
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/message-tags.glade,v
> retrieving revision 1.6
> diff -u -r1.6 message-tags.glade
> --- mail/message-tags.glade 11 Apr 2003 21:18:08 -0000 1.6
> +++ mail/message-tags.glade 20 Dec 2003 01:48:31 -0000
> @@ -2,6 +2,7 @@
> <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
>
> <glade-interface>
> +<requires lib="gnome"/>
>
> <widget class="GtkDialog" id="followup_editor">
> <property name="border_width">6</property>
> @@ -11,13 +12,13 @@
> <property name="modal">False</property>
> <property name="resizable">True</property>
> <property name="destroy_with_parent">False</property>
> - <property name="has_separator">True</property>
> + <property name="has_separator">False</property>
>
> <child internal-child="vbox">
> <widget class="GtkVBox" id="vbox2">
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">3</property>
> + <property name="spacing">6</property>
>
> <child internal-child="action_area">
> <widget class="GtkHButtonBox" id="hbuttonbox1">
> Index: mail/subscribe-dialog.glade
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/subscribe-dialog.glade,v
> retrieving revision 1.11
> diff -u -r1.11 subscribe-dialog.glade
> --- mail/subscribe-dialog.glade 17 Sep 2003 21:19:04 -0000 1.11
> +++ mail/subscribe-dialog.glade 20 Dec 2003 01:48:31 -0000
> @@ -2,6 +2,7 @@
> <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
>
> <glade-interface>
> +<requires lib="gnome"/>
>
> <widget class="GtkWindow" id="subscribe_dialog">
> <property name="width_request">500</property>
> @@ -257,17 +258,6 @@
> </child>
>
> <child>
> - <widget class="GtkHSeparator" id="hseparator1">
> - <property name="visible">True</property>
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">True</property>
> - </packing>
> - </child>
> -
> - <child>
> <widget class="GtkHBox" id="hbox5">
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> Index: shell/ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
> retrieving revision 1.1359
> diff -u -r1.1359 ChangeLog
> --- shell/ChangeLog 14 Dec 2003 15:54:39 -0000 1.1359
> +++ shell/ChangeLog 20 Dec 2003 01:48:34 -0000
> @@ -1,3 +1,19 @@
> +2003-12-19 William Jon McCann <mccann jhu edu>
> +
> + * importer/intelligent.c (create_gui):
> + * main.c (show_development_warning):
> + * e-shortcuts-view.c (destroy_group_cb):
> + * e-shell-startup-wizard.c (prepare_importer_page)
> + (key_press_event_callback):
> + * e-shell-shared-folder-picker-dialog.c (create_progress_dialog):
> + * e-shell-importer.c (choose_importer_from_list, show_error)
> + (start_import, prepare_intelligent_page):
> + * e-shell-folder-commands.c (delete_dialog):
> + * glade/e-shell-shared-folder-picker-dialog.glade:
> + * glade/e-shell-folder-creation-dialog.glade:
> + * glade/e-active-connection-dialog.glade:
> + Remove separator from dialogs. HIG fixes.
> +
> 2003-12-14 JP Rosevear <jpr ximian com>
>
> * e-user-creatable-items-handler.c (get_components_from_registry):
> Index: shell/e-shell-folder-commands.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/shell/e-shell-folder-commands.c,v
> retrieving revision 1.59
> diff -u -r1.59 e-shell-folder-commands.c
> --- shell/e-shell-folder-commands.c 9 Jul 2003 19:54:25 -0000 1.59
> +++ shell/e-shell-folder-commands.c 20 Dec 2003 01:48:35 -0000
> @@ -407,6 +407,7 @@
> gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
> gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_DELETE, GTK_RESPONSE_OK);
>
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
> gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
>
> gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
> Index: shell/e-shell-importer.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/shell/e-shell-importer.c,v
> retrieving revision 1.61
> diff -u -r1.61 e-shell-importer.c
> --- shell/e-shell-importer.c 6 Dec 2003 18:09:17 -0000 1.61
> +++ shell/e-shell-importer.c 20 Dec 2003 01:48:37 -0000
> @@ -323,6 +323,7 @@
> GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
> GTK_STOCK_OK, GTK_RESPONSE_OK,
> NULL);
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
> gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
>
> clist = gtk_clist_new (1);
> @@ -440,6 +441,7 @@
> GtkWidget *box;
>
> box = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", message);
> + gtk_dialog_set_has_separator (GTK_DIALOG (box), FALSE);
> gtk_window_set_title (GTK_WINDOW (box), title);
> g_signal_connect(box, "response", G_CALLBACK(error_response_cb), box);
>
> @@ -489,6 +491,7 @@
> icd->dialog = GTK_DIALOG (gtk_dialog_new_with_buttons(_("Importing"), NULL, 0,
> GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
> NULL));
> + gtk_dialog_set_has_separator (icd->dialog, FALSE);
> g_signal_connect (icd->dialog, "response", G_CALLBACK (dialog_response_cb), icd);
>
> g_object_weak_ref (G_OBJECT(icd->dialog), dialog_destroy_notify, icd);
> @@ -753,6 +756,7 @@
> dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_INFO, GTK_BUTTONS_NONE, "%s",
> _("Please wait...\nScanning for existing setups"));
> e_make_widget_backing_stored (dialog);
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
>
> gtk_window_set_title (GTK_WINDOW (dialog), _("Starting Intelligent Importers"));
> gtk_widget_show_all (dialog);
> Index: shell/e-shell-settings-dialog.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/shell/e-shell-settings-dialog.c,v
> retrieving revision 1.27
> diff -u -r1.27 e-shell-settings-dialog.c
> --- shell/e-shell-settings-dialog.c 3 Nov 2003 20:15:50 -0000 1.27
> +++ shell/e-shell-settings-dialog.c 20 Dec 2003 01:48:38 -0000
> @@ -344,6 +344,7 @@
>
> gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
> gtk_window_set_title (GTK_WINDOW (dialog), _("Evolution Settings"));
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
> }
>
>
> Index: shell/e-shell-shared-folder-picker-dialog.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/shell/e-shell-shared-folder-picker-dialog.c,v
> retrieving revision 1.25
> diff -u -r1.25 e-shell-shared-folder-picker-dialog.c
> --- shell/e-shell-shared-folder-picker-dialog.c 1 Dec 2003 22:14:42 -0000 1.25
> +++ shell/e-shell-shared-folder-picker-dialog.c 20 Dec 2003 01:48:39 -0000
> @@ -387,6 +387,7 @@
> dialog = gtk_dialog_new_with_buttons (_("Opening Folder"), NULL, 0,
> GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
> NULL);
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
> gtk_widget_set_size_request (dialog, 300, -1);
> gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
>
> Index: shell/e-shell-startup-wizard.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/shell/e-shell-startup-wizard.c,v
> retrieving revision 1.45
> diff -u -r1.45 e-shell-startup-wizard.c
> --- shell/e-shell-startup-wizard.c 1 Dec 2003 22:14:42 -0000 1.45
> +++ shell/e-shell-startup-wizard.c 20 Dec 2003 01:48:40 -0000
> @@ -558,6 +558,7 @@
> dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_INFO,
> GTK_BUTTONS_NONE,
> _("Please wait...\nScanning for existing setups"));
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
> e_make_widget_backing_stored (dialog);
>
> gtk_window_set_title (GTK_WINDOW (dialog), _("Starting import"));
> @@ -787,6 +788,7 @@
>
> gtk_dialog_add_button (confirm_dialog, _("Cancel"), GTK_RESPONSE_CANCEL);
> gtk_dialog_add_button (confirm_dialog, _("Quit Assistant"), GTK_RESPONSE_OK);
> + gtk_dialog_set_has_separator (GTK_DIALOG (confirm_dialog), FALSE);
>
> returnvalue = gtk_dialog_run (GTK_DIALOG (confirm_dialog));
> gtk_widget_destroy (confirm_dialog);
> Index: shell/e-shortcuts-view.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/shell/e-shortcuts-view.c,v
> retrieving revision 1.65
> diff -u -r1.65 e-shortcuts-view.c
> --- shell/e-shortcuts-view.c 22 Apr 2003 19:49:22 -0000 1.65
> +++ shell/e-shortcuts-view.c 20 Dec 2003 01:48:42 -0000
> @@ -191,6 +191,7 @@
>
> gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (message_dialog)->vbox), 6);
>
> + gtk_dialog_set_has_separator (GTK_DIALOG (message_dialog), FALSE);
> gtk_dialog_set_default_response (GTK_DIALOG (message_dialog), GTK_RESPONSE_OK);
>
> response = gtk_dialog_run (GTK_DIALOG (message_dialog));
> Index: shell/main.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/shell/main.c,v
> retrieving revision 1.137
> diff -u -r1.137 main.c
> --- shell/main.c 3 Dec 2003 20:08:14 -0000 1.137
> +++ shell/main.c 20 Dec 2003 01:48:43 -0000
> @@ -264,6 +264,7 @@
> warning_dialog = gtk_dialog_new_with_buttons("Ximian Evolution " VERSION, parent,
> GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
> GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
> + gtk_dialog_set_has_separator (GTK_DIALOG (warning_dialog), FALSE);
> text = g_strdup_printf(
> /* xgettext:no-c-format */
> /* Preview/Alpha/Beta version warning message */
> Index: shell/glade/e-active-connection-dialog.glade
> ===================================================================
> RCS file: /cvs/gnome/evolution/shell/glade/e-active-connection-dialog.glade,v
> retrieving revision 1.8
> diff -u -r1.8 e-active-connection-dialog.glade
> --- shell/glade/e-active-connection-dialog.glade 21 Apr 2003 19:13:35 -0000 1.8
> +++ shell/glade/e-active-connection-dialog.glade 20 Dec 2003 01:48:43 -0000
> @@ -2,6 +2,7 @@
> <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
>
> <glade-interface>
> +<requires lib="gnome"/>
>
> <widget class="GtkDialog" id="active_connection_dialog">
> <property name="border_width">6</property>
> @@ -12,7 +13,7 @@
> <property name="modal">False</property>
> <property name="resizable">True</property>
> <property name="destroy_with_parent">False</property>
> - <property name="has_separator">True</property>
> + <property name="has_separator">False</property>
>
> <child internal-child="vbox">
> <widget class="GtkVBox" id="dialog-vbox2">
> Index: shell/glade/e-shell-folder-creation-dialog.glade
> ===================================================================
> RCS file: /cvs/gnome/evolution/shell/glade/e-shell-folder-creation-dialog.glade,v
> retrieving revision 1.7
> diff -u -r1.7 e-shell-folder-creation-dialog.glade
> --- shell/glade/e-shell-folder-creation-dialog.glade 21 Apr 2003 19:27:35 -0000 1.7
> +++ shell/glade/e-shell-folder-creation-dialog.glade 20 Dec 2003 01:48:43 -0000
> @@ -2,6 +2,7 @@
> <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
>
> <glade-interface>
> +<requires lib="gnome"/>
>
> <widget class="GtkDialog" id="create_folder_dialog">
> <property name="border_width">6</property>
> @@ -14,7 +15,7 @@
> <property name="default_height">410</property>
> <property name="resizable">True</property>
> <property name="destroy_with_parent">False</property>
> - <property name="has_separator">True</property>
> + <property name="has_separator">False</property>
>
> <child internal-child="vbox">
> <widget class="GtkVBox" id="dialog-vbox1">
> Index: shell/glade/e-shell-shared-folder-picker-dialog.glade
> ===================================================================
> RCS file: /cvs/gnome/evolution/shell/glade/e-shell-shared-folder-picker-dialog.glade,v
> retrieving revision 1.6
> diff -u -r1.6 e-shell-shared-folder-picker-dialog.glade
> --- shell/glade/e-shell-shared-folder-picker-dialog.glade 2 May 2003 14:54:45 -0000 1.6
> +++ shell/glade/e-shell-shared-folder-picker-dialog.glade 20 Dec 2003 01:48:44 -0000
> @@ -1,252 +1,251 @@
> <?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"; >
> +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
>
> <glade-interface>
> - <widget class="GtkDialog" id="dialog">
> - <property name="title" translatable="yes">Open Other User's Folder</property>
> - <property name="type">GTK_WINDOW_TOPLEVEL</property>
> - <property name="modal">no</property>
> - <property name="allow_shrink">no</property>
> - <property name="allow_grow">no</property>
> - <property name="width-request">350</property>
> - <property name="visible">yes</property>
> - <property name="window-position">GTK_WIN_POS_NONE</property>
> -
> - <child internal-child="vbox">
> - <widget class="GtkVBox" id="dialog-vbox1">
> - <property name="homogeneous">no</property>
> - <property name="spacing">8</property>
> - <property name="visible">yes</property>
> -
> - <child internal-child="action_area">
> - <widget class="GtkHButtonBox" id="dialog-action_area1">
> - <property name="layout_style">GTK_BUTTONBOX_END</property>
> - <property name="spacing">8</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkButton" id="button3">
> - <property name="can_default">yes</property>
> - <property name="can_focus">yes</property>
> - <property name="visible">yes</property>
> - <property name="label">gtk-cancel</property>
> - <property name="use_stock">yes</property>
> - <property name="use_underline">yes</property>
> - <property name="response_id">-6</property>
> - </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkButton" id="button1">
> - <property name="can_default">yes</property>
> - <property name="has_default">yes</property>
> - <property name="can_focus">yes</property>
> - <property name="visible">yes</property>
> - <property name="label">gtk-ok</property>
> - <property name="use_stock">yes</property>
> - <property name="use_underline">yes</property>
> - <property name="response_id">-5</property>
> - </widget>
> - </child>
> -
> - </widget>
> - <packing>
> - <property name="padding">0</property>
> - <property name="expand">no</property>
> - <property name="fill">yes</property>
> - <property name="pack_type">GTK_PACK_END</property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkTable" id="table1">
> - <property name="homogeneous">no</property>
> - <property name="row_spacing">3</property>
> - <property name="column_spacing">3</property>
> - <property name="n-rows">3</property>
> - <property name="n-columns">2</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkLabel" id="label1">
> - <property name="label" translatable="yes">_Account:</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">no</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="mnemonic_widget">server-option-menu</property>
> - <property name="visible">yes</property>
> - <property name="use_underline">yes</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_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">fill</property>
> - <property name="y_options"></property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label3">
> - <property name="label" translatable="yes">_Folder Name:</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">no</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - <property name="mnemonic_widget">folder-name-entry</property>
> - <property name="visible">yes</property>
> - <property name="use_underline">yes</property>
> - </widget>
> - <packing>
> - <property name="left_attach">0</property>
> - <property name="right_attach">1</property>
> - <property name="top_attach">2</property>
> - <property name="bottom_attach">3</property>
> - <property name="x_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">fill</property>
> - <property name="y_options"></property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkOptionMenu" id="server-option-menu">
> - <property name="can_focus">yes</property>
> - <property name="history">0</property>
> - <property name="visible">yes</property>
> -
> - <child internal-child="menu">
> - <widget class="GtkMenu" id="convertwidget1">
> - <property name="visible">yes</property>
> - </widget>
> - </child>
> - </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="x_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">fill</property>
> - <property name="y_options"></property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkCombo" id="folder-name-combo">
> - <property name="value_in_list">no</property>
> - <property name="case_sensitive">no</property>
> - <property name="enable_arrow_keys">yes</property>
> - <property name="enable_arrows_always">no</property>
> - <property name="allow_empty">yes</property>
> - <property name="visible">yes</property>
> -
> - <child internal-child="entry">
> - <widget class="GtkEntry" id="folder-name-entry">
> - <property name="can_focus">yes</property>
> - <property name="editable">yes</property>
> - <property name="text" translatable="yes"></property>
> - <property name="max-length">0</property>
> - <property name="visibility">yes</property>
> - <property name="visible">yes</property>
> - </widget>
> - </child>
> -
> - <child internal-child="list">
> - <widget class="GtkList" id="convertwidget2">
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkListItem" id="convertwidget3">
> - <property name="visible">yes</property>
> -
> - <child>
> - <widget class="GtkLabel" id="convertwidget4">
> - <property name="label" translatable="yes"></property>
> - <property name="xalign">0.0</property>
> - <property name="visible">yes</property>
> - </widget>
> - </child>
> - </widget>
> - </child>
> - </widget>
> - </child>
> - </widget>
> - <packing>
> - <property name="left_attach">1</property>
> - <property name="right_attach">2</property>
> - <property name="top_attach">2</property>
> - <property name="bottom_attach">3</property>
> - <property name="x_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">expand|fill</property>
> - <property name="y_options"></property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkHBox" id="user-picker-placeholder">
> - <property name="homogeneous">no</property>
> - <property name="spacing">0</property>
> - <property name="visible">yes</property>
> -
> - <child>
> - <placeholder />
> - </child>
> - </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_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">fill</property>
> - <property name="y_options"></property>
> - </packing>
> - </child>
> -
> - <child>
> - <widget class="GtkButton" id="button-user">
> - <property name="can_focus">yes</property>
> - <property name="label" translatable="yes">_User:</property>
> - <property name="relief">GTK_RELIEF_NORMAL</property>
> - <property name="visible">yes</property>
> - <property name="use_underline">yes</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_padding">0</property>
> - <property name="y_padding">0</property>
> - <property name="x_options">fill</property>
> - <property name="y_options"></property>
> - </packing>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">2</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> - </widget>
> - <packing>
> - <property name="padding">4</property>
> - <property name="expand">yes</property>
> - <property name="fill">yes</property>
> - </packing>
> - </child>
> - </widget>
> +<requires lib="gnome"/>
> +
> +<widget class="GtkDialog" id="dialog">
> + <property name="visible">True</property>
> + <property name="title" translatable="yes">Open Other User's Folder</property>
> + <property name="type">GTK_WINDOW_TOPLEVEL</property>
> + <property name="window_position">GTK_WIN_POS_NONE</property>
> + <property name="modal">False</property>
> + <property name="resizable">True</property>
> + <property name="destroy_with_parent">False</property>
> + <property name="has_separator">False</property>
> +
> + <child internal-child="vbox">
> + <widget class="GtkVBox" id="dialog-vbox1">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">8</property>
> +
> + <child internal-child="action_area">
> + <widget class="GtkHButtonBox" id="dialog-action_area1">
> + <property name="visible">True</property>
> + <property name="layout_style">GTK_BUTTONBOX_END</property>
> +
> + <child>
> + <widget class="GtkButton" id="button3">
> + <property name="visible">True</property>
> + <property name="can_default">True</property>
> + <property name="can_focus">True</property>
> + <property name="label">gtk-cancel</property>
> + <property name="use_stock">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="response_id">-6</property>
> + </widget>
> + </child>
> +
> + <child>
> + <widget class="GtkButton" id="button1">
> + <property name="visible">True</property>
> + <property name="can_default">True</property>
> + <property name="has_default">True</property>
> + <property name="can_focus">True</property>
> + <property name="label">gtk-ok</property>
> + <property name="use_stock">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</property>
> + <property name="response_id">-5</property>
> + </widget>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">True</property>
> + <property name="pack_type">GTK_PACK_END</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkTable" id="table1">
> + <property name="visible">True</property>
> + <property name="n_rows">3</property>
> + <property name="n_columns">2</property>
> + <property name="homogeneous">False</property>
> + <property name="row_spacing">3</property>
> + <property name="column_spacing">3</property>
> +
> + <child>
> + <widget class="GtkLabel" id="label1">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">_Account:</property>
> + <property name="use_underline">True</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + <property name="mnemonic_widget">server-option-menu</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="label3">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">_Folder Name:</property>
> + <property name="use_underline">True</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + <property name="mnemonic_widget">folder-name-entry</property>
> + </widget>
> + <packing>
> + <property name="left_attach">0</property>
> + <property name="right_attach">1</property>
> + <property name="top_attach">2</property>
> + <property name="bottom_attach">3</property>
> + <property name="x_options">fill</property>
> + <property name="y_options"></property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkOptionMenu" id="server-option-menu">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="history">-1</property>
> +
> + <child internal-child="menu">
> + <widget class="GtkMenu" id="convertwidget1">
> + <property name="visible">True</property>
> + </widget>
> + </child>
> + </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="x_options">fill</property>
> + <property name="y_options"></property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkCombo" id="folder-name-combo">
> + <property name="visible">True</property>
> + <property name="value_in_list">False</property>
> + <property name="allow_empty">True</property>
> + <property name="case_sensitive">False</property>
> + <property name="enable_arrow_keys">True</property>
> + <property name="enable_arrows_always">False</property>
> +
> + <child internal-child="entry">
> + <widget class="GtkEntry" id="folder-name-entry">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">True</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</property>
> + </widget>
> + </child>
> +
> + <child internal-child="list">
> + <widget class="GtkList" id="convertwidget2">
> + <property name="visible">True</property>
> + <property name="selection_mode">GTK_SELECTION_BROWSE</property>
> +
> + <child>
> + <widget class="GtkListItem" id="convertwidget3">
> + <property name="visible">True</property>
> +
> + <child>
> + <widget class="GtkLabel" id="convertwidget4">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"></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>
> + </widget>
> + </child>
> + </widget>
> + </child>
> + </widget>
> + </child>
> + </widget>
> + <packing>
> + <property name="left_attach">1</property>
> + <property name="right_attach">2</property>
> + <property name="top_attach">2</property>
> + <property name="bottom_attach">3</property>
> + <property name="y_options"></property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="user-picker-placeholder">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <placeholder/>
> + </child>
> + </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"></property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkButton" id="button-user">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="label" translatable="yes">_User:</property>
> + <property name="use_underline">True</property>
> + <property name="relief">GTK_RELIEF_NORMAL</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>
> + </widget>
> + <packing>
> + <property name="padding">2</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> + </widget>
> + </child>
> +</widget>
> +
> </glade-interface>
> Index: shell/importer/intelligent.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/shell/importer/intelligent.c,v
> retrieving revision 1.18
> diff -u -r1.18 intelligent.c
> --- shell/importer/intelligent.c 22 Oct 2003 19:16:47 -0000 1.18
> +++ shell/importer/intelligent.c 20 Dec 2003 01:48:45 -0000
> @@ -186,6 +186,7 @@
>
> d = g_new (IntelligentImporterDialog, 1);
> d->dialog = dialog = gtk_dialog_new();
> + gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
> gtk_window_set_title((GtkWindow *)dialog, _("Importers"));
> dummy = gtk_button_new_from_stock(GTK_STOCK_CONVERT);
> gtk_button_set_label((GtkButton *)dummy, _("Import"));
> Index: smime/ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/evolution/smime/ChangeLog,v
> retrieving revision 1.15
> diff -u -r1.15 ChangeLog
> --- smime/ChangeLog 10 Dec 2003 02:25:30 -0000 1.15
> +++ smime/ChangeLog 20 Dec 2003 01:48:45 -0000
> @@ -1,3 +1,7 @@
> +2003-12-19 William Jon McCann <mccann jhu edu>
> +
> + * gui/smime-ui.glade: Remove separator from dialogs.
> +
> 2003-12-10 Not Zed <NotZed Ximian com>
>
> * gui/e-cert-selector.c (e_cert_selector_new): if we get no
> Index: smime/gui/smime-ui.glade
> ===================================================================
> RCS file: /cvs/gnome/evolution/smime/gui/smime-ui.glade,v
> retrieving revision 1.6
> diff -u -r1.6 smime-ui.glade
> --- smime/gui/smime-ui.glade 3 Dec 2003 20:48:04 -0000 1.6
> +++ smime/gui/smime-ui.glade 20 Dec 2003 01:48:50 -0000
> @@ -2,6 +2,7 @@
> <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
>
> <glade-interface>
> +<requires lib="gnome"/>
>
> <widget class="GtkDialog" id="certificate-viewer-dialog">
> <property name="title" translatable="yes">dialog1</property>
> @@ -10,7 +11,7 @@
> <property name="modal">False</property>
> <property name="resizable">True</property>
> <property name="destroy_with_parent">False</property>
> - <property name="has_separator">True</property>
> + <property name="has_separator">False</property>
>
> <child internal-child="vbox">
> <widget class="GtkVBox" id="dialog-vbox1">
> @@ -1766,7 +1767,7 @@
> <property name="modal">False</property>
> <property name="resizable">True</property>
> <property name="destroy_with_parent">False</property>
> - <property name="has_separator">True</property>
> + <property name="has_separator">False</property>
>
> <child internal-child="vbox">
> <widget class="GtkVBox" id="dialog-vbox2">
> Index: widgets/ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/evolution/widgets/ChangeLog,v
> retrieving revision 1.113
> diff -u -r1.113 ChangeLog
> --- widgets/ChangeLog 17 Dec 2003 00:50:03 -0000 1.113
> +++ widgets/ChangeLog 20 Dec 2003 01:48:51 -0000
> @@ -1,3 +1,11 @@
> +2003-12-19 William Jon McCann <mccann jhu edu>
> +
> + * e-timezone-dialog/e-timezone-dialog.glade:
> + * misc/e-filter-bar.c (do_advanced, menubar_activated):
> + * misc/e-charset-picker.c (activate_other)
> + (e_charset_picker_dialog):
> + Remove separator from dialogs. Use HIG recommended frame style.
> +
> 2003-12-16 Hans Petter Jansson <hpj ximian com>
>
> * misc/e-source-option-menu.c (select_source_foreach_menu_item):
> Index: widgets/e-timezone-dialog/e-timezone-dialog.glade
> ===================================================================
> RCS file: /cvs/gnome/evolution/widgets/e-timezone-dialog/e-timezone-dialog.glade,v
> retrieving revision 1.5
> diff -u -r1.5 e-timezone-dialog.glade
> --- widgets/e-timezone-dialog/e-timezone-dialog.glade 19 May 2003 15:45:55 -0000 1.5
> +++ widgets/e-timezone-dialog/e-timezone-dialog.glade 20 Dec 2003 01:48:52 -0000
> @@ -2,6 +2,7 @@
> <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
>
> <glade-interface>
> +<requires lib="gnome"/>
>
> <widget class="GtkDialog" id="timezone-dialog">
> <property name="border_width">6</property>
> @@ -13,7 +14,7 @@
> <property name="default_height">400</property>
> <property name="resizable">True</property>
> <property name="destroy_with_parent">False</property>
> - <property name="has_separator">True</property>
> + <property name="has_separator">False</property>
>
> <child internal-child="vbox">
> <widget class="GtkVBox" id="dialog-vbox1">
> @@ -96,57 +97,111 @@
> </child>
>
> <child>
> - <widget class="GtkFrame" id="frame1">
> + <widget class="GtkVBox" id="vbox2">
> <property name="visible">True</property>
> - <property name="label_xalign">0</property>
> - <property name="label_yalign">0.5</property>
> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkVBox" id="vbox1">
> - <property name="border_width">6</property>
> + <widget class="GtkLabel" id="label4">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"><b>Time Zones</b></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">True</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>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkHBox" id="hbox2">
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">6</property>
> + <property name="spacing">0</property>
>
> <child>
> - <widget class="GtkScrolledWindow" id="map-window">
> + <widget class="GtkLabel" id="label5">
> <property name="visible">True</property>
> - <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
> - <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
> - <property name="shadow_type">GTK_SHADOW_IN</property>
> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
> -
> - <child>
> - <placeholder/>
> - </child>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">True</property>
> - <property name="fill">True</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> </packing>
> </child>
>
> <child>
> - <widget class="GtkVBox" id="vbox2">
> + <widget class="GtkVBox" id="vbox1">
> + <property name="border_width">6</property>
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> - <property name="spacing">0</property>
> + <property name="spacing">6</property>
>
> <child>
> - <widget class="GtkLabel" id="timezone-preview">
> + <widget class="GtkScrolledWindow" id="map-window">
> <property name="visible">True</property>
> - <property name="label" translatable="yes"></property>
> - <property name="use_underline">False</property>
> - <property name="use_markup">False</property>
> - <property name="justify">GTK_JUSTIFY_CENTER</property>
> - <property name="wrap">False</property>
> - <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> + <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
> + <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
> + <property name="shadow_type">GTK_SHADOW_IN</property>
> + <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
> +
> + <child>
> + <placeholder/>
> + </child>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> + </child>
> +
> + <child>
> + <widget class="GtkVBox" id="vbox2">
> + <property name="visible">True</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">0</property>
> +
> + <child>
> + <widget class="GtkLabel" id="timezone-preview">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"></property>
> + <property name="use_underline">False</property>
> + <property name="use_markup">False</property>
> + <property name="justify">GTK_JUSTIFY_CENTER</property>
> + <property name="wrap">False</property>
> + <property name="selectable">False</property>
> + <property name="xalign">0.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> + </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> + </child>
> </widget>
> <packing>
> <property name="padding">0</property>
> @@ -157,29 +212,15 @@
> </widget>
> <packing>
> <property name="padding">0</property>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> - </child>
> -
> - <child>
> - <widget class="GtkLabel" id="label2">
> - <property name="visible">True</property>
> - <property name="label" translatable="yes">Time Zones</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.5</property>
> - <property name="yalign">0.5</property>
> - <property name="xpad">0</property>
> - <property name="ypad">0</property>
> - </widget>
> <packing>
> - <property name="type">label_item</property>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> </packing>
> </child>
> </widget>
> @@ -193,7 +234,7 @@
> </child>
>
> <child>
> - <widget class="GtkHBox" id="hbox1">
> + <widget class="GtkVBox" id="vbox3">
> <property name="visible">True</property>
> <property name="homogeneous">False</property>
> <property name="spacing">6</property>
> @@ -201,13 +242,13 @@
> <child>
> <widget class="GtkLabel" id="label3">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">_Selection:</property>
> + <property name="label" translatable="yes"><b>_Selection</b></property>
> <property name="use_underline">True</property>
> - <property name="use_markup">False</property>
> + <property name="use_markup">True</property>
> <property name="justify">GTK_JUSTIFY_CENTER</property>
> <property name="wrap">False</property>
> <property name="selectable">False</property>
> - <property name="xalign">0.5</property>
> + <property name="xalign">0</property>
> <property name="yalign">0.5</property>
> <property name="xpad">0</property>
> <property name="ypad">0</property>
> @@ -221,55 +262,89 @@
> </child>
>
> <child>
> - <widget class="GtkCombo" id="timezone-combo">
> + <widget class="GtkHBox" id="hbox1">
> <property name="visible">True</property>
> - <property name="value_in_list">False</property>
> - <property name="allow_empty">True</property>
> - <property name="case_sensitive">False</property>
> - <property name="enable_arrow_keys">True</property>
> - <property name="enable_arrows_always">False</property>
> + <property name="homogeneous">False</property>
> + <property name="spacing">6</property>
>
> - <child internal-child="entry">
> - <widget class="GtkEntry" id="combo-entry1">
> + <child>
> + <widget class="GtkLabel" id="label6">
> <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="editable">False</property>
> - <property name="visibility">True</property>
> - <property name="max_length">0</property>
> - <property name="text" translatable="yes"></property>
> - <property name="has_frame">True</property>
> - <property name="invisible_char" translatable="yes">*</property>
> - <property name="activates_default">False</property>
> + <property name="label" translatable="yes"> </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.5</property>
> + <property name="yalign">0.5</property>
> + <property name="xpad">0</property>
> + <property name="ypad">0</property>
> </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + </packing>
> </child>
>
> - <child internal-child="list">
> - <widget class="GtkList" id="convertwidget3">
> + <child>
> + <widget class="GtkCombo" id="timezone-combo">
> <property name="visible">True</property>
> - <property name="selection_mode">GTK_SELECTION_BROWSE</property>
> + <property name="value_in_list">False</property>
> + <property name="allow_empty">True</property>
> + <property name="case_sensitive">False</property>
> + <property name="enable_arrow_keys">True</property>
> + <property name="enable_arrows_always">False</property>
>
> - <child>
> - <widget class="GtkListItem" id="convertwidget4">
> + <child internal-child="entry">
> + <widget class="GtkEntry" id="combo-entry1">
> <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="editable">False</property>
> + <property name="visibility">True</property>
> + <property name="max_length">0</property>
> + <property name="text" translatable="yes"></property>
> + <property name="has_frame">True</property>
> + <property name="invisible_char" translatable="yes">*</property>
> + <property name="activates_default">False</property>
> + </widget>
> + </child>
> +
> + <child internal-child="list">
> + <widget class="GtkList" id="convertwidget3">
> + <property name="visible">True</property>
> + <property name="selection_mode">GTK_SELECTION_BROWSE</property>
>
> <child>
> - <widget class="GtkLabel" id="convertwidget5">
> + <widget class="GtkListItem" id="convertwidget4">
> <property name="visible">True</property>
> - <property name="label" translatable="yes"></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>
> +
> + <child>
> + <widget class="GtkLabel" id="convertwidget5">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes"></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>
> + </widget>
> + </child>
> </widget>
> </child>
> </widget>
> </child>
> </widget>
> + <packing>
> + <property name="padding">0</property>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + </packing>
> </child>
> </widget>
> <packing>
> Index: widgets/misc/e-charset-picker.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/widgets/misc/e-charset-picker.c,v
> retrieving revision 1.17
> diff -u -r1.17 e-charset-picker.c
> --- widgets/misc/e-charset-picker.c 19 Jun 2003 20:05:57 -0000 1.17
> +++ widgets/misc/e-charset-picker.c 20 Dec 2003 01:48:53 -0000
> @@ -217,6 +217,7 @@
> GTK_STOCK_OK, GTK_RESPONSE_OK,
> NULL));
>
> + gtk_dialog_set_has_separator (dialog, FALSE);
> gtk_dialog_set_default_response (dialog, GTK_RESPONSE_OK);
>
> label = gtk_label_new (_("Enter the character set to use"));
> @@ -374,6 +375,7 @@
> GTK_STOCK_OK, GTK_RESPONSE_OK,
> NULL));
>
> + gtk_dialog_set_has_separator (dialog, FALSE);
> gtk_dialog_set_default_response (dialog, GTK_RESPONSE_OK);
>
> label = gtk_label_new (prompt);
> Index: widgets/misc/e-filter-bar.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/widgets/misc/e-filter-bar.c,v
> retrieving revision 1.42
> diff -u -r1.42 e-filter-bar.c
> --- widgets/misc/e-filter-bar.c 11 Apr 2003 20:08:05 -0000 1.42
> +++ widgets/misc/e-filter-bar.c 20 Dec 2003 01:48:54 -0000
> @@ -151,6 +151,7 @@
> GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
>
> efb->save_dialog = dialog;
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
>
> gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
> gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 300);
> @@ -207,6 +208,7 @@
> GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
> GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
> efb->save_dialog = dialog;
> + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
>
> gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 300);
>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
