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

composer: Make format menu more generic

Browse source 
It still only contains text formatting options, but it uses the
view-more-symbolic icon.
This commit is contained in:
James Westman 2020-01-29 16:30:19 -06:00 • committed by James Westman
parent d3aff68273
commit 66bbb576a6
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/client/composer/composer-widget.vala
View file

@ -392,7 +392,7 @@ public class Composer.Widget : Gtk.EventBox, Geary.BaseInterface {
[GtkChild] private Gtk.Stack font_button_stack;
[GtkChild] private Gtk.MenuButton font_size_button;
[GtkChild] private Gtk.Image font_color_icon;
[GtkChild] private Gtk.MenuButton text_format_button;
[GtkChild] private Gtk.MenuButton more_options_button;
[GtkChild]
private Gtk.Button insert_link_button;
@ -2147,7 +2147,7 @@ public class Composer.Widget : Gtk.EventBox, Geary.BaseInterface {
this.editor.set_rich_text(compose_as_html);
this.application.config.compose_as_html = compose_as_html;
this.text_format_button.popover.popdown();
this.more_options_button.popover.popdown();
}
private void reparent_widget(Gtk.Widget child, Gtk.Container new_parent) {

10
ui/composer-widget.ui
View file

@ -1153,18 +1153,18 @@
</object>
</child>
<child>
<object class="GtkMenuButton" id="text_format_button">
<object class="GtkMenuButton" id="more_options_button">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="menu_model">rich_text_menu</property>
<property name="tooltip_text" translatable="yes">Enable or disable rich text mode</property>
<property name="menu_model">more_options_menu</property>
<property name="tooltip_text" translatable="yes">More options</property>
<property name="direction">up</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="icon_name">format-text-bold-symbolic</property>
<property name="icon_name">view-more-symbolic</property>
</object>
</child>
</object>
@ -1297,7 +1297,7 @@
</section>
</menu>
<menu id="rich_text_menu">
<menu id="more_options_menu">
<section>
<item>
<attribute name="label" translatable="yes">_Rich Text</attribute>