Merge branch 'dev' into archiso-45

Author: Hayao0819

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

@@ -19,7 +19,6 @@ desktop-effects-unmaximize-effect='scale'
 desktop-effects-unmaximize-time=100
 desktop-effects-unmaximize-transition='easeOutBounce'
 enabled-applets=['panel1:left:0:menu@cinnamon.org:0', 'panel1:left:1:grouped-window-list@cinnamon.org:2', 'panel1:right:0:systray@cinnamon.org:3', 'panel1:right:1:xapp-status@cinnamon.org:4', 'panel1:right:2:notifications@cinnamon.org:5', 'panel1:right:3:printers@cinnamon.org:6', 'panel1:right:4:removable-drives@cinnamon.org:7', 'panel1:right:5:keyboard@cinnamon.org:8', 'panel1:right:6:network@cinnamon.org:9', 'panel1:right:7:sound@cinnamon.org:10', 'panel1:right:8:power@cinnamon.org:11', 'panel1:right:9:calendar@cinnamon.org:12']
-favorite-apps=['chromium.desktop', 'nemo.desktop', 'org.gnome.Terminal.desktop', 'cinnamon-settings.desktop']
 hotcorner-layout=['expo:true:0', 'scale:false:0', ':true:0', 'desktop:true:0']
 next-applet-id=13
 panel-edit-mode=false

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

@@ -1,7 +1,7 @@
-# useradd defaults file for AlterLinux
+# useradd defaults file for Alter Linux
 # original changes by TomK
 
-# In AlterLinux, the default shell is changed to /bin/zsh from the default of ArchLinux (by Hayao)
+# In  , the default shell is changed to /bin/zsh from the default of ArchLinux (by Hayao)
 
 GROUP=users
 HOME=/home

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

@@ -4,7 +4,7 @@ Version=1.0
 Name=AlterLinux Sidebar
 Comment=Generates sidebar items.
 Icon=utilities-terminal
-Exec=/usr/local/bin/alterlinux-sidebar -f --alterlive init
+Exec=/usr/bin/alterlinux-gtk-bookmarks -f --alterlive init
 X-GNOME-Autostart-enabled=true
 Type=Application
 RunHook=0

channels/cinnamon/airootfs.any/etc/default/useradd

@@ -1,10 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
 Version=1.0
-Name=Welcome to AlterLinux
-Comment=Displays the AlterLinux welcome page.
+Name=Welcome to Alter Linux
+Comment=Displays the Alter Linux welcome page.
 Icon=utilities-terminal
-Exec=/usr/local/bin/alterlinux-welcome-page -l --alterlive
+Exec=/usr/bin/alterlinux-welcome-page -l --alterlive
 X-GNOME-Autostart-enabled=true
 Type=Application
 RunHook=0

channels/cinnamon/airootfs.any/etc/skel/.config/autostart/gensidebar.desktop

@@ -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/skel/.config/autostart/welcome_page.desktop

@@ -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}
@@ -122,7 +105,13 @@ fi
 
 
 # Set script permission
-chmod 755 /usr/local/bin/alterlinux-sidebar
+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