[evolution] Resave .ui files with latest glade and bump gtk+ requirement to 3.10
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Resave .ui files with latest glade and bump gtk+ requirement to 3.10
- Date: Thu, 15 Dec 2016 09:36:08 +0000 (UTC)
commit db244f84b2ac047e36f1be0aa0653ffb9241197e
Author: Milan Crha <mcrha redhat com>
Date: Thu Dec 15 10:34:00 2016 +0100
Resave .ui files with latest glade and bump gtk+ requirement to 3.10
...the same version, as the project requires.
.../gui/contact-editor/contact-editor.ui | 1064 +++++++++++---------
src/addressbook/gui/contact-editor/fullname.ui | 44 +-
.../gui/contact-list-editor/contact-list-editor.ui | 332 ++++---
src/calendar/alarm-notify/alarm-notify.ui | 65 +-
src/e-util/e-send-options.ui | 236 +++--
src/e-util/e-table-config.ui | 551 +++++------
src/e-util/e-timezone-dialog.ui | 190 ++--
src/e-util/filter.ui | 559 ++++++-----
src/e-util/gal-view-instance-save-as-dialog.ui | 31 +-
src/mail/mail-config.ui | 211 ++---
src/mail/mail-dialogs.ui | 348 ++++---
src/modules/calendar/e-calendar-preferences.ui | 295 ++++--
.../org-gnome-email-custom-header.ui | 133 ++-
src/plugins/publish-calendar/publish-calendar.ui | 132 ++-
src/smime/gui/smime-ui.ui | 390 ++++----
15 files changed, 2523 insertions(+), 2058 deletions(-)
---
diff --git a/src/addressbook/gui/contact-editor/contact-editor.ui
b/src/addressbook/gui/contact-editor/contact-editor.ui
index 31ca435..c3fa746 100644
--- a/src/addressbook/gui/contact-editor/contact-editor.ui
+++ b/src/addressbook/gui/contact-editor/contact-editor.ui
@@ -1,78 +1,222 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="2.16"/>
- <!-- interface-requires evolution 0.0 -->
- <!-- interface-naming-policy toplevel-contextual -->
- <object class="GtkListStore" id="model1">
- <columns>
- <!-- column-name gchararray -->
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore" id="model2">
- <columns>
- <!-- column-name gchararray -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0">Work</col>
- </row>
- <row>
- <col id="0">Personal</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="model3">
- <columns>
- <!-- column-name gchararray -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0">Work</col>
- </row>
- <row>
- <col id="0">Personal</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="model4">
- <columns>
- <!-- column-name gchararray -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0">Work</col>
- </row>
- <row>
- <col id="0">Personal</col>
- </row>
- </data>
+ <requires lib="gtk+" version="3.10"/>
+ <requires lib="evolution" version="0.0"/>
+ <object class="GtkMenu" id="menu-editor-config">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkCheckMenuItem" id="menuitem-config-phone">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Show Telephone</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckMenuItem" id="menuitem-config-sip">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Show SIP Address</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckMenuItem" id="menuitem-config-im">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Show Instant Messaging</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="menuitem1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckMenuItem" id="menuitem-config-web">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Show Web Addresses</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckMenuItem" id="menuitem-config-job">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Show Job section</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckMenuItem" id="menuitem-config-misc">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Show Miscellaneous</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="menuitem2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckMenuItem" id="menuitem-config-home">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Show Home Mailing Address</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckMenuItem" id="menuitem-config-work">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Show Work Mailing Address</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckMenuItem" id="menuitem-config-other">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Show Other Mailing Address</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="menuitem3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckMenuItem" id="menuitem-config-notes">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Show Notes</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckMenuItem" id="menuitem-config-certs">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Show Certificates</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
</object>
- <object class="GtkListStore" id="model5">
+ <object class="GtkListStore" id="model1">
<columns>
<!-- column-name gchararray -->
<column type="gchararray"/>
</columns>
- <data>
- <row>
- <col id="0">Work</col>
- </row>
- <row>
- <col id="0">Personal</col>
- </row>
- </data>
</object>
<object class="GtkDialog" id="contact editor">
+ <property name="can_focus">False</property>
<property name="title" translatable="yes">Contact Editor</property>
<property name="window_position">center</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
+ <object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkMenuButton" id="button-config">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Options</property>
+ <property name="halign">end</property>
+ <property name="use_underline">True</property>
+ <property name="direction">up</property>
+ <child>
+ <object class="GtkImage" id="gears-icon">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">emblem-system-symbolic</property>
+ <property name="icon_size">1</property>
+ </object>
+ </child>
+ <style>
+ <class name="image-button"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button-cancel">
+ <property name="label" translatable="yes">_Cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button-ok">
+ <property name="label" translatable="yes">_Save</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <accelerator key="s" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button-help">
+ <property name="label" translatable="yes">_Help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
<object class="GtkNotebook" id="notebook11">
<property name="visible">True</property>
@@ -82,49 +226,51 @@
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="min-content-width">320</property>
- <property name="min-content-height">240</property>
+ <property name="min_content_width">320</property>
+ <property name="min_content_height">240</property>
<child>
<object class="GtkViewport" id="viewport1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="resize_mode">queue</property>
- <property name="shadow-type">none</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkVBox" id="vbox33">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="orientation">vertical</property>
<property name="spacing">1</property>
<child>
<object class="GtkHBox" id="hbox55">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkButton" id="button-image">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="button-image-atkobject">
- <property name="AtkObject::accessible-name"
translatable="yes">Image</property>
- </object>
- </child>
<child>
<object class="EImageChooser" type-func="e_image_chooser_get_type"
id="image-chooser">
<property name="visible">True</property>
</object>
</child>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="button-image-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Image</property>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkTable" id="table83">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">3</property>
<property name="n_columns">4</property>
<property name="column_spacing">6</property>
@@ -132,23 +278,24 @@
<child>
<object class="GtkLabel" id="label-nickname">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Nic_kname:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-nickname</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkEntry" id="entry-fullname">
+ <property name="name">fullname</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="name">fullname</property>
<accessibility>
<relation type="labelled-by" target="button-fullname"/>
</accessibility>
@@ -156,30 +303,32 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="accellabel-fileas">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_File under:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">combo-file-as</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="where-label">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Where:</property>
<property name="use_underline">True</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -187,7 +336,7 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -202,7 +351,7 @@
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -218,19 +367,19 @@
<property name="right_attach">4</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkEntry" id="entry-nickname">
+ <property name="name">nickname</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="name">nickname</property>
</object>
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -258,16 +407,22 @@
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkComboBox" id="combo-file-as">
+ <property name="name">file-as</property>
<property name="visible">True</property>
- <property name="has-entry">True</property>
- <property name="entry-text-column">0</property>
+ <property name="can_focus">False</property>
<property name="model">model1</property>
- <property name="name">file-as</property>
+ <property name="has_entry">True</property>
+ <property name="entry_text_column">0</property>
+ <child internal-child="entry">
+ <object class="GtkEntry">
+ <property name="can_focus">False</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -280,6 +435,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -293,6 +450,7 @@
<child>
<object class="GtkHSeparator" id="hseparator10">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -304,17 +462,20 @@
<child>
<object class="GtkVBox" id="vbox34">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<property name="spacing">10</property>
<child>
<object class="GtkVBox" id="vbox-contact-mail">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkExpander" id="expander-contact-email">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child type="label">
<object class="GtkLabel" id="label400">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Email</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -323,21 +484,24 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vboxmail">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="EContactEditorDynTable"
type-func="e_contact_editor_dyntable_get_type"
- id="mail-dyntable">
+ <object class="EContactEditorDynTable"
type-func="e_contact_editor_dyntable_get_type" id="mail-dyntable">
<property name="visible">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -351,11 +515,15 @@
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -369,12 +537,15 @@
<child>
<object class="GtkVBox" id="vbox-contact-phone">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkExpander" id="expander-contact-phone">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child type="label">
<object class="GtkLabel" id="label399">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Telephone</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -383,41 +554,53 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox-phone">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="EContactEditorDynTable"
type-func="e_contact_editor_dyntable_get_type"
- id="phone-dyntable">
+ <object class="EContactEditorDynTable"
type-func="e_contact_editor_dyntable_get_type" id="phone-dyntable">
<property name="visible">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox-contact-sip">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkExpander" id="expander-contact-sip">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child type="label">
<object class="GtkLabel" id="label-sip">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">SIP Address</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -426,44 +609,53 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox-sip">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="EContactEditorDynTable"
type-func="e_contact_editor_dyntable_get_type"
- id="sip-dyntable">
+ <object class="EContactEditorDynTable"
type-func="e_contact_editor_dyntable_get_type" id="sip-dyntable">
<property name="visible">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox-contact-im">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkExpander" id="expander-contact-im">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child type="label">
<object class="GtkLabel" id="label-im">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Instant
Messaging</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -472,37 +664,45 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox-im">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="EContactEditorDynTable"
type-func="e_contact_editor_dyntable_get_type"
- id="im-dyntable">
+ <object class="EContactEditorDynTable"
type-func="e_contact_editor_dyntable_get_type" id="im-dyntable">
<property name="visible">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -515,6 +715,7 @@
<child type="tab">
<object class="GtkLabel" id="label405">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Contact</property>
</object>
<packing>
@@ -525,27 +726,27 @@
<object class="GtkScrolledWindow" id="scrolledwindow-personal">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="min-content-width">320</property>
- <property name="min-content-height">240</property>
+ <property name="min_content_width">320</property>
+ <property name="min_content_height">240</property>
<child>
<object class="GtkViewport" id="viewport2">
<property name="visible">True</property>
- <property name="shadow-type">none</property>
+ <property name="can_focus">False</property>
<property name="resize_mode">queue</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkVBox" id="vbox-size-leader">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="orientation">vertical</property>
- <property name="spacing">0</property>
<child>
<object class="GtkExpander" id="expander-personal-web">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkTable" id="table87">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="n_rows">5</property>
<property name="n_columns">2</property>
@@ -554,59 +755,63 @@
<child>
<object class="GtkLabel" id="accellabel-homepage">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Home Page:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-homepage</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label-caluri">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Calendar:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-caluri</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label-fburl">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Free/Busy:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-fburl</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label-videourl">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Video Chat:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-videourl</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -678,16 +883,17 @@
<child>
<object class="GtkLabel" id="label-weblog">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Blog:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-weblog</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -713,6 +919,7 @@
<child type="label">
<object class="GtkLabel" id="label410">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Web Addresses</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -722,33 +929,43 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkExpander" id="expander-personal-job">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkTable" id="table88">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="n_rows">4</property>
<property name="n_columns">4</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<object class="GtkLabel" id="label-profession">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Profession:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-profession</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -760,28 +977,29 @@
</accessibility>
</object>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label-jobtitle">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes"
context="Job">_Title:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-jobtitle</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
<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">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -793,26 +1011,27 @@
</accessibility>
</object>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
- <property name="y_options"></property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label-company">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Company:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-company</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -828,16 +1047,17 @@
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label-department">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Department:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-department</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -845,7 +1065,7 @@
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -861,24 +1081,23 @@
<property name="right_attach">4</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label-office">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Office:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-office</property>
+ <property name="xalign">0</property>
</object>
<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">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -894,23 +1113,21 @@
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
-
<child>
<object class="GtkLabel" id="label-manager">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Manager:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-manager</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -924,26 +1141,23 @@
<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="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label-assistant">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Assistant:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-assistant</property>
+ <property name="xalign">0</property>
</object>
<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">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -957,9 +1171,7 @@
<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>
+ <property name="y_options"/>
</packing>
</child>
</object>
@@ -967,6 +1179,7 @@
<child type="label">
<object class="GtkLabel" id="label417">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Job</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -976,6 +1189,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -986,26 +1200,32 @@
<child>
<object class="GtkTable" id="table89">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="n_rows">2</property>
<property name="n_columns">4</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<object class="GtkLabel" id="label-spouse">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Spouse:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-spouse</property>
+ <property name="xalign">0</property>
</object>
<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">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -1019,41 +1239,37 @@
<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>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label-birthday">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Birthday:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">dateedit-birthday</property>
+ <property name="xalign">0</property>
</object>
<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">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label-anniversary">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Anniversary:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">dateedit-anniversary</property>
+ <property name="xalign">1</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -1103,6 +1319,7 @@
<child type="label">
<object class="GtkLabel" id="label421">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Miscellaneous</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -1111,6 +1328,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -1126,6 +1345,7 @@
<child type="tab">
<object class="GtkLabel" id="label422">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Personal Information</property>
</object>
<packing>
@@ -1137,30 +1357,31 @@
<object class="GtkScrolledWindow" id="scrolledwindow-mailing">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="min-content-width">320</property>
- <property name="min-content-height">240</property>
+ <property name="min_content_width">320</property>
+ <property name="min_content_height">240</property>
<child>
<object class="GtkViewport" id="viewport3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="resize_mode">queue</property>
- <property name="shadow-type">none</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkVBox" id="vbox39">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkFrame" id="frame-mailing-home">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="vexpand">False</property>
<property name="border_width">6</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
- <property name="vexpand">FALSE</property>
- <property name="valign">GTK_ALIGN_START</property>
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="yalign">0.15000000596046448</property>
<property name="yscale">0.69999998807907104</property>
@@ -1169,21 +1390,27 @@
<child>
<object class="GtkHBox" id="hbox59">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkTable" id="table-home-address">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">4</property>
<property name="n_columns">4</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<object class="GtkScrolledWindow" id="scrolledwindow-home-address">
<property name="width_request">193</property>
<property name="height_request">69</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTextView" id="textview-home-address">
@@ -1210,23 +1437,24 @@
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label-home-city">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_City:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-home-city</property>
<property name="single_line_mode">True</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -1239,16 +1467,17 @@
<property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label-home-zip">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Zip/Postal
Code:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-home-zip</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -1256,7 +1485,7 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -1270,16 +1499,17 @@
<property name="right_attach">4</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label-home-state">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
<property name="label"
translatable="yes">_State/Province:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-home-state</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -1287,7 +1517,7 @@
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -1301,17 +1531,18 @@
<property name="right_attach">4</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label-home-country">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
<property name="ypad">4</property>
<property name="label" translatable="yes">_Country:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-home-country</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -1319,7 +1550,7 @@
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -1333,45 +1564,43 @@
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label-home-pobox">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_PO Box:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-home-pobox</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label-home-address">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Address:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">textview-home-address</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -1382,8 +1611,9 @@
<child type="label">
<object class="GtkLabel" id="frame73">
<property name="visible">True</property>
- <property name="xalign">0.41999998688697815</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Home</property>
+ <property name="xalign">0.41999998688697815</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -1391,22 +1621,24 @@
</child>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
- <property name="expand">FALSE</property>
- <property name="fill">FALSE</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame-mailing-work">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="vexpand">False</property>
<property name="border_width">6</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
- <property name="vexpand">FALSE</property>
- <property name="valign">GTK_ALIGN_START</property>
<child>
<object class="GtkAlignment" id="alignment6">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="yalign">0.15000000596046448</property>
<property name="yscale">0.69999998807907104</property>
@@ -1415,21 +1647,27 @@
<child>
<object class="GtkHBox" id="hbox98">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkTable" id="table-work-address">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">4</property>
<property name="n_columns">4</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<object class="GtkScrolledWindow" id="scrolledwindow-work-address">
<property name="width_request">193</property>
<property name="height_request">69</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTextView" id="textview-work-address">
@@ -1456,36 +1694,38 @@
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label-work-city">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_City:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-work-city</property>
<property name="single_line_mode">True</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label-work-address">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Address:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">textview-work-address</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -1498,16 +1738,17 @@
<property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label-work-zip">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Zip/Postal
Code:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-work-zip</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -1515,7 +1756,7 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -1529,16 +1770,17 @@
<property name="right_attach">4</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label-work-state">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
<property name="label"
translatable="yes">_State/Province:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-work-state</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -1546,7 +1788,7 @@
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -1560,17 +1802,18 @@
<property name="right_attach">4</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label-work-country">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
<property name="ypad">4</property>
<property name="label" translatable="yes">_Country:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-work-country</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -1578,7 +1821,7 @@
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -1592,32 +1835,29 @@
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label-work-pobox">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_PO Box:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-work-pobox</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -1628,8 +1868,9 @@
<child type="label">
<object class="GtkLabel" id="label460">
<property name="visible">True</property>
- <property name="xalign">0.41999998688697815</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Work</property>
+ <property name="xalign">0.41999998688697815</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -1637,21 +1878,22 @@
</child>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
- <property name="expand">FALSE</property>
- <property name="fill">FALSE</property>
</packing>
</child>
<child>
<object class="GtkExpander" id="expander-address-other">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="valign">start</property>
+ <property name="vexpand">False</property>
<property name="border_width">6</property>
- <property name="vexpand">FALSE</property>
- <property name="valign">GTK_ALIGN_START</property>
<child>
<object class="GtkAlignment" id="alignment7">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="yalign">0.15000000596046448</property>
<property name="yscale">0.69999998807907104</property>
@@ -1660,14 +1902,22 @@
<child>
<object class="GtkHBox" id="hbox103">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkTable" id="table-other-address">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">4</property>
<property name="n_columns">4</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<object class="GtkEntry" id="entry-other-city">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1675,36 +1925,38 @@
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label-other-city">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_City:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-other-city</property>
<property name="single_line_mode">True</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label-other-address">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Address:</property>
<property name="use_underline">True</property>
<property
name="mnemonic_widget">textview-other-address</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -1717,16 +1969,17 @@
<property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label-other-zip">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Zip/Postal
Code:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-other-zip</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -1734,7 +1987,7 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -1748,16 +2001,17 @@
<property name="right_attach">4</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label-other-state">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
<property name="label"
translatable="yes">_State/Province:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-other-state</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -1765,7 +2019,7 @@
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -1779,17 +2033,18 @@
<property name="right_attach">4</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label-other-country">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
<property name="ypad">4</property>
<property name="label" translatable="yes">_Country:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-other-country</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -1797,7 +2052,7 @@
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -1811,22 +2066,23 @@
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label-other-pobox">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_PO Box:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-other-pobox</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -1835,8 +2091,6 @@
<property name="height_request">69</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTextView" id="textview-other-address">
@@ -1855,14 +2109,10 @@
<property name="y_options">GTK_FILL</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -1873,8 +2123,9 @@
<child type="label">
<object class="GtkLabel" id="label467">
<property name="visible">True</property>
- <property name="xalign">0.41999998688697815</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Other</property>
+ <property name="xalign">0.41999998688697815</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -1882,9 +2133,9 @@
</child>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">2</property>
- <property name="expand">FALSE</property>
- <property name="fill">FALSE</property>
</packing>
</child>
</object>
@@ -1899,6 +2150,7 @@
<child type="tab">
<object class="GtkLabel" id="label437">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Mailing Address</property>
</object>
<packing>
@@ -1911,8 +2163,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="border_width">12</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTextView" id="text-comments">
@@ -1928,6 +2178,7 @@
<child type="tab">
<object class="GtkLabel" id="label468">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Notes</property>
</object>
<packing>
@@ -1978,10 +2229,10 @@
<child>
<object class="GtkButton" id="cert-add-pgp-btn">
<property name="label" translatable="yes">Add _PGP</property>
- <property name="use_underline">True</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -1992,10 +2243,10 @@
<child>
<object class="GtkButton" id="cert-add-x509-btn">
<property name="label" translatable="yes">Add _X.509</property>
- <property name="use_underline">True</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -2006,10 +2257,10 @@
<child>
<object class="GtkButton" id="cert-remove-btn">
<property name="label" translatable="yes">_Remove</property>
- <property name="use_underline">True</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -2018,15 +2269,12 @@
</packing>
</child>
<child>
- <placeholder/>
- </child>
- <child>
<object class="GtkButton" id="cert-load-pgp-btn">
<property name="label" translatable="yes">Load P_GP</property>
- <property name="use_underline">True</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -2037,10 +2285,10 @@
<child>
<object class="GtkButton" id="cert-load-x509-btn">
<property name="label" translatable="yes">_Load X.509</property>
- <property name="use_underline">True</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -2051,10 +2299,10 @@
<child>
<object class="GtkButton" id="cert-save-btn">
<property name="label" translatable="yes">_Save</property>
- <property name="use_underline">True</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -2062,6 +2310,9 @@
<property name="position">5</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -2104,215 +2355,72 @@
</object>
<packing>
<property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="button-help">
- <property name="label" translatable="yes">_Help</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkMenuButton" id="button-config">
- <property name="direction">up</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
- <property name="halign">end</property>
- <property name="tooltip_text" translatable="yes">Options</property>
- <style>
- <class name="image-button"/>
- </style><child>
- <object class="GtkImage" id="gears-icon">
- <property name="visible">True</property>
- <property name="icon-name">emblem-system-symbolic</property>
- <property name="icon-size">1</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button-cancel">
- <property name="label" translatable="yes">_Cancel</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button-ok">
- <property name="label" translatable="yes">_Save</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
- <accelerator key="s" modifiers="GDK_CONTROL_MASK" signal="clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
</object>
</child>
<action-widgets>
- <action-widget response="-11">button-help</action-widget>
<action-widget response="-6">button-cancel</action-widget>
<action-widget response="-5">button-ok</action-widget>
+ <action-widget response="-11">button-help</action-widget>
</action-widgets>
</object>
-
- <object class="GtkMenu" id="menu-editor-config">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkCheckMenuItem" id="menuitem-config-phone">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Show Telephone</property>
- <property name="use_underline">True</property>
- </object>
- </child>
- <child>
- <object class="GtkCheckMenuItem" id="menuitem-config-sip">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Show SIP Address</property>
- <property name="use_underline">True</property>
- </object>
- </child>
- <child>
- <object class="GtkCheckMenuItem" id="menuitem-config-im">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Show Instant Messaging</property>
- <property name="use_underline">True</property>
- </object>
- </child>
- <child>
- <object class="GtkSeparatorMenuItem" id="menuitem1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- </child>
- <child>
- <object class="GtkCheckMenuItem" id="menuitem-config-web">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Show Web Addresses</property>
- <property name="use_underline">True</property>
- </object>
- </child>
- <child>
- <object class="GtkCheckMenuItem" id="menuitem-config-job">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Show Job section</property>
- <property name="use_underline">True</property>
- </object>
- </child>
- <child>
- <object class="GtkCheckMenuItem" id="menuitem-config-misc">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Show Miscellaneous</property>
- <property name="use_underline">True</property>
- </object>
- </child>
- <child>
- <object class="GtkSeparatorMenuItem" id="menuitem2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- </child>
- <child>
- <object class="GtkCheckMenuItem" id="menuitem-config-home">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Show Home Mailing Address</property>
- <property name="use_underline">True</property>
- </object>
- </child>
- <child>
- <object class="GtkCheckMenuItem" id="menuitem-config-work">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Show Work Mailing Address</property>
- <property name="use_underline">True</property>
- </object>
- </child>
- <child>
- <object class="GtkCheckMenuItem" id="menuitem-config-other">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Show Other Mailing Address</property>
- <property name="use_underline">True</property>
- </object>
- </child>
- <child>
- <object class="GtkSeparatorMenuItem" id="menuitem3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- </child>
- <child>
- <object class="GtkCheckMenuItem" id="menuitem-config-notes">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Show Notes</property>
- <property name="use_underline">True</property>
- </object>
- </child>
- <child>
- <object class="GtkCheckMenuItem" id="menuitem-config-certs">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Show Certificates</property>
- <property name="use_underline">True</property>
- </object>
- </child>
+ <object class="GtkListStore" id="model2">
+ <columns>
+ <!-- column-name gchararray -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0">Work</col>
+ </row>
+ <row>
+ <col id="0">Personal</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model3">
+ <columns>
+ <!-- column-name gchararray -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0">Work</col>
+ </row>
+ <row>
+ <col id="0">Personal</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model4">
+ <columns>
+ <!-- column-name gchararray -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0">Work</col>
+ </row>
+ <row>
+ <col id="0">Personal</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model5">
+ <columns>
+ <!-- column-name gchararray -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0">Work</col>
+ </row>
+ <row>
+ <col id="0">Personal</col>
+ </row>
+ </data>
</object>
-
</interface>
diff --git a/src/addressbook/gui/contact-editor/fullname.ui b/src/addressbook/gui/contact-editor/fullname.ui
index 453d81e..28c104d 100644
--- a/src/addressbook/gui/contact-editor/fullname.ui
+++ b/src/addressbook/gui/contact-editor/fullname.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="2.24"/>
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.10"/>
<object class="GtkListStore" id="model1">
<columns>
<!-- column-name gchararray -->
@@ -9,7 +9,7 @@
</columns>
<data>
<row>
- <col id="0" translatable="yes"></col>
+ <col id="0" translatable="yes"/>
</row>
<row>
<col id="0" translatable="yes">Mr.</col>
@@ -35,7 +35,7 @@
</columns>
<data>
<row>
- <col id="0" translatable="yes"></col>
+ <col id="0" translatable="yes"/>
</row>
<row>
<col id="0" translatable="yes">Sr.</col>
@@ -63,12 +63,12 @@
<property name="modal">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="vbox-container">
+ <object class="GtkBox" id="vbox-container">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">8</property>
<child internal-child="action_area">
- <object class="GtkHButtonBox" id="hbuttonbox1">
+ <object class="GtkButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
@@ -79,8 +79,7 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -95,8 +94,7 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -131,8 +129,6 @@
<property name="activates_default">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -149,8 +145,6 @@
<property name="activates_default">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -167,8 +161,6 @@
<property name="activates_default">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -185,11 +177,11 @@
<object class="GtkLabel" id="label-first">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="label" translatable="yes">_First:</property>
<property name="use_underline">True</property>
<property name="justify">center</property>
<property name="mnemonic_widget">entry-first</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="top_attach">1</property>
@@ -202,11 +194,11 @@
<object class="GtkLabel" id="label-title">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="label" translatable="yes" context="FullName">_Title:</property>
<property name="use_underline">True</property>
<property name="justify">center</property>
<property name="mnemonic_widget">comboentry-title</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
@@ -217,11 +209,11 @@
<object class="GtkLabel" id="label-middle">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="label" translatable="yes">_Middle:</property>
<property name="use_underline">True</property>
<property name="justify">center</property>
<property name="mnemonic_widget">entry-middle</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="top_attach">2</property>
@@ -234,11 +226,11 @@
<object class="GtkLabel" id="label-last">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="label" translatable="yes">_Last:</property>
<property name="use_underline">True</property>
<property name="justify">center</property>
<property name="mnemonic_widget">entry-last</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="top_attach">3</property>
@@ -251,11 +243,11 @@
<object class="GtkLabel" id="label-suffix">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="label" translatable="yes">_Suffix:</property>
<property name="use_underline">True</property>
<property name="justify">center</property>
<property name="mnemonic_widget">comboentry-suffix</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="top_attach">4</property>
@@ -271,6 +263,11 @@
<property name="model">model1</property>
<property name="has_entry">True</property>
<property name="entry_text_column">0</property>
+ <child internal-child="entry">
+ <object class="GtkEntry">
+ <property name="can_focus">False</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -286,6 +283,11 @@
<property name="model">model2</property>
<property name="has_entry">True</property>
<property name="entry_text_column">0</property>
+ <child internal-child="entry">
+ <object class="GtkEntry">
+ <property name="can_focus">False</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
diff --git a/src/addressbook/gui/contact-list-editor/contact-list-editor.ui
b/src/addressbook/gui/contact-list-editor/contact-list-editor.ui
index c1a24f0..f23a734 100644
--- a/src/addressbook/gui/contact-list-editor/contact-list-editor.ui
+++ b/src/addressbook/gui/contact-list-editor/contact-list-editor.ui
@@ -1,20 +1,72 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<!--*- mode: xml -*-->
<interface>
+ <requires lib="gtk+" version="3.10"/>
<object class="GtkDialog" id="dialog">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Contact List Editor</property>
- <property name="window_position">GTK_WIN_POS_CENTER</property>
+ <property name="window_position">center</property>
<property name="icon_name">stock_contact-list</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <signal handler="contact_list_editor_delete_event_cb" name="delete_event"/>
+ <property name="type_hint">normal</property>
+ <signal name="delete-event" handler="contact_list_editor_delete_event_cb" swapped="no"/>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox">
+ <object class="GtkBox" id="dialog-vbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action-area">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="cancel-button">
+ <property name="label" translatable="yes">_Cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="is_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="contact_list_editor_cancel_button_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="ok-button">
+ <property name="label" translatable="yes">_Save</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="contact_list_editor_ok_button_clicked_cb" swapped="no"/>
+ <accelerator key="s" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
<object class="GtkTable" id="table">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">6</property>
<property name="n_rows">2</property>
@@ -24,9 +76,10 @@
<child>
<object class="GtkImage" id="image">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="icon_size">6</property>
<property name="icon_name">x-office-address-book</property>
+ <property name="icon_size">6</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -38,6 +91,7 @@
<child>
<object class="GtkTable" id="source-table">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<property name="column_spacing">6</property>
@@ -45,10 +99,11 @@
<child>
<object class="GtkLabel" id="list-name-label">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_List name:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">list-name-entry</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
@@ -58,10 +113,11 @@
<child>
<object class="GtkLabel" id="source-label">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Where:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">client-combo-box</property>
+ <property name="mnemonic_widget">client-combo-box</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="top_attach">1</property>
@@ -73,7 +129,8 @@
<child>
<object class="GtkEntry" id="list-name-entry">
<property name="visible">True</property>
- <signal handler="contact_list_editor_list_name_entry_changed_cb" name="changed"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="contact_list_editor_list_name_entry_changed_cb"
swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -104,12 +161,14 @@
<child>
<object class="GtkVBox" id="members-vbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="members-label">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Members</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -117,15 +176,18 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="members-alignment">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkTable" id="members-table">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">4</property>
<property name="n_columns">2</property>
<property name="column_spacing">6</property>
@@ -137,15 +199,13 @@
<placeholder/>
</child>
<child>
- <placeholder/>
- </child>
- <child>
<object class="GtkLabel" id="members-instructions">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</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="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="justify">center</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="y_options"/>
@@ -154,6 +214,7 @@
<child>
<object class="GtkEntry" id="email-entry">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="top_attach">1</property>
@@ -165,16 +226,19 @@
<object class="GtkScrolledWindow" id="scrolled-window">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="shadow_type">etched-in</property>
<child>
<object class="GtkTreeView" id="tree-view">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="headers_visible">False</property>
<property name="search_column">0</property>
- <signal handler="contact_list_editor_tree_view_key_press_event_cb"
name="key_press_event"/>
- <signal handler="contact_list_editor_drag_data_received_cb"
name="drag_data_received"/>
+ <signal name="drag-data-received"
handler="contact_list_editor_drag_data_received_cb" swapped="no"/>
+ <signal name="key-press-event"
handler="contact_list_editor_tree_view_key_press_event_cb" swapped="no"/>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"/>
+ </child>
</object>
</child>
</object>
@@ -185,11 +249,14 @@
</child>
<child>
<object class="GtkCheckButton" id="check-button">
+ <property name="label" translatable="yes">_Hide addresses when sending mail to
this list</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="is_focus">True</property>
- <property name="label" translatable="yes">_Hide addresses when sending mail to
this list</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <signal handler="contact_list_editor_check_button_toggled_cb" name="toggled"/>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="contact_list_editor_check_button_toggled_cb"
swapped="no"/>
</object>
<packing>
<property name="top_attach">3</property>
@@ -200,39 +267,43 @@
<child>
<object class="GtkVBox" id="members-buttons">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkButton" id="add-button">
+ <property name="label" translatable="yes">_Add</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
+ <property name="can_focus">False</property>
<property name="is_focus">True</property>
<property name="can_default">True</property>
+ <property name="receives_default">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Add an email to the
List</property>
- <property name="label" translatable="yes">_Add</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
+ <property name="use_underline">True</property>
<property name="xalign">0</property>
- <signal handler="contact_list_editor_add_button_clicked_cb" name="clicked"/>
+ <signal name="clicked" handler="contact_list_editor_add_button_clicked_cb"
swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="remove-button">
+ <property name="label" translatable="yes">_Remove</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
+ <property name="can_focus">False</property>
<property name="is_focus">True</property>
<property name="can_default">True</property>
+ <property name="receives_default">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Remove an email address
from the List</property>
- <property name="label" translatable="yes">_Remove</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
+ <property name="use_underline">True</property>
<property name="xalign">0</property>
- <signal handler="contact_list_editor_remove_button_clicked_cb"
name="clicked"/>
+ <signal name="clicked"
handler="contact_list_editor_remove_button_clicked_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -242,15 +313,17 @@
</child>
<child>
<object class="GtkButton" id="select-button">
+ <property name="label" translatable="yes">_Select...</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="is_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
- <property name="use_underline">True</property>
+ <property name="receives_default">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Insert email addresses from
Address Book</property>
- <property name="label" translatable="yes">_Select...</property>
- <signal name="clicked"
handler="contact_list_editor_select_button_clicked_cb"/>
+ <property name="use_underline">True</property>
+ <signal name="clicked"
handler="contact_list_editor_select_button_clicked_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -259,84 +332,91 @@
</packing>
</child>
<child>
+ <object class="GtkAlignment" id="members-buttons-alignment">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkButton" id="top-button">
+ <property name="label" translatable="yes">_Top</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
+ <property name="is_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="contact_list_editor_top_button_clicked_cb"
swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="up-button">
+ <property name="label" translatable="yes">_Up</property>
<property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
<property name="is_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
- <property name="label" translatable="yes">_Top</property>
- <property name="use-stock">False</property>
- <property name="use-underline">True</property>
- <property name="sensitive">False</property>
- <signal name="clicked" handler="contact_list_editor_top_button_clicked_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="up-button">
- <property name="visible">True</property>
- <property name="is_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="label" translatable="yes">_Up</property>
- <property name="use-stock">False</property>
- <property name="use-underline">True</property>
- <property name="sensitive">False</property>
- <signal name="clicked" handler="contact_list_editor_up_button_clicked_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="down-button">
- <property name="visible">True</property>
- <property name="is_focus">True</property>
- <property name="has_focus">True</property>
- <property name="label" translatable="yes">_Down</property>
- <property name="use-stock">False</property>
- <property name="use-underline">True</property>
- <property name="sensitive">False</property>
- <signal name="clicked" handler="contact_list_editor_down_button_clicked_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="bottom-button">
- <property name="visible">True</property>
- <property name="is_focus">True</property>
- <property name="has_focus">True</property>
- <property name="label" translatable="yes">_Bottom</property>
- <property name="use-stock">False</property>
- <property name="use-underline">True</property>
- <property name="sensitive">False</property>
- <signal name="clicked"
handler="contact_list_editor_bottom_button_clicked_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">6</property>
- </packing>
- </child>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="contact_list_editor_up_button_clicked_cb"
swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
<child>
- <object class="GtkAlignment" id="members-buttons-alignment">
+ <object class="GtkButton" id="down-button">
+ <property name="label" translatable="yes">_Down</property>
<property name="visible">True</property>
- <child>
- <placeholder/>
- </child>
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
+ <property name="has_focus">True</property>
+ <property name="is_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="contact_list_editor_down_button_clicked_cb"
swapped="no"/>
</object>
<packing>
- <property name="position">3</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="bottom-button">
+ <property name="label" translatable="yes">_Bottom</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
+ <property name="has_focus">True</property>
+ <property name="is_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked"
handler="contact_list_editor_bottom_button_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">6</property>
</packing>
</child>
</object>
@@ -348,10 +428,15 @@
<property name="x_options"/>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -364,51 +449,14 @@
</child>
</object>
<packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action-area">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <child>
- <object class="GtkButton" id="cancel-button">
- <property name="visible">True</property>
- <property name="is_focus">True</property>
- <property name="can_default">True</property>
- <property name="label" translatable="yes">_Cancel</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
- <signal handler="contact_list_editor_cancel_button_clicked_cb" name="clicked"/>
- </object>
- </child>
- <child>
- <object class="GtkButton" id="ok-button">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="label" translatable="yes">_Save</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
- <accelerator key="s" modifiers="GDK_CONTROL_MASK" signal="clicked"/>
- <signal handler="contact_list_editor_ok_button_clicked_cb" name="clicked"/>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
</child>
<action-widgets>
- <action-widget response="0">check-button</action-widget>
- <action-widget response="0">add-button</action-widget>
- <action-widget response="0">remove-button</action-widget>
- <action-widget response="0">select-button</action-widget>
<action-widget response="0">cancel-button</action-widget>
<action-widget response="0">ok-button</action-widget>
</action-widgets>
diff --git a/src/calendar/alarm-notify/alarm-notify.ui b/src/calendar/alarm-notify/alarm-notify.ui
index 0de10a5..5d3b3c0 100644
--- a/src/calendar/alarm-notify/alarm-notify.ui
+++ b/src/calendar/alarm-notify/alarm-notify.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.10"/>
<object class="GtkAdjustment" id="adjustment-days">
<property name="upper">65535</property>
<property name="step_increment">1</property>
@@ -22,8 +23,8 @@
<property name="border_width">5</property>
<property name="title" translatable="yes">Appointments</property>
<property name="type_hint">dialog</property>
- <property name="focus-on-map">False</property>
- <property name="urgency-hint">True</property>
+ <property name="urgency_hint">True</property>
+ <property name="focus_on_map">False</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
@@ -43,7 +44,6 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -77,13 +77,12 @@
<property name="halign">start</property>
<property name="valign">start</property>
<property name="yalign">0</property>
- <property name="icon-name">dialog-information</property>
- <property name="icon-size">6</property>
+ <property name="icon_name">dialog-information</property>
+ <property name="icon_size">6</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
<property name="height">3</property>
</packing>
</child>
@@ -110,7 +109,6 @@
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="width">2</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -132,8 +130,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -152,7 +148,6 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -169,9 +164,7 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -187,9 +180,7 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -204,8 +195,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
- <property name="use-underline">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -217,8 +207,6 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -233,33 +221,30 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="valign">start</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
<property name="label" translatable="yes">Location:</property>
<property name="selectable">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="location-label">
<property name="visible">True</property>
- <property name="wrap">True</property>
- <property name="max-width-chars">80</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">location of appointment</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">80</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="width">6</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -267,15 +252,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Snooze _time:</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -284,15 +267,12 @@
<property name="can_focus">True</property>
<property name="halign">start</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
<property name="adjustment">adjustment-days</property>
<property name="climb_rate">1</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -305,8 +285,6 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -315,15 +293,12 @@
<property name="can_focus">True</property>
<property name="halign">start</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
<property name="adjustment">adjustment-hours</property>
<property name="climb_rate">1</property>
</object>
<packing>
<property name="left_attach">3</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -336,8 +311,6 @@
<packing>
<property name="left_attach">4</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -346,7 +319,6 @@
<property name="can_focus">True</property>
<property name="halign">start</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
<property name="adjustment">adjustment-minutes</property>
<property name="climb_rate">1</property>
<property name="snap_to_ticks">True</property>
@@ -354,8 +326,6 @@
<packing>
<property name="left_attach">5</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -363,14 +333,12 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">minutes</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">6</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -378,7 +346,6 @@
<property name="left_attach">1</property>
<property name="top_attach">2</property>
<property name="width">2</property>
- <property name="height">1</property>
</packing>
</child>
</object>
diff --git a/src/e-util/e-send-options.ui b/src/e-util/e-send-options.ui
index 13459e2..b324e02 100644
--- a/src/e-util/e-send-options.ui
+++ b/src/e-util/e-send-options.ui
@@ -1,23 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
+ <requires lib="gtk+" version="3.10"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">100</property>
- <property name="lower">0</property>
- <property name="page_increment">10</property>
- <property name="step_increment">1</property>
- <property name="page_size">0</property>
<property name="value">5</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment2">
<property name="upper">100</property>
- <property name="lower">0</property>
- <property name="page_increment">10</property>
- <property name="step_increment">1</property>
- <property name="page_size">0</property>
<property name="value">2</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
</object>
<object class="GtkListStore" id="model1">
<columns>
+ <!-- column-name gchararray -->
<column type="gchararray"/>
</columns>
<data>
@@ -37,6 +36,7 @@
</object>
<object class="GtkListStore" id="model2">
<columns>
+ <!-- column-name gchararray -->
<column type="gchararray"/>
</columns>
<data>
@@ -62,6 +62,7 @@
</object>
<object class="GtkListStore" id="model3">
<columns>
+ <!-- column-name gchararray -->
<column type="gchararray"/>
</columns>
<data>
@@ -75,6 +76,7 @@
</object>
<object class="GtkListStore" id="model4">
<columns>
+ <!-- column-name gchararray -->
<column type="gchararray"/>
</columns>
<data>
@@ -88,6 +90,7 @@
</object>
<object class="GtkListStore" id="model5">
<columns>
+ <!-- column-name gchararray -->
<column type="gchararray"/>
</columns>
<data>
@@ -101,6 +104,7 @@
</object>
<object class="GtkListStore" id="model6">
<columns>
+ <!-- column-name gchararray -->
<column type="gchararray"/>
</columns>
<data>
@@ -112,10 +116,9 @@
</row>
</data>
</object>
- <!-- interface-requires gtk+ 2.16 -->
- <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkDialog" id="send-options-dialog">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="can_default">True</property>
<property name="title" translatable="yes">Send Options</property>
<property name="resizable">False</property>
@@ -123,9 +126,68 @@
<property name="window_position">mouse</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="vbox">
+ <object class="GtkBox" id="vbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="can_default">True</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="helpbutton1">
+ <property name="label" translatable="yes">_Help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancelbutton1">
+ <property name="label" translatable="yes">_Cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="okbutton1">
+ <property name="label" translatable="yes">_OK</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
<object class="GtkNotebook" id="notebook">
<property name="visible">True</property>
@@ -133,6 +195,7 @@
<child>
<object class="GtkTable" id="general-options">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="n_rows">4</property>
<property name="n_columns">4</property>
@@ -141,6 +204,7 @@
<child>
<object class="GtkLabel" id="label92">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -154,11 +218,13 @@
<child>
<object class="GtkFrame" id="frame16">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkTable" id="table32">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="n_rows">2</property>
<property name="n_columns">3</property>
@@ -182,18 +248,20 @@
<child>
<object class="GtkAlignment" id="alignment38">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xscale">0</property>
<property name="left_padding">12</property>
<child>
<object class="GtkTable" id="table33">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">2</property>
<property name="n_columns">3</property>
<property name="column_spacing">12</property>
<property name="row_spacing">12</property>
<child>
<object class="GtkRadioButton" id="reply-within">
- <property name="label" translatable="yes" comments="Translators: This is
part of 'Within [ X ] days', where [ X ] is a spinner with a number"
context="ESendOptionsWithin">Wi_thin</property>
+ <property name="label" translatable="yes" context="ESendOptionsWithin"
comments="Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a
number">Wi_thin</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -225,8 +293,9 @@
<child>
<object class="GtkLabel" id="label93">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="ESendOptionsWithin"
comments="Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a
number">days</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes" comments="Translators: This is
part of 'Within [ X ] days', where [ X ] is a spinner with a number"
context="ESendOptionsWithin">days</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -269,6 +338,7 @@
<child type="label">
<object class="GtkLabel" id="label94">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Replies</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -287,17 +357,19 @@
<child>
<object class="GtkFrame" id="frame17">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkTable" id="table34">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="n_rows">4</property>
<property name="n_columns">2</property>
<child>
<object class="GtkCheckButton" id="delay-delivery-button">
- <property comments="To translators: This means Delay the message delivery for
some time" name="label" translatable="yes">_Delay message delivery</property>
+ <property name="label" translatable="yes" comments="To translators: This means
Delay the message delivery for some time">_Delay message delivery</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -312,6 +384,7 @@
<child>
<object class="GtkLabel" id="label95">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -323,19 +396,22 @@
<child>
<object class="GtkAlignment" id="alignment39">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkHBox" id="hbox11">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label96">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes" comments="Translators: This is
part of 'After [ X ] days', where [ X ] is a spinner with a number"
context="ESendOptionsAfter">_After</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="ESendOptionsAfter"
comments="Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a
number">_After</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">expire-after</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -359,8 +435,9 @@
<child>
<object class="GtkLabel" id="label97">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="ESendOptionsAfter"
comments="Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a
number">days</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes" comments="Translators: This is
part of 'After [ X ] days', where [ X ] is a spinner with a number"
context="ESendOptionsAfter">days</property>
</object>
<packing>
<property name="expand">False</property>
@@ -397,6 +474,7 @@
<child>
<object class="GtkLabel" id="label98">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -411,6 +489,7 @@
<child>
<object class="GtkAlignment" id="alignment40">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkHBox" id="hbox13">
@@ -421,10 +500,11 @@
<child>
<object class="GtkLabel" id="until-label">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes" comments="Translators: This is
part of 'Until [ date ]', where [ date ] is a date picker" context="ESendOptions">_Until</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="ESendOptions"
comments="Translators: This is part of 'Until [ date ]', where [ date ] is a date picker">_Until</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">until-date</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -457,6 +537,7 @@
<child type="label">
<object class="GtkLabel" id="label103">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Delivery Options</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -473,8 +554,15 @@
</packing>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<object class="GtkComboBox" id="combo-priority">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">model1</property>
<child>
<object class="GtkCellRendererText" id="renderer1"/>
@@ -494,10 +582,11 @@
<child>
<object class="GtkLabel" id="priority-label">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Priority:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">combo-priority</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="top_attach">1</property>
@@ -508,10 +597,11 @@
<child>
<object class="GtkLabel" id="security-label">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Classification:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">security-combo</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
@@ -521,6 +611,7 @@
<child>
<object class="GtkComboBox" id="security-combo">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">model2</property>
<child>
<object class="GtkCellRendererText" id="renderer2"/>
@@ -536,17 +627,12 @@
<property name="y_options">GTK_FILL</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
<child type="tab">
<object class="GtkLabel" id="gopts-label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Gene_ral Options</property>
<property name="use_underline">True</property>
</object>
@@ -557,20 +643,24 @@
<child>
<object class="GtkVBox" id="status-tracking">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame18">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment42">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox10">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="spacing">12</property>
<child>
@@ -591,6 +681,7 @@
<child>
<object class="GtkAlignment" id="alignment46">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">19</property>
<child>
<object class="GtkRadioButton" id="delivered">
@@ -612,6 +703,7 @@
<child>
<object class="GtkAlignment" id="alignment47">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">19</property>
<child>
<object class="GtkRadioButton" id="delivered-opened">
@@ -634,6 +726,7 @@
<child>
<object class="GtkAlignment" id="alignment48">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">19</property>
<child>
<object class="GtkRadioButton" id="all-info">
@@ -656,6 +749,7 @@
<child>
<object class="GtkAlignment" id="alignment56">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">19</property>
<child>
<object class="GtkCheckButton" id="autodelete">
@@ -681,6 +775,7 @@
<child type="label">
<object class="GtkLabel" id="label106">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Status Tracking</property>
<property name="use_underline">True</property>
<attributes>
@@ -698,15 +793,18 @@
<child>
<object class="GtkFrame" id="frame19">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment43">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkTable" id="table35">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="n_rows">4</property>
<property name="n_columns">2</property>
@@ -715,10 +813,11 @@
<child>
<object class="GtkLabel" id="opened-label">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_When opened:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">open-combo</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
@@ -728,10 +827,11 @@
<child>
<object class="GtkLabel" id="declined-label">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">When decli_ned:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">delete-combo</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="top_attach">1</property>
@@ -743,10 +843,11 @@
<child>
<object class="GtkLabel" id="completed-label">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">When co_mpleted:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">complete-combo</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">3</property>
@@ -758,10 +859,11 @@
<child>
<object class="GtkLabel" id="accepted-label">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">When acce_pted:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">accept-combo</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="top_attach">2</property>
@@ -773,6 +875,7 @@
<child>
<object class="GtkComboBox" id="open-combo">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">model3</property>
<child>
<object class="GtkCellRendererText" id="renderer3"/>
@@ -790,6 +893,7 @@
<child>
<object class="GtkComboBox" id="delete-combo">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">model4</property>
<child>
<object class="GtkCellRendererText" id="renderer4"/>
@@ -809,6 +913,7 @@
<child>
<object class="GtkComboBox" id="accept-combo">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">model5</property>
<child>
<object class="GtkCellRendererText" id="renderer5"/>
@@ -828,6 +933,7 @@
<child>
<object class="GtkComboBox" id="complete-combo">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">model6</property>
<child>
<object class="GtkCellRendererText" id="renderer6"/>
@@ -850,6 +956,7 @@
<child type="label">
<object class="GtkLabel" id="label111">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Return Notification</property>
<property name="use_underline">True</property>
<attributes>
@@ -865,10 +972,14 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
<child type="tab">
<object class="GtkLabel" id="slabel">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Sta_tus Tracking</property>
<property name="use_underline">True</property>
</object>
@@ -879,66 +990,9 @@
</child>
</object>
<packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="helpbutton1">
- <property name="label" translatable="yes">_Help</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">False</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="cancelbutton1">
- <property name="label" translatable="yes">_Cancel</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">False</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="okbutton1">
- <property name="label" translatable="yes">_OK</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">False</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
<property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
diff --git a/src/e-util/e-table-config.ui b/src/e-util/e-table-config.ui
index 6323a60..566e867 100644
--- a/src/e-util/e-table-config.ui
+++ b/src/e-util/e-table-config.ui
@@ -1,266 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
- <object class="GtkDialog" id="e-table-config">
- <property name="can_focus">False</property>
- <property name="title">dialog1</property>
- <property name="resizable">False</property>
- <property name="modal">True</property>
- <property name="window_position">center-on-parent</property>
- <property name="type_hint">dialog</property>
- <child internal-child="vbox">
- <object class="GtkBox" id="dialog-vbox6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="cancelbutton2">
- <property name="label" translatable="yes">_Cancel</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">False</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="applybutton2">
- <property name="label" translatable="yes">_Apply</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">False</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="okbutton2">
- <property name="label" translatable="yes">_OK</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">False</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="top-frame">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">2</property>
- <property name="label_xalign">0</property>
- <child>
- <object class="GtkTable" id="table1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">2</property>
- <property name="n_rows">3</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">4</property>
- <property name="row_spacing">2</property>
- <child>
- <object class="GtkButton" id="button-sort">
- <property name="label" translatable="yes">_Sort...</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_sort_clicked" swapped="no"/>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button-group">
- <property name="label" translatable="yes">_Group By...</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_group_by_clicked" swapped="no"/>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label-sort">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="wrap">True</property>
- </object>
- <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">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button-fields">
- <property name="label" translatable="yes">_Fields Shown...</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_group_by_clicked" swapped="no"/>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label-fields">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="wrap">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="justify">center</property>
- </object>
- <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">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="justify">center</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label33">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="justify">center</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label-group">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="wrap">True</property>
- </object>
- <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">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label26">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Description</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="-6">cancelbutton2</action-widget>
- <action-widget response="-10">applybutton2</action-widget>
- <action-widget response="-5">okbutton2</action-widget>
- </action-widgets>
- </object>
+ <requires lib="gtk+" version="3.10"/>
<object class="GtkDialog" id="dialog-group-by">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Group</property>
@@ -285,7 +26,6 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -297,12 +37,11 @@
<child>
<object class="GtkButton" id="button42">
<property name="label" translatable="yes">_Cancel</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">False</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -314,12 +53,11 @@
<child>
<object class="GtkButton" id="button41">
<property name="label" translatable="yes">_OK</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">False</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -366,7 +104,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
@@ -395,7 +132,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
@@ -413,7 +149,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
@@ -529,7 +264,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
@@ -558,7 +292,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
@@ -576,7 +309,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
@@ -692,7 +424,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
@@ -721,7 +452,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
@@ -739,7 +469,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
@@ -855,7 +584,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
@@ -884,7 +612,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
@@ -902,7 +629,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
@@ -983,7 +709,6 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -995,12 +720,11 @@
<child>
<object class="GtkButton" id="button45">
<property name="label" translatable="yes">_Cancel</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">False</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -1012,13 +736,12 @@
<child>
<object class="GtkButton" id="button44">
<property name="label" translatable="yes">_OK</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">False</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -1075,7 +798,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
@@ -1093,7 +815,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
@@ -1161,7 +882,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
@@ -1179,7 +899,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
@@ -1247,7 +966,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
@@ -1265,7 +983,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
@@ -1333,7 +1050,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
@@ -1351,7 +1067,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
@@ -1399,4 +1114,258 @@
<action-widget response="-5">button44</action-widget>
</action-widgets>
</object>
+ <object class="GtkDialog" id="e-table-config">
+ <property name="can_focus">False</property>
+ <property name="title">dialog1</property>
+ <property name="resizable">False</property>
+ <property name="modal">True</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="cancelbutton2">
+ <property name="label" translatable="yes">_Cancel</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="applybutton2">
+ <property name="label" translatable="yes">_Apply</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="okbutton2">
+ <property name="label" translatable="yes">_OK</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="top-frame">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">2</property>
+ <property name="label_xalign">0</property>
+ <child>
+ <object class="GtkTable" id="table1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">2</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">4</property>
+ <property name="row_spacing">2</property>
+ <child>
+ <object class="GtkButton" id="button-sort">
+ <property name="label" translatable="yes">_Sort...</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_sort_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button-group">
+ <property name="label" translatable="yes">_Group By...</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_group_by_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label-sort">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="wrap">True</property>
+ <property name="xalign">0</property>
+ </object>
+ <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">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button-fields">
+ <property name="label" translatable="yes">_Fields Shown...</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_group_by_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label-fields">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="wrap">True</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="justify">center</property>
+ <property name="xalign">0</property>
+ </object>
+ <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">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="justify">center</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label33">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="justify">center</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label-group">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="wrap">True</property>
+ <property name="xalign">0</property>
+ </object>
+ <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">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label26">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Description</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">cancelbutton2</action-widget>
+ <action-widget response="-10">applybutton2</action-widget>
+ <action-widget response="-5">okbutton2</action-widget>
+ </action-widgets>
+ </object>
</interface>
diff --git a/src/e-util/e-timezone-dialog.ui b/src/e-util/e-timezone-dialog.ui
index 9c2508a..1aff51a 100644
--- a/src/e-util/e-timezone-dialog.ui
+++ b/src/e-util/e-timezone-dialog.ui
@@ -1,307 +1,281 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<!--*- mode: xml -*-->
<interface>
+ <requires lib="gtk+" version="3.10"/>
<object class="GtkDialog" id="timezone-dialog">
+ <property name="can_focus">False</property>
<property name="title" translatable="yes">Select a Time Zone</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
<property name="default_width">500</property>
<property name="default_height">400</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
- <property name="homogeneous">False</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
+ <object class="GtkButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancel-button">
+ <property name="label" translatable="yes">_Cancel</property>
<property name="visible">True</property>
- <property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Cancel</property>
- <property name="use_stock">False</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="ok-button">
+ <property name="label" translatable="yes">_OK</property>
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_OK</property>
- <property name="use_stock">False</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="timezone-table">
- <property name="orientation">vertical</property>
- <property name="border_width">12</property>
<property name="visible">True</property>
- <property name="homogeneous">False</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkBox" id="hbox3">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
- <property name="homogeneous">False</property>
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
- <property name="icon-name">dialog-information</property>
- <property name="icon_size">6</property>
+ <property name="can_focus">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="icon_name">dialog-information</property>
+ <property name="icon_size">6</property>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
<property name="label" translatable="yes">Use the left mouse button to zoom in on an
area of the map and select a time zone.
Use the right mouse button to zoom out.</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>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
<property name="label" translatable="yes">Time Zones</property>
- <property name="use_underline">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>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkBox" id="hbox2">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
- <property name="homogeneous">False</property>
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
- <property name="label" translatable="no"> </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="can_focus">False</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="label"> </property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="vbox1">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
- <property name="homogeneous">False</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkScrolledWindow" id="map-window">
<property name="visible">True</property>
<property name="can_focus">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>
+ <property name="hscrollbar_policy">always</property>
+ <property name="vscrollbar_policy">always</property>
+ <property name="shadow_type">in</property>
<child>
<placeholder/>
</child>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="preview-label">
<property name="visible">True</property>
- <property name="label" translatable="no">America/New_York</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</property>
+ <property name="can_focus">False</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="label">America/New_York</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
<property name="label" translatable="yes">_Selection</property>
<property name="use_underline">True</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
+ <property name="justify">center</property>
+ <property name="mnemonic_widget">timezone-combo</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">timezone-combo</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkBox" id="hbox1">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
- <property name="homogeneous">False</property>
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
- <property name="label" translatable="no"> </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="can_focus">False</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="label"> </property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="timezone-combo">
<property name="visible">True</property>
- <property name="add_tearoffs">False</property>
- <property name="focus_on_click">True</property>
- <accessibility>
-
- </accessibility>
+ <property name="can_focus">False</property>
<child internal-child="accessible">
- <object class="AtkObject" id="a11y-timezone-combo1">
- <property name="AtkObject::accessible_name" translatable="yes">Timezone drop-down
combination box</property>
+ <object class="AtkObject" id="timezone-combo-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Timezone drop-down
combination box</property>
</object>
</child>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">4</property>
</packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
diff --git a/src/e-util/filter.ui b/src/e-util/filter.ui
index 8c638d9..c98b593 100644
--- a/src/e-util/filter.ui
+++ b/src/e-util/filter.ui
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.10"/>
<object class="GtkAdjustment" id="adjustment1">
- <property name="value">1</property>
<property name="upper">1000</property>
+ <property name="value">1</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
@@ -79,6 +79,268 @@
</row>
</data>
</object>
+ <object class="GtkVBox" id="filter_datespec">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkHBox" id="hbox5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">4</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Compare against</property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="combobox_type">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">model2</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer2"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHSeparator" id="hseparator1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">1</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkNotebook" id="notebook_type">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="show_tabs">False</property>
+ <property name="show_border">False</property>
+ <child>
+ <object class="GtkVBox" id="vbox9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">The message’s date will be compared against
+the current time when filtering occurs.</property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">label1</property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">The message’s date will be compared against
+12:00am of the date specified.</property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCalendar" id="calendar_specify">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">label2</property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="ypad">15</property>
+ <property name="label" translatable="yes">The message’s date will be compared against
+a time relative to when filtering occurs.</property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">5</property>
+ <property name="left_padding">58</property>
+ <child>
+ <object class="GtkHBox" id="hbox6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkSpinButton" id="spin_relative">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="climb_rate">1</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="combobox_relative">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">model3</property>
+ <property name="active">0</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer3"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="combobox_past_future">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">model4</property>
+ <property name="active">0</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer4"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">2</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">label3</property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
<object class="GtkListStore" id="rule_list_store">
<columns>
<!-- column-name column1 -->
@@ -91,14 +353,15 @@
</object>
<object class="GtkVBox" id="rule_editor">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label17">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Show filters for mail:</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -109,6 +372,7 @@
<child>
<object class="GtkComboBox" id="filter_source_combobox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">model1</property>
<child>
<object class="GtkCellRendererText" id="renderer1"/>
@@ -126,14 +390,15 @@
<child>
<object class="GtkVBox" id="rule_frame">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="rule_label">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Filter Rules</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -147,10 +412,12 @@
<child>
<object class="GtkHBox" id="hbox10">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label16">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -161,24 +428,25 @@
<child>
<object class="GtkHBox" id="hbox4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkScrolledWindow" id="rule_scrolled_window">
+ <property name="width_request">220</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
- <property name="width_request">220</property>
<child>
<object class="GtkTreeView" id="rule_tree_view">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="model">rule_list_store</property>
<property name="headers_visible">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"/>
+ </child>
<child>
<object class="GtkTreeViewColumn" id="column_enabled">
- <!--<property name="visible">False</property>-->
<property name="title">Enabled</property>
<child>
<object class="GtkCellRendererToggle" id="cell_renderer_enabled"/>
@@ -203,17 +471,20 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox5">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkVButtonBox" id="vbuttonbox4">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkButton" id="rule_add">
@@ -222,8 +493,7 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -253,8 +523,7 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -269,8 +538,7 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -285,8 +553,7 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -301,8 +568,7 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -317,8 +583,7 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -342,257 +607,25 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="padding">3</property>
<property name="position">2</property>
</packing>
</child>
</object>
- <object class="GtkVBox" id="filter_datespec">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkHBox" id="hbox5">
- <property name="visible">True</property>
- <property name="border_width">4</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Compare against</property>
- <property name="justify">center</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="combobox_type">
- <property name="visible">True</property>
- <property name="model">model2</property>
- <child>
- <object class="GtkCellRendererText" id="renderer2"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHSeparator" id="hseparator1">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="padding">1</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkNotebook" id="notebook_type">
- <property name="visible">True</property>
- <property name="show_tabs">False</property>
- <property name="show_border">False</property>
- <child>
- <object class="GtkVBox" id="vbox9">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="label" translatable="yes">The message’s date will be compared against
-the current time when filtering occurs.</property>
- <property name="justify">center</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">label1</property>
- <property name="justify">center</property>
- </object>
- <packing>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox7">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="label" translatable="yes">The message’s date will be compared against
-12:00am of the date specified.</property>
- <property name="justify">center</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCalendar" id="calendar_specify">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="label" translatable="yes">label2</property>
- <property name="justify">center</property>
- </object>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox8">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="ypad">15</property>
- <property name="label" translatable="yes">The message’s date will be compared against
-a time relative to when filtering occurs.</property>
- <property name="justify">center</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="top_padding">5</property>
- <property name="left_padding">58</property>
- <child>
- <object class="GtkHBox" id="hbox6">
- <property name="visible">True</property>
- <property name="homogeneous">True</property>
- <child>
- <object class="GtkSpinButton" id="spin_relative">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">adjustment1</property>
- <property name="climb_rate">1</property>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="combobox_relative">
- <property name="visible">True</property>
- <property name="model">model3</property>
- <property name="active">0</property>
- <child>
- <object class="GtkCellRendererText" id="renderer3"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="combobox_past_future">
- <property name="visible">True</property>
- <property name="model">model4</property>
- <property name="active">0</property>
- <child>
- <object class="GtkCellRendererText" id="renderer4"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="padding">2</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">label3</property>
- <property name="justify">center</property>
- </object>
- <packing>
- <property name="position">2</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
</interface>
diff --git a/src/e-util/gal-view-instance-save-as-dialog.ui b/src/e-util/gal-view-instance-save-as-dialog.ui
index d7215f1..4354820 100644
--- a/src/e-util/gal-view-instance-save-as-dialog.ui
+++ b/src/e-util/gal-view-instance-save-as-dialog.ui
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <!-- interface-requires gtk+ 2.12 -->
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.10"/>
<object class="GtkVBox" id="vbox-top">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">5</property>
- <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkRadioButton" id="radiobutton-create">
@@ -31,15 +31,18 @@
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="left_padding">24</property>
<child>
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Name:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry-create</property>
@@ -55,9 +58,11 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">●</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -65,6 +70,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -78,8 +85,8 @@
<child>
<object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkRadioButton" id="radiobutton-replace">
@@ -100,6 +107,7 @@
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="left_padding">24</property>
<child>
@@ -107,25 +115,30 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="custom-replace">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"/>
+ </child>
</object>
</child>
</object>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
diff --git a/src/mail/mail-config.ui b/src/mail/mail-config.ui
index 0d6b6e2..3424f9d 100644
--- a/src/mail/mail-config.ui
+++ b/src/mail/mail-config.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="3.0"/>
+ <requires lib="gtk+" version="3.10"/>
<object class="GtkListStore" id="RCMailsListStore">
<columns>
<!-- column-name Mails -->
@@ -39,7 +39,6 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="use_stock">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -54,7 +53,6 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="use_stock">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -95,9 +93,9 @@
<object class="GtkLabel" id="junk_header_label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Header name</property>
<property name="mnemonic_widget">junk-header-name</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="x_options">GTK_SHRINK</property>
@@ -107,9 +105,9 @@
<object class="GtkLabel" id="junk_header_label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Header content</property>
<property name="mnemonic_widget">junk-header-content</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">1</property>
@@ -187,8 +185,8 @@
<property name="page_increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment7">
- <property name="upper">200</property>
<property name="lower">31</property>
+ <property name="upper">200</property>
<property name="value">71</property>
<property name="step_increment">1</property>
<property name="page_increment">1</property>
@@ -211,8 +209,8 @@
<object class="GtkLabel" id="default-behavior-header">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Default Behavior</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -332,8 +330,8 @@
<child>
<object class="GtkBox" id="hboxUseOutbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
- <property name="orientation">horizontal</property>
<child>
<object class="GtkCheckButton" id="chkUseOutbox">
<property name="label" translatable="yes">Send messages through Outbo_x
folder</property>
@@ -371,13 +369,13 @@
<child>
<object class="GtkHBox" id="hboxWrapCharactersCount">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="lblWordWrapLength">
<property name="visible">True</property>
- <property name="label" translatable="yes">Number of characters for word
w_rapping:</property>
<property name="can_focus">False</property>
- <property name="receives_default">False</property>
+ <property name="label" translatable="yes">Number of characters for word
w_rapping:</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -391,8 +389,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="max_length">3</property>
- <property name="adjustment">adjustment7</property>
<property name="caps_lock_warning">False</property>
+ <property name="adjustment">adjustment7</property>
<property name="numeric">True</property>
<property name="update_policy">if-valid</property>
</object>
@@ -418,10 +416,10 @@
<object class="GtkLabel" id="lblCharset">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="label" translatable="yes">Ch_aracter encoding:</property>
<property name="use_underline">True</property>
<property name="justify">center</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="expand">False</property>
@@ -464,8 +462,8 @@
<object class="GtkLabel" id="replies-and-forwards-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Replies and Forwards</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -493,10 +491,10 @@
<object class="GtkLabel" id="lblReplyStyle">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="label" translatable="yes">_Reply style:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">comboboxReplyStyle</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
@@ -507,10 +505,10 @@
<object class="GtkLabel" id="lblForwardStyle">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="label" translatable="yes">_Forward style:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">comboboxForwardStyle</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="top_attach">1</property>
@@ -632,10 +630,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<items>
- <item translatable="yes" context="ReplyForward" id="attach">Attachment</item>
- <item translatable="yes" context="ReplyForward" id="outlook">Inline (Outlook
style)</item>
- <item translatable="yes" context="ReplyForward" id="quoted">Quoted</item>
- <item translatable="yes" context="ReplyForward" id="do-not-quote">Do Not
Quote</item>
+ <item id="attach" translatable="yes" context="ReplyForward">Attachment</item>
+ <item id="outlook" translatable="yes" context="ReplyForward">Inline (Outlook
style)</item>
+ <item id="quoted" translatable="yes" context="ReplyForward">Quoted</item>
+ <item id="do-not-quote" translatable="yes" context="ReplyForward">Do Not
Quote</item>
</items>
</object>
</child>
@@ -656,9 +654,9 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<items>
- <item translatable="yes" context="ReplyForward" id="attached">Attachment</item>
- <item translatable="yes" context="ReplyForward" id="inline">Inline</item>
- <item translatable="yes" context="ReplyForward" id="quoted">Quoted</item>
+ <item id="attached" translatable="yes" context="ReplyForward">Attachment</item>
+ <item id="inline" translatable="yes" context="ReplyForward">Inline</item>
+ <item id="quoted" translatable="yes" context="ReplyForward">Quoted</item>
</items>
</object>
</child>
@@ -715,9 +713,9 @@
<object class="GtkLabel" id="signature-header">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Sig_natures</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -783,10 +781,10 @@
<object class="GtkLabel" id="languages-header">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_Languages</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">listSpellCheckLanguage</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -819,14 +817,14 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection3"/>
+ </child>
<child internal-child="accessible">
<object class="AtkObject" id="listSpellCheckLanguage-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Languages
Table</property>
</object>
</child>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="treeview-selection3"/>
- </child>
</object>
</child>
</object>
@@ -834,7 +832,6 @@
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">2</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -842,13 +839,11 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="yalign">0</property>
- <property name="icon-name">dialog-information</property>
+ <property name="icon_name">dialog-information</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -856,15 +851,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">The list of languages here reflects only
the languages for which you have a dictionary installed.</property>
<property name="wrap">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -892,8 +885,8 @@
<object class="GtkLabel" id="spell-options-header">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Options</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -974,9 +967,9 @@
<object class="GtkLabel" id="confirmation-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">To help avoid email accidents and embarrassments, ask
for confirmation before taking the following checkmarked actions:</property>
<property name="wrap">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1203,10 +1196,10 @@
<child>
<object class="GtkButton" id="sao-folders-add-button">
<property name="label" translatable="yes">_Add</property>
- <property name="use_underline">True</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1217,10 +1210,10 @@
<child>
<object class="GtkButton" id="sao-folders-remove-button">
<property name="label" translatable="yes">_Remove</property>
- <property name="use_underline">True</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1232,8 +1225,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -1261,8 +1252,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -1273,18 +1262,15 @@
<object class="GtkLabel" id="sao-folders-frame-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" comments="Translators: Label of a frame with a
list of folders for which to use selected account in Send account overrides">Use for Folders</property>
- <property name="use_markup">False</property>
<property name="margin_left">6</property>
<property name="margin_right">6</property>
+ <property name="label" translatable="yes" comments="Translators: Label of a frame with a
list of folders for which to use selected account in Send account overrides">Use for Folders</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -1320,10 +1306,10 @@
<child>
<object class="GtkButton" id="sao-recipients-add-button">
<property name="label" translatable="yes">A_dd</property>
- <property name="use_underline">True</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1334,10 +1320,10 @@
<child>
<object class="GtkButton" id="sao-recipients-edit-button">
<property name="label" translatable="yes">_Edit</property>
- <property name="use_underline">True</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1348,10 +1334,10 @@
<child>
<object class="GtkButton" id="sao-recipients-remove-button">
<property name="label" translatable="yes">Re_move</property>
- <property name="use_underline">True</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1363,8 +1349,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -1392,8 +1376,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -1404,18 +1386,15 @@
<object class="GtkLabel" id="sao-recipients-frame-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" comments="Translators: Label of a frame with a
list of recipients for whom to use selected account in Send account overrides">Use for Recipients</property>
- <property name="use_markup">False</property>
<property name="margin_left">6</property>
<property name="margin_right">6</property>
+ <property name="label" translatable="yes" comments="Translators: Label of a frame with a
list of recipients for whom to use selected account in Send account overrides">Use for Recipients</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -1463,10 +1442,9 @@
<object class="GtkLabel" id="sao-account-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" comments="Translators: Label of a frame with a
list of configured accounts in Send account overrides">Account</property>
- <property name="use_markup">False</property>
<property name="margin_left">6</property>
<property name="margin_right">6</property>
+ <property name="label" translatable="yes" comments="Translators: Label of a frame with a
list of configured accounts in Send account overrides">Account</property>
</object>
</child>
</object>
@@ -1474,7 +1452,6 @@
<property name="left_attach">0</property>
<property name="top_attach">3</property>
<property name="width">2</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -1482,8 +1459,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_bottom">6</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Send account overrides</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -1492,7 +1469,6 @@
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">2</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -1503,25 +1479,24 @@
<property name="margin_right">6</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Assign which account should be used as a send account
for respective folders or recipients, an override for usual send account detection. List of recipients can
contain partial addresses or names. The name and the address parts are compared separately.</property>
<property name="wrap">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">2</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="sao-prefer-folder-check">
<property name="label" translatable="yes">_Folder override has precedence over Recipient
override</property>
- <property name="use_underline">True</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="margin_left">12</property>
+ <property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -1529,7 +1504,6 @@
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">2</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -1549,6 +1523,19 @@
</packing>
</child>
</object>
+ <object class="GtkSizeGroup" id="composer-combo-box-size-group">
+ <widgets>
+ <widget name="comboboxReplyStyle"/>
+ <widget name="comboboxForwardStyle"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="composer-label-size-group">
+ <widgets>
+ <widget name="lblCharset"/>
+ <widget name="lblReplyStyle"/>
+ <widget name="lblForwardStyle"/>
+ </widgets>
+ </object>
<object class="GtkListStore" id="hash_algo_model">
<columns>
<!-- column-name Hash -->
@@ -1619,8 +1606,8 @@
<object class="GtkLabel" id="start-up-header">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Start up</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -1722,8 +1709,8 @@
<object class="GtkLabel" id="message-display-header">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Message Display</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -1777,11 +1764,11 @@
<object class="GtkLabel" id="lblScreenVariable">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="label" translatable="yes">S_tandard Font:</property>
<property name="use_underline">True</property>
<property name="justify">right</property>
<property name="mnemonic_widget">FontVariable</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
@@ -1793,6 +1780,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="font">Sans 12</property>
<property name="title" translatable="yes">Select HTML fixed width
font</property>
<signal name="font-set" handler="changed" swapped="no"/>
</object>
@@ -1810,6 +1798,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="font">Sans 12</property>
<property name="title" translatable="yes">Select HTML variable width
font</property>
<signal name="font-set" handler="changed" swapped="no"/>
</object>
@@ -1824,11 +1813,11 @@
<object class="GtkLabel" id="label444">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="label" translatable="yes">Fix_ed Width Font:</property>
<property name="use_underline">True</property>
<property name="justify">right</property>
<property name="mnemonic_widget">FontFixed</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="top_attach">1</property>
@@ -2045,8 +2034,8 @@
<object class="GtkLabel" id="delete-mail-header">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Delete Mail</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -2145,7 +2134,6 @@
<property name="position">2</property>
</packing>
</child>
-
<child>
<object class="GtkVBox" id="archive-mail-section">
<property name="visible">True</property>
@@ -2155,8 +2143,8 @@
<object class="GtkLabel" id="archive-mail-header">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Archive Mail</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -2184,11 +2172,11 @@
<property name="spacing">4</property>
<child>
<object class="GtkLabel" id="lblArchiveMailFolder">
- <property name="label" translatable="yes">On This Computer A_rchive
folder:</property>
- <property name="tooltip-text" translatable="yes">Archive folder to use for On
This Computer messages</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use-underline">True</property>
+ <property name="tooltip_text" translatable="yes">Archive folder to use for On
This Computer messages</property>
+ <property name="label" translatable="yes">On This Computer A_rchive
folder:</property>
+ <property name="use_underline">True</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -2252,8 +2240,8 @@
<object class="GtkLabel" id="html-general-header">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">General</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -2331,8 +2319,8 @@
<object class="GtkLabel" id="loading-images-header">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Loading Remote Content</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -2495,8 +2483,8 @@
<object class="GtkLabel" id="RCSitesLbl">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Allow for sites:</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -2600,8 +2588,8 @@
<object class="GtkLabel" id="RCMailsLbl">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Allow for senders:</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -2679,8 +2667,8 @@
<object class="GtkLabel" id="labels-section">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Labels</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -2739,8 +2727,8 @@
<object class="GtkLabel" id="photograph-header">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Sender Photograph</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -2818,10 +2806,10 @@
<object class="GtkLabel" id="message-headers-header">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Displayed Message Headers</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">txtHeaders</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -2869,14 +2857,14 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
<child internal-child="accessible">
<object class="AtkObject" id="treeHeaders-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Mail
Headers Table</property>
</object>
</child>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="treeview-selection1"/>
- </child>
</object>
</child>
</object>
@@ -2905,8 +2893,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -2920,8 +2907,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -2961,10 +2947,10 @@
<object class="GtkLabel" id="datetime-format-header">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Date/Time Format</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">txtHeaders</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -3013,6 +2999,15 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
</object>
@@ -3051,9 +3046,9 @@
<object class="GtkVBox" id="vboxJunk">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">start</property>
<property name="border_width">12</property>
<property name="spacing">12</property>
- <property name="valign">GTK_ALIGN_START</property>
<child>
<object class="GtkVBox" id="junk-general-section">
<property name="visible">True</property>
@@ -3063,8 +3058,8 @@
<object class="GtkLabel" id="junk-general-header">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">General</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -3092,8 +3087,6 @@
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="x_padding">12</property>
@@ -3147,12 +3140,12 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="junk-test-opts-header">
+ <object class="GtkLabel" id="junk-test-opts-header">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="margin-top">12</property>
+ <property name="margin_top">12</property>
<property name="label" translatable="yes">Junk Test Options</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -3162,7 +3155,6 @@
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
- <property name="x_padding">0</property>
</packing>
</child>
<child>
@@ -3258,8 +3250,7 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3274,8 +3265,7 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3359,19 +3349,6 @@
</packing>
</child>
</object>
- <object class="GtkSizeGroup" id="composer-combo-box-size-group">
- <widgets>
- <widget name="comboboxReplyStyle"/>
- <widget name="comboboxForwardStyle"/>
- </widgets>
- </object>
- <object class="GtkSizeGroup" id="composer-label-size-group">
- <widgets>
- <widget name="lblCharset"/>
- <widget name="lblReplyStyle"/>
- <widget name="lblForwardStyle"/>
- </widgets>
- </object>
<object class="GtkListStore" id="use_ssl_model">
<columns>
<!-- column-name Label -->
diff --git a/src/mail/mail-dialogs.ui b/src/mail/mail-dialogs.ui
index e87e834..b8b40a4 100644
--- a/src/mail/mail-dialogs.ui
+++ b/src/mail/mail-dialogs.ui
@@ -1,20 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.10"/>
+ <object class="GtkListStore" id="combo_model">
+ <columns>
+ <!-- column-name Flag -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Call</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Do Not Forward</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Follow-Up</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">For Your Information</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Forward</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">No Response Necessary</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes" comments="Past tense, as in "has been read".">Read</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Reply</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Reply to All</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Review</col>
+ </row>
+ </data>
+ </object>
<object class="GtkVBox" id="toplevel">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="spacing">12</property>
<child>
<object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkImage" id="pixmap">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="icon_name">stock_mail-flag-for-followup</property>
- <property name="icon-size">6</property>
+ <property name="icon_size">6</property>
</object>
<packing>
<property name="expand">False</property>
@@ -25,6 +66,7 @@
<child>
<object class="GtkLabel" id="lblDirections">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">The messages you have selected for follow up are
listed below.
Please select a follow up action from the “Flag” menu.</property>
</object>
@@ -45,53 +87,62 @@ Please select a follow up action from the “Flag” menu.</property>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="message_list">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"/>
+ </child>
</object>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkTable" id="table2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">3</property>
<property name="n_columns">3</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
+ <placeholder/>
+ </child>
+ <child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Flag:</property>
<property name="use_underline">True</property>
<property name="justify">center</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Due By:</property>
<property name="use_underline">True</property>
<property name="justify">center</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -100,14 +151,13 @@ Please select a follow up action from the “Flag” menu.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -138,32 +188,29 @@ Please select a follow up action from the “Flag” menu.</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkComboBox" id="combo">
<property name="visible">True</property>
- <property name="has-entry">True</property>
- <property name="entry-text-column">0</property>
+ <property name="can_focus">False</property>
<property name="model">combo_model</property>
+ <property name="has_entry">True</property>
+ <property name="entry_text_column">0</property>
+ <child internal-child="entry">
+ <object class="GtkEntry">
+ <property name="can_focus">False</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -172,56 +219,65 @@ Please select a follow up action from the “Flag” menu.</property>
</packing>
</child>
</object>
- <object class="GtkListStore" id="combo_model">
- <columns>
- <!-- column-name Flag -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Call</col>
- </row>
- <row>
- <col id="0" translatable="yes">Do Not Forward</col>
- </row>
- <row>
- <col id="0" translatable="yes">Follow-Up</col>
- </row>
- <row>
- <col id="0" translatable="yes">For Your Information</col>
- </row>
- <row>
- <col id="0" translatable="yes">Forward</col>
- </row>
- <row>
- <col id="0" translatable="yes">No Response Necessary</col>
- </row>
- <row>
- <col id="0" translatable="yes" comments="Past tense, as in "has been read".">Read</col>
- </row>
- <row>
- <col id="0" translatable="yes">Reply</col>
- </row>
- <row>
- <col id="0" translatable="yes">Reply to All</col>
- </row>
- <row>
- <col id="0" translatable="yes">Review</col>
- </row>
- </data>
- </object>
<object class="GtkDialog" id="license_dialog">
+ <property name="can_focus">False</property>
<property name="title" translatable="yes">License Agreement</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog_vbox">
+ <object class="GtkBox" id="dialog_vbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="lic_no_button">
+ <property name="label" translatable="yes">_No</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="lic_yes_button">
+ <property name="label" translatable="yes">_Accept License</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="license_top_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -243,6 +299,8 @@ Please select a follow up action from the “Flag” menu.</property>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -263,80 +321,73 @@ Please select a follow up action from the “Flag” menu.</property>
</child>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">lic_no_button</action-widget>
+ <action-widget response="-3">lic_yes_button</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="message_security_dialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Security Information</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area4">
+ <object class="GtkButtonBox" id="dialog-action_area2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="lic_no_button">
- <property name="label" translatable="yes">_No</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="lic_yes_button">
+ <object class="GtkButton" id="okbutton1">
+ <property name="label" translatable="yes">_OK</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="label" translatable="yes">_Accept License</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="-6">lic_no_button</action-widget>
- <action-widget response="-3">lic_yes_button</action-widget>
- </action-widgets>
- </object>
- <object class="GtkDialog" id="message_security_dialog">
- <property name="border_width">6</property>
- <property name="title" translatable="yes">Security Information</property>
- <property name="type_hint">dialog</property>
- <child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox2">
- <property name="visible">True</property>
- <property name="spacing">6</property>
<child>
<object class="GtkVBox" id="vbox161">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="spacing">18</property>
<child>
<object class="GtkVBox" id="frame5">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label464">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Digital Signature</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -350,11 +401,41 @@ Please select a follow up action from the “Flag” menu.</property>
<child>
<object class="GtkGrid" id="signature_grid">
<property name="visible">True</property>
- <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
<child>
<placeholder/>
</child>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
<packing>
@@ -366,12 +447,14 @@ Please select a follow up action from the “Flag” menu.</property>
<child>
<object class="GtkVBox" id="frame6">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label477">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Encryption</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -385,11 +468,41 @@ Please select a follow up action from the “Flag” menu.</property>
<child>
<object class="GtkGrid" id="encryption_grid">
<property name="visible">True</property>
- <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
<child>
<placeholder/>
</child>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
<packing>
@@ -400,34 +513,9 @@ Please select a follow up action from the “Flag” menu.</property>
</child>
</object>
<packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area2">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="okbutton1">
- <property name="label" translatable="yes">_OK</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
<property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
diff --git a/src/modules/calendar/e-calendar-preferences.ui b/src/modules/calendar/e-calendar-preferences.ui
index 0ae46de..60b5d25 100644
--- a/src/modules/calendar/e-calendar-preferences.ui
+++ b/src/modules/calendar/e-calendar-preferences.ui
@@ -1,8 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="2.16"/>
- <!-- interface-requires evolution 0.0 -->
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.10"/>
+ <requires lib="evolution" version="0.0"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">9999</property>
<property name="step_increment">1</property>
@@ -14,14 +14,14 @@
<property name="page_increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment3">
- <property name="value">1</property>
<property name="upper">9999</property>
+ <property name="value">1</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment4">
- <property name="value">1</property>
<property name="upper">999999</property>
+ <property name="value">1</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
@@ -105,13 +105,15 @@
<child>
<object class="GtkVBox" id="general">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Time</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -125,11 +127,13 @@
<child>
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
- <property name="spacing">12</property>
+ <property name="can_focus">False</property>
<property name="vexpand">False</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -140,28 +144,34 @@
<child>
<object class="GtkTable" id="time">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">4</property>
<property name="n_columns">2</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
+ <placeholder/>
+ </child>
+ <child>
<object class="GtkLabel" id="label_second_zone">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Se_cond zone:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">day_second_zone</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox_second_zone">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkButton" id="day_second_zone">
<property name="label" translatable="yes" context="cal-second-zone">None</property>
@@ -171,12 +181,15 @@
<property name="use_underline">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label64">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xpad">6</property>
<property name="label" translatable="yes">(Shown in a Day View)</property>
</object>
@@ -214,21 +227,23 @@
<child>
<object class="GtkLabel" id="timezone_label">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Time _zone:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">timezone</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox_use_system_timezone">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkCheckButton" id="use-system-tz-check">
<property name="label" translatable="yes">Use s_ystem time zone</property>
@@ -240,12 +255,14 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="system-tz-label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xpad">5</property>
<property name="label">(system/tz)</property>
</object>
@@ -267,17 +284,19 @@
<child>
<object class="GtkLabel" id="label_time_format">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Time format:</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox_time_format">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkRadioButton" id="use_12_hour">
@@ -319,11 +338,10 @@
<property name="y_options">GTK_FILL</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -337,8 +355,9 @@
<child>
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Work Week</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -352,10 +371,12 @@
<child>
<object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -366,6 +387,7 @@
<child>
<object class="GtkTable" id="workWeek">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">3</property>
<property name="n_columns">2</property>
<property name="column_spacing">6</property>
@@ -373,47 +395,51 @@
<child>
<object class="GtkLabel" id="label12">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="A weekday like "Monday"
follows">Wee_k starts on:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">week_start_day</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label13">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Work days:</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="day_start_label">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Day begins:</property>
- <property name="mnemonic_widget">start_of_day</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">start_of_day</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox5">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="mon_button">
@@ -568,14 +594,15 @@
<child>
<object class="GtkComboBoxText" id="week_start_day">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<items>
- <item translatable="yes" id="monday">Monday</item>
- <item translatable="yes" id="tuesday">Tuesday</item>
- <item translatable="yes" id="wednesday">Wednesday</item>
- <item translatable="yes" id="thursday">Thursday</item>
- <item translatable="yes" id="friday">Friday</item>
- <item translatable="yes" id="saturday">Saturday</item>
- <item translatable="yes" id="sunday">Sunday</item>
+ <item id="monday" translatable="yes">Monday</item>
+ <item id="tuesday" translatable="yes">Tuesday</item>
+ <item id="wednesday" translatable="yes">Wednesday</item>
+ <item id="thursday" translatable="yes">Thursday</item>
+ <item id="friday" translatable="yes">Friday</item>
+ <item id="saturday" translatable="yes">Saturday</item>
+ <item id="sunday" translatable="yes">Sunday</item>
</items>
</object>
<packing>
@@ -588,6 +615,7 @@
<child>
<object class="GtkHBox" id="hbox13">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="EDateEdit" id="start_of_day">
@@ -602,30 +630,32 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="day_end_label">
+ <object class="EDateEdit" id="end_of_day">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Day _ends:</property>
- <property name="mnemonic_widget">end_of_day</property>
- <property name="use_underline">True</property>
+ <property name="show_date">False</property>
+ <property name="show_week_numbers">False</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">False</property>
<property name="pack_type">end</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="EDateEdit" id="end_of_day">
+ <object class="GtkLabel" id="day_end_label">
<property name="visible">True</property>
- <property name="show_date">False</property>
- <property name="show_week_numbers">False</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Day _ends:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">end_of_day</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="pack_type">end</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -639,6 +669,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -652,8 +684,9 @@
<child>
<object class="GtkLabel" id="label65">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Date/Time Format</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -667,10 +700,12 @@
<child>
<object class="GtkHBox" id="hbox27">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label66">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -681,6 +716,7 @@
<child>
<object class="GtkTable" id="datetime_format_table">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_columns">3</property>
<property name="row_spacing">6</property>
<child>
@@ -692,8 +728,19 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -707,8 +754,9 @@
<child>
<object class="GtkLabel" id="misc-label1">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Miscellaneous</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -725,9 +773,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <property name="margin-left">12</property>
</object>
<packing>
<property name="expand">False</property>
@@ -738,6 +786,7 @@
<child>
<object class="GtkLabel" id="general-space-label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">True</property>
@@ -748,31 +797,30 @@
</object>
<packing>
<property name="tab_fill">False</property>
- <property name="tab_expand">False</property>
- <property name="position">0</property>
</packing>
</child>
<child type="tab">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">General</property>
</object>
<packing>
<property name="tab_fill">False</property>
- <property name="tab_expand">False</property>
- <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="display">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label17">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">View Options</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -786,10 +834,12 @@
<child>
<object class="GtkHBox" id="hbox8">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label19">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -800,14 +850,17 @@
<child>
<object class="GtkVBox" id="displayGeneral">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkHBox" id="hbox_time_divisions">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label23">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Time divisions:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">time_divisions</property>
@@ -821,6 +874,7 @@
<child>
<object class="GtkComboBox" id="time_divisions">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">model4</property>
<child>
<object class="GtkCellRendererText" id="renderer4"/>
@@ -830,16 +884,16 @@
</child>
</object>
<packing>
- <property name="position">1</property>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="position">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -934,20 +988,24 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Alerts</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -961,10 +1019,12 @@
<child>
<object class="GtkHBox" id="hbox3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -975,6 +1035,7 @@
<child>
<object class="GtkVBox" id="alerts">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="confirm_delete">
@@ -993,24 +1054,28 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object>
<packing>
- <property name="tab_fill">False</property>
- <property name="tab_expand">False</property>
<property name="position">1</property>
+ <property name="tab_fill">False</property>
</packing>
</child>
<child type="tab">
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Display</property>
</object>
<packing>
@@ -1021,13 +1086,15 @@
<child>
<object class="GtkVBox" id="tasks-vbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label18">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Task List</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -1041,10 +1108,12 @@
<child>
<object class="GtkHBox" id="hbox9">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label20">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1055,10 +1124,12 @@
<child>
<object class="GtkVBox" id="taskList">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkHBox" id="hbox14">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkCheckButton" id="tasks_due_today_highlight">
@@ -1099,6 +1170,7 @@
<child>
<object class="GtkHBox" id="hbox15">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkCheckButton" id="tasks_overdue_highlight">
@@ -1139,6 +1211,7 @@
<child>
<object class="GtkHBox" id="hbox11">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="tasks_hide_completed">
@@ -1163,12 +1236,15 @@
<property name="climb_rate">1</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="tasks_hide_completed_units">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">model5</property>
<child>
<object class="GtkCellRendererText" id="renderer5"/>
@@ -1178,37 +1254,42 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
- <property name="position">2</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="tab_fill">False</property>
- <property name="tab_expand">False</property>
<property name="position">2</property>
+ <property name="tab_fill">False</property>
</packing>
</child>
<child type="tab">
<object class="GtkLabel" id="tasks-tab-label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Tasks</property>
</object>
<packing>
@@ -1219,14 +1300,15 @@
<child>
<object class="GtkVBox" id="alarms">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label67">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Reminders</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -1240,8 +1322,9 @@
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
- <property name="left_padding">10</property>
+ <property name="can_focus">False</property>
<property name="bottom_padding">10</property>
+ <property name="left_padding">10</property>
<child>
<object class="GtkVBox" id="alarm_options_vbox">
<property name="visible">True</property>
@@ -1257,8 +1340,8 @@
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="fill">False</property>
<property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -1272,8 +1355,8 @@
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="fill">False</property>
<property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
@@ -1287,14 +1370,15 @@
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="fill">False</property>
<property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox6">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
<object class="GtkCheckButton" id="default_reminder">
@@ -1327,6 +1411,7 @@
<child>
<object class="GtkComboBox" id="default_reminder_units">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">model2</property>
<child>
<object class="GtkCellRendererText" id="renderer2"/>
@@ -1344,6 +1429,7 @@
<child>
<object class="GtkLabel" id="label16">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="This is the last half of a user
preference. "Set default reminder [time-period] before every new appointment"">before every new
appointment</property>
</object>
<packing>
@@ -1354,14 +1440,15 @@
</child>
</object>
<packing>
- <property name="fill">False</property>
<property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">4</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox7">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
<object class="GtkCheckButton" id="ba_reminder">
@@ -1394,6 +1481,7 @@
<child>
<object class="GtkComboBox" id="ba_reminder_units">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">model3</property>
<child>
<object class="GtkCellRendererText" id="renderer3"/>
@@ -1411,6 +1499,7 @@
<child>
<object class="GtkLabel" id="ba_reminder_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="This is the last half of a user
preference. "Show a reminder [time-period] before every anniversary/birthday"">before every
anniversary/birthday</property>
</object>
<packing>
@@ -1421,21 +1510,23 @@
</child>
</object>
<packing>
- <property name="fill">False</property>
<property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">5</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox10">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
<object class="GtkLabel" id="default-snooze-minutes-label">
- <property name="label" translatable="yes">Default _snooze time (in
minutes)</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Default _snooze time (in
minutes)</property>
<property name="use_underline">True</property>
- <property name="mnemonic-widget">default-snooze-minutes-spin</property>
+ <property name="mnemonic_widget">default-snooze-minutes-spin</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1458,8 +1549,8 @@
</child>
</object>
<packing>
- <property name="fill">False</property>
<property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">6</property>
</packing>
</child>
@@ -1467,16 +1558,17 @@
</child>
</object>
<packing>
- <property name="fill">False</property>
<property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label62">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Select the sources for reminder
notification:</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1492,8 +1584,6 @@
<object class="GtkScrolledWindow" id="reminder-calendars-scrolled-window">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<placeholder/>
@@ -1501,164 +1591,166 @@
</object>
<packing>
<property name="tab_fill">False</property>
- <property name="position">0</property>
</packing>
</child>
<child type="tab">
<object class="GtkLabel" id="reminder-calendars-sources-tab-label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Calendars</property>
</object>
<packing>
<property name="tab_fill">False</property>
- <property name="tab_expand">False</property>
- <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="reminder-memos-scrolled-window">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<placeholder/>
</child>
</object>
<packing>
- <property name="tab_fill">False</property>
<property name="position">1</property>
+ <property name="tab_fill">False</property>
</packing>
</child>
<child type="tab">
<object class="GtkLabel" id="reminder-memos-sources-tab-label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Memo Lists</property>
</object>
<packing>
- <property name="tab_fill">False</property>
- <property name="tab_expand">False</property>
<property name="position">1</property>
+ <property name="tab_fill">False</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="reminder-tasks-scrolled-window">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<placeholder/>
</child>
</object>
<packing>
- <property name="tab_fill">False</property>
<property name="position">2</property>
+ <property name="tab_fill">False</property>
</packing>
</child>
<child type="tab">
<object class="GtkLabel" id="reminder-tasks-sources-tab-label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Task Lists</property>
</object>
<packing>
- <property name="tab_fill">False</property>
- <property name="tab_expand">False</property>
<property name="position">2</property>
+ <property name="tab_fill">False</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object>
<packing>
- <property name="tab_fill">False</property>
- <property name="tab_expand">False</property>
<property name="position">3</property>
+ <property name="tab_fill">False</property>
</packing>
</child>
<child type="tab">
<object class="GtkLabel" id="alarm-label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Reminders</property>
</object>
<packing>
- <property name="tab_fill">False</property>
- <property name="tab_expand">False</property>
<property name="position">3</property>
+ <property name="tab_fill">False</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="freebusy">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="default-freebusy-header">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Default Free/Busy Server</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
<packing>
- <property name="position">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="default-freebusy-alignment">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="default-freebusy-vbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkHBox" id="hbox18">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label33">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Template:</property>
<property name="use_underline">True</property>
- <property name="mnemonic-widget">template_url</property>
+ <property name="mnemonic_widget">template_url</property>
</object>
<packing>
- <property name="position">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="template_url">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">●</property>
</object>
<packing>
- <property name="position">1</property>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="position">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label32">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">%u and %d will be replaced by user and domain
from the email address.</property>
<property name="wrap">True</property>
<attributes>
@@ -1666,18 +1758,18 @@
</attributes>
</object>
<packing>
- <property name="position">1</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
<packing>
- <property name="position">1</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -1689,6 +1781,7 @@
<child type="tab">
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Publishing Information</property>
</object>
<packing>
diff --git a/src/plugins/email-custom-header/org-gnome-email-custom-header.ui
b/src/plugins/email-custom-header/org-gnome-email-custom-header.ui
index 782ad2b..1b5383d 100644
--- a/src/plugins/email-custom-header/org-gnome-email-custom-header.ui
+++ b/src/plugins/email-custom-header/org-gnome-email-custom-header.ui
@@ -1,90 +1,141 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<!--*- mode: xml -*-->
<interface>
+ <requires lib="gtk+" version="3.10"/>
<object class="GtkDialog" id="email-custom-header-dialog">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="can_default">True</property>
<property name="title" translatable="yes">Email Custom Header</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_MOUSE</property>
- <property name="modal">False</property>
<property name="resizable">False</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
+ <property name="window_position">mouse</property>
+ <property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="email-custom-header-vbox">
+ <object class="GtkBox" id="email-custom-header-vbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="can_default">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
<child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
+ <object class="GtkButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="helpbutton1">
+ <property name="label" translatable="yes">_Help</property>
<property name="visible">True</property>
- <property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Help</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="cancelbutton1">
+ <property name="label" translatable="yes">_Cancel</property>
<property name="visible">True</property>
- <property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Cancel</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="okbutton1">
+ <property name="label" translatable="yes">_OK</property>
<property name="visible">True</property>
- <property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_OK</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkTable" id="email-custom-header-options">
- <property name="border_width">12</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
<property name="n_rows">4</property>
<property name="n_columns">4</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">12</property>
<property name="column_spacing">12</property>
+ <property name="row_spacing">12</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
diff --git a/src/plugins/publish-calendar/publish-calendar.ui
b/src/plugins/publish-calendar/publish-calendar.ui
index c6eee86..7d7a68e 100644
--- a/src/plugins/publish-calendar/publish-calendar.ui
+++ b/src/plugins/publish-calendar/publish-calendar.ui
@@ -1,11 +1,11 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <!-- interface-requires gtk+ 2.12 -->
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.10"/>
<object class="GtkAdjustment" id="adjustment1">
- <property name="value">1</property>
<property name="lower">1</property>
<property name="upper">100</property>
+ <property name="value">1</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
@@ -93,14 +93,15 @@
<child>
<object class="GtkVBox" id="vbox7">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label22">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">General</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -114,10 +115,12 @@
<child>
<object class="GtkHBox" id="hbox14">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label25">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -128,6 +131,7 @@
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">3</property>
<property name="n_columns">2</property>
<property name="column_spacing">6</property>
@@ -135,19 +139,21 @@
<child>
<object class="GtkLabel" id="label28">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Publish as:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">type_selector</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkComboBox" id="type_selector">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">model1</property>
<child>
<object class="GtkCellRendererText" id="renderer1"/>
@@ -166,21 +172,23 @@
<child>
<object class="GtkLabel" id="label29">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Publishing _Frequency:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">publish_frequency</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkComboBox" id="publish_frequency">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">model2</property>
<child>
<object class="GtkCellRendererText" id="renderer2"/>
@@ -200,21 +208,23 @@
<child>
<object class="GtkLabel" id="fb_duration_label">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Time _duration:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">fb_duration_spin</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox20">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkSpinButton" id="fb_duration_spin">
<property name="visible">True</property>
@@ -231,6 +241,7 @@
<child>
<object class="GtkComboBox" id="fb_duration_combo">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">model3</property>
<child>
<object class="GtkCellRendererText" id="renderer3"/>
@@ -240,6 +251,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -255,20 +268,24 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label23">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Sources</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -282,10 +299,12 @@
<child>
<object class="GtkHBox" id="hbox15">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label26">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -297,19 +316,21 @@
<object class="GtkScrolledWindow" id="events_swin">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<placeholder/>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
@@ -318,6 +339,7 @@
<child type="tab">
<object class="GtkLabel" id="label20">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Calendar</property>
</object>
<packing>
@@ -327,14 +349,15 @@
<child>
<object class="GtkVBox" id="vbox8">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label30">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Location</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -348,10 +371,12 @@
<child>
<object class="GtkHBox" id="hbox17">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label32">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -362,18 +387,20 @@
<child>
<object class="GtkVBox" id="vbox9">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkHBox" id="hbox19">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label34">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Service _type:</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -384,6 +411,7 @@
<child>
<object class="GtkComboBox" id="publish_service">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">model4</property>
<child>
<object class="GtkCellRendererText" id="renderer4"/>
@@ -394,29 +422,32 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="position">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="server_hbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="server_label">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Server:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">server_entry</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -431,29 +462,32 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="position">1</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="file_hbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="file_label">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_File:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">file_entry</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -468,22 +502,23 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="position">2</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
<packing>
- <property name="position">1</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -496,8 +531,9 @@
<child>
<object class="GtkLabel" id="optional_label">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Optional Information</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -511,10 +547,12 @@
<child>
<object class="GtkHBox" id="hbox18">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label33">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -525,19 +563,21 @@
<child>
<object class="GtkVBox" id="vbox10">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkHBox" id="port_hbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="port_label">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">P_ort:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">port_entry</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -559,23 +599,25 @@
</child>
</object>
<packing>
- <property name="position">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="username_hbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="username_label">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Username:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">username_entry</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -597,23 +639,25 @@
</child>
</object>
<packing>
- <property name="position">1</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="password_hbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="password_label">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Password:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">password_entry</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -636,9 +680,9 @@
</child>
</object>
<packing>
- <property name="position">2</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -659,9 +703,9 @@
</child>
</object>
<packing>
- <property name="position">1</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -679,6 +723,7 @@
<child type="tab">
<object class="GtkLabel" id="label21">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Publishing Location</property>
</object>
<packing>
@@ -689,29 +734,33 @@
</object>
<object class="GtkHBox" id="toplevel">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="url list">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"/>
+ </child>
</object>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVButtonBox" id="vbuttonbox1">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<property name="layout_style">start</property>
<child>
@@ -721,8 +770,7 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -732,11 +780,11 @@
</child>
<child>
<object class="GtkButton" id="url edit">
+ <property name="label" translatable="yes">_Edit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
- <property name="label" translatable="yes">_Edit</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -752,8 +800,7 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -764,6 +811,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
diff --git a/src/smime/gui/smime-ui.ui b/src/smime/gui/smime-ui.ui
index 9eb761b..259543f 100644
--- a/src/smime/gui/smime-ui.ui
+++ b/src/smime/gui/smime-ui.ui
@@ -1,22 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy toplevel-contextual -->
- <object class="GtkListStore" id="model1">
- <columns>
- <!-- column-name gchararray -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">a</col>
- </row>
- <row>
- <col id="0" translatable="yes">b</col>
- </row>
- </data>
+ <requires lib="gtk+" version="3.10"/>
+ <object class="GtkImage" id="backup-all-image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">document-save</property>
+ </object>
+ <object class="GtkImage" id="backup-image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">document-save</property>
</object>
<object class="GtkWindow" id="cert-manager-config-control">
+ <property name="can_focus">False</property>
<property name="title">window1</property>
<child>
<object class="GtkNotebook" id="cert-manager-notebook">
@@ -25,12 +22,13 @@
<child>
<object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label57">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">You have certificates from these organizations
that identify you:</property>
</object>
<packing>
@@ -42,19 +40,21 @@
<child>
<object class="GtkHBox" id="hbox6">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow4">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="yourcerts-treeview">
- <property name="name">yourcerts</property>
+ <property name="name">yourcerts</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"/>
+ </child>
<child internal-child="accessible">
<object class="AtkObject" id="yourcerts-treeview-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Certificates
Table</property>
@@ -64,13 +64,15 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVButtonBox" id="vbuttonbox1">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<property name="layout_style">start</property>
<child>
@@ -145,8 +147,7 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -157,11 +158,14 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -170,6 +174,7 @@
<child type="tab">
<object class="GtkLabel" id="label54">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Your Certificates</property>
</object>
<packing>
@@ -179,12 +184,13 @@
<child>
<object class="GtkVBox" id="vbox5">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label60">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">You have certificates on file that identify these
people:</property>
</object>
<packing>
@@ -196,19 +202,21 @@
<child>
<object class="GtkHBox" id="hbox7">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow5">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="contactcerts-treeview">
- <property name="name">contactcerts</property>
+ <property name="name">contactcerts</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"/>
+ </child>
<child internal-child="accessible">
<object class="AtkObject" id="contactcerts-treeview-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Certificates
Table</property>
@@ -218,13 +226,15 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVButtonBox" id="vbuttonbox2">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<property name="layout_style">start</property>
<child>
@@ -251,8 +261,7 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -283,8 +292,7 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -295,11 +303,14 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -311,6 +322,7 @@
<child type="tab">
<object class="GtkLabel" id="label55">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Contact Certificates</property>
</object>
<packing>
@@ -321,12 +333,13 @@
<child>
<object class="GtkVBox" id="vbox6">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label62">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">You have certificates on file that identify these
certificate authorities:</property>
</object>
<packing>
@@ -338,30 +351,34 @@
<child>
<object class="GtkHBox" id="hbox8">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow6">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="authoritycerts-treeview">
- <property name="name">authoritycerts</property>
+ <property name="name">authoritycerts</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"/>
+ </child>
</object>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVButtonBox" id="vbuttonbox3">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<property name="layout_style">start</property>
<child>
@@ -388,8 +405,7 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -420,8 +436,7 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -432,11 +447,14 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -448,6 +466,7 @@
<child type="tab">
<object class="GtkLabel" id="label56">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Authorities</property>
</object>
<packing>
@@ -459,22 +478,83 @@
</child>
</object>
<object class="GtkDialog" id="ca-trust-dialog">
+ <property name="can_focus">False</property>
<property name="title" translatable="yes">Certificate Authority Trust</property>
<property name="window_position">center</property>
<property name="type_hint">normal</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox2">
+ <object class="GtkBox" id="dialog-vbox2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="view_certificate_button">
+ <property name="label" translatable="yes">_View Certificate</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancelbutton">
+ <property name="label" translatable="yes">_Cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="okbutton">
+ <property name="label" translatable="yes">_OK</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
<object class="GtkVBox" id="vbox9">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="ca-trust-label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -531,9 +611,10 @@
<child>
<object class="GtkLabel" id="label66">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Before trusting this CA for any purpose, you
should examine its certificate and its policy and procedures (if available).</property>
<property name="wrap">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -543,16 +624,37 @@
</child>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-3">view_certificate_button</action-widget>
+ <action-widget response="-6">cancelbutton</action-widget>
+ <action-widget response="-5">okbutton</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="cert-trust-dialog">
+ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">Email Certificate Trust Settings</property>
+ <property name="window_position">center</property>
+ <property name="type_hint">normal</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area2">
+ <object class="GtkButtonBox" id="dialog-action_area3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="view_certificate_button">
- <property name="label" translatable="yes">_View Certificate</property>
+ <object class="GtkButton" id="editca">
+ <property name="label" translatable="yes">_Edit CA Trust</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -566,113 +668,37 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="cancelbutton">
- <property name="label" translatable="yes">_Cancel</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="okbutton">
+ <object class="GtkButton" id="editok">
<property name="label" translatable="yes">_OK</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="-3">view_certificate_button</action-widget>
- <action-widget response="-6">cancelbutton</action-widget>
- <action-widget response="-5">okbutton</action-widget>
- </action-widgets>
- </object>
- <object class="GtkVBox" id="cert_selector_vbox">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkHBox" id="hbox5">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label67">
- <property name="visible">True</property>
- <property name="label" translatable="yes">C_ertificate:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic-widget">cert_combobox</property>
- </object>
- <packing>
- <property name="expand">False</property>
<property name="fill">False</property>
+ <property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="cert_combobox">
- <property name="visible">True</property>
- <property name="model">model1</property>
- <child>
- <object class="GtkCellRendererText" id="renderer1"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <object class="GtkDialog" id="cert-trust-dialog">
- <property name="title" translatable="yes">Email Certificate Trust Settings</property>
- <property name="window_position">center</property>
- <property name="type_hint">normal</property>
- <child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox3">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
<object class="GtkVBox" id="vbox8">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="trust-label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="wrap">True</property>
</object>
<packing>
@@ -715,64 +741,78 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area3">
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-3">editca</action-widget>
+ <action-widget response="-5">editok</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkListStore" id="model1">
+ <columns>
+ <!-- column-name gchararray -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">a</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">b</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkVBox" id="cert_selector_vbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkHBox" id="hbox5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label67">
<property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="editca">
- <property name="label" translatable="yes">_Edit CA Trust</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">C_ertificate:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">cert_combobox</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="cert_combobox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">model1</property>
<child>
- <object class="GtkButton" id="editok">
- <property name="label" translatable="yes">_OK</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">False</property>
- <property name="use-underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
+ <object class="GtkCellRendererText" id="renderer1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
- <action-widgets>
- <action-widget response="-3">editca</action-widget>
- <action-widget response="-5">editok</action-widget>
- </action-widgets>
- </object>
- <object class="GtkImage" id="backup-image">
- <property name="visible">True</property>
- <property name="icon-name">document-save</property>
- </object>
- <object class="GtkImage" id="backup-all-image">
- <property name="visible">True</property>
- <property name="icon-name">document-save</property>
</object>
</interface>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
