[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1030]

[<dom...@us...>]

Revision: 1030
          http://sourceforge.net/p/fvwm-crystal/code/1030
Author:   dominique_libre
Date:     2020-04-12 01:56:59 +0000 (Sun, 12 Apr 2020)
Log Message:
-----------
Install the gtk+ config files when they don't exist

Modified Paths:
--------------
    ChangeLog
    fvwm/scripts/SetGtkFont

Added Paths:
-----------
    addons/.gtkrc-2.0
    addons/settings.ini

Modified: ChangeLog
===================================================================
--- ChangeLog	2020-04-12 01:37:52 UTC (rev 1029)
+++ ChangeLog	2020-04-12 01:56:59 UTC (rev 1030)
@@ -2,10 +2,13 @@
 
 samedi 11 avril 2020
   asciidoc/FAQ: updated uniform look with gtk & qt
++ addons/.gtkrc-2.0: gtk+2 example config file
++ addons/settings.ini: gtk+3 example config file
+  fvwm/scripts/SetGtkFont: install gtk+ config files when they don't exist
 
 vendreedi 10 avril 2020
 + fvwm/scripts/SetGtkFont;
-  fvwm/scripts/FontSelector/FontSelector: applay the panel font setting
+  fvwm/scripts/FontSelector/FontSelector: apply the panel font setting
   to GTK+ 2 and 3.
 
 jeudi 9 avril 2020

Added: addons/.gtkrc-2.0
===================================================================
--- addons/.gtkrc-2.0	                        (rev 0)
+++ addons/.gtkrc-2.0	2020-04-12 01:56:59 UTC (rev 1030)
@@ -0,0 +1,15 @@
+gtk-theme-name="Adwaita-dark"
+gtk-icon-theme-name="Adwaita"
+gtk-font-name="Verdana Regular 14"
+gtk-cursor-theme-name="Adwaita"
+gtk-cursor-theme-size=0
+gtk-toolbar-style=GTK_TOOLBAR_BOTH
+gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
+gtk-button-images=0
+gtk-menu-images=0
+gtk-enable-event-sounds=1
+gtk-enable-input-feedback-sounds=1
+gtk-xft-antialias=1
+gtk-xft-hinting=1
+gtk-xft-hintstyle="hintfull"
+gtk-xft-rgba="rgb"

Added: addons/settings.ini
===================================================================
--- addons/settings.ini	                        (rev 0)
+++ addons/settings.ini	2020-04-12 01:56:59 UTC (rev 1030)
@@ -0,0 +1,19 @@
+[Settings]
+gtk-theme-name=Adwaita-dark
+gtk-icon-theme-name=Adwaita
+gtk-font-name=Verdana Regular 14
+gtk-cursor-theme-name=Adwaita
+gtk-cursor-theme-size=0
+gtk-toolbar-style=GTK_TOOLBAR_BOTH
+gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
+gtk-button-images=0
+gtk-menu-images=0
+gtk-enable-event-sounds=1
+gtk-enable-input-feedback-sounds=1
+gtk-xft-antialias=1
+gtk-xft-hinting=1
+gtk-xft-hintstyle=hintfull
+gtk-xft-rgba=rgb
+gtk-application-prefer-dark-theme=1
+gtk-cursor-blink=0
+

Modified: fvwm/scripts/SetGtkFont
===================================================================
--- fvwm/scripts/SetGtkFont	2020-04-12 01:37:52 UTC (rev 1029)
+++ fvwm/scripts/SetGtkFont	2020-04-12 01:56:59 UTC (rev 1030)
@@ -11,5 +11,20 @@
 Gtk3PrefFile="${HOME}/.config/gtk-3.0/settings.ini"
 GtkFontName=`echo ${panel_font} ${panel_font_style} ${panel_font_size}`
 
-sed -i "s:gtk-font-name=\".*\":gtk-font-name=\"${GtkFontName}\":" "${Gtk2PrefFile}"
-sed -i "s:gtk-font-name=.*:gtk-font-name=${GtkFontName}:" "${Gtk3PrefFile}"
+if [ ! -f "${Gtk2PrefFile}" ]; then
+	cp ${FVWM_SYSTEMDIR}/../addons/.gtkrc-2.0 ${Gtk2PrefFile}
+fi
+if [ ! -f "${Gtk3PrefFile}" ]; then
+	mkdir -p "${HOME}/.config/gtk3-0"
+	cp ${FVWM_SYSTEMDIR}/../addons/settings.ini ${Gtk3PrefFile}
+fi
+if ! grep -q gtk-font-name "${Gtk2PrefFile}"; then
+	echo "gtk-font-name=\"${GtkFontName}\"" >> ${Gtk2PrefFile}
+else
+	sed -i "s:gtk-font-name=\".*\":gtk-font-name=\"${GtkFontName}\":" "${Gtk2PrefFile}"
+fi
+if ! grep -q gtk-font-name "${Gtk3PrefFile}"; then
+	echo "gtk-font-name=${GtkFontName}" >> ${Gtk3PrefFile}
+else
+	sed -i "s:gtk-font-name=.*:gtk-font-name=${GtkFontName}:" "${Gtk3PrefFile}"
+fi

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.