Merge lp:~ryanriffle/writer/instant_style_apply into lp:writer

[Ryan Riffle]

I made clicking bold, italic, and underline apply the style instead of having to select the text first. Also in TextToolbar I added focus_on_click = false to the other buttons aside from bold.

I had to change the way TextEditor.cursor_moved is called, because the notify caused cursor_moved_callback to be called before text_insert_callback was called, therefore resetting the styles. Also added a mouse click event because Gtk.TextView.move_cursor signal does not emit if the user clicks somewhere in the text.

[Ryan Riffle (ryanriffle)]

I am not sure what the design should be. Whether you want to use a dictionary for the added members or a new TextStyle class. Just let me know and I can change it.

[Ryan Riffle (ryanriffle)]

Is this going to be reviewed?

[Tuur Dutoit (tuur-dutoit-f)]

Yes, of course. I'm sorry, I've been lazy the last few days (after exams...). Tomorrow I'll get some work done.

[Tuur Dutoit (tuur-dutoit-f)]

That's very good, I'm merging it in.

review: Approve

=== modified file 'src/Utils/TextEditor.vala'
--- src/Utils/TextEditor.vala	2014-10-26 10:41:33 +0000
+++ src/Utils/TextEditor.vala	2014-12-14 05:22:00 +0000
@@ -30,73 +30,110 @@
 
 namespace Writer {
     public class TextEditor : TextBuffer {
-    
+
         public TextView text_view;
-        
+        public bool style_bold;
+        public bool style_italic;
+        public bool style_underline;
+        public bool style_strikethrough;
+
         public signal void cursor_moved ();
         public signal void text_inserted ();
-    
+
         public TextEditor () {
             setup_tagtable (this);
             text_view = new TextView.with_buffer (this);
-            
-            this.notify["cursor-position"].connect (cursor_moved_callback);
+
+            style_bold = false;
+            style_italic = false;
+            style_underline = false;
+            style_strikethrough = false;
+
+            text_view.move_cursor.connect (cursor_moved_callback);
+            text_view.button_release_event.connect (editor_clicked_callback);
             this.insert_text.connect_after (text_inserted_callback);
-            
+
             text_view.key_press_event.connect (key_press_callback);
             text_view.pixels_below_lines = 20;
         }
-        
+
         // Get a TextTagTable with all the default tags
         private void setup_tagtable (TextBuffer buffer) {
-            
+
             buffer.create_tag ("bold", "weight", 700);
             buffer.create_tag ("italic", "style", Pango.Style.ITALIC);
             buffer.create_tag ("underline", "underline", Pango.Underline.SINGLE);
             buffer.create_tag ("strikethrough", "strikethrough", true);
-            
+
             buffer.create_tag ("align-left", "justification", Gtk.Justification.LEFT);
             buffer.create_tag ("align-center", "justification", Gtk.Justification.CENTER);
             buffer.create_tag ("align-right", "justification", Gtk.Justification.RIGHT);
             buffer.create_tag ("align-fill", "justification", Gtk.Justification.FILL);
-            
+
         }
-        
-        
+
+
         /*
          * Styles (apply, remove, check)
          */
-         
+
         public void apply_style (string name) {
             if (has_selection)
                 get_selection_range ().apply_style (name);
+
+            if (name == "bold")
+                style_bold = true;
+            else if (name == "italic")
+                style_italic = true;
+            else if (name == "underline")
+                style_underline = true;
+            else if (name == "strikethrough")
+                style_strikethrough = true;
         }
-        
+
         public void remove_style (string name) {
             if (has_selection)
                 get_selection_range ().remove_style (name);
+
+            if (name == "bold")
+                style_bold = false;
+            else if (name == "italic")
+                style_italic = false;
+            else if (name == "underline")
+                style_underline = false;
+            else if (name == "strikethrough")
+                style_strikethrough = false;
         }
-        
+
         public void toggle_style (string name) {
             if (has_selection)
                 get_selection_range ().toggle_style (name);
+
+            if (name == "bold")
+                style_bold = !style_bold;
+            else if (name == "italic")
+                style_italic = !style_italic;
+            else if (name == "underline")
+                style_underline = !style_underline;
+            else if (name == "strikethrough")
+                style_strikethrough = !style_strikethrough;
         }
-        
+
         public bool has_style (string name) {
             if (has_selection)
                 return get_selection_range ().has_style (name);
             else
                 return iter_has_style (get_cursor (), name);
         }
-        
-        
+
+
         public Gtk.Justification get_justification () {
             if (has_selection)
                 return get_selection_range ().get_justification ();
             else
                 return get_justification_at_iter (get_cursor ());
         }
-        
+
         public Gtk.Justification get_justification_at_iter (TextIter iter) {
             if (iter_has_style (iter, "align-center"))
                 return Gtk.Justification.CENTER;
@@ -107,14 +144,14 @@
             else
                 return Gtk.Justification.LEFT;
         }
-        
+
         public int get_justification_as_int () {
             if (has_selection)
                 return get_selection_range ().get_justification_as_int ();
             else
                 return get_justification_as_int_at_iter (get_cursor ());
         }
-        
+
         public int get_justification_as_int_at_iter (TextIter iter) {
             if (iter_has_style (iter, "align-center"))
                 return 1;
@@ -125,82 +162,82 @@
             else
                 return 0;
         }
-        
+
         public void set_justification (string align) {
             get_paragraph (get_cursor ()).set_justification (align);
         }
-        
-        
+
+
         public void set_font (FontDescription font) {
             get_selection_range ().set_font (font);
         }
-        
+
         public void set_font_from_string (string font) {
             get_selection_range ().set_font_from_string (font);
         }
-        
-        
+
+
         public void set_font_color (Gdk.Color color) {
             get_selection_range ().set_font_color (color);
         }
-        
+
         public void set_font_color_from_string (string color) {
             get_selection_range ().set_font_color_from_string (color);
         }
-        
-        
-        
+
+
+
         /*
          * Inserts
          */
-        
+
         public void insert_comment () {
             print ("Insert Comment\n");
         }
-        
+
         public void insert_image () {
             print ("Insert Image\n");
         }
-        
+
         public void insert_link () {
             print ("Insert Link\n");
         }
-        
+
         public void insert_table (int cols, int rows) {
             print ("Insert Table of %d columns by %d rows\n", cols, rows);
         }
-        
-        
+
+
         public void insert_line () {
             TextIter insert_cursor = get_cursor ();
             insert_line_at_iter (insert_cursor);
         }
-        
+
         public void insert_paragraph () {
             TextIter cursor = get_cursor ();
             insert_paragraph_at_iter (cursor);
         }
-        
+
         public void insert_line_at_iter (TextIter iter) {
             //TODO
             // Cursor does not move to next line
             // Only happens when inserting at the end of the buffer
             // Bug reported in GTK+
-            
+
             insert (ref iter, "\u2028", -1);
         }
-        
+
         public void insert_paragraph_at_iter (TextIter iter) {
             insert (ref iter, "\n", -1);
         }
-        
-        
-        
-        
+
+
+
+
         /*
          * paragraphs
          */
-        
+
         // Moves iter to the start of the paragraph it is located in
         public TextIter get_paragraph_start (TextIter iter) {
             iter.backward_find_char ((char) => {
@@ -211,7 +248,7 @@
             }, null);
             return iter;
         }
-        
+
         // Moves iter to the end of the paragraph it is located in
         public TextIter get_paragraph_end (TextIter iter) {
             iter.forward_find_char ((char) => {
@@ -222,121 +259,136 @@
             }, null);
             return iter;
         }
-        
+
         public TextRange get_paragraph (TextIter iter) {
             TextIter start = get_paragraph_start (iter);
             TextIter end = get_paragraph_end (iter);
-            
+
             return new TextRange (this, start, end);
         }
-        
-        
-        
-        
+
+
+
+
         /*
          * Search
          */
-        
+
         public void search (string text) {
             if (text.length > 0)
                 search_string (text);
             else
                 clear_search ();
         }
-        
+
         public void search_string (string text) {
             print ("Searching for: %s\n", text);
         }
-        
+
         public void clear_search () {
             print ("Clearing search");
         }
-        
-        
-        
+
+
+
         /*
          * Utilities
          */
-        
+
         public TextIter get_cursor () {
             TextIter iter;
             get_iter_at_mark (out iter, get_insert ());
             return iter;
         }
-        
+
         public TextRange get_cursor_as_range () {
             var cursor = get_cursor ();
             return new TextRange (this, cursor, cursor);
         }
-        
+
         public TextRange get_selection_range () {
             TextIter start; TextIter end;
             get_selection_bounds (out start, out end);
             return new TextRange (this, start, end);
         }
-        
+
         public bool iter_has_tag (TextIter iter, TextTag tag) {
             return iter.has_tag (tag) || iter.begins_tag (tag) || iter.ends_tag (tag);
         }
-        
+
         public bool iter_has_style (TextIter iter, string name) {
             var tag = tag_table.lookup (name);
             return iter_has_tag (iter, tag);
         }
-        
+
         public TextIter copy_iter (TextIter iter) {
             TextIter copy;
             get_iter_at_offset (out copy, iter.get_offset ());
             return copy;
         }
-        
-        
-        
-        
-        
+
+
+
+        private void update_styles () {
+            var iter = get_cursor();
+
+            style_bold = iter_has_style (iter, "bold");
+            style_italic = iter_has_style (iter, "italic");
+            style_underline = iter_has_style (iter, "underline");
+            style_strikethrough = iter_has_style (iter, "strikethrough");
+        }
+
         /*
          * Signal callbacks
          */
-        
+
         private void cursor_moved_callback () {
             // Emit 'cursor_moved' signal
+            update_styles ();
             cursor_moved ();
         }
-        
+
         private void text_inserted_callback (TextIter cursor, string new_text, int length) {
             TextIter previous;
             get_iter_at_offset (out previous, cursor.get_offset () - length);
-            
-            if (iter_has_style (previous, "bold"))
+
+            if (style_bold)
                 apply_tag_by_name ("bold", previous, cursor);
-            if (iter_has_style (previous, "italic"))
+            if (style_italic)
                 apply_tag_by_name ("italic", previous, cursor);
-            if (iter_has_style (previous, "underline"))
+            if (style_underline)
                 apply_tag_by_name ("underline", previous, cursor);
-            if (iter_has_style (previous, "strikethrough"))
+            if (style_strikethrough)
                 apply_tag_by_name ("strikethrough", previous, cursor);
-            
-            
+
+
             // Emit signals
             text_inserted ();
             cursor_moved ();
         }
-        
+
         private bool key_press_callback (EventKey event) {
             if (Gdk.keyval_name (event.keyval) == "Return") {
                 ModifierType modifiers = Gtk.accelerator_get_default_mod_mask ();
-                
+
                 if ((event.state & modifiers) == Gdk.ModifierType.SHIFT_MASK)
                     insert_line ();
                 else
                     insert_paragraph ();
-                
+
                 return true;
             }
-            else {                
+            else {
                 return false;
             }
         }
-    
+
+        private bool editor_clicked_callback (EventButton event) {
+            update_styles ();
+            cursor_moved ();
+
+            return false;
+        }
+
     }
-}
 \ No newline at end of file
+}
 
=== modified file 'src/Widgets/TextToolBar.vala'
--- src/Widgets/TextToolBar.vala	2014-12-07 19:18:49 +0000
+++ src/Widgets/TextToolBar.vala	2014-12-14 05:22:00 +0000
@@ -29,7 +29,7 @@
 
 namespace Writer.Widgets {
     public class TextToolBar : Gtk.Toolbar {
-    
+
         private TextEditor editor;
         public FontButton font_button;
         public ColorButton font_color_button;
@@ -42,20 +42,20 @@
         public ModeButton align_button;
         public Gtk.SeparatorToolItem item_separator;
         public Popover insert_popover;
-    
+
         public TextToolBar (TextEditor editor) {
             this.get_style_context ().add_class ("writer-toolbar");
-            
+
             this.editor = editor;
             editor.cursor_moved.connect (cursor_moved);
-    
+
             setup_ui ();
         }
-        
+
         public void setup_ui () {
-        
+
             // Make Widgets
-            
+
             var paragraph_combobox = new Gtk.ComboBoxText ();
                 paragraph_combobox.append ("Paragraph", ("Paragraph"));
                 paragraph_combobox.append ("Title", ("Title"));
@@ -67,7 +67,7 @@
                 paragraph_combobox.set_active_id ("Paragraph");
             var paragraph_item = new ToolItem ();
                 paragraph_item.add (paragraph_combobox);
-                
+
             var font_item = new ToolItem ();
                 font_button = new Gtk.FontButton ();
                 font_button.use_font = true;
@@ -80,7 +80,7 @@
 
             var font_color_item = new Gtk.ToolItem ();
                 font_color_item.add (font_color_button);
-                
+
             var styles_item = new ToolItem ();
                 var styles_buttons = new ButtonGroup ();
                     bold_button = new Gtk.ToggleButton ();
@@ -89,16 +89,19 @@
                         styles_buttons.pack_start (bold_button);
                     italic_button = new Gtk.ToggleButton ();
                         italic_button.add (new Image.from_icon_name ("format-text-italic-symbolic", Gtk.IconSize.BUTTON));
+                        italic_button.focus_on_click = false;
                         styles_buttons.pack_start (italic_button);
                     underline_button = new Gtk.ToggleButton ();
                         underline_button.add (new Image.from_icon_name ("format-text-underline-symbolic", Gtk.IconSize.BUTTON));
+                        underline_button.focus_on_click = false;
                         styles_buttons.pack_start (underline_button);
                     strikethrough_button = new Gtk.ToggleButton ();
                         strikethrough_button.add (new Image.from_icon_name ("format-text-strikethrough-symbolic", Gtk.IconSize.BUTTON));
+                        strikethrough_button.focus_on_click = false;
                         styles_buttons.pack_start (strikethrough_button);
                 styles_item.add (styles_buttons);
 
-                
+
             var align_item = new ToolItem ();
                 align_button = new ModeButton ();
                     align_button.append (new Gtk.Image.from_icon_name ("format-justify-left-symbolic", Gtk.IconSize.BUTTON));
@@ -106,7 +109,7 @@
                     align_button.append (new Gtk.Image.from_icon_name ("format-justify-right-symbolic", Gtk.IconSize.BUTTON));
                     align_button.append (new Gtk.Image.from_icon_name ("format-justify-fill-symbolic", Gtk.IconSize.BUTTON));
                 align_item.add (align_button);
-            
+
             var indent_button = new ButtonGroup ();
                 var indent_more_button = new Button.from_icon_name ("format-indent-more-symbolic", Gtk.IconSize.BUTTON);
                 var indent_less_button = new Button.from_icon_name ("format-indent-less-symbolic", Gtk.IconSize.BUTTON);
@@ -114,9 +117,9 @@
                 indent_button.add (indent_less_button);
             var indent_item = new Gtk.ToolItem ();
                 indent_item.add (indent_button);
-            
+
             item_separator = new Gtk.SeparatorToolItem ();
-            
+
             //TODO: Set 'Insert' as title, not as Entry
             //       It looks like this isn't supported by GTK+
             //       WTF!?
@@ -129,8 +132,8 @@
                 insert_menu.set_active (0);
             var insert_item = new Gtk.ToolItem ();
                 insert_item.add (insert_menu);
-            
-            
+
+
             //Set border_width on ToolItems
             paragraph_item.border_width = 5;
             font_item.border_width = 5;
@@ -139,7 +142,7 @@
             align_item.border_width = 5;
             indent_item.border_width = 5;
             insert_item.border_width = 5;
-            
+
             // Add Widgets
             this.add (paragraph_item);
             this.add (font_item);
@@ -149,15 +152,15 @@
             this.add (indent_item);
             this.add (item_separator);
             this.add (insert_item);
-            
-            
-            
+
+
+
             // Connect signals
-            
+
             align_button.mode_changed.connect (() => {
                 change_align (align_button.selected);
             });
-            
+
             font_button.font_set.connect (() => {
                 editor.set_font_from_string (font_button.get_font_name ());
             });
@@ -166,7 +169,7 @@
                 font_color_button.get_color (out color);
                 editor.set_font_color (color);
             });
-            
+
             bold_button.button_press_event.connect ((event) => {
                 if (event.type == EventType.BUTTON_PRESS)
                     editor.toggle_style ("bold");
@@ -187,16 +190,16 @@
                     editor.toggle_style ("strikethrough");
                 return false;
             });
-            
+
         }
-        
-        
-        
-        
+
+
+
+
         /*
          * Signal callbacks
          */
-        
+
         public void change_align (int index) {
             switch (index) {
                 case 1:
@@ -209,15 +212,15 @@
                     editor.set_justification ("left"); break;
             }
         }
-         
+
         public void cursor_moved () {
             bold_button.active = editor.has_style ("bold");
             italic_button.active = editor.has_style ("italic");
             underline_button.active = editor.has_style ("underline");
             strikethrough_button.active = editor.has_style ("strikethrough");
-            
+
             align_button.selected = editor.get_justification_as_int ();
-            
+
             //TODO
             // Update font and color buttons
         }