fix the logo is shown in the windows's title.

PetoiCamp · Aug 22, 2023 · 22a3480 · 22a3480
1 parent 2c622d8
commit 22a3480
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/pyUI/Calibrator.py b/pyUI/Calibrator.py
@@ -22,6 +22,7 @@ def __init__(self,model,lan):
         self.calibSliders = list()
         self.OSname = self.winCalib.call('tk', 'windowingsystem')
         if self.OSname == 'win32':
+            self.winCalib.iconbitmap(resourcePath + 'Petoi.ico')
             self.calibButtonW = 8
         else:
             self.calibButtonW = 4

diff --git a/pyUI/FirmwareUploader.py b/pyUI/FirmwareUploader.py
@@ -68,7 +68,7 @@ def buildMenu(self):
         self.win.configure(menu=self.menuBar)
 
         if self.OSname == 'win32':
-            self.win.iconbitmap(r'{}Petoi.ico'.format(resourcePath))
+            self.win.iconbitmap(resourcePath + 'Petoi.ico')
 
         self.helpMenu = Menu(self.menuBar, tearoff=0)
         self.helpMenu.add_command(label=txt('labAbout'), command=self.about)
@@ -111,7 +111,7 @@ def initWidgets(self):
             print ('Create configuration file')
             self.defaultLan = 'English'
             model = 'Bittle'
-            strDefaultPath = releasePath
+            strDefaultPath = releasePath[:-1]
             strSwVersion = '2.0'
             strBdVersion = NyBoard_version_list[-1]
             mode = 'Standard'
@@ -351,7 +351,7 @@ def formalize(self, strdir=' '):
         sep = "/"
         listDir = strdir.split("/")
         if (strdir == str(pathlib.Path().resolve())):
-            strdir = sep.join(listDir) + '/release'
+            strdir = sep.join(listDir) + sep + "release"
         else:
             if (listDir[-1].find("release") == -1) and len(listDir) >= 2:
                 while listDir[-1].find("release") == -1 and len(listDir) >= 2:
@@ -366,8 +366,8 @@ def formalize(self, strdir=' '):
     def open_dir(self):
         # call askdirectory to open file director
         logger.debug(f"{self.strFileDir.get()}")
-        if (self.strFileDir.get()).find(releasePath) != -1:
-            initDir = releasePath
+        if (self.strFileDir.get()).find(releasePath[:-1]) != -1:
+            initDir = releasePath[:-1]
         else:
             initDir = self.strFileDir
         dirpath = filedialog.askdirectory(title=txt('titleFileDir'), initialdir=initDir)

diff --git a/pyUI/SkillComposer.py b/pyUI/SkillComposer.py
@@ -99,7 +99,7 @@ def __init__(self,model, lan):
         except Exception as e:
             print('Create configuration file')
             self.defaultLan = 'English'
-            self.defaultPath = releasePath
+            self.defaultPath = releasePath[:-1]
             self.defaultSwVer = '2.0'
             self.defaultBdVer = NyBoard_version
             self.defaultMode = 'Standard'
@@ -1371,7 +1371,7 @@ def getCreatorInfo(self, modifyQ):
             print('Create configuration file')
             defaultLan = self.defaultLan
             defaultModel = self.model
-            defaultPath = releasePath
+            defaultPath = releasePath[:-1]
             defaultSwVer = '2.0'
             defaultBdVer = NyBoard_version
             defaultMode = 'Standard'

diff --git a/pyUI/UI.py b/pyUI/UI.py
@@ -51,7 +51,7 @@ def __init__(self):
             print('Create configuration file')
             self.defaultLan = 'English'
             model = 'Bittle'
-            self.defaultPath = releasePath
+            self.defaultPath = releasePath[:-1]
             self.defaultSwVer = '2.0'
             self.defaultBdVer = NyBoard_version
             self.defaultMode = 'Standard'
@@ -66,14 +66,14 @@ def __init__(self):
 
         self.OSname = self.window.call('tk', 'windowingsystem')
         if self.OSname == 'win32':
-            self.window.iconbitmap(r'{}Petoi.ico'.format(resourcePath))
+            self.window.iconbitmap(resourcePath + 'Petoi.ico')
             self.window.geometry('398x270+800+400')
         elif self.OSname == 'aqua':
             self.window.geometry('+800+400')
             self.backgroundColor = 'gray'
         else:
             self.window.tk.call('wm', 'iconphoto', self.window._w, "-default",
-                                PhotoImage(file= r'{}Petoi.png'.format(resourcePath)))
+                                PhotoImage(file= resourcePath + 'Petoi.png'))
             self.window.geometry('+800+400')
 
         self.myFont = tkFont.Font(

diff --git a/pyUI/commonVar.py b/pyUI/commonVar.py
@@ -2,7 +2,7 @@
 import sys
 sys.path.append('../serialMaster/')
 resourcePath = './resources/'
-releasePath = './release'
+releasePath = './release/'
 sys.path.append(resourcePath)
 from ardSerial import *
 from tkinter import *