nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop Gtk.Stock: Closes #7203, Closes #7294

Browse source 
These changes also invalidates #7218, as we're no longer using
buttons with icons with these changes.
This commit is contained in:
Jim Nelson 2013-08-02 15:28:33 -07:00
parent d33771787a
commit 403dd8508e
17 changed files with 96 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ui/account_cannot_remove.glade
View file

@ -3,9 +3,7 @@
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkActionGroup" id="actions">
<child>
<object class="GtkAction" id="ok_action">
<property name="stock_id">gtk-ok</property>
</object>
<object class="GtkAction" id="ok_action"/>
</child>
</object>
<object class="GtkBox" id="container">
@ -17,7 +15,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="yalign">0</property>
<property name="stock">gtk-dialog-error</property>
<property name="pixel_size">60</property>
<property name="icon_name">dialog-error</property>
<property name="icon-size">6</property>
</object>
<packing>
@ -72,7 +71,8 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button2">
<property name="label" translatable="yes">_Remove</property>
<property name="label" translatable="yes">_OK</property>
<property name="use_action_appearance">False</property>
<property name="related_action">ok_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>

8
ui/account_list.glade
View file

@ -8,9 +8,7 @@
</object>
</child>
<child>
<object class="GtkAction" id="close">
<property name="stock_id">gtk-close</property>
</object>
<object class="GtkAction" id="close"/>
</child>
<child>
<object class="GtkAction" id="edit_account">
@ -122,11 +120,13 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="close_button">
<property name="label" translatable="yes">_Close</property>
<property name="use_action_appearance">False</property>
<property name="related_action">close</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
<property name="use_underline">True</property>
<property name="yalign">0.54000002145767212</property>
</object>
<packing>

50
ui/composer.glade
View file

@ -3,57 +3,43 @@
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkActionGroup" id="compose actions">
<child>
<object class="GtkAction" id="undo">
<property name="stock_id">gtk-undo</property>
</object>
<object class="GtkAction" id="undo"/>
<accelerator key="z" modifiers="GDK_CONTROL_MASK"/>
</child>
<child>
<object class="GtkAction" id="redo">
<property name="stock_id">gtk-redo</property>
</object>
<object class="GtkAction" id="redo"/>
<accelerator key="z" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
</child>
<child>
<object class="GtkAction" id="cut">
<property name="stock_id">gtk-cut</property>
</object>
<object class="GtkAction" id="cut"/>
<accelerator key="x" modifiers="GDK_CONTROL_MASK"/>
</child>
<child>
<object class="GtkAction" id="copy">
<property name="stock_id">gtk-copy</property>
</object>
<object class="GtkAction" id="copy"/>
<accelerator key="c" modifiers="GDK_CONTROL_MASK"/>
</child>
<child>
<object class="GtkAction" id="paste">
<property name="stock_id">gtk-paste</property>
</object>
<object class="GtkAction" id="paste"/>
<accelerator key="v" modifiers="GDK_CONTROL_MASK"/>
</child>
<child>
<object class="GtkAction" id="justifyleft">
<property name="label" translatable="yes">_Left</property>
<property name="stock_id">gtk-justify-left</property>
</object>
</child>
<child>
<object class="GtkAction" id="justifyright">
<property name="label" translatable="yes">_Right</property>
<property name="stock_id">gtk-justify-right</property>
</object>
</child>
<child>
<object class="GtkAction" id="justifycenter">
<property name="label" translatable="yes">_Center</property>
<property name="stock_id">gtk-justify-center</property>
</object>
</child>
<child>
<object class="GtkAction" id="justifyfull">
<property name="label" translatable="yes">_Justify</property>
<property name="stock_id">gtk-justify-fill</property>
</object>
</child>
<child>
@ -66,27 +52,26 @@
<child>
<object class="GtkAction" id="color">
<property name="label" translatable="yes">C_olor</property>
<property name="stock_id">gtk-select-color</property>
</object>
<accelerator key="r" modifiers="GDK_CONTROL_MASK"/>
</child>
<child>
<object class="GtkAction" id="menu">
<property name="label" translatable="yes">Menu</property>
<property name="stock_id">gtk-go-down</property>
<property name="icon_name">go-down</property>
</object>
</child>
<child>
<object class="GtkAction" id="indent">
<property name="label" translatable="yes">Quote text</property>
<property name="stock_id">gtk-indent</property>
<property name="icon_name">format-indent-more</property>
</object>
<accelerator key="bracketright" modifiers="GDK_CONTROL_MASK"/>
</child>
<child>
<object class="GtkAction" id="outdent">
<property name="label" translatable="yes">Unquote text</property>
<property name="stock_id">gtk-unindent</property>
<property name="icon_name">format-indent-less</property>
</object>
<accelerator key="bracketleft" modifiers="GDK_CONTROL_MASK"/>
</child>
@ -110,25 +95,25 @@
</child>
<child>
<object class="GtkToggleAction" id="bold">
<property name="stock_id">gtk-bold</property>
<property name="icon_name">format-text-bold</property>
</object>
<accelerator key="b" modifiers="GDK_CONTROL_MASK"/>
</child>
<child>
<object class="GtkToggleAction" id="italic">
<property name="stock_id">gtk-italic</property>
<property name="icon_name">format-text-italic</property>
</object>
<accelerator key="i" modifiers="GDK_CONTROL_MASK"/>
</child>
<child>
<object class="GtkToggleAction" id="underline">
<property name="stock_id">gtk-underline</property>
<property name="icon_name">format-text-underline</property>
</object>
<accelerator key="u" modifiers="GDK_CONTROL_MASK"/>
</child>
<child>
<object class="GtkToggleAction" id="strikethrough">
<property name="stock_id">gtk-strikethrough</property>
<property name="icon_name">format-text-strikethrough</property>
</object>
<accelerator key="k" modifiers="GDK_CONTROL_MASK"/>
</child>
@ -554,10 +539,8 @@
</child>
<child>
<object class="GtkToolItem" id="filler">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<child>
<placeholder/>
</child>
@ -568,8 +551,8 @@
</child>
<child>
<object class="GtkToggleToolButton" id="menu button">
<property name="related_action">menu</property>
<property name="use_action_appearance">False</property>
<property name="related_action">menu</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes" comments="Various options for formatting text">Formatting Menu</property>
@ -665,10 +648,9 @@
<child>
<object class="GtkButton" id="add_pending_attachments">
<property name="label" translatable="yes">_Include Original Attachments</property>
<property name="visible">False</property>
<property name="no_show_all">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="no_show_all">True</property>
<property name="halign">start</property>
<property name="valign">center</property>
<property name="use_underline">True</property>
@ -681,11 +663,11 @@
</child>
<child>
<object class="GtkButton" id="Discard">
<property name="label">gtk-discard</property>
<property name="label">_Discard</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>

2
ui/find_bar.glade
View file

@ -9,7 +9,7 @@
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">gtk-close</property>
<property name="icon_name">window-close</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image3">

3
ui/password-dialog.glade
View file

@ -24,7 +24,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="yalign">0</property>
<property name="stock">gtk-dialog-authentication</property>
<property name="pixel_size">60</property>
<property name="icon_name">security-high</property>
<property name="icon-size">6</property>
</object>
<packing>

19
ui/preferences.glade
View file

@ -18,15 +18,13 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="close_button">
<property name="label">gtk-close</property>
<property name="use_action_appearance">False</property>
<property name="label">_Close</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">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@ -69,7 +67,6 @@
<child>
<object class="GtkCheckButton" id="autoselect">
<property name="label" translatable="yes">_Automatically select next message</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@ -77,7 +74,6 @@
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@ -92,7 +88,6 @@
<child>
<object class="GtkCheckButton" id="display_preview">
<property name="label" translatable="yes">_Display conversation preview</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@ -100,7 +95,6 @@
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@ -135,7 +129,6 @@
<child>
<object class="GtkCheckButton" id="spell_check">
<property name="label" translatable="yes">Enable _spell checking</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@ -143,7 +136,6 @@
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@ -178,7 +170,6 @@
<child>
<object class="GtkCheckButton" id="play_sounds">
<property name="label" translatable="yes">_Play notification sounds</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@ -186,7 +177,6 @@
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@ -201,7 +191,6 @@
<child>
<object class="GtkCheckButton" id="show_notifications">
<property name="label" translatable="yes">Show _notifications for new mail</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@ -209,7 +198,6 @@
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@ -221,6 +209,9 @@
<property name="height">1</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>

11
ui/remove_confirm.glade
View file

@ -3,14 +3,10 @@
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkActionGroup" id="actions">
<child>
<object class="GtkAction" id="cancel_action">
<property name="stock_id">gtk-cancel</property>
</object>
<object class="GtkAction" id="cancel_action"/>
</child>
<child>
<object class="GtkAction" id="remove_action">
<property name="stock_id">gtk-remove</property>
</object>
<object class="GtkAction" id="remove_action"/>
</child>
</object>
<object class="GtkBox" id="container">
@ -22,7 +18,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="yalign">0</property>
<property name="stock">gtk-dialog-warning</property>
<property name="pixel_size">60</property>
<property name="icon_name">dialog-warning</property>
<property name="icon-size">6</property>
</object>
<packing>