This repository has been archived by the owner on May 22, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 101
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix ugly styles for Qt apps when running under GTK-based desktop on Q…
…t 5.7+. Improve light-locker monkey patch so that light-locker can be uninstalled without any problems. (cherry picked from commit 5427904)
- Loading branch information
Showing
4 changed files
with
122 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| #!/bin/sh | ||
| # | ||
| # LightDM wrapper to run around X sessions. | ||
|
|
||
| echo "Running X session wrapper" | ||
|
|
||
| # Load profile | ||
| for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do | ||
| if [ -f "$file" ]; then | ||
| echo "Loading profile from $file"; | ||
| . "$file" | ||
| fi | ||
| done | ||
|
|
||
| # Load resources | ||
| for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do | ||
| if [ -f "$file" ]; then | ||
| echo "Loading resource: $file" | ||
| xrdb -merge "$file" | ||
| fi | ||
| done | ||
|
|
||
| # Load keymaps | ||
| for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do | ||
| if [ -f "$file" ]; then | ||
| echo "Loading keymap: $file" | ||
| setxkbmap `cat "$file"` | ||
| XKB_IN_USE=yes | ||
| fi | ||
| done | ||
|
|
||
| # Load xmodmap if not using XKB | ||
| if [ -z "$XKB_IN_USE" ]; then | ||
| for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do | ||
| if [ -f "$file" ]; then | ||
| echo "Loading modmap: $file" | ||
| xmodmap "$file" | ||
| fi | ||
| done | ||
| fi | ||
|
|
||
| unset XKB_IN_USE | ||
|
|
||
| # Run all system xinitrc shell scripts | ||
| xinitdir="/etc/X11/xinit/xinitrc.d" | ||
| if [ -d "$xinitdir" ]; then | ||
| for script in $xinitdir/*; do | ||
| echo "Loading xinit script $script" | ||
| if [ -x "$script" -a ! -d "$script" ]; then | ||
| . "$script" | ||
| fi | ||
| done | ||
| fi | ||
|
|
||
| # Run user xsession shell script | ||
| script="$HOME/.xsession" | ||
| if [ -x "$script" -a ! -d "$script" ]; then | ||
| echo "Loading xsession script $script" | ||
| . "$script" | ||
| fi | ||
|
|
||
| if [[ " ${@[@]} " =~ " gnome|xfce|openbox " && "$(which light-locker)" ]]; then | ||
| # Ensure that Light Locker starts before session manager. | ||
| /usr/bin/light-locker & | ||
| sleep 3 | ||
| fi | ||
|
|
||
| if ! [[ " ${@[@]} " =~ " plasma|lxqt " ]]; then | ||
| # Fix ugly styles for Qt applications when running under GTK-based desktops and Qt 5.7+ | ||
| export QT_QPA_PLATFORMTHEME='qt5ct' | ||
| export QT_STYLE_OVERRIDE='' | ||
| fi | ||
|
|
||
| echo "X session wrapper complete, running session $*" | ||
|
|
||
| exec "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| [Appearance] | ||
| color_scheme_path= | ||
| custom_palette=false | ||
| icon_theme=Numix-Square | ||
| style=Fusion | ||
|
|
||
| [Fonts] | ||
| fixed= | ||
| general= | ||
|
|
||
| [Interface] | ||
| activate_item_on_single_click=1 | ||
| buttonbox_layout=3 | ||
| cursor_flash_time=1000 | ||
| dialog_buttons_have_icons=1 | ||
| double_click_interval=400 | ||
| gui_effects=General | ||
| menus_have_icons=true | ||
| stylesheets=@Invalid() | ||
|
|
||
| [SettingsWindow] | ||
| geometry= |