resolve build conflicts

Add pt_PT translation

.travis.yml

@@ -0,0 +1,29 @@
+---
+
+language: node_js
+
+node_js:
+  - lts/*
+
+sudo: required
+
+services:
+  - docker
+
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - libstdc++-5-dev
+
+cache:
+  directories:
+    - /tmp/liftoff
+
+install:
+  - npm install @elementaryos/houston
+
+script:
+  - houston ci
+    --name-human Color Picker

README.md

@@ -27,11 +27,5 @@ You'll need the following dependencies to build:
 * valac
 
 ## Build, Install and Run
-Call in the project's root folder:
-
-    meson build && cd build
-    mesonconf -Dprefix=/usr
-    ninja
-    sudo ninja install
-    com.github.ronnydo.colorpicker
+If you like to build it by your own, have a look into the dev-build.sh file.
 

data/com.github.ronnydo.colorpicker.appdata.xml

@@ -22,7 +22,31 @@
 	<category>Development</category>
   </categories>
   <releases>
-	​<release version="1.0.3" date="2018-04-27" urgency="medium">
+  	​<release version="1.1.2" date="2019-01-02" urgency="medium">
+  	​  <description>
+  	    <ul>
+  		  <li>Juno Release!!1! (finally)</li>
+  		  <li>"Olá em português" (Translation by @drom98)</li>
+  		</ul>
+  	  </description>
+  	​</release>
+  	​<release version="1.0.5" date="2018-04-27" urgency="medium">
+  	​  <description>
+  	    <ul>
+  		  <li>Implement 'close with right-mouse-button' feature (issue #27)</li>
+  		  <li>Update icon</li>
+  		  <li>Add French, Spanish and Catalan translation</li>
+  		</ul>
+  	  </description>
+  	​</release>
+	​<release version="1.0.4" date="2018-04-27" urgency="medium">
+	​  <description>
+	    <ul>
+		  <li>fix version conflict</li>
+		</ul>
+	  </description>
+	​</release>
+	​<release version="1.0.3" date="2018-04-26" urgency="medium">
 	​  <description>
 	    <ul>
 		  <li>Implement 'close with right-mouse-button' feature (issue #27)</li>

debian/changelog

@@ -1,22 +1,43 @@
-com.github.ronnydo.colorpicker (1.0.3) xenial; urgency=low
+com.github.ronnydo.colorpicker (1.1.2) bionic; urgency=medium
+
+  * Juno Release!!1! (finally)
+  * "Olá em português" (Translation by @drom98)
+  
+ -- Ronny Dobra <ronnydobra@arcor.de>  Thu, 02 Jan 2019 20:31:00 +0100
+
+com.github.ronnydo.colorpicker (1.0.5) xenial; urgency=medium
 
   * Implement 'close with right-mouse-button' feature (issue #27)
   * Update icon
   * Add French, Spanish and Catalan translation
   
- -- Ronny Dobra <ronnydobra at arcor dot de>  Thu, 27 Apr 2017 13:31:00 +0100
+ -- Ronny Dobra <ronnydobra@arcor.de>  Thu, 27 Apr 2018 18:31:00 +0100
+ 
+com.github.ronnydo.colorpicker (1.0.4) xenial; urgency=medium
+
+  * fix version conflicts
+  
+ -- Ronny Dobra <ronnydobra@arcor.de>  Thu, 27 Apr 2018 13:31:00 +0100
+ 
+com.github.ronnydo.colorpicker (1.0.3) xenial; urgency=medium
+
+  * Implement 'close with right-mouse-button' feature (issue #27)
+  * Update icon
+  * Add French, Spanish and Catalan translation
+  
+ -- Ronny Dobra <ronnydobra@arcor.de>  Thu, 26 Apr 2018 13:31:00 +0100
  
 com.github.ronnydo.colorpicker (1.0.2) xenial; urgency=medium
 
   * Implement "Don't add the same color to color history twice" (issue #24)
   
- -- Ronny Dobra <ronnydobra at arcor dot de>  Thu, 20 Aug 2017 13:30:00 +0100
+ -- Ronny Dobra <ronnydobra@arcor.de>  Thu, 20 Aug 2017 13:30:00 +0100
 
 com.github.ronnydo.colorpicker (1.0.1) xenial; urgency=medium
 
   * Improvements to avoid issue #19
   
- -- Ronny Dobra <ronnydobra at arcor dot de>  Thu, 13 Jul 2017 01:45:00 +0100
+ -- Ronny Dobra <ronnydobra@arcor.de>  Thu, 13 Jul 2017 01:45:00 +0100
 
 com.github.ronnydo.colorpicker (1.0.0) xenial; urgency=medium
 
@@ -26,38 +47,38 @@ com.github.ronnydo.colorpicker (1.0.0) xenial; urgency=medium
   * Invalid AppData file (issue #17)
   * Code cleanup
   
- -- Ronny Dobra <ronnydobra at arcor dot de>  Thu, 07 Jul 2017 12:00:00 +0100
+ -- Ronny Dobra <ronnydobra@arcor.de>  Thu, 07 Jul 2017 12:00:00 +0100
 
 com.github.ronnydo.colorpicker (0.9.5) xenial; urgency=medium
 
   * Fix issue #13
   
- -- Ronny Dobra <ronnydobra at arcor dot de>  Thu, 27 Jun 2017 23:20:00 +0100
+ -- Ronny Dobra <ronnydobra@arcor.de>  Thu, 27 Jun 2017 23:20:00 +0100
 
 com.github.ronnydo.colorpicker (0.9.4) xenial; urgency=medium
 
   * Fix issue #16
   
- -- Ronny Dobra <ronnydobra at arcor dot de>  Thu, 26 Jun 2017 23:10:00 +0100
+ -- Ronny Dobra <ronnydobra@arcor.de>  Thu, 26 Jun 2017 23:10:00 +0100
 
 com.github.ronnydo.colorpicker (0.9.3) xenial; urgency=medium
 
   * Color Picker now restores your recent window position, color format and color history! (issue #10, issue #11 and issue #15)
   * Minor icon changes
   
- -- Ronny Dobra <ronnydobra at arcor dot de>  Thu, 26 Jun 2017 22:45:00 +0100
+ -- Ronny Dobra <ronnydobra@arcor.de>  Thu, 26 Jun 2017 22:45:00 +0100
 
 com.github.ronnydo.colorpicker (0.9.2) xenial; urgency=medium
 
   * Fix issue #9
   
- -- Ronny Dobra <ronnydobra at arcor dot de>  Thu, 23 Jun 2017 17:15:00 +0100
+ -- Ronny Dobra <ronnydobra@arcor.de>  Thu, 23 Jun 2017 17:15:00 +0100
 
 com.github.ronnydo.colorpicker (0.9.1) xenial; urgency=medium
 
   * Fix issue #8
   
- -- Ronny Dobra <ronnydobra at arcor dot de>  Thu, 23 Jun 2017 09:45:00 +0100
+ -- Ronny Dobra <ronnydobra@arcor.de>  Thu, 23 Jun 2017 09:45:00 +0100
 
 com.github.ronnydo.colorpicker (0.9.0) xenial; urgency=medium
 
@@ -69,28 +90,28 @@ com.github.ronnydo.colorpicker (0.9.0) xenial; urgency=medium
   * Update icons
   * Add German translation
 
- -- Ronny Dobra <ronnydobra at arcor dot de>  Thu, 22 Jun 2017 23:02:00 +0100
+ -- Ronny Dobra <ronnydobra@arcor.de>  Thu, 22 Jun 2017 23:02:00 +0100
 
 com.github.ronnydo.colorpicker (0.1.2) xenial; urgency=low
 
   * Fix build information
 
- -- Ronny Dobra <ronnydobra at arcor dot de>  Thu, 21 Jun 2017 19:22:00 +0100
+ -- Ronny Dobra <ronnydobra@arcor.de>  Thu, 21 Jun 2017 19:22:00 +0100
  
 com.github.ronnydo.colorpicker (0.1.1) xenial; urgency=low
 
   * Added debian files and logo files
 
- -- Ronny Dobra <ronnydobra at arcor dot de>  Thu, 19 Jun 2017 00:44:00 +0100
+ -- Ronny Dobra <ronnydobra@arcor.de>  Thu, 19 Jun 2017 00:44:00 +0100
   
 com.github.ronnydo.colorpicker (0.1.0) xenial; urgency=low
 
   * First official release
 
- -- Ronny Dobra <ronnydobra at arcor dot de>  Thu, 15 Jun 2017 13:21:00 +0100
+ -- Ronny Dobra <ronnydobra@arcor.de>  Thu, 15 Jun 2017 13:21:00 +0100
  
 com.github.ronnydo.colorpicker (0.0.1) xenial; urgency=low
 
   * Release Test
 
- -- Ronny Dobra <ronnydobra at arcor dot de>  Thu, 15 Jun 2017 12:59:00 +0100
+ -- Ronny Dobra <ronnydobra@arcor.de>  Thu, 15 Jun 2017 12:59:00 +0100

debian/control

@@ -1,7 +1,7 @@
 Source: com.github.ronnydo.colorpicker
 Section: x11
 Priority: extra
-Maintainer: Ronny Dobra <ronnydobra at arcor dot de>
+Maintainer: Ronny Dobra <ronnydobra@arcor.de>
 Build-Depends: debhelper (>= 9),
                libgranite-dev,
                libgtk-3-dev,

dev-build.sh

@@ -1,7 +1,9 @@
 sudo rm -r build
 meson build
 cd build
-mesonconf -Dprefix=/usr
+meson configure -Dprefix=/usr
 ninja
+sudo cp ../data/com.github.ronnydo.colorpicker.gschema.xml /usr/share/glib-2.0/schemas/
+sudo glib-compile-schemas /usr/share/glib-2.0/schemas/
 ./com.github.ronnydo.colorpicker
 cd ..

po/LINGUAS

@@ -1 +1,5 @@
-ca de es fr
+ca 
+de 
+es 
+fr 
+pt_PT

po/pt_PT.po

@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the com.github.danrabbit.nimbus package.
+# Diogo Oliveira <https://github.com/drom98>, YEAR.
+#
+#, fuzzy
+
+msgid ""
+msgstr ""
+"Project-Id-Version: com.github.ronnydo.colorpicker\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-06-21 20:40-0700\n"
+"PO-Revision-Date: 2018-08-27 HO:MI+ZONE\n"
+"Last-Translator: Diogo Oliveira <https://github.com/drom98>\n"
+"Language-Team: Portuguese <LL@li.org>\n"
+"Language: pt_PT\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Color Picker"
+msgstr "Color Picker"
+
+
+msgid "Pick Color"
+msgstr "Selecionar Cor"
+
+
+msgid "Format"
+msgstr "Formato"
+
+msgid "Color History"
+msgstr "Histórico de Cores"

src/ColorPickerWindow.vala

@@ -85,7 +85,7 @@ namespace ColorPicker {
             color_format_combobox.append_text ("rgba");
             color_format_combobox.append_text ("Gdk RGBA");
             color_format_combobox.append_text ("Qt rgba");
-            color_format_combobox.active = settings.color_format_index;
+            color_format_combobox.active =  settings.color_format_index;
             
             var adjust_button = new Gtk.Button.from_icon_name ("media-eq-symbolic");
             adjust_button.margin_start = 12;

src/Widgets/Picker.vala

@@ -34,6 +34,9 @@ namespace ColorPicker.Widgets {
         const string bright_border_color_string = "#FFFFFF";
         private Gdk.RGBA bright_border_color = Gdk.RGBA();
         
+        private int mouse_pos_x = 0;        
+        private int mouse_pos_y = 0;
+        
         // 1. Snapsize is the amount of pixel going to be magnified by the zoomlevel.
         // 2. The snapsize must be odd to have a 1px magnifier center.
         // 3. Asure that snapsize*max_zoomlevel+shadow_width*2 is smaller than 2 * get_screen ().get_display ().get_maximal_cursor_size()
@@ -77,9 +80,11 @@ namespace ColorPicker.Widgets {
 
         
         public override bool button_release_event (Gdk.EventButton e) {
+            // button_1 is left mouse button
             if (e.button == 1) {
                 Gdk.RGBA color = get_color_at ((int) e.x_root, (int) e.y_root);
                 picked (color);
+            // button_3 is right mouse button
             } else if (e.button == 3) {
                 cancelled ();
             }
@@ -93,8 +98,9 @@ namespace ColorPicker.Widgets {
        }
 
 
-        public override bool motion_notify_event (Gdk.EventMotion e) {        
+        public override bool motion_notify_event (Gdk.EventMotion e) {  
             Gdk.RGBA color = get_color_at ((int) e.x_root, (int) e.y_root);
+            
             moved (color);
             
             set_magnifier_cursor ();
@@ -237,10 +243,32 @@ namespace ColorPicker.Widgets {
 
 
         public override bool key_press_event (Gdk.EventKey e) {
-            if (e.keyval == Gdk.Key.Escape) {
-                cancelled ();
+            int px, py;
+            get_pointer (out px, out py);
+            var manager = Gdk.Display.get_default ().get_device_manager ();
+                            
+            switch (e.keyval) {
+                case Gdk.Key.Escape:
+                    cancelled ();
+                    break;
+                case Gdk.Key.Return:
+                    Gdk.RGBA color = get_color_at (px, py);
+                    picked (color);
+                    break;
+                case Gdk.Key.Up:
+                    manager.get_client_pointer ().warp (get_screen (), px, py - 1);
+                    break;
+                case Gdk.Key.Down:
+                    manager.get_client_pointer ().warp (get_screen (), px, py + 1);
+                    break;
+                case Gdk.Key.Left:
+                    manager.get_client_pointer ().warp (get_screen (), px - 1, py);
+                    break;
+                case Gdk.Key.Right:
+                    manager.get_client_pointer ().warp (get_screen (), px + 1, py);
+                    break;
             }
-
+           
             return true;            
         }