fix minor config issues

Added Turkish translation

.gitignore

@@ -0,0 +1,3 @@
+build
+~*
+*~

.travis.yml

@@ -0,0 +1,28 @@
+---
+
+language: node_js
+
+node_js:
+  - 10/*
+
+sudo: required
+
+services:
+  - docker
+
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - libstdc++-5-dev
+
+cache:
+  directories:
+    - /tmp/liftoff
+
+install:
+  - npm i -g @elementaryos/houston
+
+script:
+  - houston ci

README.md

@@ -17,21 +17,28 @@ On elementaryOS? Simply install Color Picker from AppCenter:
   </a>
 </p>
 
-Otherwise you can download and install the [latest .deb file](https://github.com/ronnydo/colorpicker/releases/latest).
+For other Debian-based systems, you can download and install the [latest .deb file](https://github.com/ronnydo/colorpicker/releases/latest).
 
-## Dependencies
-You'll need the following dependencies to build:
+For other systems, you will need to compile the package yourself. See the instructions below.
+
+## Build from source
+If you like to build ColorPicker yourself, take a look at the [`dev-build.sh`](dev-build.sh) file.
+
+### Dependencies
+You'll need the following dependencies to compile ColorPicker:
 * granite
 * libgtk-3-dev
 * meson
 * valac
 
-## Build, Install and Run
-Call in the project's root folder:
+### Example
 
-    meson build && cd build
-    mesonconf -Dprefix=/usr
-    ninja
-    sudo ninja install
-    com.github.ronnydo.colorpicker
+Here's a sample list of commands for building the package from source. These have been tested to work correctly on Ubuntu 18.04.
 
+```sh
+sudo apt install valac libgranite-dev
+git clone https://github.com/RonnyDo/ColorPicker.git
+cd ColorPicker/
+chmod +x dev-build.sh
+./dev-build.sh
+```

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2017 Ronny Dobra <ronnydobra at arcor dot de> -->
 <component type="desktop">
-  <id>com.github.ronnydo.colorpicker.desktop</id>
+  <id>com.github.ronnydo.colorpicker</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+</project_license>
   <name>Color Picker</name>
@@ -22,7 +22,41 @@
 	<category>Development</category>
   </categories>
   <releases>
-	​<release version="1.0.3" date="2018-04-27" urgency="medium">
+  	​<release version="1.1.3" date="2020-01-02" urgency="medium">
+  	​  <description>
+  	    <ul>
+  		  <li>Added Polish translation (kudos to @michalzkosmosu)</li>
+		  <li>Added Dutch translation (kudos to @Vistaus)</li>
+		  <li>Added Turkish translation (kudos to @ibrakap)</li>
+		  <li>Fix build integration (kudos to @meisenzahl)</li>
+  		</ul>
+  	  </description>
+  	​</release>
+  	​<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,53 @@
-com.github.ronnydo.colorpicker (1.0.3) xenial; urgency=low
+com.github.ronnydo.colorpicker (1.1.3) bionic; urgency=medium
+
+  * Added Polish translation (kudos to @michalzkosmosu)
+  * Added Dutch translation (kudos to @Vistaus)
+  * Added Turkish translation (kudos to @ibrakap)
+  * Fix build integration (kudos to @meisenzahl)
+  
+ -- Ronny Dobra <ronnydobra@arcor.de>  Thu, 02 Jan 2020 20:31:00 +0100
+
+
+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 +57,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 +100,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,11 @@
 sudo rm -r build
 meson build
 cd build
-mesonconf -Dprefix=/usr
+meson configure -Dprefix=/usr
 ninja
-./com.github.ronnydo.colorpicker
+
+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/
+
+G_MESSAGES_DEBUG=all ./com.github.ronnydo.colorpicker
 cd ..

po/LINGUAS

@@ -1 +1,8 @@
-ca de es fr
+ca 
+de 
+es 
+fr 
+nl
+tr
+pl
+pt_PT

po/fr.po

@@ -1,5 +1,5 @@
 # French translations for com.github.ronnydo.colorpicker package.
-# Copyright (C) 2017 THE com.github.ronnydo.colorpicker'S COPYRIGHT HOLDER
+# Copyright (C) 2019 THE com.github.ronnydo.colorpicker'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the com.github.ronnydo.colorpicker package.
 # Ronny Dobra <ronnydobra at arcor dot de>, 2017.
 #
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: com.github.ronnydo.colorpicker\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-04-10 21:48-0200\n"
-"PO-Revision-Date: 2018-04-10 21:48-0200\n"
-"Last-Translator: Arthur Soulié <arthur.soulie@tuta.io>\n"
+"PO-Revision-Date: 2019-01-24 20:27+0100\n"
+"Last-Translator: NathanBnm\n"
 "Language-Team: French\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgstr "Color Picker"
 
 
 msgid "Pick Color"
-msgstr "Sélectionnez une Couleur"
+msgstr "Sélectionner une Couleur"
 
 
 msgid "Format"

po/nl.po

@@ -0,0 +1,31 @@
+# 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.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+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: 2019-11-09 14:16+0100\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 2.2.4\n"
+"Last-Translator: Heimen Stoffels <vistausss@outlook.com>\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: nl\n"
+
+msgid "Color Picker"
+msgstr "Kleurkiezer"
+
+msgid "Pick Color"
+msgstr "Kleur kiezen"
+
+msgid "Format"
+msgstr "Opmaak"
+
+msgid "Color History"
+msgstr "Geschiedenis"

po/pl.po

@@ -0,0 +1,31 @@
+# Polish translation for Ronny Dobra's Color Picker.
+# This file is distributed under the same license as the com.github.danrabbit.nimbus package.
+# Michał Nowakowski <nowakowski@offshore.rocks>, 2019.
+#
+#, 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: 2019-11-17 17:27-0700\n"
+"Last-Translator: Michał Nowakowski <nowakowski@offshore.rocks>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Color Picker"
+msgstr "Próbnik koloru"
+
+msgid "Pick Color"
+msgstr "Wybierz kolor"
+
+
+msgid "Format"
+msgstr "Format"
+
+msgid "Color History"
+msgstr "Historia kolorów"

po/pt_PT.po

@@ -0,0 +1,31 @@
+# Portuguese translation for ColorPicker.
+# Copyright (C) 2019 The ColorPicker contributors
+# This file is distributed under the same license as the com.github.danrabbit.nimbus package.
+# Diogo Oliveira <https://github.com/drom98>, 2018.
+#
+#, 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"

po/tr.po

@@ -0,0 +1,32 @@
+# Turkish translations for com.github.ronnydo.colorpicker package.
+# Copyright (C) 2019 THE com.github.ronnydo.colorpicker'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the com.github.ronnydo.colorpicker package.
+# Önder Bakırtaş <onderbakirtas at gmail dot com>, 2019.
+#
+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: 2019-09-17 20:40-0700\n"
+"Last-Translator: Önder Bakırtaş <onderbakirtas at gmail dot com>\n"
+"Language-Team: Turkish\n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Color Picker"
+msgstr "Renk Seçici"
+
+
+msgid "Pick Color"
+msgstr "Renk Seç"
+
+
+msgid "Format"
+msgstr "Biçim"
+
+msgid "Color History"
+msgstr "Renk Geçmişi"

src/ColorPicker.vala

@@ -45,9 +45,11 @@ namespace ColorPicker {
             app_window.show_all ();
 
             var quit_action = new SimpleAction ("quit", null);
-
+            
             add_action (quit_action);
-            add_accelerator ("<Control>q", "app.quit", null);
+
+            //add_accelerator ("<Control>q", "app.quit", null);
+            set_accels_for_action ("app.quit", {"<Control>q"});
 
             quit_action.activate.connect (() => {
                 if (app_window != null) {

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

@@ -33,7 +33,8 @@ namespace ColorPicker.Widgets {
 
         const string bright_border_color_string = "#FFFFFF";
         private Gdk.RGBA bright_border_color = Gdk.RGBA();
-        
+
+
         // 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 +78,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 +96,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 +241,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;            
         }