Merge lp:~tintou/eidete/eidete into lp:eidete

[Corentin Noël]

Support for HiDPI
Fixed broken translation

=== modified file 'src/Widgets/selectionarea.vala'
--- src/Widgets/selectionarea.vala	2015-01-06 13:29:27 +0000
+++ src/Widgets/selectionarea.vala	2016-12-31 18:23:09 +0000
@@ -57,43 +57,49 @@
             });
 
             this.configure_event.connect ((e) => {
-                var screen_width = Gdk.Screen.width ();
-                var screen_height = Gdk.Screen.height ();
+                var scale = get_scale_factor ();
+                var screen_width = Gdk.Screen.width () * scale;
+                var screen_height = Gdk.Screen.height () * scale;
+
+                var e_x = e.x * scale;
+                var e_y= e.y * scale;
+                var e_width = e.width * scale;
+                var e_height = e.height * scale;
 
                 // check if coordinates are out of the screen and check
                 // if coordinate + width/height is out of the screen, then
                 // adjust coordinates to keep width and height (and aspect
                 // ratio) intact
 
-                if (e.x < 0 || e.x > screen_width) {
+                if (e_x < 0 || e_x > screen_width) {
                     x = 0;
-                } else if (e.x + e.width > screen_width && e.width < screen_width) {
-                    x = screen_width - e.width;
+                } else if (e_x + e_width > screen_width && e_width < screen_width) {
+                    x = screen_width - e_width;
                 } else {
-                    x = e.x;
+                    x = e_x;
                 }
 
-                if (e.y < 0) {
+                if (e_y < 0) {
                     y = 0;
-                } else if (e.y + e.height >= screen_height && e.height < screen_height) {
-                    y = screen_height - e.height - 1;
+                } else if (e_y + e_height >= screen_height && e_height < screen_height) {
+                    y = screen_height - e_height - 1;
                 } else {
-                    y = e.y;
+                    y = e_y;
                 }
 
                 // just in case an edge is still outside of the screen
                 // we'll modify the width/height if thats the case
 
-                if (x + e.width > screen_width) {
+                if (x + e_width > screen_width) {
                     w = screen_width - x;
                 } else {
-                    w = e.width;
+                    w = e_width;
                 }
 
-                if (y + e.height > screen_height) {
+                if (y + e_height > screen_height) {
                     h = screen_height - y;
                 } else {
-                    h = e.height;
+                    h = e_height;
                 }
 
                 geometry_changed (x, y, w, h);
 
=== modified file 'src/eidete.vala'
--- src/eidete.vala	2015-01-20 22:36:51 +0000
+++ src/eidete.vala	2016-12-31 18:23:09 +0000
@@ -115,6 +115,7 @@
         public void start_and_build () {
             Gtk.Settings.get_default ().gtk_application_prefer_dark_theme = true;
 
+            this.screen = Gdk.Screen.get_default ();
             this.main_window = new Gtk.Window ();
             this.main_window.icon_name = exec_name;
             this.main_window.set_application (this);
@@ -147,21 +148,23 @@
             var monitors_combo = new Gtk.ComboBoxText ();
             monitors_combo.hexpand = true;
 
-            for (var i = 0; i < Gdk.Screen.get_default ().get_n_monitors (); i++) {
+            for (var i = 0; i < screen.get_n_monitors (); i++) {
                 // TODO proper translation here
                 monitors_combo.append (i.to_string (), _("Monitor") + " " + (i + 1).to_string ());
             }
 
             monitors_combo.active = 0;
 
-            if (Gdk.Screen.get_default ().get_n_monitors () == 1)
+            if (screen.get_n_monitors () == 1)
                 monitors_combo.set_sensitive (false);
 
-            var width = new Gtk.SpinButton.with_range (50, Gdk.Screen.get_default ().get_width (), 1);
+            var primary = screen.get_primary_monitor ();
+            var scale = screen.get_monitor_scale_factor (primary);
+            var width = new Gtk.SpinButton.with_range (50, screen.get_width () * scale, 1);
             width.max_length = 4;
             width.margin_left = 1;
 
-            var height = new Gtk.SpinButton.with_range (50, Gdk.Screen.get_default ().get_height (), 1);
+            var height = new Gtk.SpinButton.with_range (50, screen.get_height () * scale, 1);
             height.max_length = 4;
             height.margin_left = 1;
             width.set_sensitive (false);
@@ -204,18 +207,18 @@
             mouse.margin_top = 12;
 
             grid.attach (sound, 0, 0, 1, 1);
-            grid.attach (new LLabel.right (_("Record Computer Sounds") + ":"), 0, 1, 1, 1);
+            grid.attach (new LLabel.right (_("Record Computer Sounds:")), 0, 1, 1, 1);
             grid.attach (use_comp_sounds, 1, 1, 1, 1);
-            grid.attach (new LLabel.right (_("Record from Microphone") + ":"), 0, 2, 1, 1);
+            grid.attach (new LLabel.right (_("Record from Microphone:")), 0, 2, 1, 1);
             grid.attach (audio_box, 1, 2, 1, 1);
             grid.attach ((video), 0, 3, 2, 1);
-            grid.attach (new LLabel.right ("        " + _("Record from Monitor") + ":"), 0, 4, 1, 1);
+            grid.attach (new LLabel.right (_("Record from Monitor:")), 0, 4, 1, 1);
             grid.attach (monitors_combo, 1, 4, 1, 1);
-            grid.attach (new LLabel.right (_("Recording Area") + ":"), 0, 5, 1, 1);
+            grid.attach (new LLabel.right (_("Recording Area:")), 0, 5, 1, 1);
             grid.attach (recordingarea_combo, 1, 5, 1, 1);
-            grid.attach (new LLabel.right (_("Width") + ":"), 0, 6, 1, 1);
+            grid.attach (new LLabel.right (_("Width:")), 0, 6, 1, 1);
             grid.attach (width, 1, 6, 1, 1);
-            grid.attach (new LLabel.right (_("Height") + ":"), 0, 7, 1, 1);
+            grid.attach (new LLabel.right (_("Height:")), 0, 7, 1, 1);
             grid.attach (height, 1, 7, 1, 1);
 
             // grid2
@@ -237,12 +240,12 @@
             circle_box.pack_start (circle_color);
 
             grid2.attach ((keyboard), 0, 0, 1, 1);
-            grid2.attach (new LLabel.right (_("Pressed keys on screen") + ":"), 0, 1, 1, 1);
+            grid2.attach (new LLabel.right (_("Pressed keys on screen:")), 0, 1, 1, 1);
             grid2.attach (use_keyview, 1, 1, 1, 1);
             grid2.attach ((mouse), 0, 2, 1, 1);
-            grid2.attach (new LLabel.right (_("Mouse clicks on screen") + ":"), 0, 3, 1, 1);
+            grid2.attach (new LLabel.right (_("Mouse clicks on screen:")), 0, 3, 1, 1);
             grid2.attach (use_clickview, 1, 3, 1, 1);
-            grid2.attach (new LLabel.right (_("Circle around the cursor") + ":"), 0, 4, 1, 1);
+            grid2.attach (new LLabel.right (_("Circle around the cursor:")), 0, 4, 1, 1);
             grid2.attach (circle_box, 1, 4, 1, 1);
             grid2.column_spacing = 12;
             grid2.row_spacing = 6;
@@ -307,27 +310,28 @@
                 count.start (this);
             });
 
-            this.screen = Gdk.Screen.get_default ();
             settings.monitor = 0;
             monitors_combo.changed.connect (() => {
                 settings.monitor = int.parse (monitors_combo.active_id);
 
-                this.screen.get_monitor_geometry(settings.monitor, out this.monitor_rec);
+                this.screen.get_monitor_geometry (settings.monitor, out this.monitor_rec);
+                var _scale = screen.get_monitor_scale_factor (settings.monitor);
 
-                settings.sx = this.monitor_rec.x;
-                settings.sy = this.monitor_rec.y;
-                settings.ex = settings.sx + this.monitor_rec.width - 1;
-                settings.ey = settings.sy + this.monitor_rec.height - 1;
+                settings.sx = this.monitor_rec.x * _scale;
+                settings.sy = this.monitor_rec.y * _scale;
+                settings.ex = settings.sx + this.monitor_rec.width * _scale - 1;
+                settings.ey = settings.sy + this.monitor_rec.height * _scale - 1;
             });
 
             settings.monitor = int.parse (monitors_combo.active_id);
 
             this.screen.get_monitor_geometry (settings.monitor, out this.monitor_rec);
+            scale = screen.get_monitor_scale_factor (settings.monitor);
 
-            settings.sx = this.monitor_rec.x;
-            settings.sy = this.monitor_rec.y;
-            settings.ex = settings.sx + this.monitor_rec.width - 1;
-            settings.ey = settings.sy + this.monitor_rec.height - 1;
+            settings.sx = this.monitor_rec.x * scale;
+            settings.sy = this.monitor_rec.y * scale;
+            settings.ex = settings.sx + this.monitor_rec.width * scale - 1;
+            settings.ey = settings.sy + this.monitor_rec.height * scale - 1;
 
             recordingarea_combo.changed.connect (() => {
                 if (recordingarea_combo.active_id != "full"){
@@ -359,11 +363,12 @@
                     settings.monitor = int.parse (monitors_combo.active_id);
 
                     this.screen.get_monitor_geometry (settings.monitor, out this.monitor_rec);
+                    var _scale = screen.get_monitor_scale_factor (settings.monitor);
 
-                    settings.sx = this.monitor_rec.x;
-                    settings.sy = this.monitor_rec.y;
-                    settings.ex = settings.sx + this.monitor_rec.width - 1;
-                    settings.ey = settings.sy + this.monitor_rec.height - 1;
+                    settings.sx = this.monitor_rec.x * _scale;
+                    settings.sy = this.monitor_rec.y * _scale;
+                    settings.ex = settings.sx + this.monitor_rec.width * _scale - 1;
+                    settings.ey = settings.sy + this.monitor_rec.height * _scale - 1;
 
                     width.set_sensitive (false);
                     height.set_sensitive (false);