Key bindings and resampling options

Author: STBrian

src/autoImport.py

@@ -135,15 +135,20 @@ def autoImport(self):
                     textureToReplace = Image.open(file)
                     isSized = isImageSize(textureToReplace, position[2] - position[0], position[3] - position[1])
                     if not (not isSized and not allowResize):
-                        # Show new texture in preview frame
-                        portviewRes = textureToReplace.resize((256, 256), Image.Resampling.NEAREST)
-                        root.previewFrame.portview.configure(dark_image=portviewRes)
-
                         # Replace texture
                         print("Opening new texture and replacing...")
 
                         if not isSized:
-                            textureToReplace = textureToReplace.resize((position[2] - position[0], position[3] - position[1]), Image.Resampling.LANCZOS)
+                            resampling = Image.Resampling.LANCZOS
+                            if self.globalVars.resamplingType == "Bilinear":
+                                resampling = Image.Resampling.BILINEAR
+                            elif self.globalVars.resamplingType == "Nearest":
+                                resampling = Image.Resampling.NEAREST
+                            textureToReplace = textureToReplace.resize((position[2] - position[0], position[3] - position[1]), resampling)
+                        # Show new texture in preview frame
+                        portviewRes = textureToReplace.resize((256, 256), Image.Resampling.NEAREST)
+                        root.previewFrame.portview.configure(dark_image=portviewRes)
+                        # Replace
                         atlas.addElement(position, textureToReplace)
 
                         if not Path(f"{outputDir}/{textureDestDir}").exists():

src/infoDisplay.py

@@ -104,7 +104,12 @@ def changeTextureFunc(self, value):
                     messagebox.showerror("Invalid texture", f"Texture selected is not {position[2] - position[0]}x{position[3] - position[1]}")
                 else:
                     if not isSized:
-                        textureToReplace = textureToReplace.resize((position[2] - position[0], position[3] - position[1]), Image.Resampling.LANCZOS)
+                        resampling = Image.Resampling.LANCZOS
+                        if self.globalVars.resamplingType == "Bilinear":
+                            resampling = Image.Resampling.BILINEAR
+                        elif self.globalVars.resamplingType == "Nearest":
+                            resampling = Image.Resampling.NEAREST
+                        textureToReplace = textureToReplace.resize((position[2] - position[0], position[3] - position[1]), resampling)
                     atlas.addElement(position, textureToReplace)
                     duplicated = checkForMatch(value, added.getItems())
 

src/main.py

@@ -41,6 +41,8 @@ def parseConfigFile(fp: str):
         config["Preferences"]["showpreviewbg"] = "true"
     if not "allowresize" in config["Preferences"]:
         config["Preferences"]["allowresize"] = "true"
+    if not "resampling" in config["Preferences"]:
+        config["Preferences"]["resampling"] = "Lanczos"
 
     if not config["Preferences"]["theme"] in ("dark", "light"):
         config["Preferences"]["theme"] = "dark"
@@ -50,6 +52,9 @@ def parseConfigFile(fp: str):
 
     if not config["Preferences"]["allowresize"] in ("true", "false"):
         config["Preferences"]["allowresize"] = "true"
+
+    if not config["Preferences"]["resampling"] in ("Bilinear", "Nearest", "Lanczos"):
+        config["Preferences"]["resampling"] = "Lanczos"
     return config
 
 def createNewConfigFile(fp: str | Path, values: dict):
@@ -187,6 +192,7 @@ def __init__(self):
              ("outputFolder", str), 
              ("showPreviewBg", bool), 
              ("allowResize", bool),
+             ("resamplingType", str),
              ("items", dict),
              ("uvs", dict),
              ("atlasHandler", atlasTexture3dst),
@@ -229,6 +235,7 @@ def __init__(self):
         self.globalVars.outputFolder = self.config["Project"]["lastdir"]
         self.globalVars.showPreviewBg = self.config["Preferences"]["showpreviewbg"] == "true"
         self.globalVars.allowResize = self.config["Preferences"]["allowresize"] == "true"
+        self.globalVars.resamplingType = self.config["Preferences"]["resampling"]
 
         self.saveChangesForIniFile()
         self.changeTheme()
@@ -276,7 +283,7 @@ def __init__(self):
         # --------------------------------------------
 
         if self.globalVars.outputFolder != "":
-            print(self.globalVars.outputFolder)
+            print("Opening last project:", self.globalVars.outputFolder)
             if not Path(self.globalVars.outputFolder).exists():
                 messagebox.showwarning("Failed to open project", "Last project cannot be opened. Missing directory")
                 self.globalVars.outputFolder = ""
@@ -294,6 +301,33 @@ def __init__(self):
                     self.config["Project"]["lastdir"] = ""
                     self.saveChangesForIniFile()
 
+    def key_listener(self, event: tkinter.Event):
+        key = event.keysym
+        if key == "Up" or key == "Down":
+            itemSelected = self.mainFrame.elementsTreeView.selection()
+            if itemSelected:
+                items = self.mainFrame.elementsTreeView.get_children()
+                index = items.index(itemSelected[0])
+
+                if key == "Up":
+                    if index > 0:
+                        previous = items[index - 1]
+                        self.mainFrame.elementsTreeView.selection_set(previous)
+                        self.mainFrame.elementsTreeView.focus(previous)
+                        self.mainFrame.elementsTreeView.see(previous)
+                elif key == "Down":
+                    if index < len(items) - 1:
+                        next_elem = items[index + 1]
+                        self.mainFrame.elementsTreeView.selection_set(next_elem)
+                        self.mainFrame.elementsTreeView.focus(next_elem)
+                        self.mainFrame.elementsTreeView.see(next_elem)
+        elif key == "Return":
+            self.mainFrame.searchOptionsFrame.saveSearch()
+    
+    def click_widget(self, event: tkinter.Event):
+        if event.widget != self.mainFrame.searchOptionsFrame.entryText._entry:
+            self.focus()
+
     def saveChangesForIniFile(self):
         with open(self.globalVars.runningDir.joinpath("mc3ds-tm.ini"), "w") as configfile:
             self.config.write(configfile)
@@ -376,7 +410,7 @@ def openProjectPath():
                 cancelButton.grid(column=0, row=11, padx=10, pady=15, sticky="e")
 
                 applyButton = customtkinter.CTkButton(newProjectWindow, text="Create", command=createProject)
-                applyButton.grid(column=1, row=11, padx=10, sticky="e", pady=10)
+                applyButton.grid(column=1, row=11, padx=(0, 10), sticky="e", pady=10)
 
                 self.newProjectWindow = newProjectWindow
             else:
@@ -466,7 +500,7 @@ def openProject(self, dirpath: str | Path) -> bool:
         if isinstance(dirpath, str):
             dirpath = Path(dirpath)
         if not Path(dirpath).joinpath("project.conf").exists():
-            messagebox.showerror("Failed to open project", "No project config found in folder")
+            messagebox.showerror("Failed to open project", "No project config file found in folder")
             return False
         else:
             config = configparser.ConfigParser()
@@ -531,24 +565,35 @@ def openSettings(self):
             previewBgCheckbox = customtkinter.CTkCheckBox(settingsWindow, text="Show preview background", variable=previewBgValue, border_width=1, checkbox_width=20, checkbox_height=20)
             previewBgCheckbox.grid(column=0, row=3, padx=10, pady=(0, 2), sticky="w")
 
+            replaceOpLabel = customtkinter.CTkLabel(settingsWindow, text="Replace options", font=(None, 14, "bold"))
+            replaceOpLabel.grid(column=0, row=4, padx=10, pady=(10, 0), sticky="ws")
+
+            resamplingLabel = customtkinter.CTkLabel(settingsWindow, text="Resampling", font=(None, 12))
+            resamplingLabel.grid(column=0, row=5, padx=10, pady=0, sticky="ws")
+
+            resamplingValue = customtkinter.StringVar(value=self.globalVars.resamplingType)
+            resamplingCombobox = customtkinter.CTkComboBox(settingsWindow, variable=resamplingValue, values=["Lanczos", "Bilinear", "Nearest"], state="readonly")
+            resamplingCombobox.grid(column=0, row=6, padx=10, pady=(0, 10), sticky="w")
+
             allowResizeValue = customtkinter.BooleanVar(value=self.globalVars.allowResize)
             allowResizeCheckbox = customtkinter.CTkCheckBox(settingsWindow, text="Allow resize textures", variable=allowResizeValue, border_width=1, checkbox_width=20, checkbox_height=20)
-            allowResizeCheckbox.grid(column=0, row=4, padx=10, pady=(0, 10), sticky="w")
+            allowResizeCheckbox.grid(column=0, row=7, padx=10, pady=(0, 10), sticky="w")
 
             applyChanges = partial(self.applySettings, 
                                    {
                                        "theme": themeValue,
                                        "showpreviewbg": previewBgValue,
-                                       "allowresize": allowResizeValue
+                                       "allowresize": allowResizeValue,
+                                       "resampling": resamplingValue
                                    })
 
             discardChanges = partial(settingsWindow.destroy)
 
             cancelButton = customtkinter.CTkButton(settingsWindow, text="Cancel", command=discardChanges)
-            cancelButton.grid(column=0, row=5, padx=10, pady=10, sticky="e")
+            cancelButton.grid(column=0, row=8, padx=10, pady=10, sticky="e")
 
             applyButton = customtkinter.CTkButton(settingsWindow, text="Apply", command=applyChanges)
-            applyButton.grid(column=1, row=5, padx=(0, 10), pady=10)
+            applyButton.grid(column=1, row=8, padx=(0, 10), pady=10)
 
             self.settingsWindow = settingsWindow
         else:
@@ -559,13 +604,15 @@ def applySettings(self, newSettings: dict):
         self.theme = newSettings["theme"].get()
         self.globalVars.showPreviewBg = newSettings["showpreviewbg"].get()
         self.globalVars.allowResize = newSettings["allowresize"].get()
+        self.globalVars.resamplingType = newSettings["resampling"].get()
 
         self.changeTheme()
         self.mainFrame.infoDispFrame.showItemInfo()
 
         self.config["Preferences"]["theme"] = self.theme
         self.config["Preferences"]["showpreviewbg"] = "true" if self.globalVars.showPreviewBg else "false"
         self.config["Preferences"]["allowresize"] = "true" if self.globalVars.allowResize else "false"
+        self.config["Preferences"]["resampling"] = self.globalVars.resamplingType
         self.saveChangesForIniFile()
 
     def changeTheme(self):
@@ -580,12 +627,6 @@ def updateListCallback(self):
         self.mainFrame.searchOptionsFrame.saveSearch()
 
     def loadResources(self) -> bool:
-        # Load atlas
-        if not Path(self.globalVars.outputFolder).joinpath(self.globalVars.atlasPath).exists():
-            messagebox.showwarning("Missing resource", "The atlas texture cannot be found")
-            return False
-        else:
-            self.globalVars.atlasHandler = atlasTexture3dst().open(Path(self.globalVars.outputFolder).joinpath(self.globalVars.atlasPath), self.globalVars.tilePadding)
         # Load uvs and items in atlas
         if not Path(self.globalVars.outputFolder).joinpath(self.globalVars.uvsPath).exists():
             messagebox.showwarning("Missing resource", "The uvs file cannot be found")
@@ -598,6 +639,12 @@ def loadResources(self) -> bool:
             self.globalVars.addedItems = IndexFile().open(os.path.normpath(f"{self.globalVars.outputFolder}/added.txt"))
         else:
             self.globalVars.addedItems = IndexFile().new()
+        # Load atlas
+        if not Path(self.globalVars.outputFolder).joinpath(self.globalVars.atlasPath).exists():
+            messagebox.showwarning("Missing resource", "The atlas texture cannot be found")
+            return False
+        else:
+            self.globalVars.atlasHandler = atlasTexture3dst().open(Path(self.globalVars.outputFolder).joinpath(self.globalVars.atlasPath), self.globalVars.tilePadding)
         return True
 
     def saveChanges(self):
@@ -649,6 +696,9 @@ def updateTreeviewTheme(self):
     app.updateTreeviewTheme()
     app.bind("<<TreeviewSelect>>", lambda event: app.focus_set())
 
+    app.bind("<KeyRelease>", app.key_listener)
+    app.bind("<Button-1>", app.click_widget)
+
     app.bind('<Alt-F4>', app.closeApp)
     app.protocol("WM_DELETE_WINDOW", app.closeApp)