from dev

Author: arcolinuxz

usr/local/bin/fix-sddm-conf

@@ -0,0 +1,39 @@
+#!/bin/bash
+#set -e
+##################################################################################################################
+# Author    : Erik Dubois
+# Website   : https://www.erikdubois.be
+# Website   : https://www.alci.online
+# Website   : https://www.arcolinux.info
+# Website   : https://www.arcolinux.com
+# Website   : https://www.arcolinuxd.com
+# Website   : https://www.arcolinuxb.com
+# Website   : https://www.arcolinuxiso.com
+# Website   : https://www.arcolinuxforum.com
+##################################################################################################################
+#
+#   DO NOT JUST RUN THIS. EXAMINE AND JUDGE. RUN AT YOUR OWN RISK.
+#
+##################################################################################################################
+#tput setaf 0 = black 
+#tput setaf 1 = red 
+#tput setaf 2 = green
+#tput setaf 3 = yellow 
+#tput setaf 4 = dark blue 
+#tput setaf 5 = purple
+#tput setaf 6 = cyan 
+#tput setaf 7 = gray 
+#tput setaf 8 = light blue
+##################################################################################################################
+
+echo "Copying both files : etc/sddm.conf and /etc/sddm.conf.d/kde_settings.conf"
+sudo cp -v /usr/share/archlinux-tweak-tool/data/arco/sddm/sddm.conf /etc/sddm.conf
+[ -d /etc/sddm.conf.d/ ] || sudo mkdir -p /etc/sddm.conf.d/
+sudo cp -v /usr/share/archlinux-tweak-tool/data/arco/sddm.conf.d/kde_settings.conf /etc/sddm.conf.d/kde_settings.conf
+echo "/etc/sddm.conf and /etc/sddm.conf.d/kde_settings.conf changed with configs of ATT"
+
+echo "###############################################################################"
+echo "###                DONE - YOU CAN CLOSE THIS WINDOW                        ####"
+echo "###############################################################################"
+
+

usr/share/archlinux-tweak-tool/GUI.py

@@ -256,7 +256,7 @@ def GUI(self, Gtk, Gdk, GdkPixbuf, base_dir, os, Pango):  # noqa
 
     else:
 
-        if Functions.file_check(Functions.sddm_conf):
+        if Functions.file_check(Functions.sddm_default_d1) and Functions.file_check(Functions.sddm_default_d2) and os.path.exists("/usr/bin/sddm"):
             Sddm_GUI.GUI(self, Gtk, GdkPixbuf, vboxStack17, sddm, Functions)
         else:
             hbox31 = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=10)
@@ -270,17 +270,17 @@ def GUI(self, Gtk, Gdk, GdkPixbuf, base_dir, os, Pango):  # noqa
             vboxStack17.pack_start(hbox31, False, False, 0)
             vboxStack17.pack_start(hbox41, False, False, 0)
             ls = Gtk.Label()
-            ls.set_markup("No /etc/sddm.conf configuration file found. \nInstall <b>Sddm</b> and the configuration file to use this tab.")
-            reset_sddm_original = Gtk.Button(label="Apply the sddm.conf from ArcoLinux")
-            reset_sddm_original.connect("clicked", self.on_click_no_sddm_reset_original)
-            install_sddm = Gtk.Button(label="Install Sddm and enable it")
+            ls.set_markup("No /etc/sddm.conf or /etc/sddm.conf.d/kde_settings.conf file found. \nUse button 1 to install and enable <b>Sddm</b>.\n ")
+            #reset_sddm_original = Gtk.Button(label="2. Apply the sddm.conf from ArcoLinux")
+            #reset_sddm_original.connect("clicked", self.on_click_no_sddm_reset_original)
+            install_sddm = Gtk.Button(label="1. Install Sddm and enable it")
             install_sddm.connect("clicked", self.on_click_att_sddm_clicked)
-            reset_sddm_original_restart = Gtk.Button(label="Restart ArchLinux Tweak Tool")
+            reset_sddm_original_restart = Gtk.Button(label="2. Restart ArchLinux Tweak Tool")
             reset_sddm_original_restart.connect("clicked", self.on_refresh_att_clicked)
 
             vboxStack17.pack_start(ls, False, False, 0)
             vboxStack17.pack_end(reset_sddm_original_restart, False, False, 0)
-            vboxStack17.pack_end(reset_sddm_original, False, False, 0)
+            #vboxStack17.pack_end(reset_sddm_original, False, False, 0)
             vboxStack17.pack_end(install_sddm, False, False, 0)
 
     # # ==========================================================

usr/share/archlinux-tweak-tool/Sddm_GUI.py

@@ -56,7 +56,7 @@ def GUI(self, Gtk, GdkPixbuf, vboxStack10, sddm, Functions):
     label2.set_text("Theme")
 
     label_sddm_config = Gtk.Label(xalign=0)
-    label_sddm_config.set_text("Set our sddm configuration back")
+    label_sddm_config.set_text("Set our sddm configuration back\n(/etc/sddm.conf and /etc/sddm.conf.d/kde_settings.conf")
 
     label_empty1 = Gtk.Label(xalign=0)
     label_empty1.set_text("")
@@ -93,7 +93,7 @@ def GUI(self, Gtk, GdkPixbuf, vboxStack10, sddm, Functions):
     apply_sddm = Gtk.Button(label="Apply settings")
     apply_sddm.connect("clicked", self.on_click_sddm_apply)
 
-    reset_sddm_original = Gtk.Button(label="Apply the sddm.conf from ArcoLinux")
+    reset_sddm_original = Gtk.Button(label="Apply the sddm configuration from ArcoLinux")
     reset_sddm_original.connect("clicked", self.on_click_sddm_reset_original)
 
     enable_sddm = Gtk.Button(label="Enable Sddm")