theme: Show KDE and GTK information together.

This commit is contained in:
Dylan Araps 2017-08-17 10:16:10 +10:00
parent 69012eb0ff
commit d5dd1ec6d6
1 changed files with 6 additions and 7 deletions

View File

@ -1613,15 +1613,12 @@ 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")" kde_theme="$(grep "^${kde}" "$kde_config_file")"
theme="${theme/${kde}*=}" kde_theme="${theme/${kde}*=}"
theme="$(uppercase "$theme")" kde_theme="$(uppercase "$theme")"
gtk_shorthand="on"
else else
err "Theme: KDE config files not found, skipping." err "Theme: KDE config files not found, skipping."
fi fi
return
;; ;;
*"Cinnamon"*) *"Cinnamon"*)
@ -1700,6 +1697,7 @@ get_style() {
# Toggle visibility of GTK themes. # Toggle visibility of GTK themes.
[[ "$gtk2" == "off" ]] && unset gtk2_theme [[ "$gtk2" == "off" ]] && unset gtk2_theme
[[ "$gtk3" == "off" ]] && unset gtk3_theme [[ "$gtk3" == "off" ]] && unset gtk3_theme
[[ "$kde" == "off" ]] && unset kde_theme
# Format the string based on which themes exist. # Format the string based on which themes exist.
if [[ "$gtk2_theme" && "$gtk2_theme" == "$gtk3_theme" ]]; then if [[ "$gtk2_theme" && "$gtk2_theme" == "$gtk3_theme" ]]; then
@ -1716,12 +1714,13 @@ get_style() {
fi fi
# Final string. # Final string.
theme="${gtk2_theme}${gtk3_theme}" theme="${kde_theme}${gtk2_theme}${gtk3_theme}"
# Make the output shorter by removing "[GTKX]" from the string. # Make the output shorter by removing "[GTKX]" from the string.
if [[ "$gtk_shorthand" == "on" ]]; then if [[ "$gtk_shorthand" == "on" ]]; then
theme="${theme// '[GTK'[0-9]']'}" theme="${theme// '[GTK'[0-9]']'}"
theme="${theme/ '[GTK2/3]'}" theme="${theme/ '[GTK2/3]'}"
theme="${theme/ '[KDE]'}"
fi fi
fi fi
} }