Skip to content

Commit b7af76f

Browse files
author
falkTX
committed
Fixup some breeze theme configs; Do not sleep on wizard; Cleanup
1 parent 7c3d32c commit b7af76f

File tree

8 files changed

+76
-8
lines changed

8 files changed

+76
-8
lines changed

config-theme/.gtkrc-2.0-kde4

Lines changed: 0 additions & 1 deletion
This file was deleted.

config-theme/config/breezerc

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
[Common]
2+
ShadowColor=7,8,9
3+
ShadowSize=ShadowMedium
4+
ShadowStrength=89
5+
6+
[Style]
7+
AnimationsEnabled=false
8+
ScrollBarAddLineButtons=2
9+
ScrollBarSubLineButtons=1
10+
ViewDrawFocusIndicator=false
11+
12+
[Windeco]
13+
AnimationsEnabled=false
14+
ButtonSize=ButtonSmall
15+
DrawTitleBarSeparator=false

scripts/xrec_1

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#!/bin/bash
22

33
# all dependencies:
4-
# $ sudo apt-get install xserver-xephyr harvid
4+
# $ sudo apt-get install xserver-xephyr
55

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

1212
start_screen_gnome2 () {
@@ -44,6 +44,11 @@ export DISPLAY=:0
4444
plasma-desktop
4545
}
4646

47+
start_screen_kde5 () {
48+
# set environment
49+
sudo su - falk -c "$(pwd)/$(dirname $0)/xrec_1b.sh"
50+
}
51+
4752
start_screen_xfce4 () {
4853
# set environment
4954
export DISPLAY=:2.0
@@ -75,6 +80,11 @@ init_screen
7580
start_screen_kde4
7681
;;
7782

83+
kde5|-kde5|--kde5)
84+
init_screen
85+
start_screen_kde5
86+
;;
87+
7888
xfce4|-xfce4|--xfce4)
7989
init_screen
8090
start_screen_xfce4
@@ -86,6 +96,7 @@ echo "usage: xrec_1 <DE>
8696
DE can be:
8797
gnome2 Gnome2 session
8898
kde4 KDE4 session
99+
kde5 KDE5 session
89100
xfce4 XFCE4 session
90101
"
91102
;;

scripts/xrec_1b.sh

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
#!/bin/bash
2+
3+
export DISPLAY=:2.0
4+
export KWIN_COMPOSE=N
5+
export XDG_RUNTIME_DIR=/run/user/1001
6+
export KDE_FULL_SESSION=true
7+
export XDG_SESSION_DESKTOP=KDE
8+
export XDG_CURRENT_DESKTOP=KDE
9+
export XDG_SESSION_TYPE=x11
10+
export KDE_SESSION_UID=1001
11+
# export KDE_SESSION_VERSION=5
12+
export QT_ACCESSIBILITY=1
13+
export QT_AUTO_SCREEN_SCALE_FACTOR=0
14+
15+
export XCURSOR_SIZE=0
16+
export XCURSOR_THEME=oxy-zion
17+
export XDG_CONFIG_DIRS=/etc/xdg/xdg-/usr/share/xsessions/plasma:/usr/share/kxstudio/menu:/etc/xdg
18+
19+
export XDG_DATA_DIRS=/usr/share//usr/share/xsessions/plasma:/usr/local/share:/usr/share:/var/lib/snapd/desktop
20+
# export XDG_SEAT_PATH=/org/freedesktop/DisplayManager/Seat0
21+
# export XDG_SEAT=seat0
22+
export XDG_SESSION_CLASS=user
23+
# export XDG_SESSION_ID=29
24+
# export XDG_SESSION_PATH=/org/freedesktop/DisplayManager/Session11
25+
export XDG_VTNR=1
26+
27+
# sudo mkdir /run/user/1001
28+
# sudo chmod 700 /run/user/1001
29+
# sudo chown falk:falk /run/user/1001
30+
31+
export $(dbus-launch)
32+
33+
rm -rf /home/falk/.{a,c,g,h,j,k,l,m,w}*
34+
kxstudio-welcome --live-dvd
35+
36+
plasmashell
37+
kwin_x11 &
38+
sleep 3
39+
kwin_x11 --replace

update-configs.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/bash
2+
3+
sudo cp -R config config-theme welcome /usr/share/kxstudio/
4+
sudo chmod 755 -R /usr/share/kxstudio/

welcome/welcome.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
from PyQt5.QtGui import QIcon, QPixmap
99
from PyQt5.QtWidgets import QApplication, QMessageBox, QWizard
1010
from subprocess import getoutput
11-
from time import sleep
1211
import os, sys
1312

1413
# ----------------------------------------------
@@ -95,6 +94,7 @@
9594
"hydrogen/hydrogen.conf",
9695
"phasex/phasex.cfg",
9796

97+
"gtkrc-2.0",
9898
"config/fontconfig/fonts.conf",
9999
"config/gtk-3.0/settings.ini",
100100
"config/linuxsampler.org/Qsampler.conf",
@@ -103,6 +103,7 @@
103103
"config/rncbc.org/Qsynth.conf",
104104
"config/rncbc.org/Qtractor.conf",
105105
"config/rosegardenmusic/Rosegarden.conf",
106+
"config/breezerc",
106107
"config/gtkrc",
107108
"config/gtkrc-2.0",
108109
"config/kcmdisplayrc",
@@ -183,6 +184,8 @@ def do_copy_theme(fontSize, copy_all=False):
183184
os.system('cp "%s/mozilla/firefox/default/chrome/userContent.css" "%s"' % (CONFIG_THEME_DIR, foxFolder))
184185

185186
def do_wine_stuff():
187+
return
188+
186189
if not os.path.exists("/usr/bin/wineboot"):
187190
return
188191

@@ -247,7 +250,6 @@ def run(self):
247250
# Settings
248251
self.setLabelPixmap.emit(ID_GROUP_SETTINGS, ID_PIXMAP_PROCESS)
249252
if self._copy:
250-
sleep(1)
251253
if self._copy_all:
252254
do_copy_all()
253255
elif self._copy_basic:
@@ -257,7 +259,6 @@ def run(self):
257259
# Theme
258260
self.setLabelPixmap.emit(ID_GROUP_THEME, ID_PIXMAP_PROCESS)
259261
if self._copy_theme:
260-
sleep(1)
261262
do_copy_theme(self._font_size)
262263
self.setLabelPixmap.emit(ID_GROUP_THEME, ID_PIXMAP_DONE)
263264

@@ -270,7 +271,6 @@ def run(self):
270271
# Final
271272
self.setLabelPixmap.emit(ID_GROUP_FINAL, ID_PIXMAP_PROCESS)
272273
if self._copy:
273-
sleep(1)
274274
do_final_stuff()
275275
self.setLabelPixmap.emit(ID_GROUP_FINAL, ID_PIXMAP_DONE)
276276

welcome/welcome.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<x>0</x>
88
<y>0</y>
99
<width>702</width>
10-
<height>634</height>
10+
<height>640</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">

0 commit comments

Comments
 (0)