Improve app structure

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2017 Ronny Dobra <ronnydobra at arcor dot de> -->
+<!-- Copyright 2020 Ronny Dobra <ronnydobra at arcor dot de> -->
 <component type="desktop">
   <id>com.github.ronnydo.colorpicker</id>
   <metadata_license>CC0-1.0</metadata_license>

data/com.github.ronnydo.colorpicker.desktop → data/com.github.ronnydo.colorpicker.desktop.in

@@ -1,7 +1,6 @@
 [Desktop Entry]
 Name=Color Picker
 Comment=An intuitive Color Picker
-Comment[fr]=Un Sélecteur de Couleurs intuitifs
 Exec=com.github.ronnydo.colorpicker
 Icon=com.github.ronnydo.colorpicker
 Keywords=colorpicker;color;picker;selector;pipette;

data/meson.build

@@ -1,23 +1,35 @@
-icon_sizes = ['32', '48', '64', '128']
+icon_sizes = ['16', '24', '32', '48', '64', '128']
 
 foreach i : icon_sizes
-    install_data(
-        join_paths('icons', i, meson.project_name() + '.svg'),
-        install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', i + 'x' + i, 'apps')
+    install_data (
+        join_paths ('icons', i, meson.project_name () + '.svg'),
+        install_dir: join_paths (get_option ('datadir'), 'icons', 'hicolor', i + 'x' + i, 'apps')
+    )
+    install_data (
+        join_paths ('icons', i, meson.project_name () + '.svg'),
+        install_dir: join_paths (get_option ('datadir'), 'icons', 'hicolor', i + 'x' + i + '@2', 'apps')
     )
 endforeach
 
-install_data(
-    meson.project_name() + '.gschema.xml',
-    install_dir: join_paths(get_option('datadir'), 'glib-2.0', 'schemas')
+
+i18n.merge_file (
+    input: meson.project_name () + '.desktop.in',
+    output: meson.project_name () + '.desktop',
+    po_dir: join_paths (meson.source_root (), 'po', 'extra'),
+    type: 'desktop',
+    install: true,
+    install_dir: join_paths (get_option ('datadir'), 'applications')
 )
 
-install_data(
-    meson.project_name() + '.desktop',
-    install_dir: join_paths(get_option('datadir'), 'applications')
+i18n.merge_file (
+    input: meson.project_name () + '.appdata.xml.in',
+    output: meson.project_name () + '.appdata.xml',
+    po_dir: join_paths (meson.source_root (), 'po', 'extra'),
+    install: true,
+    install_dir: join_paths (get_option ('datadir'), 'metainfo')
 )
 
-install_data(
-    meson.project_name() + '.appdata.xml',
-    install_dir: join_paths(get_option('datadir'), 'metainfo')
+install_data (
+    meson.project_name () + '.gschema.xml',
+    install_dir: join_paths (get_option ('datadir'), 'glib-2.0', 'schemas')
 )

meson.build

@@ -1,46 +1,39 @@
-project('com.github.ronnydo.colorpicker', ['vala', 'c'],
-    version: '0.1.2',
+# Project name, programming language and version
+project (
+    'com.github.ronnydo.colorpicker',
+    'vala', 'c',
+    version: '1.1.5',
     license: 'GPL-3.0'
 )
 
-gnome = import('gnome')
-i18n = import('i18n')
+# Translation module
+i18n = import ('i18n')
 
-add_project_arguments(
-    '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()),
+# Project arguments
+add_project_arguments (
+    '-DGETTEXT_PACKAGE="@0@"'.format (meson.project_name ()),
     language: 'c'
 )
 
-conf = configuration_data()
-conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
-configure_file(output: 'config.h', configuration: conf)
-config_h_dir = include_directories('.')
-
-
-c_args = [
-  '-include', 'config.h'
+# Listing dependencies
+dependencies = [
+    dependency ('glib-2.0'),
+    dependency ('gtk+-3.0'),
+    dependency ('granite'),
+    dependency ('gobject-2.0')
 ]
 
-executable(
-    'com.github.ronnydo.colorpicker',
-    'src/ColorPicker.vala',
-    'src/ColorPickerWindow.vala',
-    'src/ExtRGBA.vala',
-    'src/Widgets/ColorArea.vala',
-    'src/Widgets/ColorHistory.vala',
-    'src/Widgets/Picker.vala',
-    'src/Services/Settings.vala',
-    c_args: c_args,
-    dependencies: [
-        dependency('glib-2.0'),
-        dependency('gobject-2.0'),
-        dependency('granite'),
-        dependency('gtk+-3.0'),
-    ],
+subdir ('src')
+
+# Executable
+executable (
+    meson.project_name (),
+    sources,
+    dependencies: dependencies,
     install : true
 )
 
-meson.add_install_script('meson/post_install.py')
+subdir ('data')
+subdir ('po')
 
-subdir('data')
-subdir('po')
+meson.add_install_script ('meson/post_install.py')

meson/post_install.py

@@ -1,10 +1,17 @@
 #!/usr/bin/env python3
 
-import os
+from os import path, environ
 import subprocess
 
-schemadir = os.path.join(os.environ['MESON_INSTALL_PREFIX'], 'share', 'glib-2.0', 'schemas')
+prefix = environ.get('MESON_INSTALL_PREFIX', '/usr/local')
+schemadir = path.join(environ['MESON_INSTALL_PREFIX'], 'share', 'glib-2.0', 'schemas')
+datadir = path.join(prefix, 'share')
+desktop_database_dir = path.join(datadir, 'applications')
 
-if not os.environ.get('DESTDIR'):
-	print('Compiling gsettings schemas...')
-	subprocess.call(['glib-compile-schemas', schemadir])
+if not environ.get('DESTDIR'):
+    print('Compiling gsettings schemas…')
+    subprocess.call(['glib-compile-schemas', schemadir])
+    print('Updating desktop database…')
+    subprocess.call(['update-desktop-database', '-q', desktop_database_dir])
+    print('Updating icon cache…')
+    subprocess.call(['gtk-update-icon-cache', '-qtf', path.join(datadir, 'icons', 'hicolor')])

po/LINGUAS

@@ -1,9 +1,9 @@
 bg
-ca 
-de 
-es 
-fr 
+ca
+de
+es
+fr
 nl
-tr
 pl
-pt_PT
+pt
+tr

po/bg.po

@@ -1,33 +1,34 @@
-# 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.
-# clappingmonkey <clappingmonkey33@gmail.com>, 2020.
+# Bulgarian translations for com.github.ronnydo.colorpicker package.
+# Copyright (C) 2020 THE com.github.ronnydo.colorpicker'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the com.github.ronnydo.colorpicker package.
+# clappingmonkey <clappingmonkey@gmail.com>, 2020.
 #
-#, 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: 2020-02-17 13:00+0300\n"
+"POT-Creation-Date: 2020-05-14 18:18+0200\n"
+"PO-Revision-Date: 2020-05-14 18:11+0200\n"
 "Last-Translator: clappingmonkey <[email protected]>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
-"Language: Bulgarian\n"
+"Language-Team: none\n"
+"Language: bg\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"
 
+#: src/ColorPickerWindow.vala:31
 msgid "Color Picker"
 msgstr "Color Picker"
 
-
+#: src/ColorPickerWindow.vala:52
 msgid "Pick Color"
 msgstr "Избери Цвят"
 
-
+#: src/ColorPickerWindow.vala:71
 msgid "Format"
 msgstr "Формат"
 
+#: src/ColorPickerWindow.vala:105
 msgid "Color History"
 msgstr "История"

po/ca.po

@@ -1,31 +1,33 @@
-# Catalan translation for ColorPicker.
-# Copyright (C) 2018 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the ColorPicker package.
-# Adolfo Jayme Barrientos <[email protected]>, 2018.
+# Catalan translations for com.github.ronnydo.colorpicker package.
+# Copyright (C) 2020 THE com.github.ronnydo.colorpicker'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the com.github.ronnydo.colorpicker package.
+# Adolfo Jayme Barrientos <[email protected], 2018.
 #
 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-03-25 01:39-0600\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2020-05-14 18:18+0200\n"
+"PO-Revision-Date: 2020-05-14 18:12+0200\n"
+"Last-Translator: Adolfo Jayme Barrientos <[email protected]\n"
+"Language-Team: none\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.6\n"
-"Last-Translator: Adolfo Jayme Barrientos <[email protected]>\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Language: ca\n"
 
+#: src/ColorPickerWindow.vala:31
 msgid "Color Picker"
 msgstr "Selector de colors"
 
+#: src/ColorPickerWindow.vala:52
 msgid "Pick Color"
 msgstr "Trieu un color"
 
+#: src/ColorPickerWindow.vala:71
 msgid "Format"
 msgstr "Format"
 
+#: src/ColorPickerWindow.vala:105
 msgid "Color History"
 msgstr "Historial de colors"

po/com.github.ronnydo.colorpicker.pot

@@ -1,33 +1,34 @@
 # 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.
+# This file is distributed under the same license as the com.github.ronnydo.colorpicker package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 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"
+"POT-Creation-Date: 2020-05-14 18:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: src/ColorPickerWindow.vala:31
 msgid "Color Picker"
 msgstr ""
 
-
+#: src/ColorPickerWindow.vala:52
 msgid "Pick Color"
 msgstr ""
 
-
+#: src/ColorPickerWindow.vala:71
 msgid "Format"
 msgstr ""
 
+#: src/ColorPickerWindow.vala:105
 msgid "Color History"
 msgstr ""

po/de.po

@@ -1,32 +1,34 @@
 # German translations for com.github.ronnydo.colorpicker package.
-# Copyright (C) 2017 THE com.github.ronnydo.colorpicker'S COPYRIGHT HOLDER
+# Copyright (C) 2020 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.
 #
 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: 2017-06-21 20:40-0700\n"
+"POT-Creation-Date: 2020-05-14 18:18+0200\n"
+"PO-Revision-Date: 2020-05-14 18:12+0200\n"
 "Last-Translator: Ronny Dobra <ronnydobra at arcor dot de>\n"
-"Language-Team: German\n"
+"Language-Team: none\n"
 "Language: de\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"
 
+#: src/ColorPickerWindow.vala:31
 msgid "Color Picker"
 msgstr "Color Picker"
 
-
+#: src/ColorPickerWindow.vala:52
 msgid "Pick Color"
 msgstr "Farbe auswählen"
 
-
+#: src/ColorPickerWindow.vala:71
 msgid "Format"
 msgstr "Format"
 
+#: src/ColorPickerWindow.vala:105
 msgid "Color History"
 msgstr "Farb-Historie"

po/es.po

@@ -1,31 +1,34 @@
 # Spanish translations for com.github.ronnydo.colorpicker package.
-# Copyright (C) 2017 THE com.github.ronnydo.colorpicker'S COPYRIGHT HOLDER
+# Copyright (C) 2020 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.
+# Adolfo Jayme Barrientos <[email protected]>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: com.github.ronnydo.colorpicker\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-20 20:40-0500\n"
-"PO-Revision-Date: 2018-03-25 01:37-0600\n"
+"POT-Creation-Date: 2020-05-14 18:18+0200\n"
+"PO-Revision-Date: 2020-05-14 18:12+0200\n"
 "Last-Translator: Adolfo Jayme Barrientos <[email protected]>\n"
-"Language-Team: Spanish\n"
+"Language-Team: none\n"
 "Language: es\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"
-"X-Generator: Poedit 2.0.6\n"
 
+#: src/ColorPickerWindow.vala:31
 msgid "Color Picker"
 msgstr "Selector de colores"
 
+#: src/ColorPickerWindow.vala:52
 msgid "Pick Color"
 msgstr "Seleccione un color"
 
+#: src/ColorPickerWindow.vala:71
 msgid "Format"
 msgstr "Formato"
 
+#: src/ColorPickerWindow.vala:105
 msgid "Color History"
 msgstr "Historial de colores"

po/extra/POTFILES

@@ -0,0 +1,2 @@
+data/com.github.ronnydo.colorpicker.desktop.in
+data/com.github.ronnydo.colorpicker.appdata.xml.in