Provide more dotfiles: .xprofile and a gschema override

6 files changed, 204 insertions, 87 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d7c131852e8d..399bd0f1d703 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pantheon-workarounds
 	pkgdesc = Workarounds for Pantheon derivatives
 	pkgver = 3.2.0.r73.gc49189b
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/quequotion/pantheon-bzr-qq
 	install = gala.install
 	arch = any
@@ -40,11 +40,15 @@ pkgbase = pantheon-workarounds
 	source = numlockx-pantheon.desktop
 	source = gtk.css
 	source = settings.ini
+	source = 26_pantheon-qq-gconf.gschema.override
+	source = .xprofile
 	sha512sums = 30a488431a23ff5521a12e97fa69ed17b2033ba8f016bb922e07ad9bf2d671e14a90a38266de1567c4dcbf178b6919a8108fad3dd13e50573018dc2a8e9b070e
 	sha512sums = 842db1b456c96287865955741ba00c3ceeecf82691700f691d9fc45dc665230f1224ce7cdf5a1301826ab96cfe59e922c3878a5986ab3639da0cb79a2948f727
 	sha512sums = bc5724ef255adad39e35e3fbd7beacbd3ea270c7019362ff6a8bc15cf8f503a4304c18c5e35ae2a6ddb8d1e6e7cc6973642a2ffdc8fe9e219c7f2dbacf5eab72
-	sha512sums = ee75dfaa7d887dbfe0c74b7fb6005d5aafbce22fa00b3b476b3c88628a9f786cfd3410237a2b22ca135ea85759b45b59068e5d00650f65449a19ae222e957784
-	sha512sums = 90b0927892e708b601542f317af52f42174bdcbb4e9df6f3d5667f2a8029deff42cef5459072c295f343d73a99f43b76eaeb5432b8367e69f42d5aac7f1b2f57
+	sha512sums = 5481a5784ee687c346fd22751796c0264ce981710dd722d036397afd8423ecf356e5c24b7d348257a04c99af2250f2076c958c069a604db438b61c342359bf05
+	sha512sums = 983fde059024d4456e8bc748862ce20796b339d31fb792dbc30bb6d49345b269b7e6f8dabe04aea139dc8bdb9f88f288506f15343664fec012eff7a07a3fac98
+	sha512sums = 59ff0ac632091ddf9bcbe51785b0664daef005d272b8fd4295fa1fa4d2aead9318126e5e3e9850b7a59d44428511eb9b46e4b3809583023e86c538755e6145f2
+	sha512sums = 372e89fc0cdf1beca7ec56686e2aefc49b576134a28c1d407b809cc9817e0e3196ff6698d45a4b518a1644d7ba7936b93fcc8e6408e55d9db797b81be8f610a5
 
 pkgname = pantheon-workarounds
 
diff --git a/.xprofile b/.xprofile
new file mode 100644
index 000000000000..1da2d4a42134
--- /dev/null
+++ b/.xprofile
@@ -0,0 +1,25 @@
+#Configure Input Method
+export {{GTK,QT}_IM_MODULE,XMODIFIERS=@im}=fcitx
+
+#GTK Tweaks
+export G{TK_{OVERLAY_SCROLLING,CSD},DK_CORE_DEVICE_EVENTS}=1
+export GTK_THEME="elementary:dark"
+export GTK2_RC_FILES="~/.gtkrc-2.0"
+export GTK_MODULES="$GTK_MODULES:pantheon-filechooser-module"
+
+#OpenGL tweaks
+export __GL_{THREADED_OPTIMIZATIONS,SYNC_TO_VBLANK}=1
+export __GL_YIELD="USLEEP"
+export __GL_FSAA_MODE=7
+export __GL_LOG_MAX_ANISO=1
+
+#QT Conformity
+export QT_STYLE_OVERRIDE="elementary:dark"
+export QT_QPA_PLATFORMTHEME='gnome'
+
+#Cursor
+export XCURSOR_THEME=elementary
+export XCURSOR_SIZE=48
+
+#UX
+setxkbmap jp
diff --git a/26_pantheon-qq-gconf.gschema.override b/26_pantheon-qq-gconf.gschema.override
new file mode 100644
index 000000000000..3fed0e409b0a
--- /dev/null
+++ b/26_pantheon-qq-gconf.gschema.override
@@ -0,0 +1,94 @@
+[io/elementary/desktop/wingpanel]
+autohide='Float'
+
+[io/elementary/desktop/wingpanel/applications-menu]
+use-category=true
+
+[io/elementary/desktop/wingpanel/datetime]
+clock-format='24h'
+clock-show-seconds=false
+clock-show-weekday=true
+
+[io/elementary/dpms]
+standby-time=0
+
+[io/elementary/files/column-view]
+default-zoom-level='largest'
+maximum-zoom-level='largest'
+minimum-zoom-level='largest'
+zoom-level='largest'
+
+[io/elementary/files/icon-view]
+default-zoom-level='largest'
+maximum-zoom-level='largest'
+minimum-zoom-level='largest'
+zoom-level='largest'
+
+[io/elementary/files/list-view]
+default-zoom-level='largest'
+maximum-zoom-level='largest'
+minimum-zoom-level='largest'
+zoom-level='largest'
+
+[net/launchpad/plank/docks/dock1]
+alignment='center'
+auto-pinning=true
+current-workspace-only=false
+hide-delay=0
+hide-mode='auto'
+icon-size=48
+items-alignment='center'
+lock-items=false
+monitor=''
+offset=0
+pinned-only=false
+position='bottom'
+pressure-reveal=false
+show-dock-item=false
+theme='Transparent'
+tooltips-enabled=true
+unhide-delay=0
+zoom-enabled=true
+zoom-percent=150
+
+[org/cinnamon/desktop/interface]
+cursor-blink=false
+cursor-size=48
+cursor-theme='elementary'
+enable-animations=false
+font-name='Sans 12'
+gtk-theme='elementary:dark'
+gtk-theme-backup='Adwaita-dark'
+icon-theme='elementary-blue'
+icon-theme-backup='elementary'
+toolbar-icons-size='small'
+toolbar-style='icons'
+
+[org/cinnamon/desktop/sound]
+event-sounds=false
+
+[org/cinnamon/desktop/wm/preferences]
+button-layout='close:menu'
+theme='elementary:dark'
+theme-backup='Adwaita-dark'
+titlebar-font='Sans Bold 12'
+
+[org/gnome/desktop/interface]
+cursor-blink=false
+cursor-size=48
+cursor-theme='elementary'
+enable-animations=false
+font-name='Sans 12'
+enable-hot-corners=false
+gtk-theme='elementary:dark'
+icon-theme='elementary-blue'
+toolbar-icons-size='small'
+toolbar-style='icons'
+
+[org/gnome/desktop/wm/preferences]
+button-layout='close:menu'
+theme='elementary:dark'
+titlebar-font='Sans Bold 12'
+
+[org/pantheon/desktop/gala/animations]
+enable-animations=false
diff --git a/PKGBUILD b/PKGBUILD
index f6b2c14b9a42..63836e9e50ad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=pantheon-workarounds
 pkgver=3.2.0.r73.gc49189b
 #pkgver=r1158.5898845
-pkgrel=1
+pkgrel=2
 pkgdesc='Workarounds for Pantheon derivatives'
 arch=('any')
 url='https://github.com/quequotion/pantheon-bzr-qq'
@@ -34,12 +34,16 @@ source=("https://raw.githubusercontent.com/elementary/gala/master/data/org.panth
         'pantheon-session-qq'
         'numlockx-pantheon.desktop'
         'gtk.css'
-        'settings.ini')
+        'settings.ini'
+        '26_pantheon-qq-gconf.gschema.override'
+        '.xprofile')
 sha512sums=('30a488431a23ff5521a12e97fa69ed17b2033ba8f016bb922e07ad9bf2d671e14a90a38266de1567c4dcbf178b6919a8108fad3dd13e50573018dc2a8e9b070e'
             '842db1b456c96287865955741ba00c3ceeecf82691700f691d9fc45dc665230f1224ce7cdf5a1301826ab96cfe59e922c3878a5986ab3639da0cb79a2948f727'
             'bc5724ef255adad39e35e3fbd7beacbd3ea270c7019362ff6a8bc15cf8f503a4304c18c5e35ae2a6ddb8d1e6e7cc6973642a2ffdc8fe9e219c7f2dbacf5eab72'
-            'ee75dfaa7d887dbfe0c74b7fb6005d5aafbce22fa00b3b476b3c88628a9f786cfd3410237a2b22ca135ea85759b45b59068e5d00650f65449a19ae222e957784'
-            '90b0927892e708b601542f317af52f42174bdcbb4e9df6f3d5667f2a8029deff42cef5459072c295f343d73a99f43b76eaeb5432b8367e69f42d5aac7f1b2f57')
+            '5481a5784ee687c346fd22751796c0264ce981710dd722d036397afd8423ecf356e5c24b7d348257a04c99af2250f2076c958c069a604db438b61c342359bf05'
+            '983fde059024d4456e8bc748862ce20796b339d31fb792dbc30bb6d49345b269b7e6f8dabe04aea139dc8bdb9f88f288506f15343664fec012eff7a07a3fac98'
+            '59ff0ac632091ddf9bcbe51785b0664daef005d272b8fd4295fa1fa4d2aead9318126e5e3e9850b7a59d44428511eb9b46e4b3809583023e86c538755e6145f2'
+            '372e89fc0cdf1beca7ec56686e2aefc49b576134a28c1d407b809cc9817e0e3196ff6698d45a4b518a1644d7ba7936b93fcc8e6408e55d9db797b81be8f610a5')
 
 pkgver() {
   cd "${srcdir}"
diff --git a/gtk.css b/gtk.css
index d0d2cb26a63b..249ad655088f 100644
--- a/gtk.css
+++ b/gtk.css
@@ -1,7 +1,37 @@
-/*************
- * CSD Fixes *
- ************/
+/* https://www.reddit.com/r/elementaryos/comments/eulr2p/pure_black_overlay_on_elementary_dark_theme/ */
+/* elementary-gtk black */
+@define-color base_color mix (@BLACK_900, @BLACK_500, 0.5);
+@define-color bg_color shade (@base_color, 0.1);
+@define-color titlebar_color shade (@bg_color, 0.1);
+@define-color decoration_border_color alpha (white, 0.15);
 
+/* distinguish dialogs */
+dialog decoration,
+messagedialog decoration {
+  box-shadow: 0 0 0 1px @decoration_border_color;
+}
+/* distinguish buttons & entries */
+button, checkbutton, radiobutton, entry {
+  box-shadow: 0 0 0 1px @decoration_border_color;
+}
+
+/* boldest font on active tab */
+notebook tab:checked label {
+  font-weight: 900;
+}
+
+/* https://www.reddit.com/r/gnome/comments/eojq1r/what_css_property_controls_this_1px_square_border/fedlzxy/ */
+/* Rounded corners */
+decoration {
+ border-radius: 8px;
+}
+
+window, window.background {
+ border-radius: 0 0 4px 4px;
+}
+
+/* https://wiki.archlinux.org/index.php/GTK#Client-side_decorations */
+/* Reduce CSD gaps and shadows */
 .window-frame, .window-frame:backdrop {
  box-shadow: 0 0 0 black;
  border-style: none;
@@ -9,105 +39,65 @@
  border-radius: 0;
 }
 
-.titlebar {
- border-radius: 0;
-}
-
 .window-frame.csd.popup {
-  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13);
+ box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13);
 }
 
 .header-bar {
-  background-image: none;
-  box-shadow: none;
-}
-
-window.ssd headerbar.titlebar {
-    padding-top: 1px;
-    padding-bottom: 1px;
-    min-height: 0;
-}
-
-window.ssd headerbar.titlebar button.titlebutton {
-    padding: 0px;
-    min-height: 0;
-    min-width: 0;
+ background-image: none;
+ box-shadow: none;
 }
 
-.ssd .titlebar {
-  border-width: 0;
-  box-shadow: none;
+GtkLabel.title {
+ opacity: 0;
 }
 
-/* CSD / SSD minimization */
-/* shrink headebars */
+/* https://ogbe.net/blog/gnome_titles.html*/
+/* shrink headerbars */
 headerbar {
-    min-height: 0px;
-    padding-left: 2px; /* same as childrens vertical margins for nicer proportions */
-    padding-right: 2px;
+ min-height: 0px;
+ padding-left: 2px; /* same as childrens vertical margins for nicer proportions */
+ padding-right: 2px;
 }
 
-headerbar entry,
-headerbar spinbutton,
-headerbar button,
-headerbar separator {
-    margin-top: 2px; /* same as headerbar side padding for nicer proportions */
-    margin-bottom: 2px;
+headerbar * {
+ margin-top: 0px; /* same as headerbar side padding for nicer proportions */
+ margin-bottom: 0px;
+ padding: 0px;
 }
 
 /* shrink ssd titlebars */
 .default-decoration {
-    min-height: 0; /* let the entry and button drive the titlebar size */
-    padding: 2px
+ min-height: 0; /* let the entry and button drive the titlebar size */
+ padding: 0px;
 }
 
 .default-decoration .titlebutton {
-    min-height: 0px; /* tweak these two props to reduce button size */
-    min-width: 0px;
+ min-height: 0px; /* tweak these two props to reduce button size */
+ min-width: 0px;
 }
 
 window.ssd headerbar.titlebar {
-    padding-top: 1px;
-    padding-bottom: 1px;
-    min-height: 0;
+ padding-top: 0px;
+ padding-bottom: 0px;
+ min-height: 0;
 }
 
 window.ssd headerbar.titlebar button.titlebutton {
-    padding-top: 1px;
-    padding-bottom:1px;
-    min-height: 0;
-}
-
-/* You may want to use this if you don't like the double title. */
-GtkLabel.title {
-    opacity: 0;
-}
-
-/* From elementary css */
-
-.titlebar.default-decoration {
-    padding: 0 3px;
-    min-height: 32px;
+ padding-top: 0px;
+ padding-bottom:0px;
+ min-height: 0;
 }
 
-dialog .titlebar.default-decoration,
-messagedialog .titlebar,
-messagedialog .titlebar.default-decoration {
-    min-height: 0;
-    padding: 3px;
-}
-
-/*********************
- * wingpanel support *
- ********************/
-
+/* https://wiki.archlinux.org/index.php/Pantheon#Wingpanel_transparency */
+/* wingpanel */
 .panel {
-/*    background-color: transparent; */
-/*    background-color: black; */
-    background-color: rgba(0,0,0,0.5);
-    transition: all 1s ease-in-out;
+/* background-color: transparent;*/
+/* background-color: black;*/
+ background-color: rgba(0,0,0,0.5);
+ transition: all 1s ease-in-out;
 }
 
 .panel.maximized {
-    background-color: #000;
+ background-color: #000;
 }
diff --git a/settings.ini b/settings.ini
index 3147564d3224..40244cae67ff 100644
--- a/settings.ini
+++ b/settings.ini
@@ -1,14 +1,14 @@
 [Settings]
-gtk-theme-name = Adwaita-dark
-gtk-icon-theme-name = elementary
-gtk-fallback-icon-theme = gnome
+gtk-theme-name = elementary:dark
+gtk-icon-theme-name = elementary-blue
+gtk-fallback-icon-theme = elementary
 gtk-sound-theme-name = freedesktop
 gtk-cursor-theme-name=elementary
 gtk-cursor-theme-size=48
 gtk-icon-sizes = panel-menu-bar = 24,24
-gtk-font-name = Open Sans 14
-gtk-toolbar-style = GTK_TOOLBAR_TEXT
-gtk-toolbar-icon-size = GTK_ICON_SIZE_LARGE_TOOLBAR
+gtk-font-name = Open Sans 10
+gtk-toolbar-style = GTK_TOOLBAR_ICONS
+gtk-toolbar-icon-size = GTK_ICON_SIZE_SMALL_TOOLBAR
 gtk-button-images = 0
 gtk-menu-images = 0
 gtk-enable-event-sounds = 1