diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-03-10 21:53:12 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-03-17 20:49:12 +0800 |
| commit | 2e87aa81fc94f5d9564421e036adae7b48e7380a (patch) | |
| tree | 9576f15a49a6101c9246c6ce0f82e5c7bd4575c2 /mail/mail-config.ui | |
| parent | 95a0ae4afb72b534c991fbcd774733a93f256514 (diff) | |
| download | gsoc2013-evolution-2e87aa81fc94f5d9564421e036adae7b48e7380a.tar gsoc2013-evolution-2e87aa81fc94f5d9564421e036adae7b48e7380a.tar.gz gsoc2013-evolution-2e87aa81fc94f5d9564421e036adae7b48e7380a.tar.bz2 gsoc2013-evolution-2e87aa81fc94f5d9564421e036adae7b48e7380a.tar.lz gsoc2013-evolution-2e87aa81fc94f5d9564421e036adae7b48e7380a.tar.xz gsoc2013-evolution-2e87aa81fc94f5d9564421e036adae7b48e7380a.tar.zst gsoc2013-evolution-2e87aa81fc94f5d9564421e036adae7b48e7380a.zip | |
Remove EMailShellSettings.
EShellSettings predates GSettings and is no longer necessary.
GSettings allows binding GObject properties to GSettings keys,
with optional mapping functions. That fulfills the purpose of
EShellSettings.
Diffstat (limited to 'mail/mail-config.ui')
| -rw-r--r-- | mail/mail-config.ui | 68 |
1 files changed, 13 insertions, 55 deletions
diff --git a/mail/mail-config.ui b/mail/mail-config.ui index 162cdd4dd7..2b32acb683 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -481,16 +481,14 @@ <property name="xalign">0</property> <property name="xscale">0</property> <child> - <object class="GtkComboBox" id="comboboxReplyStyle"> + <object class="GtkComboBoxText" id="comboboxReplyStyle"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">model3</property> - <child> - <object class="GtkCellRendererText" id="renderer3"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> + <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> + </items> </object> </child> </object> @@ -506,16 +504,13 @@ <property name="xalign">0</property> <property name="xscale">0</property> <child> - <object class="GtkComboBox" id="comboboxForwardStyle"> + <object class="GtkComboBoxText" id="comboboxForwardStyle"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">model4</property> - <child> - <object class="GtkCellRendererText" id="renderer4"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> + <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> + </items> </object> </child> </object> @@ -1065,43 +1060,6 @@ </row> </data> </object> - <object class="GtkListStore" id="model3"> - <columns> - <!-- column-name gchararray --> - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes" context="ReplyForward">Attachment</col> - </row> - <row> - <col id="0" translatable="yes" context="ReplyForward">Inline (Outlook style)</col> - </row> - <row> - <col id="0" translatable="yes" context="ReplyForward">Quoted</col> - </row> - <row> - <col id="0" translatable="yes" context="ReplyForward">Do not quote</col> - </row> - </data> - </object> - <object class="GtkListStore" id="model4"> - <columns> - <!-- column-name gchararray --> - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes" context="ReplyForward">Attachment</col> - </row> - <row> - <col id="0" translatable="yes" context="ReplyForward">Inline</col> - </row> - <row> - <col id="0" translatable="yes" context="ReplyForward">Quoted</col> - </row> - </data> - </object> <object class="GtkNotebook" id="network_preferences_toplevel"> <property name="visible">True</property> <property name="can_focus">True</property> |