Merge branch 'dev' into dev-stable

Author: Hayao0819

channels/cinnamon/airootfs.any/etc/dconf/db/local.d/01-alter-screensaver

@@ -0,0 +1,17 @@
+[org/cinnamon/desktop/lockdown]
+disable-lock-screen=true
+
+[org/gnome/desktop/lockdown]
+disable-lock-screen=true
+
+[org/cinnamon/desktop/screensaver]
+allow-keyboard-shortcuts=false
+default-message='Password: %PASSWORD%'
+layout-group=0
+lock-enabled=false
+
+[org/gnome/desktop/screensaver]
+lock-enabled=false
+
+[org/cinnamon/desktop/keybindings/media-keys]
+screensaver=@as []

channels/cinnamon/airootfs.any/etc/dconf/db/local.d/02-disable-lock

@@ -0,0 +1,16 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Icon=/usr/share/icons/hicolor/scalable/alter.svg
+Exec=/usr/bin/alterlinux-welcome-page 
+Type=Application
+StartupNotify=false
+Terminal=false
+Hidden=false
+
+Name=Welcome to Alter Linux
+Comment=Displays the Alter Linux welcome page.
+
+Name[ja]=Alter Linuxへようこそ
+GenericName[ja]=Alter Linuxへようこそ
+Comment[ja]=Alter Linuxの利用に役立つページです。

channels/cinnamon/airootfs.any/etc/dconf/db/local.d/02-live-config

@@ -83,27 +83,10 @@ if [[ "${arch}" = "x86_64" ]]; then
 fi
 
 
-# Update system datebase
-dconf update
-
-
 # firewalld
 systemctl enable firewalld.service
 
 
-# Replace link
-if [[ "${japanese}" = true ]]; then
-    remove "/etc/skel/Desktop/welcome-to-alter.desktop"
-    remove "/home/${username}/Desktop/welcome-to-alter.desktop"
-
-    mv "/etc/skel/Desktop/welcome-to-alter-jp.desktop" "/etc/skel/Desktop/welcome-to-alter.desktop"
-    mv "/home/${username}/Desktop/welcome-to-alter-jp.desktop" "/home/${username}/Desktop/welcome-to-alter.desktop"
-else
-    remove "/etc/skel/Desktop/welcome-to-alter-jp.desktop"
-    remove "/home/${username}/Desktop/welcome-to-alter-jp.desktop"
-fi
-
-
 # Added autologin group to auto login
 groupadd autologin
 usermod -aG autologin ${username}
@@ -126,3 +109,9 @@ chmod 755 /usr/bin/alterlinux-gtk-bookmarks
 
 # Replace auto login user
 sed -i s/%USERNAME%/${username}/g /etc/lightdm/lightdm.conf
+
+# Replace password for screensaver comment
+sed -i s/%PASSWORD%/${password}/g "/etc/dconf/db/local.d/02-disable-lock"
+
+# Update system datebase
+dconf update

channels/cinnamon/airootfs.any/etc/skel/Desktop/welcome-to-alter.desktop

@@ -48,4 +48,12 @@ remove /etc/systemd/system/{choose-mirror.service,getty@tty1.service.d}
 sed -i "s/^autologin/#autologin/g" /etc/lightdm.conf
 
 # Remove dconf for live environment
-remove "/etc/dconf/db/local.d/02-live-config"
+remove "/etc/dconf/db/local.d/02-disable-lock"
+
+# Replace menu source (enable screen lock)
+remove "/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js"
+mv "/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js.org" "/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js"
+
+
+# Update system datebase
+dconf update