Merge pull request #2 from Jordonbc/1.1.0a

Added Info and removed start gap

JDE/Interfaces/desktop.py

@@ -6,6 +6,7 @@ from tkinter import *
 
 from JDE.Interfaces import start
 from Programs import jpad
+from Programs import info
 
 desktopLog = logging.getLogger("desktop.py")
 
@@ -50,7 +51,7 @@ class desktop:
 
             # self.startPic.place_configure(x=int(0), y=int(self.cHeight) - 55)
 
-            self.search.place_configure(x=57, y=int(self.cHeight) - 55, height=55, width=200)
+            self.search.place_configure(x=0, y=int(self.cHeight) - 55, height=55, width=300)
 
             # versionText.place(x=int(cWidth) - 300, y=int(cHeight) - 120)
 
@@ -102,7 +103,7 @@ class desktop:
             self.search = Entry(self.window, textvariable=self.searchvar, font=(14), bg=self.menuColour)
             self.search.bind("<Button-1>", self.box)
             self.search.bind("<Return>", self.search_internet)
-            self.search.place(x=57, y=350, height=50, width=100)
+            self.search.place(x=0, y=350, height=50, width=100)
             self.search.insert(0, "Search")
         except Exception as e:
             desktopLog.error(str(e))
@@ -131,7 +132,7 @@ class desktop:
             self.contextMenu.add_command(label="File Explorer", state=DISABLED)
             self.contextMenu.add_command(label="Hardware Monitor", state=DISABLED)
             self.contextMenu.add_command(label="Music Player", state=DISABLED)
-            self.contextMenu.add_command(label="Info", state=DISABLED)
+            self.contextMenu.add_command(label="Info", command=info.info)
             self.contextMenu.add_command(label="Terminal", state=DISABLED)
             self.contextMenu.add_command(label="Settings", state=DISABLED)
             self.contextMenu.add_command(label="Restart", state=DISABLED)
@@ -246,8 +247,8 @@ class desktop:
             self.notifcationBar = Frame(self.window, bg=self.menuColour)
             self.notifcationBar.place(x=int(self.width) - 100, y=int(self.height) - 55)
 
-            self.window.attributes('-fullscreen', False)
-            self.max = 0
+            self.window.attributes('-fullscreen', True)
+            self.max = 1
 
             self.displayTime = Label(self.notifcationBar, text=self.cTime, bg=self.menuColour, font=("System", 20))
             self.displayTime.pack(side=RIGHT)

JDE/Recent

@@ -26,3 +26,4 @@ jpad
 jpad
 jpad
 jpad
+jpad

JDE/Settings/settings.conf

@@ -5,3 +5,4 @@ background = "JDE/Images/background.png"
 colour = "#a0fd44"
 startPic = "JDE/Images/start.png"
 fullStart = "0"
+version = "1.1.0 ALPHA"

Programs/info.py

@@ -0,0 +1,35 @@
+from tkinter import *
+
+
+class info:
+    def createWindow(self):
+        self.window = Tk()
+        self.window.configure(bg=self.menuColour)
+        self.window.title("JDE Information Panel")
+        self.window.geometry("500x300")
+
+        # glassOSLogo = PhotoImage(file="GlassOS/Glass_OS_Logo.png")
+        # glassOSPicture = Button(rootInfo, image=glassOSLogo)
+
+        glassOSPicture = Label(self.window, text="JDE " + self.version,
+                               font=("Space Bd BT Bold", 32, ""), fg="#FF0000", bg=self.menuColour)
+        glassOSPicture.pack()
+
+        text = Label(self.window, text="You are currently running JDE " + self.version + ".", bg=self.menuColour)
+
+        text.pack(expand=YES, fill=BOTH)
+
+        self.window.mainloop()
+
+    def __init__(self):
+        try:
+            config = {}
+            exec(open("JDE/Settings/settings.conf").read(), config)
+
+            self.menuColour = config["colour"]
+            self.version = config["version"]
+
+        except:
+            pass
+
+        self.createWindow()