Updated: Welcome Screen

The syled and colors are ste correctly

Signed-off-by: debianpepper <pdpdebdevuan@protonmail.com>

iso_configs/pmostools/peptools/welcome.py

@@ -17,7 +17,7 @@ import welfunc
 pewel = welconf.bbstyle
 pewel.resizable(False, False)
 WINDOW_HEIGHT = 400
-WINDOW_WIDTH = 710
+WINDOW_WIDTH = 650
 
 
 def wbase():
@@ -101,32 +101,26 @@ fsw.grid(row=1, column=0, columnspan=4)
 fs = ttk.Frame(fsw)
 fs.grid(row=0, column=0, ipadx=5, ipady=5, padx=5, pady=5, sticky='e')
 
-wms = ttk.Labelframe(fs, bootstyle="warning", text="Welcome to Peppermint OS")
+wms = ttk.Labelframe(fs, bootstyle="dark", text="Welcome to Peppermint OS")
 wms.grid(row=0, column=0, ipadx=0, ipady=0, padx=10, pady=10, sticky='e')
 
 
 # Frame Buttons
-btnsaw = ttk.Button(
-    wms,
-    text="Suggested",
-    cursor="hand2",
-    style="danger-outline",
-    command=welfunc.suggested_packages)
-btnsaw.grid(row=0, column=0, ipadx=5, ipady=5, padx=5, pady=5, sticky='ew')
+
 
 btnph = ttk.Button(
     wms,
-    text="Peppermint Hub",
+    text="Suggested",
     cursor="hand2",
-    bootstyle="danger-outline",
-    command=welfunc.hub)
+    bootstyle="danger",
+    command=welfunc.suggested_packages)
 btnph.grid(row=1, column=0, ipadx=5, ipady=5, padx=5, pady=5, sticky='ew')
 
 btnpdocs = ttk.Button(
     wms,
     text="Pep Docs",
     cursor="hand2",
-    bootstyle="danger-outline",
+    bootstyle="danger",
     command=welfunc.pep_docs)
 btnpdocs.grid(row=2, column=0, ipadx=5, ipady=5, padx=5, pady=5, sticky='ew')
 
@@ -134,35 +128,35 @@ btnbdl = ttk.Button(
     wms,
     text="Build Log",
     cursor="hand2",
-    bootstyle="danger-outline",
+    bootstyle="danger",
     command=welfunc.build_date)
 btnbdl.grid(row=3, column=0, ipadx=5, ipady=5, padx=5, pady=5, sticky='ew')
 
 # Frame labels
-lblsaw = ttk.Label(wms, text=" - Select Packages and Web Browsers ",
-                   wraplength=300)
+lblsaw = ttk.Label(wms, text=" - What is Peppermint OS ",
+                   wraplength=300, bootstyle="dark")
 lblsaw.grid(row=0, column=1, sticky='ew')
 
-lblph = ttk.Label(wms, text=" - System changes, and customizations ",
-                  wraplength=300)
+lblph = ttk.Label(wms, text=" - Select Packages and Web Browsers",
+                  wraplength=300, bootstyle="dark")
 lblph.grid(row=1, column=1, sticky='ew')
 
 lblpdocs = ttk.Label(wms, text=" - Peppermint Online Documentation",
-                     wraplength=300)
+                     wraplength=300, bootstyle="dark")
 lblpdocs.grid(row=2, column=1, sticky='ew')
 
 lblbdl = ttk.Label(wms, text=" - Review the build log",
-                   wraplength=300)
+                   wraplength=300, bootstyle="dark")
 lblbdl.grid(row=3, column=1, sticky='ew')
 
 # Frame Title
-soc = ttk.Labelframe(fs, bootstyle="warning", text="The Peppermint Community")
+soc = ttk.Labelframe(fs, bootstyle="dark", text="The Peppermint Community")
 soc.grid(row=0, column=1, ipadx=5, ipady=5, padx=5, pady=5, sticky='e')
 #soc.grid(row=5, column=0)
 
 # Frame message
 lblqt = ttk.Label(soc, text=welconf.MESSAGE_TEXT,
-                  wraplength=250)
+                  wraplength=250, bootstyle="dark")
 lblqt.grid(row=3, column=0, columnspan=3,sticky='ew')
 
 # Social Icons
@@ -171,12 +165,20 @@ icotfm = welconf.fm
 icotmat = welconf.mat
 icotcb = welconf.cb
 
+btnsaw = ttk.Button(
+    wms,
+    text="About",
+    cursor="hand2",
+    bootstyle="danger",
+    command=welfunc.about)
+btnsaw.grid(row=0, column=0, ipadx=5, ipady=5, padx=5, pady=5, sticky='ew')
+
 # Social buttons
 btncf = ttk.Button(
     soc,
     text="Forums",
     cursor="hand2",
-    bootstyle="dark-outline",
+    bootstyle="danger",
     image=icotfm,
     command=welfunc.source_forge)
 btncf.grid(
@@ -192,7 +194,7 @@ btnmt = ttk.Button(
     soc,
     text="-matrix-",
     cursor="hand2",
-    bootstyle="dark-outline",
+    bootstyle="danger",
     image=icotmat,
     command=welfunc.matrix)
 btnmt.grid(
@@ -208,7 +210,7 @@ btnmas = ttk.Button(
     soc,
     text="Mastodon",
     cursor="hand2",
-    bootstyle="dark-outline",
+    bootstyle="danger",
     image=icotms,
     command=welfunc.mastodon)
 btnmas.grid(
@@ -224,7 +226,7 @@ btncb = ttk.Button(
     soc,
     text="CodeBerg",
     cursor="hand2",
-    bootstyle="dark-outline",
+    bootstyle="danger",
     image=icotcb,
     command=welfunc.code_berg)
 btncb.grid(

iso_configs/pmostools/peptools/welconf.py

@@ -13,7 +13,7 @@ import os
 # This will set the style to used for bootstrap
 # just change the name to what is needed for the
 # the system
-bbstyle = ttk.Window(themename="darkly")
+bbstyle = ttk.Window(themename="peppermint")
 
 # set the title of the window
 DEBIAN_TITLE = "Welcome to Peppermint - (Debian)"
@@ -34,6 +34,7 @@ tms = PhotoImage(file=spath + '/images/mn.png')
 fm = PhotoImage(file=spath + '/images/sf.png')
 mat = PhotoImage(file=spath + '/images/mt.png')
 cb = PhotoImage(file=spath + '/images/cb.png')
+bb = PhotoImage(file=spath + '/images/cb.png')
 
 # set the message for the community section
 MESSAGE_TEXT = ("Come join the conversation about"

iso_configs/pmostools/peptools/welfunc.py

@@ -17,47 +17,47 @@ def suggested_packages():
     """ Open the suggested packages """
     os.system('python3 ' + spath + '/suggested.py')
 
-def hub():
-    """Open the Hub"""
-    os.system('hub')
+def about():
+    """Open the about page"""
+    os.system('min --new-window https://peppermintos.com/about/ &'
+              )
 
 
-##SSB's
+##SSB's###
 
 def pep_docs():
     """Open Pep Docs"""
-    os.system('luakit -U https://peppermint_os.codeberg.page/html/ &'
+    os.system('min --new-window https://peppermint_os.codeberg.page/html/ &'
               )
 
-## Community Section
+# Community Section
+
 
 def mastodon():
     """Open Mastodon"""
-    os.system('luakit -U https://fosstodon.org/@peppermintos &'
+    os.system('min --new-window https://fosstodon.org/@peppermintos &'
               )
 
 
 def code_berg():
     """Open Codeberg"""
-    os.system('luakit -U https://codeberg.org/Peppermint_OS & '
+    os.system('min --new-window https://codeberg.org/Peppermint_OS & '
               )
 
 
 def matrix():
     """Open Matrix"""
-    os.system('luakit -U https://matrix.to/#/!JhPtEbNexzFaoOkvGp:matrix.org?'
-              'via=matrix.org & '
+    os.system('min --new-window https://matrix.to/#/!JhPtEbNexzFaoOkvGp:matrix.org?via=matrix.org & '
               )
 
 
 def source_forge():
     """Open Sourceforge"""
-    os.system('luakit -U https://sourceforge.net/p/peppermintos/pepos/ & '
+    os.system('min --new-window https://sourceforge.net/p/peppermintos/pepos/ & '
               )
 
 
 def build_date():
     """Open BuildDate wiki"""
-    os.system('luakit -U https://sourceforge.net/p/peppermintos/pepwiki/'
-              'BuildDate/ & '
+    os.system('min --new-window https://sourceforge.net/p/peppermintos/pepwiki/BuildDate/ & '
               )

iso_configs/sources/deb_64/sources.list

@@ -9,8 +9,8 @@ deb http://deb.debian.org/debian/ bookworm main contrib non-free
 deb-src http://deb.debian.org/debian/ bookworm main contrib non-free
 
 # Security Repo - main contrib non-free
-#deb http://security.debian.org/ bookworm-security main contrib non-free
-#deb-src http://security.debian.org/ bookworm-security main contrib non-free
+deb http://security.debian.org/ bookworm-security main contrib non-free
+deb-src http://security.debian.org/ bookworm-security main contrib non-free
 
 # Updates Repo - main contrib non-free
 #deb http://deb.debian.org/debian bookworm-updates main contrib non-free
@@ -19,6 +19,6 @@ deb-src http://deb.debian.org/debian/ bookworm main contrib non-free
 #deb-src http://deb.debian.org/debian/ bookworm-proposed-updates main contrib non-free
 
 # bookworm-backports, previously on backports.debian.org
-#deb http://deb.debian.org/debian/ bookworm-backports main contrib non-free
-#deb-src http://deb.debian.org/debian/ bookworm-backports main contrib non-free
+deb http://deb.debian.org/debian/ bookworm-backports main contrib non-free
+deb-src http://deb.debian.org/debian/ bookworm-backports main contrib non-free
 

iso_configs/sources/dev_64/sources.list

@@ -6,16 +6,16 @@
 
 # Main Repo - main contrib non-free
 deb http://deb.devuan.org/merged daedalus main contrib non-free
-#deb-src http://deb.devuan.org/merged daedalus main contrib non-free
+deb-src http://deb.devuan.org/merged daedalus main contrib non-free
 
 # Security Repo - main contrib non-free
-#deb http://deb.devuan.org/merged daedalus-security main contrib non-free
-#deb-src http://deb.devuan.org/merged daedalus-security main contrib non-free
+deb http://deb.devuan.org/merged daedalus-security main contrib non-free
+deb-src http://deb.devuan.org/merged daedalus-security main contrib non-free
 
 # Updates Repo - main contrib non-free
 #deb http://deb.devuan.org/merged daedalus-updates main contrib non-free
 #deb-src http://deb.devuan.org/merged daedalus-updates main contrib non-free
 
 # daedalus-backports, previously on backports.debian.org
-#deb http://deb.devuan.org/merged daedalus-backports main contrib non-free
-#deb-src http://deb.devuan.org/merged daedalus-backports main contrib non-free
+deb http://deb.devuan.org/merged daedalus-backports main contrib non-free
+deb-src http://deb.devuan.org/merged daedalus-backports main contrib non-free