redshift-config-gtk: Implement GTK+ GUI config tool

Author: kakurasan

.gitignore

@@ -115,6 +115,8 @@ m4/lt~obsolete.m4
 /src/redshift-gtk/defs.py
 /src/redshift-gtk/redshift-gtk
 /src/redshift-gtk/__pycache__/
+/src/redshift-config-gtk/redshift-config-gtk-resource.c
+/src/redshift-config-gtk/redshift-config-gtk
 
 # gettext
 /po/POTFILES

.travis.yml

@@ -25,6 +25,9 @@ addons:
       - libxxf86vm-dev
       # GeoClue2
       - libglib2.0-dev
+      # GUI config tool
+      - libgtk-3-dev
+      - libxml2-utils
       # GUI
       - python3
 
@@ -35,6 +38,7 @@ before_install: |
     brew link --force gettext
     brew install intltool
     brew upgrade python
+    brew install gtk+3
     
     # distuninstallcheck fails on macOS when automake 1.16 or 1.16.1 is used.
     # http://gnu-automake.7480.n7.nabble.com/bug-31222-automake-1-16-1-am-pep3147-tweak-bug-td22937.html

CONTRIBUTING.md

@@ -53,6 +53,7 @@ Dependencies
 * libxcb, libxcb-randr (Optional, for RandR support)
 * libX11, libXxf86vm (Optional, for VidMode support)
 * Glib 2 (Optional, for GeoClue2 support)
+* GTK+ 3 (Optional, for GUI config tool)
 
 * python3, pygobject, pyxdg (Optional, for GUI support)
 * appindicator (Optional, for Ubuntu-style GUI status icon)

configure.ac

@@ -69,6 +69,7 @@ PKG_CHECK_MODULES([XCB_RANDR], [xcb-randr],
 	[have_xcb_randr=yes], [have_xcb_randr=no])
 
 PKG_CHECK_MODULES([GLIB], [glib-2.0 gobject-2.0], [have_glib=yes], [have_glib=no])
+PKG_CHECK_MODULES([GTK3], [gtk+-3.0], [have_gtk3=yes], [have_gtk3=no])
 PKG_CHECK_MODULES([GEOCLUE2], [glib-2.0 gio-2.0 >= 2.26], [have_geoclue2=yes], [have_geoclue2=no])
 
 # macOS headers
@@ -100,6 +101,30 @@ AC_CHECK_HEADER([windows.h], [have_windows_h=yes], [have_windows_h=no])
 # Check for Python
 AM_PATH_PYTHON([3.2], [have_python=yes], [have_python=no])
 
+# Check GTK+ GUI config tool
+AC_MSG_CHECKING([whether to enable GTK+ GUI config tool])
+AC_ARG_ENABLE([config-gui], [AC_HELP_STRING([--enable-config-gui],
+	[enable GTK+ GUI config tool])],
+	[enable_config_gui=$enableval],[enable_config_gui=maybe])
+AS_IF([test "x$enable_config_gui" != xno], [
+	AS_IF([test "x$have_gtk3" = xyes], [
+		AC_DEFINE([ENABLE_CONFIG_GUI], 1,
+			[Define to 1 to enable GTK+ GUI config tool])
+		AC_MSG_RESULT([yes])
+		enable_config_gui=yes
+	], [
+		AC_MSG_RESULT([missing dependencies])
+		AS_IF([test "x$enable_config_gui" = xyes], [
+			AC_MSG_ERROR([missing dependencies for GTK+])
+		])
+		enable_config_gui=no
+	])
+], [
+	AC_MSG_RESULT([no])
+	enable_config_gui=no
+])
+AM_CONDITIONAL([ENABLE_CONFIG_GUI], [test "x$enable_config_gui" = xyes])
+
 # Check DRM method
 AC_MSG_CHECKING([whether to enable DRM method])
 AC_ARG_ENABLE([drm], [AC_HELP_STRING([--enable-drm],
@@ -362,6 +387,7 @@ AC_CONFIG_FILES([
 	po/Makefile.in
 	src/Makefile
 	src/redshift-gtk/Makefile
+	src/redshift-config-gtk/Makefile
 ])
 AC_OUTPUT
 
@@ -386,6 +412,7 @@ echo "
     CoreLocation (macOS):	${enable_corelocation}
 
     GUI:		${enable_gui}
+    GUI config tool:	${enable_config_gui}
     Ubuntu icons:	${enable_ubuntu}
     systemd units:	${enable_systemd} ${systemduserunitdir}
     AppArmor profile:   ${enable_apparmor}

po/POTFILES.in

@@ -3,6 +3,7 @@
 data/appdata/redshift-gtk.appdata.xml.in
 data/applications/redshift.desktop.in
 data/applications/redshift-gtk.desktop.in
+[type: gettext/glade] src/redshift-config-gtk/gtk/menus.ui
 
 src/redshift.c
 src/options.c
@@ -19,4 +20,6 @@ src/location-geoclue2.c
 src/location-corelocation.m
 src/location-manual.c
 
+src/redshift-config-gtk/redshift-config-gtk.c
+
 src/redshift-gtk/statusicon.py

src/Makefile.am

@@ -1,5 +1,9 @@
 
-SUBDIRS = redshift-gtk
+SUBDIRS = . redshift-gtk
+
+if ENABLE_CONFIG_GUI
+SUBDIRS += redshift-config-gtk
+endif
 
 # I18n
 localedir = $(datadir)/locale
@@ -8,75 +12,82 @@ AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"
 # redshift Program
 bin_PROGRAMS = redshift
 
-redshift_SOURCES = \
+noinst_LTLIBRARIES = libredshift_common.la
+libredshift_common_la_LIBADD =
+
+libredshift_common_la_SOURCES = \
 	colorramp.c colorramp.h \
 	config-ini.c config-ini.h \
 	gamma-dummy.c gamma-dummy.h \
-	hooks.c hooks.h \
 	location-manual.c location-manual.h \
 	options.c options.h \
-	pipeutils.c pipeutils.h \
-	redshift.c redshift.h \
-	signals.c signals.h \
-	solar.c solar.h \
-	systemtime.c systemtime.h
+	pipeutils.c pipeutils.h
 
-EXTRA_redshift_SOURCES = \
+EXTRA_libredshift_common_la_SOURCES = \
 	gamma-drm.c gamma-drm.h \
 	gamma-randr.c gamma-randr.h \
 	gamma-vidmode.c gamma-vidmode.h \
 	gamma-quartz.c gamma-quartz.h \
 	gamma-w32gdi.c gamma-w32gdi.h \
 	location-geoclue2.c location-geoclue2.h \
-	location-corelocation.m location-corelocation.h \
+	location-corelocation.m location-corelocation.h
+
+redshift_SOURCES = \
+	hooks.c hooks.h \
+	redshift.c redshift.h \
+	signals.c signals.h \
+	solar.c solar.h \
+	systemtime.c systemtime.h
+
+EXTRA_redshift_SOURCES = \
 	windows/appicon.rc \
 	windows/versioninfo.rc
 
 AM_CFLAGS =
-redshift_LDADD = @LIBINTL@
+redshift_LDADD = @LIBINTL@ libredshift_common.la
 EXTRA_DIST = windows/redshift.ico
 
 if ENABLE_DRM
-redshift_SOURCES += gamma-drm.c gamma-drm.h
+libredshift_common_la_SOURCES += gamma-drm.c gamma-drm.h
 AM_CFLAGS += $(DRM_CFLAGS)
-redshift_LDADD += \
+libredshift_common_la_LIBADD += \
 	$(DRM_LIBS) $(DRM_CFLAGS)
 endif
 
 if ENABLE_RANDR
-redshift_SOURCES += gamma-randr.c gamma-randr.h
+libredshift_common_la_SOURCES += gamma-randr.c gamma-randr.h
 AM_CFLAGS += $(XCB_CFLAGS) $(XCB_RANDR_CFLAGS)
-redshift_LDADD += \
+libredshift_common_la_LIBADD += \
 	$(XCB_LIBS) $(XCB_CFLAGS) \
 	$(XCB_RANDR_LIBS) $(XCB_RANDR_CFLAGS)
 endif
 
 if ENABLE_VIDMODE
-redshift_SOURCES += gamma-vidmode.c gamma-vidmode.h
+libredshift_common_la_SOURCES += gamma-vidmode.c gamma-vidmode.h
 AM_CFLAGS += $(X11_CFLAGS) $(XF86VM_CFLAGS)
-redshift_LDADD += \
+libredshift_common_la_LIBADD += \
 	$(X11_LIBS) $(X11_CFLAGS) \
 	$(XF86VM_LIBS) $(XF86VM_CFLAGS)
 endif
 
 if ENABLE_QUARTZ
-redshift_SOURCES += gamma-quartz.c gamma-quartz.h
+libredshift_common_la_SOURCES += gamma-quartz.c gamma-quartz.h
 AM_CFLAGS += $(QUARTZ_CFLAGS)
-redshift_LDADD += \
+libredshift_common_la_LIBADD += \
 	$(QUARTZ_LIBS) $(QUARTZ_CFLAGS)
 endif
 
 if ENABLE_WINGDI
-redshift_SOURCES += gamma-w32gdi.c gamma-w32gdi.h
-redshift_LDADD += -lgdi32
+libredshift_common_la_SOURCES += gamma-w32gdi.c gamma-w32gdi.h
+libredshift_common_la_LIBADD += -lgdi32
 endif
 
 
 if ENABLE_GEOCLUE2
-redshift_SOURCES += location-geoclue2.c location-geoclue2.h
+libredshift_common_la_SOURCES += location-geoclue2.c location-geoclue2.h
 AM_CFLAGS += \
 	$(GEOCLUE2_CFLAGS)
-redshift_LDADD += \
+libredshift_common_la_LIBADD += \
 	$(GEOCLUE2_LIBS) $(GEOCLUE2_CFLAGS)
 endif
 
@@ -85,14 +96,14 @@ endif
 # (Objective C).
 
 if ENABLE_CORELOCATION
-noinst_LTLIBRARIES = liblocation-corelocation.la
+noinst_LTLIBRARIES += liblocation-corelocation.la
 liblocation_corelocation_la_SOURCES = \
 	location-corelocation.m location-corelocation.h
 liblocation_corelocation_la_OBJCFLAGS = \
 	$(CORELOCATION_CFLAGS)
 liblocation_corelocation_la_LIBADD = \
 	$(CORELOCATION_CFLAGS) $(CORELOCATION_LIBS)
-redshift_LDADD += liblocation-corelocation.la
+libredshift_common_la_LIBADD += liblocation-corelocation.la
 endif
 
 

src/redshift-config-gtk/Makefile.am

@@ -0,0 +1,33 @@
+SUFFIXES = .gresource.xml
+
+localedir = $(datadir)/locale
+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"
+
+bin_PROGRAMS = redshift-config-gtk
+
+redshift_config_gtk_SOURCES = \
+	redshift-config-gtk.c
+
+nodist_redshift_config_gtk_SOURCES = \
+	redshift-config-gtk-resource.c
+
+# GLib resources
+redshift-config-gtk-resource.c: \
+	redshift-config-gtk-resource.gresource.xml \
+	gtk/menus.ui \
+	icons/48x48/apps/redshift.png
+
+redshift_config_gtk_CFLAGS = $(GTK3_CFLAGS) -I$(top_srcdir)/src
+redshift_config_gtk_LDADD = $(GTK3_LIBS) ../libredshift_common.la
+
+EXTRA_DIST = \
+	redshift-config-gtk-resource.gresource.xml \
+	gtk/menus.ui \
+	icons/48x48/apps/redshift.png
+
+.gresource.xml.c:
+	$(AM_V_GEN)glib-compile-resources \
+		--sourcedir=`dirname $<` $< --target=$@ --generate-source
+
+CLEANFILES = \
+	$(nodist_redshift_config_gtk_SOURCES)

src/redshift-config-gtk/gtk/menus.ui

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   GTK+ menus UI file for redshift-config-gtk.
+
+   This file is part of Redshift.
+
+   Redshift is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   Redshift is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with Redshift.  If not, see <http://www.gnu.org/licenses/>.
+
+   Copyright (c) 2018 Masanori Kakura <kakurasan@gmail.com>
+-->
+<interface>
+ <menu id="menubar">
+  <submenu>
+   <attribute name="label" translatable="yes">_File</attribute>
+   <section>
+    <item>
+     <attribute name="label" translatable="yes">_Save settings</attribute>
+     <attribute name="action">app.save</attribute>
+     <attribute name="accel">&lt;Primary&gt;s</attribute>
+     <attribute name="icon">gtk-save</attribute>
+    </item>
+    <item>
+     <attribute name="label" translatable="yes">_Revert color settings</attribute>
+     <attribute name="action">app.revert</attribute>
+     <attribute name="accel">&lt;Primary&gt;r</attribute>
+     <attribute name="icon">gtk-undo</attribute>
+    </item>
+   </section>
+   <section>
+    <item>
+     <attribute name="label" translatable="yes">_Quit</attribute>
+     <attribute name="action">app.quit</attribute>
+     <attribute name="accel">&lt;Primary&gt;q</attribute>
+     <attribute name="icon">gtk-quit</attribute>
+    </item>
+   </section>
+  </submenu>
+ </menu>
+</interface>

src/redshift-config-gtk/icons/48x48/apps/redshift.png

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   GLib resource file for redshift-config-gtk.
+
+   This file is part of Redshift.
+
+   Redshift is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   Redshift is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with Redshift.  If not, see <http://www.gnu.org/licenses/>.
+
+   Copyright (c) 2018 Masanori Kakura <kakurasan@gmail.com>
+-->
+<gresources>
+  <gresource prefix="/dk/jonls/redshift-config-gtk">
+    <file preprocess="xml-stripblanks">gtk/menus.ui</file>
+    <file>icons/48x48/apps/redshift.png</file>
+  </gresource>
+</gresources>