Merge lp:~artem-anufrij/scratch/Bugfix-1193676 into lp:~elementary-apps/scratch/scratch

[Artem Anufrij]

Zooming (ctrl + scroll, or ctrl +/-) implemented.

Zooming (ctrl + scroll, or ctrl +/-)

[Danielle Foré (danrabbit)]

There's no easy way to get back to the default zoom level. I would suggest a tool item with the icon "zoom-original" be added to the right side of the header bar whenever the zoom level is not the default.

If I open preferences, turn off "custom font" and then try to zoom, Scratch will freeze.

review: Needs Fixing

[Corentin Noël (tintou)]

Working fine here

review: Approve (code)

[Shawn McTear (syst3mfailur3)]

For reseting to default zoom, why not add ctrl+0, as thats already the keyboard shortcut in browsers.

Note: Haven't tested code.

[lp:~artem-anufrij/scratch/Bugfix-1193676]

1409. By artem-anufrij on 2014-10-27

add zoom-original button

[Danielle Foré (danrabbit)]

Crash fixed and zoom button present.

If I have a custom font set, hitting the zoom button also resets the font family. It should only reset the font size.

I'm not sure "Default font" is a great tooltip. How about just "Zoom 1:1"

[lp:~artem-anufrij/scratch/Bugfix-1193676]

1410. By artem-anufrij on 2014-10-27

ctrl+0 added

1411. By artem-anufrij on 2014-10-27

Tooltip changed

[Artem Anufrij (artem-anufrij)]

Tooltip: "Zoom 1:1"

added Ctrl+0 for reset zoom

[lp:~artem-anufrij/scratch/Bugfix-1193676]

1412. By artem-anufrij on 2014-10-28

font familiy will not be reset on zoom 1:1

[Artem Anufrij (artem-anufrij)]

font familiy will not be reset on zoom 1:1

[lp:~artem-anufrij/scratch/Bugfix-1193676]

1413. By artem-anufrij on 2014-10-28

compare only font size for visiblity of zoom 1:1 button

[Danielle Foré (danrabbit)]

Works as expected :) Needs another code review since changes were made

review: Approve (ux)

[lp:~artem-anufrij/scratch/Bugfix-1193676]

1414. By artem-anufrij on 2014-10-29

break;

1415. By artem-anufrij on 2014-10-29

solved conflict

[Robert Roth (evfool)]

Clean code, two minor issues noted inline.

review: Approve (code style)

[lp:~artem-anufrij/scratch/Bugfix-1193676]

1416. By artem-anufrij on 2014-10-30

space between conversion and method name added

[Artem Anufrij (artem-anufrij)]

@Robert:

done...

review: Approve

=== modified file 'src/MainWindow.vala'
--- src/MainWindow.vala	2014-10-29 21:19:58 +0000
+++ src/MainWindow.vala	2014-10-30 19:07:02 +0000
@@ -32,6 +32,9 @@
 namespace Scratch {
 
     public class MainWindow : Gtk.Window {
+        public int FONT_SIZE_MAX = 72;
+        public int FONT_SIZE_MIN = 7;
+
         public weak ScratchApp app;
 
         // Widgets
@@ -195,13 +198,13 @@
                         toolbar_title = "(%s)".printf (doc.get_basename ());
 
                     this.toolbar.title = toolbar_title;
-                }
-                else {
+                } else {
                     this.toolbar.title = this.app.app_cmd_name;
                 }
                 // Set actions sensitive property
                 main_actions.get_action ("SaveFile").visible = (!settings.autosave || doc.file == null);
                 main_actions.get_action ("SaveFileAs").visible = (doc.file != null);
+                main_actions.get_action ("Zoom").visible = get_current_font_size () != get_default_font_size ();
                 doc.check_undoable_actions ();
             });
 
@@ -516,7 +519,76 @@
             update_opened_files ();
         }
 
+        public void set_default_zoom () {
+            Scratch.settings.font = get_current_font () + " " + get_default_font_size ().to_string ();
+        }
+
+        // Ctrl + scroll
+        public void zoom_in () {
+             zooming (ScrollDirection.UP);
+        }
+
+        // Ctrl + scroll
+        public void zoom_out () {
+            zooming (ScrollDirection.DOWN);
+        }
+
+        void zooming (ScrollDirection direction) {
+
+            string font = get_current_font ();
+            int font_size = (int) get_current_font_size ();
+
+            if (Scratch.settings.use_system_font) {
+
+                Scratch.settings.use_system_font = false;
+
+                font = get_default_font ();
+                font_size = (int) get_default_font_size ();
+            }
+
+
+            if (direction == ScrollDirection.DOWN) {
+                font_size --;
+                if (font_size < FONT_SIZE_MIN)
+                    return;
+            } else if (direction  == ScrollDirection.UP) {
+                font_size ++;
+                if (font_size > FONT_SIZE_MAX)
+                    return;
+            }
+
+            string new_font = font + " " + font_size.to_string ();
+            Scratch.settings.font = new_font;
+        }
+
+        public string get_current_font () {
+            string font = Scratch.settings.font;
+            string font_family = font.substring (0, font.last_index_of (" "));
+            return font_family;
+        }
+
+        public double get_current_font_size () {
+            string font = Scratch.settings.font;
+            string font_size = font.substring (font.last_index_of (" ") + 1);
+            return double.parse (font_size);
+        }
+
+        public string get_default_font () {
+            string font = app.default_font;
+            string font_family = font.substring (0, font.last_index_of (" "));
+            return font_family;
+        }
+
+        public double get_default_font_size () {
+            string font = app.default_font;
+            string font_size = font.substring (font.last_index_of (" ") + 1);
+            return double.parse (font_size);
+        }
+
         // Actions functions
+        void action_set_default_zoom () {
+            set_default_zoom ();
+        }
         void action_preferences () {
             var dialog = new Scratch.Dialogs.Preferences (this, plugins);
             dialog.show_all ();
@@ -773,6 +845,10 @@
           /* label, accelerator */       N_("Clipboard"), null,
           /* tooltip */                  N_("New file from Clipboard"),
                                          action_new_tab_from_clipboard },
+           { "Zoom", "zoom-original",
+          /* label, accelerator */       N_("Zoom"), "<Control>0",
+          /* tooltip */                  N_("Zoom 1:1"),
+                                         action_set_default_zoom },
            { "SaveFile", "document-save",
           /* label, accelerator */       N_("Save"), "<Control>s",
           /* tooltip */                  N_("Save this file"),

=== modified file 'src/Scratch.vala'
--- src/Scratch.vala	2014-10-11 22:32:35 +0000
+++ src/Scratch.vala	2014-10-30 19:07:02 +0000
@@ -35,6 +35,7 @@
 
         public string app_cmd_name { get { return _app_cmd_name; } }
         public string data_home_folder_unsaved { get { return _data_home_folder_unsaved; } }
+        public string default_font { get; set; }
         private static string _app_cmd_name;
         private static string _data_home_folder_unsaved;
         private static string _cwd;
@@ -87,6 +88,7 @@
             Logger.DisplayLevel = LogLevel.DEBUG;
 
             // Init settings
+            default_font = new GLib.Settings ("org.gnome.desktop.interface").get_string ("monospace-font-name");
             saved_state = new SavedState ();
             settings = new Settings ();
             services = new ServicesSettings ();

=== modified file 'src/Widgets/SourceView.vala'
--- src/Widgets/SourceView.vala	2014-08-05 12:33:36 +0000
+++ src/Widgets/SourceView.vala	2014-10-30 19:07:02 +0000
@@ -40,13 +40,13 @@
         private uint selection_changed_timer = 0;
         private TextIter last_select_start_iter;
         private TextIter last_select_end_iter;
-        
-        
-        // Consts        
+
+
+        // Consts
         // Pause after end user highlighting to confirm select,in ms
-        private const uint SELECTION_CHANGED_PAUSE = 400; 
-        
-        
+        private const uint SELECTION_CHANGED_PAUSE = 400;
+
+
         // Signals
         public signal void style_changed (SourceStyleScheme style);
         public signal void language_changed (SourceLanguage language);
@@ -84,6 +84,43 @@
             // Settings
             restore_settings ();
             settings.changed.connect (restore_settings);
+
+            this.scroll_event.connect ((key_event) => {
+                if ((Gdk.ModifierType.CONTROL_MASK in key_event.state) && key_event.delta_y < 0) {
+                    Scratch.ScratchApp.instance.get_last_window ().zoom_in ();
+                    return true;
+                } else if ((Gdk.ModifierType.CONTROL_MASK in key_event.state) && key_event.delta_y > 0) {
+                    Scratch.ScratchApp.instance.get_last_window ().zoom_out ();
+                    return true;
+                }
+
+                return false;
+            });
+
+            this.key_press_event.connect ((key_event) => {
+                switch (key_event.keyval) {
+                    case Gdk.Key.plus:
+                        if (Gdk.ModifierType.CONTROL_MASK in key_event.state) {
+                            Scratch.ScratchApp.instance.get_last_window ().zoom_in ();
+                            return true;
+                        }
+                        break;
+                    case Gdk.Key.minus:
+                        if (Gdk.ModifierType.CONTROL_MASK in key_event.state) {
+                            Scratch.ScratchApp.instance.get_last_window ().zoom_out ();
+                            return true;
+                        }
+                        break;
+                    case 0x30:
+                        if (Gdk.ModifierType.CONTROL_MASK in key_event.state) {
+                            Scratch.ScratchApp.instance.get_last_window ().set_default_zoom ();
+                            return true;
+                        }
+                        break;
+                }
+
+                return false;
+            });
         }
 
         ~SourceView () {
@@ -143,9 +180,7 @@
             if (!value) // if false, simply return null
                 return;
 
-            var settings = new GLib.Settings ("org.gnome.desktop.interface");
-            this.font = settings.get_string ("monospace-font-name");
-
+            this.font = ScratchApp.instance.default_font;
         }
 
         public void change_syntax_highlight_from_file (File file) {
@@ -197,7 +232,7 @@
             override_font (Pango.FontDescription.from_string (this.font));
 
             buffer.style_scheme = style_scheme_manager.get_scheme (Scratch.settings.style_scheme);
-        
+
             this.style_changed (buffer.style_scheme);
         }
 
@@ -211,7 +246,7 @@
             Scratch.settings.indent_width = (int) tab_width;
             Scratch.settings.font = this.font;
             Scratch.settings.style_scheme = buffer.style_scheme.id;
-            
+
             this.style_changed (buffer.style_scheme);
         }
 
@@ -270,44 +305,44 @@
             buffer.get_start_iter (out start);
             buffer.place_cursor (start);
         }
-        
+
         public void set_language (SourceLanguage lang) {
             this.buffer.set_language (lang);
             this.language_changed (lang);
         }
-        
-        
+
+
         void on_mark_set (TextIter loc,TextMark mar) {
             // Weed out user movement for text selection changes
             TextIter start, end;
             this.buffer.get_selection_bounds (out start,out end);
-            
+
             if (start == last_select_start_iter && end == last_select_end_iter)
                 return;
-                                                
+
             if (selection_changed_timer !=0 &&
                 MainContext.get_thread_default ().find_source_by_id (selection_changed_timer) != null)
                 Source.remove (selection_changed_timer);
-            
+
             // Fire deselected immediatly
             if (!this.buffer.get_has_selection ())
                 deselected ();
             // Don't fire signal till we think select movement is done
             else
                 selection_changed_timer = Timeout.add (SELECTION_CHANGED_PAUSE, selection_changed_event);
-            
+
         }
-        
+
         bool selection_changed_event () {
             TextIter start, end;
             bool selected = this.buffer.get_selection_bounds (out start,out end);
             if (selected)
-                selection_changed (start,end);        
+                selection_changed (start,end);
             else
-                deselected ();                    
+                deselected ();
             return false;
         }
 
     }
 
-}
+}
\ No newline at end of file

=== modified file 'src/Widgets/ToolBar.vala'
--- src/Widgets/ToolBar.vala	2014-10-11 22:32:35 +0000
+++ src/Widgets/ToolBar.vala	2014-10-30 19:07:02 +0000
@@ -31,6 +31,7 @@
         public ToolButton save_as_button;
         public ToolButton revert_button;
         public ToolButton find_button;
+        public ToolButton zoom_default;
 
         public Gtk.Menu share_menu;
         public Gtk.Menu menu;
@@ -50,6 +51,7 @@
             save_as_button = main_actions.get_action ("SaveFileAs").create_tool_item () as Gtk.ToolButton;
             revert_button = main_actions.get_action ("Revert").create_tool_item () as Gtk.ToolButton;
             find_button = main_actions.get_action ("Fetch").create_tool_item () as Gtk.ToolButton;
+            zoom_default = main_actions.get_action ("Zoom").create_tool_item () as Gtk.ToolButton;
 
             // Create Share and AppMenu
             share_menu = new Gtk.Menu ();
@@ -89,8 +91,9 @@
             pack_start (revert_button);
             pack_start (new SeparatorToolItem ());
             pack_start (find_button);
-
+           
             pack_end (share_app_menu);
+            pack_end (zoom_default);
 
             // Show/Hide widgets
             show_all ();
@@ -98,6 +101,7 @@
             // Some signals...
             settings.changed.connect (() => {
                 save_button.visible = !settings.autosave;
+                zoom_default.visible = ScratchApp.instance.get_last_window ().get_default_font_size () != ScratchApp.instance.get_last_window ().get_current_font_size ();
             });
 
         }