fix minor config issues

Added Turkish translation

.gitignore

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

.travis.yml

@@ -3,7 +3,7 @@
 language: node_js
 
 node_js:
-  - lts/*
+  - 10/*
 
 sudo: required
 
@@ -22,8 +22,7 @@ cache:
     - /tmp/liftoff
 
 install:
-  - npm install @elementaryos/houston
+  - npm i -g @elementaryos/houston
 
 script:
   - houston ci
-    --name-human Color Picker

README.md

@@ -17,15 +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
-If you like to build it by your own, have a look into the dev-build.sh file.
+### Example
 
+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,17 @@
 	<category>Development</category>
   </categories>
   <releases>
-  	​<release version="1.1.1" date="2019-01-02" 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>

debian/changelog

@@ -1,4 +1,14 @@
-com.github.ronnydo.colorpicker (1.1.1) bionic; urgency=medium
+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)

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

@@ -3,7 +3,9 @@ meson build
 cd build
 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
+
+G_MESSAGES_DEBUG=all ./com.github.ronnydo.colorpicker
 cd ..

po/LINGUAS

@@ -2,4 +2,7 @@ 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

@@ -1,7 +1,7 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# 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>, YEAR.
+# Diogo Oliveira <https://github.com/drom98>, 2018.
 #
 #, fuzzy
 
@@ -21,13 +21,11 @@ msgstr ""
 msgid "Color Picker"
 msgstr "Color Picker"
 
-
 msgid "Pick Color"
-msgstr "Selecionar Cor"
-
+msgstr "Selecionar cor"
 
 msgid "Format"
 msgstr "Formato"
 
 msgid "Color History"
-msgstr "Histórico de Cores"
+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/Widgets/Picker.vala

@@ -33,10 +33,8 @@ 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()