Closes #6438 Quote level replaces indent
This commit is contained in:
Robert Schroll
Eric Gregory
parent
96a5e99b06
commit
7d8b23545f
3 changed files with 69 additions and 19 deletions
|
|
@ -128,6 +128,7 @@ public class ComposerWindow : Gtk.Window {
|
|||
private string? body_html = null;
|
||||
private Gee.Set<File> attachment_files = new Gee.HashSet<File>(File.hash, (EqualFunc) File.equal);
|
||||
|
||||
private Gtk.Builder builder;
|
||||
private Gtk.Label from_label;
|
||||
private Gtk.Label from_single;
|
||||
private Gtk.ComboBoxText from_multiple = new Gtk.ComboBoxText();
|
||||
|
|
@ -149,7 +150,6 @@ public class ComposerWindow : Gtk.Window {
|
|||
private Gtk.Alignment visible_on_attachment_drag_over;
|
||||
private Gtk.Widget hidden_on_attachment_drag_over_child;
|
||||
private Gtk.Widget visible_on_attachment_drag_over_child;
|
||||
private Gtk.Toolbar compose_toolbar;
|
||||
|
||||
private Gtk.RadioMenuItem font_small;
|
||||
private Gtk.RadioMenuItem font_medium;
|
||||
|
|
@ -180,7 +180,7 @@ public class ComposerWindow : Gtk.Window {
|
|||
setup_drag_destination(this);
|
||||
|
||||
add_events(Gdk.EventMask.KEY_PRESS_MASK | Gdk.EventMask.KEY_RELEASE_MASK);
|
||||
Gtk.Builder builder = GearyApplication.instance.create_builder("composer.glade");
|
||||
builder = GearyApplication.instance.create_builder("composer.glade");
|
||||
|
||||
// Add the content-view style class for the elementary GTK theme.
|
||||
Gtk.Box button_area = (Gtk.Box) builder.get_object("button_area");
|
||||
|
|
@ -243,7 +243,7 @@ public class ComposerWindow : Gtk.Window {
|
|||
cc_entry.changed.connect(validate_send_button);
|
||||
bcc_entry.changed.connect(validate_send_button);
|
||||
|
||||
compose_toolbar = (Gtk.Toolbar) builder.get_object("compose_toolbar");
|
||||
Gtk.Toolbar compose_toolbar = (Gtk.Toolbar) builder.get_object("compose_toolbar");
|
||||
|
||||
actions.get_action(ACTION_UNDO).activate.connect(on_action);
|
||||
actions.get_action(ACTION_REDO).activate.connect(on_action);
|
||||
|
|
@ -262,8 +262,8 @@ public class ComposerWindow : Gtk.Window {
|
|||
actions.get_action(ACTION_REMOVE_FORMAT).activate.connect(on_remove_format);
|
||||
actions.get_action(ACTION_COMPOSE_AS_HTML).activate.connect(on_compose_as_html);
|
||||
|
||||
actions.get_action(ACTION_INDENT).activate.connect(on_formatting_action);
|
||||
actions.get_action(ACTION_OUTDENT).activate.connect(on_formatting_action);
|
||||
actions.get_action(ACTION_INDENT).activate.connect(on_indent);
|
||||
actions.get_action(ACTION_OUTDENT).activate.connect(on_action);
|
||||
|
||||
actions.get_action(ACTION_JUSTIFY_LEFT).activate.connect(on_formatting_action);
|
||||
actions.get_action(ACTION_JUSTIFY_RIGHT).activate.connect(on_formatting_action);
|
||||
|
|
@ -471,6 +471,8 @@ public class ComposerWindow : Gtk.Window {
|
|||
}
|
||||
}
|
||||
|
||||
protect_blockquote_styles();
|
||||
|
||||
// Set focus.
|
||||
if (Geary.String.is_empty(to)) {
|
||||
to_entry.grab_focus();
|
||||
|
|
@ -919,14 +921,14 @@ public class ComposerWindow : Gtk.Window {
|
|||
private void on_compose_as_html() {
|
||||
WebKit.DOM.DOMTokenList body_classes = editor.get_dom_document().body.get_class_list();
|
||||
if (!compose_as_html) {
|
||||
compose_toolbar.hide();
|
||||
toggle_toolbar_buttons(false);
|
||||
try {
|
||||
body_classes.add("plain");
|
||||
} catch (Error error) {
|
||||
debug("Error setting composer style: %s", error.message);
|
||||
}
|
||||
} else {
|
||||
compose_toolbar.show();
|
||||
toggle_toolbar_buttons(true);
|
||||
try {
|
||||
body_classes.remove("plain");
|
||||
} catch (Error error) {
|
||||
|
|
@ -936,6 +938,19 @@ public class ComposerWindow : Gtk.Window {
|
|||
GearyApplication.instance.config.compose_as_html = compose_as_html;
|
||||
}
|
||||
|
||||
private void toggle_toolbar_buttons(bool show) {
|
||||
string[] buttons = {"bold button", "italic button", "underline button",
|
||||
"strikethrough button", "toolbar separator 1", "toolbar separator 2", "font button",
|
||||
"font size button", "color button", "link button", "remove format button"};
|
||||
foreach (string button in buttons) {
|
||||
Gtk.Widget widget = (Gtk.Widget) builder.get_object(button);
|
||||
if (show)
|
||||
widget.show();
|
||||
else
|
||||
widget.hide();
|
||||
}
|
||||
}
|
||||
|
||||
private void on_select_font() {
|
||||
if (!font_button.active)
|
||||
return;
|
||||
|
|
@ -1000,6 +1015,38 @@ public class ComposerWindow : Gtk.Window {
|
|||
}
|
||||
}
|
||||
|
||||
private void on_indent(Gtk.Action action) {
|
||||
on_action(action);
|
||||
|
||||
// Undo styling of blockquotes
|
||||
try {
|
||||
WebKit.DOM.NodeList node_list = editor.get_dom_document().query_selector_all(
|
||||
"blockquote[style=\"margin: 0 0 0 40px; border: none; padding: 0px;\"]");
|
||||
for (int i = 0; i < node_list.length; ++i) {
|
||||
WebKit.DOM.Element element = (WebKit.DOM.Element) node_list.item(i);
|
||||
element.remove_attribute("style");
|
||||
element.set_attribute("type", "cite");
|
||||
}
|
||||
} catch (Error error) {
|
||||
warning("Error removing blockquote style: %s", error.message);
|
||||
}
|
||||
}
|
||||
|
||||
private void protect_blockquote_styles() {
|
||||
// We will search for an remove a particular styling when we quote text. If that style
|
||||
// exists in the quoted text, we alter it slightly so we don't mess with it later.
|
||||
try {
|
||||
WebKit.DOM.NodeList node_list = editor.get_dom_document().query_selector_all(
|
||||
"blockquote[style=\"margin: 0 0 0 40px; border: none; padding: 0px;\"]");
|
||||
for (int i = 0; i < node_list.length; ++i) {
|
||||
((WebKit.DOM.Element) node_list.item(i)).set_attribute("style",
|
||||
"margin: 0 0 0 40px; padding: 0px; border:none;");
|
||||
}
|
||||
} catch (Error error) {
|
||||
warning("Error protecting blockquotes: %s", error.message);
|
||||
}
|
||||
}
|
||||
|
||||
private void on_insert_link() {
|
||||
if (compose_as_html)
|
||||
link_dialog("http://");
|
||||
|
|
|
|||
|
|
@ -310,16 +310,17 @@ public string quote_lines(string text) {
|
|||
|
||||
public string resolve_nesting(string text, string[] values) {
|
||||
try {
|
||||
GLib.Regex tokenregex = new GLib.Regex("([0-9]*)(.?)");
|
||||
GLib.Regex tokenregex = new GLib.Regex("(.?)([0-9]*)(.?)");
|
||||
return tokenregex.replace_eval(text, -1, 0, 0, (info, res) => {
|
||||
int key = int.parse(info.fetch(1));
|
||||
string next_char = info.fetch(2);
|
||||
// If there is a next character, and it's not a newline, insert a newline
|
||||
// before it. Otherwise, that text will become part of the inserted quote.
|
||||
int key = int.parse(info.fetch(2));
|
||||
string prev_char = info.fetch(1), next_char = info.fetch(3);
|
||||
// Make sure there's a newline before and after the quote.
|
||||
if (prev_char != "" && prev_char != "\n")
|
||||
prev_char = prev_char + "\n";
|
||||
if (next_char != "" && next_char != "\n")
|
||||
next_char = "\n" + next_char;
|
||||
if (key >= 0 && key < values.length) {
|
||||
res.append(quote_lines(resolve_nesting(values[key], values)) + next_char);
|
||||
res.append(prev_char + quote_lines(resolve_nesting(values[key], values)) + next_char);
|
||||
} else {
|
||||
debug("Regex error in denesting blockquotes: Invalid key");
|
||||
res.append("");
|
||||
|
|
|
|||
|
|
@ -84,12 +84,14 @@
|
|||
</child>
|
||||
<child>
|
||||
<object class="GtkAction" id="indent">
|
||||
<property name="label" translatable="yes">Quote text</property>
|
||||
<property name="stock_id">gtk-indent</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>
|
||||
</object>
|
||||
<accelerator key="bracketleft" modifiers="GDK_CONTROL_MASK"/>
|
||||
|
|
@ -477,7 +479,7 @@
|
|||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkSeparatorToolItem" id="toolbutton5">
|
||||
<object class="GtkSeparatorToolItem" id="toolbar separator 1">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
</object>
|
||||
|
|
@ -491,8 +493,8 @@
|
|||
<property name="related_action">indent</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="tooltip_text" translatable="yes" comments="Indent text">Indent (Ctrl+])</property>
|
||||
<property name="label" translatable="yes">Indent</property>
|
||||
<property name="tooltip_text" translatable="yes" comments="Adds a quote level">Quote text (Ctrl+])</property>
|
||||
<property name="label" translatable="yes">Quote text</property>
|
||||
<property name="use_underline">True</property>
|
||||
</object>
|
||||
<packing>
|
||||
|
|
@ -505,8 +507,8 @@
|
|||
<property name="related_action">outdent</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="tooltip_text" translatable="yes" comments="Removes an indent level">Un-indent (Ctrl+[)</property>
|
||||
<property name="label" translatable="yes">Un-indent</property>
|
||||
<property name="tooltip_text" translatable="yes" comments="Removes a quote level">Unquote text (Ctrl+[)</property>
|
||||
<property name="label" translatable="yes">Unquote text</property>
|
||||
<property name="use_underline">True</property>
|
||||
</object>
|
||||
<packing>
|
||||
|
|
@ -515,7 +517,7 @@
|
|||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkSeparatorToolItem" id="toolbutton3">
|
||||
<object class="GtkSeparatorToolItem" id="toolbar separator 2">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
</object>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue