Merge pull request #767 from mstraube/kde

Fix KDE themes
This commit is contained in:
Herdiansyah 2017-07-13 01:53:35 +07:00 committed by GitHub
commit b669e9cab7

View file

@ -778,7 +778,7 @@ get_wm_theme() {
kde_config_dir kde_config_dir
if [[ -f "${kde_config_dir}/kwinrc" ]]; then if [[ -f "${kde_config_dir}/kwinrc" ]]; then
wm_theme="$(awk '/theme=kwin4/{gsub(/theme=kwin4_decoration_qml_/,"",$0); print $0; exit}' "${kde_config_dir}/kwinrc")" wm_theme="$(awk '/theme=/{gsub(/theme=.*qml_|theme=.*svg__/,"",$0); print $0; exit}' "${kde_config_dir}/kwinrc")"
[[ -z "$wm_theme" ]] && wm_theme="$(awk '/library=org.kde/{gsub(/library=org.kde./,"",$0); print $0; exit}' "${kde_config_dir}/kwinrc")" [[ -z "$wm_theme" ]] && wm_theme="$(awk '/library=org.kde/{gsub(/library=org.kde./,"",$0); print $0; exit}' "${kde_config_dir}/kwinrc")"
[[ -z "$wm_theme" ]] && wm_theme="$(awk '/PluginLib=kwin3_/{gsub(/PluginLib=kwin3_/,"",$0); print $0; exit}' "${kde_config_dir}/kwinrc")" [[ -z "$wm_theme" ]] && wm_theme="$(awk '/PluginLib=kwin3_/{gsub(/PluginLib=kwin3_/,"",$0); print $0; exit}' "${kde_config_dir}/kwinrc")"
@ -1530,7 +1530,7 @@ get_style() {
if [[ -f "${kde_config_dir}/kdeglobals" ]]; then if [[ -f "${kde_config_dir}/kdeglobals" ]]; then
kde_config_file="${kde_config_dir}/kdeglobals" kde_config_file="${kde_config_dir}/kdeglobals"
theme="$(grep "^[^#]*${kde}" "$kde_config_file")" theme="$(grep "^${kde}" "$kde_config_file")"
theme="${theme/${kde}*=}" theme="${theme/${kde}*=}"
theme="$(uppercase "$theme")" theme="$(uppercase "$theme")"
@ -1648,7 +1648,7 @@ get_theme() {
gsettings="gtk-theme" gsettings="gtk-theme"
gconf="gtk_theme" gconf="gtk_theme"
xfconf="/Net/ThemeName" xfconf="/Net/ThemeName"
kde="widgetStyle" kde="Name"
get_style get_style
} }