Browse Source

Add improvements to the welcome dialog design.

parazyd 1 year ago
parent
commit
0ec3fc61da

+ 2 - 2
home/luther/.config/gtk-3.0/settings.ini

@@ -1,5 +1,5 @@
1 1
 [Settings]
2
-gtk-theme-name=shearwater
2
+gtk-theme-name=Breeze
3 3
 gtk-icon-theme-name=Adwaita
4 4
 gtk-font-name=Ubuntu 10
5 5
 gtk-cursor-theme-size=0
@@ -13,4 +13,4 @@ gtk-xft-antialias=1
13 13
 gtk-xft-hinting=1
14 14
 gtk-xft-hintstyle=hintfull
15 15
 gtk-xft-rgba=rgb
16
-gtk-cursor-theme-name=Adwaita
16
+gtk-cursor-theme-name=breeze_cursors

+ 2 - 2
home/luther/.gtkrc-2.0

@@ -2,10 +2,10 @@
2 2
 # Any customization should be done in ~/.gtkrc-2.0.mine instead.
3 3
 
4 4
 include "/home/luther/.gtkrc-2.0.mine"
5
-gtk-theme-name="shearwater"
5
+gtk-theme-name="Breeze"
6 6
 gtk-icon-theme-name="Adwaita"
7 7
 gtk-font-name="Ubuntu 10"
8
-gtk-cursor-theme-name="Adwaita"
8
+gtk-cursor-theme-name="breeze_cursors"
9 9
 gtk-cursor-theme-size=0
10 10
 gtk-toolbar-style=GTK_TOOLBAR_BOTH
11 11
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR

+ 16 - 0
root/.config/gtk-3.0/settings.ini

@@ -0,0 +1,16 @@
1
+[Settings]
2
+gtk-theme-name=Breeze
3
+gtk-icon-theme-name=Adwaita
4
+gtk-font-name=Ubuntu 10
5
+gtk-cursor-theme-size=0
6
+gtk-toolbar-style=GTK_TOOLBAR_BOTH
7
+gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
8
+gtk-button-images=1
9
+gtk-menu-images=1
10
+gtk-enable-event-sounds=1
11
+gtk-enable-input-feedback-sounds=1
12
+gtk-xft-antialias=1
13
+gtk-xft-hinting=1
14
+gtk-xft-hintstyle=hintfull
15
+gtk-xft-rgba=rgb
16
+gtk-cursor-theme-name=breeze_cursors

+ 19 - 0
root/.gtkrc-2.0

@@ -0,0 +1,19 @@
1
+# DO NOT EDIT! This file will be overwritten by LXAppearance.
2
+# Any customization should be done in ~/.gtkrc-2.0.mine instead.
3
+
4
+include "/home/luther/.gtkrc-2.0.mine"
5
+gtk-theme-name="Breeze"
6
+gtk-icon-theme-name="Adwaita"
7
+gtk-font-name="Ubuntu 10"
8
+gtk-cursor-theme-name="breeze_cursors"
9
+gtk-cursor-theme-size=0
10
+gtk-toolbar-style=GTK_TOOLBAR_BOTH
11
+gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
12
+gtk-button-images=1
13
+gtk-menu-images=1
14
+gtk-enable-event-sounds=1
15
+gtk-enable-input-feedback-sounds=1
16
+gtk-xft-antialias=1
17
+gtk-xft-hinting=1
18
+gtk-xft-hintstyle="hintfull"
19
+gtk-xft-rgba="rgb"

+ 19 - 5
usr/local/lib/heads/heads-keymap

@@ -8,23 +8,37 @@
8 8
 kmps="/usr/share/X11/xkb/symbols"
9 9
 
10 10
 cd "$kmps"
11
-klist="$(find *)"
11
+klist="$(find * -type f)"
12
+_feed=""
13
+for i in $klist; do
14
+	_feed="${_feed}${i}
15
+"
16
+	_name="$(grep 'name\[Group1\]' $i | head -n1 | cut -d'"' -f2)"
17
+	_feed="${_feed}${_name}
18
+"
19
+done
12 20
 cd - >/dev/null
13 21
 
14 22
 sel_layout() {
15 23
 	yad \
16
-		--text="Please select your prefered keyboard layout.
24
+		--title="heads keyboard layout" \
25
+		--text="<b>Select the keyboard layout</b>
26
+
27
+Please choose your prefered keyboard layout by selecting it below.
17 28
 (Start typing to search)" \
18 29
 		--no-escape \
30
+		--borders=40 \
31
+		--image="/usr/share/icons/Adwaita/64x64/apps/preferences-desktop-keyboard-symbolic.symbolic.png" \
32
+		--image-on-top \
19 33
 		--listen \
20 34
 		--width=360 \
21 35
 		--height=360 \
22 36
 		--fixed \
23
-		--button="Accept":0 \
37
+		--button="<b>Accept</b>":0 \
24 38
 		--center \
25 39
 		--list \
26
-		--title="heads keyboard layout" \
27 40
 		--separator="\n" \
41
+		--column="Layout Code" \
28 42
 		--column="Layout Name" \
29 43
 		--search-column=1 \
30 44
 		--print-column=1
@@ -32,7 +46,7 @@ sel_layout() {
32 46
 
33 47
 sel=""
34 48
 while [ -z "$sel" ]; do
35
-	sel="$(printf "%s\n" "$klist" | sel_layout)"
49
+	sel="$(printf "%s\n" "$_feed" | sel_layout)"
36 50
 done
37 51
 #printf "%s\n" "$sel"
38 52
 setxkbmap -layout "$sel"

+ 8 - 3
usr/local/lib/heads/heads-locale

@@ -9,10 +9,15 @@ locs="$(grep ' UTF-8$' /etc/locale.gen | tr -d '#' | awk '{print $1}')"
9 9
 
10 10
 chosen="$(printf "%s\n" "$locs" | yad \
11 11
 	--title="heads' locale" \
12
-	--text="Select your prefered locale.
13
-(Choose multiple by holding down Ctrl)
12
+	--text="<b>Select the system locale</b>
13
+
14
+Choose below your prefered locale.
15
+(Select multiple by holding down Ctrl)
14 16
 (Start typing to search)" \
15 17
 	--no-escape \
18
+	--borders=40 \
19
+	--image="/usr/share/icons/Adwaita/64x64/apps/preferences-desktop-locale-symbolic.symbolic.png" \
20
+	--image-on-top \
16 21
 	--listen \
17 22
 	--width=360 \
18 23
 	--height=360 \
@@ -20,7 +25,7 @@ chosen="$(printf "%s\n" "$locs" | yad \
20 25
 	--center \
21 26
 	--list \
22 27
 	--multiple \
23
-	--button="Accept":0 \
28
+	--button="<b>Accept</b>":0 \
24 29
 	--separator="\n" \
25 30
 	--column="Locale Name" \
26 31
 	--search-column=1 \

+ 8 - 3
usr/local/lib/heads/heads-rootpw

@@ -6,14 +6,19 @@
6 6
 input_pw() {
7 7
 	yad \
8 8
 		--title="Change the root password" \
9
-		--text="Enter the root password which you wish to use:" \
9
+		--text="<b>Change the root password</b>
10
+
11
+Enter the root password which you wish to use:" \
10 12
 		--no-escape \
13
+		--borders=40 \
14
+		--image="/usr/share/icons/Adwaita/64x64/apps/system-users-symbolic.symbolic.png" \
15
+		--image-on-top \
11 16
 		--center \
12 17
 		--fixed \
13 18
 		--width=360 \
14
-		--height=80 \
19
+		--height=100 \
15 20
 		--entry \
16
-		--button="Accept":0
21
+		--button="<b>Accept</b>":0
17 22
 }
18 23
 
19 24
 pw=""

+ 7 - 2
usr/local/lib/heads/heads-tz

@@ -10,16 +10,21 @@ zones="$(find * -type f -name '[A-Z]*' | grep -Ev '^right|^posix')"
10 10
 
11 11
 chosen="$(printf "%s\n" "$zones" | yad \
12 12
 	--title="heads' timezone" \
13
-	--text="Select your prefered timezone.
13
+	--text="<b>Select the system timezone</b>
14
+
15
+Select below your prefered timezone.
14 16
 (Start typing to search)" \
17
+	--image="/usr/share/icons/Adwaita/64x64/apps/preferences-system-time-symbolic.symbolic.png" \
18
+	--image-on-top \
15 19
 	--no-escape \
16 20
 	--listen \
21
+	--borders=40 \
17 22
 	--width=360 \
18 23
 	--height=360 \
19 24
 	--fixed \
20 25
 	--center \
21 26
 	--list \
22
-	--button="Accept":0 \
27
+	--button="<b>Accept</b>":0 \
23 28
 	--separator="\n" \
24 29
 	--column="Timezone" \
25 30
 	--search-column=1 \

+ 18 - 6
usr/local/lib/heads/heads-welcome

@@ -10,12 +10,17 @@ rm -f /etc/sudoers.d/heads-welcome
10 10
 
11 11
 data="$(yad \
12 12
 	--title="Welcome to heads!" \
13
-	--text="Welcome to heads!
14
-Here you can choose to customize your system before starting the graphical
15
-environment. Select any option below to proceed." \
13
+	--text="<big><b>Welcome to heads!</b></big>
14
+Here you can choose to customize your system before starting the graphical environment.
15
+Select any option below to proceed.
16
+	" \
16 17
 	--form \
17 18
 	--columns=1 \
19
+	--borders=40 \
18 20
 	--center \
21
+	--width=640 \
22
+	--height=480 \
23
+	--fixed \
19 24
 	--no-escape \
20 25
 	--separator=":" \
21 26
 	--field="Select a keyboard layout!preferences-desktop-keyboard-symbolic":FBTN \
@@ -23,17 +28,19 @@ environment. Select any option below to proceed." \
23 28
 	--field="Set the timezone!preferences-system-time-symbolic":FBTN \
24 29
 	--field="Change the root password!system-users-symbolic":FBTN \
25 30
 	--field="":LBL \
26
-	--field="Miscellaneous options:":LBL \
31
+	--field="<b>Miscellaneous options:</b>":LBL \
27 32
 	--field="Randomize MAC addresses of network interfaces":CHK \
33
+	--field="Disable the permakey kernel module (do not shutdown when unplugging the USB medium)":CHK \
28 34
 	--button="Shutdown":1 \
29
-	--button="Start heads":0 \
35
+	--button="<b>Start heads</b>":0 \
30 36
 	"/usr/local/lib/heads/heads-keymap" \
31 37
 	"/usr/local/lib/heads/heads-locale" \
32 38
 	"/usr/local/lib/heads/heads-tz" \
33 39
 	"/usr/local/lib/heads/heads-rootpw" \
34 40
 	"n/a" \
35 41
 	"n/a" \
36
-	"TRUE")"
42
+	"TRUE" \
43
+	"FALSE")"
37 44
 
38 45
 # Shut down on unsuccessful exit.
39 46
 #[ $? = 0 ] || init 0
@@ -46,6 +53,7 @@ environment. Select any option below to proceed." \
46 53
 # 4: n/a
47 54
 # 5: n/a
48 55
 # 6: macaddr
56
+# 7: permakey
49 57
 i=-1
50 58
 echo "$data" | tr ':' '\n' | while read val; do
51 59
 	i=$(( $i + 1 ))
@@ -56,6 +64,10 @@ echo "$data" | tr ':' '\n' | while read val; do
56 64
 				/etc/wicd/scripts/preconnect/macchange
57 65
 			chmod 755 /etc/wicd/scripts/preconnect/macchange
58 66
 			;;
67
+		7)
68
+			[ "$val" = TRUE ] || continue
69
+			lsmod | grep -q permakey && rmmod permakey || true
70
+			;;
59 71
 		*)
60 72
 			continue
61 73
 			;;