Skip to content

Commit

Permalink
Fixup some breeze theme configs; Do not sleep on wizard; Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
falkTX committed Apr 1, 2018
1 parent 7c3d32c commit b7af76f
Show file tree
Hide file tree
Showing 8 changed files with 76 additions and 8 deletions.
1 change: 0 additions & 1 deletion config-theme/.gtkrc-2.0-kde4

This file was deleted.

15 changes: 15 additions & 0 deletions config-theme/config/breezerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[Common]
ShadowColor=7,8,9
ShadowSize=ShadowMedium
ShadowStrength=89

[Style]
AnimationsEnabled=false
ScrollBarAddLineButtons=2
ScrollBarSubLineButtons=1
ViewDrawFocusIndicator=false

[Windeco]
AnimationsEnabled=false
ButtonSize=ButtonSmall
DrawTitleBarSeparator=false
File renamed without changes.
15 changes: 13 additions & 2 deletions scripts/xrec_1
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/bin/bash

# all dependencies:
# $ sudo apt-get install xserver-xephyr harvid
# $ sudo apt-get install xserver-xephyr

init_screen () {
# Set up nested X server
Xephyr -keybd ephyr,,,xkbmodel=evdev -br -reset -screen 1280x720x24 -dpi 96 :2 &
sleep 3
sleep 1
}

start_screen_gnome2 () {
Expand Down Expand Up @@ -44,6 +44,11 @@ export DISPLAY=:0
plasma-desktop
}

start_screen_kde5 () {
# set environment
sudo su - falk -c "$(pwd)/$(dirname $0)/xrec_1b.sh"
}

start_screen_xfce4 () {
# set environment
export DISPLAY=:2.0
Expand Down Expand Up @@ -75,6 +80,11 @@ init_screen
start_screen_kde4
;;

kde5|-kde5|--kde5)
init_screen
start_screen_kde5
;;

xfce4|-xfce4|--xfce4)
init_screen
start_screen_xfce4
Expand All @@ -86,6 +96,7 @@ echo "usage: xrec_1 <DE>
DE can be:
gnome2 Gnome2 session
kde4 KDE4 session
kde5 KDE5 session
xfce4 XFCE4 session
"
;;
Expand Down
39 changes: 39 additions & 0 deletions scripts/xrec_1b.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#!/bin/bash

export DISPLAY=:2.0
export KWIN_COMPOSE=N
export XDG_RUNTIME_DIR=/run/user/1001
export KDE_FULL_SESSION=true
export XDG_SESSION_DESKTOP=KDE
export XDG_CURRENT_DESKTOP=KDE
export XDG_SESSION_TYPE=x11
export KDE_SESSION_UID=1001
# export KDE_SESSION_VERSION=5
export QT_ACCESSIBILITY=1
export QT_AUTO_SCREEN_SCALE_FACTOR=0

export XCURSOR_SIZE=0
export XCURSOR_THEME=oxy-zion
export XDG_CONFIG_DIRS=/etc/xdg/xdg-/usr/share/xsessions/plasma:/usr/share/kxstudio/menu:/etc/xdg

export XDG_DATA_DIRS=/usr/share//usr/share/xsessions/plasma:/usr/local/share:/usr/share:/var/lib/snapd/desktop
# export XDG_SEAT_PATH=/org/freedesktop/DisplayManager/Seat0
# export XDG_SEAT=seat0
export XDG_SESSION_CLASS=user
# export XDG_SESSION_ID=29
# export XDG_SESSION_PATH=/org/freedesktop/DisplayManager/Session11
export XDG_VTNR=1

# sudo mkdir /run/user/1001
# sudo chmod 700 /run/user/1001
# sudo chown falk:falk /run/user/1001

export $(dbus-launch)

rm -rf /home/falk/.{a,c,g,h,j,k,l,m,w}*
kxstudio-welcome --live-dvd

plasmashell
kwin_x11 &
sleep 3
kwin_x11 --replace
4 changes: 4 additions & 0 deletions update-configs.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash

sudo cp -R config config-theme welcome /usr/share/kxstudio/
sudo chmod 755 -R /usr/share/kxstudio/
8 changes: 4 additions & 4 deletions welcome/welcome.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from PyQt5.QtGui import QIcon, QPixmap
from PyQt5.QtWidgets import QApplication, QMessageBox, QWizard
from subprocess import getoutput
from time import sleep
import os, sys

# ----------------------------------------------
Expand Down Expand Up @@ -95,6 +94,7 @@
"hydrogen/hydrogen.conf",
"phasex/phasex.cfg",

"gtkrc-2.0",
"config/fontconfig/fonts.conf",
"config/gtk-3.0/settings.ini",
"config/linuxsampler.org/Qsampler.conf",
Expand All @@ -103,6 +103,7 @@
"config/rncbc.org/Qsynth.conf",
"config/rncbc.org/Qtractor.conf",
"config/rosegardenmusic/Rosegarden.conf",
"config/breezerc",
"config/gtkrc",
"config/gtkrc-2.0",
"config/kcmdisplayrc",
Expand Down Expand Up @@ -183,6 +184,8 @@ def do_copy_theme(fontSize, copy_all=False):
os.system('cp "%s/mozilla/firefox/default/chrome/userContent.css" "%s"' % (CONFIG_THEME_DIR, foxFolder))

def do_wine_stuff():
return

if not os.path.exists("/usr/bin/wineboot"):
return

Expand Down Expand Up @@ -247,7 +250,6 @@ def run(self):
# Settings
self.setLabelPixmap.emit(ID_GROUP_SETTINGS, ID_PIXMAP_PROCESS)
if self._copy:
sleep(1)
if self._copy_all:
do_copy_all()
elif self._copy_basic:
Expand All @@ -257,7 +259,6 @@ def run(self):
# Theme
self.setLabelPixmap.emit(ID_GROUP_THEME, ID_PIXMAP_PROCESS)
if self._copy_theme:
sleep(1)
do_copy_theme(self._font_size)
self.setLabelPixmap.emit(ID_GROUP_THEME, ID_PIXMAP_DONE)

Expand All @@ -270,7 +271,6 @@ def run(self):
# Final
self.setLabelPixmap.emit(ID_GROUP_FINAL, ID_PIXMAP_PROCESS)
if self._copy:
sleep(1)
do_final_stuff()
self.setLabelPixmap.emit(ID_GROUP_FINAL, ID_PIXMAP_DONE)

Expand Down
2 changes: 1 addition & 1 deletion welcome/welcome.ui
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>702</width>
<height>634</height>
<height>640</height>
</rect>
</property>
<property name="windowTitle">
Expand Down

0 comments on commit b7af76f

Please sign in to comment.