CTKFileDialog-plus 0.4.0__tar.gz → 0.5.1__tar.gz

{ctkfiledialog_plus-0.4.0 → ctkfiledialog_plus-0.5.1}/CTKFileDialog_plus.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CTKFileDialog-plus
-Version: 0.4.0
+Version: 0.5.1
 Summary: A modern file dialog for CustomTkinter
 Home-page: https://github.com/hmidani-abdelilah/CTkFileDialog-plus
 Author: abdelilah
@@ -61,10 +61,10 @@ python3 -m venv .venv
 .\.venv\Scripts\activate.ps1 # In Powershell
 pip3 install -r requirements.txt 
 
-# Or ussing pip 
+# Or using pip 
 
 python3 -m venv .venv 
-source .venv/bin/activate # In powershell -> .\.venv\Scripts\activate.ps1
+source .venv/bin/activate # In Powershell -> .\.venv\Scripts\activate.ps1
 pip3 install CTkFileDialog-plus
 
 ```
@@ -195,11 +195,11 @@ ctk.set_appearance_mode("Dark")
 ctk.set_default_color_theme("blue")
 
 def save_as_file():
-    file = asksaveasfile(autocomplete=True)
-    if file:
-        file.write("This file was created using the demo.")
-        file.close()
-        result_label.configure(text=f"File saved:\n{file.name}")
+    f = asksaveasfile(autocomplete=True)
+    if f:
+        f.write("This file was created using the demo.")
+        f.close()
+        result_label.configure(text=f"File saved:\n{f.name}")
 
 app = ctk.CTk()
 app.title("asksaveasfile Demo")
@@ -320,7 +320,7 @@ root.mainloop()
 
 ## Mini Dialog 
 
-This is a parameter of the file dialog, but it's more powerful than the default one. As I mentioned earlier, it doesn't support parameters like tooltip, preview_img, or video_preview.
+The mini dialog is a compact alternative to the Default dialog. It does not support `tooltip`, `preview_img`, or `video_preview`.
 
 ## 🌙 Dark Mode Preview
 

{ctkfiledialog_plus-0.4.0 → ctkfiledialog_plus-0.5.1}/CTkFileDialog/Dialog.py

@@ -212,26 +212,17 @@ class _DrawApp():
 
             # If it's a file and we're in save-as mode
             if self.method in ['asksaveasfile', 'asksaveasfilename']:
-                if os.path.isfile(path):
-                    msg = CTkMessagebox(
-                        message='This file exists. Do you want to overwrite it?',
-                        icon='warning',
-                        title='Warning',
-                        option_1='Yes',
-                        option_2='No'
-                    )
-                    if msg.get() == 'No':
-                        return
+                # In save-as mode, we just select the file path
+                # The file will be created/overwritten when user confirms
                 self._temp_item = path
-                self.close_app()
+                self.update_entry(path)
                 return
 
             if self.method == 'askopenfile':
                 if not os.path.isfile(path):
-                    
                     CTkMessagebox(message='File not found!', title='Error', icon='cancel')
                     self.PathEntry.delete(0, ctk.END)
-                    self.PathEntry.insert(0, self.current_path)
+                    self.PathEntry.insert(0, str(self.current_path))
                     return 
 
                 self._temp_item = path
@@ -251,38 +242,104 @@ class _DrawApp():
             return
 
         except PermissionError:
-            
             CTkMessagebox(message='Permission denied!', title='Error', icon='cancel')
-        except FileNotFoundError: 
-            
+        except FileNotFoundError:
             CTkMessagebox(message='File Not Found!', title='Error', icon='cancel')
 
     def close_app(self):
+        # Handle save-as filename dialog
         if self.method == 'asksaveasfilename':
-            if not os.path.isdir(self.PathEntry.get()): self.selected_file = self.PathEntry.get()
+            path = self.PathEntry.get().strip()
+            if not path:
+                CTkMessagebox(message='Please enter a filename!', title='Error', icon='cancel')
+                return
+            
+            # Check if it's a valid path
+            path = os.path.abspath(os.path.expanduser(os.path.expandvars(path)))
+            
+            # Don't allow directories as filenames
+            if os.path.isdir(path):
+                CTkMessagebox(message='A directory with this name exists. Please enter a filename.', title='Error', icon='cancel')
+                return
+            
+            # Check if file exists and ask for confirmation
+            if os.path.exists(path):
+                msg = CTkMessagebox(
+                    message='This file already exists. Do you want to overwrite it?',
+                    icon='warning',
+                    title='File Exists',
+                    option_1='Yes',
+                    option_2='No'
+                )
+                if msg.get() == 'No':
+                    return
+            
+            self.selected_file = path
+            self.protocol_windows()
+            self.app.destroy()
+            return
+        
+        # Handle save-as file dialog
+        if self.method == 'asksaveasfile':
+            path = self.PathEntry.get().strip()
+            if not path:
+                CTkMessagebox(message='Please enter a filename!', title='Error', icon='cancel')
+                return
+            
+            path = os.path.abspath(os.path.expanduser(os.path.expandvars(path)))
+            
+            if os.path.isdir(path):
+                CTkMessagebox(message='A directory with this name exists. Please enter a filename.', title='Error', icon='cancel')
+                return
+            
+            if os.path.exists(path):
+                msg = CTkMessagebox(
+                    message='This file already exists. Do you want to overwrite it?',
+                    icon='warning',
+                    title='File Exists',
+                    option_1='Yes',
+                    option_2='No'
+                )
+                if msg.get() == 'No':
+                    return
+            
+            self.selected_file = path
+            self.protocol_windows()
+            self.app.destroy()
+            return
 
-        if self._temp_item:
-            self.protocol_windows() 
+        # Handle single file open
+        if self.method == 'askopenfile':
+            if not self._temp_item:
+                CTkMessagebox(message='Please select a file!', title='Error', icon='cancel')
+                return
+            
+            self.selected_file = self._temp_item
+            self.protocol_windows()
             self.app.destroy()
-            if self.method == 'asksaveasfile':
-                self.selected_file = self._temp_item
-                return 
-            elif self.method == 'askopenfile':
-                self.selected_file = self._temp_item
-            else:
-                self.selected_file = self._temp_item
+            return
+
+        # Handle single file/directory selection
+        if self.method in ['askopenfilename', 'askdirectory']:
+            if not self._temp_item:
+                CTkMessagebox(message='Please select a file or directory!', title='Error', icon='cancel')
                 return
+            
+            self.selected_file = self._temp_item
+            self.protocol_windows()
+            self.app.destroy()
+            return
 
+        # Handle multiple files selection
         if len(self._temp_items) >= 1:
             self.protocol_windows()
             self.app.destroy()
-            if self.method == "askopenfilenames" or self.method ==  "askopenfiles":
+            if self.method in ["askopenfilenames", "askopenfiles"]:
                 seen = set()
                 self.selected_objects = [
                     f for f in self._temp_items
                     if not os.path.isdir(f) and f not in seen and not seen.add(f)
                 ]
-                
                 return
             
     
@@ -587,8 +644,12 @@ class _DrawApp():
                     hover_color="#8da3ae",
                     text_color="#000000" if self.current_theme.lower() == 'light' else '#cccccc',
         )
-            if os.path.isdir(r): 
+            if os.path.isdir(r):
                 self.navigate_to(path=r, master=master)
+            elif self.method in ['asksaveasfile', 'asksaveasfilename']:
+                # In save-as mode, select the file (don't navigate)
+                self._temp_item = r
+                self.update_entry(r)
             else:
                 self._temp_items.append(r)
 
@@ -1317,13 +1378,20 @@ class _MiniDialog():
                 path = os.path.join(self.initial_dir, path)
 
         if self.method in ['asksaveasfile', 'asksaveasfilename']:
-            if not path or os.path.isdir(path):
+            # Validate filename
+            if not path:
+                CTkMessagebox(message='Please enter a filename!', title='Error', icon='cancel')
+                return
+            
+            if os.path.isdir(path):
+                CTkMessagebox(message='A directory with this name exists. Please enter a filename.', title='Error', icon='cancel')
                 return
 
-            if os.path.exists(path) and self._extra_method != 'askopenfile':
+            # Check if file exists and ask for confirmation
+            if os.path.exists(path):
                 opts = CTkMessagebox(
-                    message='This file already exists! Do you want to overwrite it?',
-                    title='Error',
+                    message='This file already exists. Do you want to overwrite it?',
+                    title='File Exists',
                     icon='warning',
                     option_1='Yes',
                     option_2='No'
@@ -1373,6 +1441,10 @@ class _MiniDialog():
             idx = items.index(selected_item)
             if hasattr(self, 'absolute_paths') and idx < len(self.absolute_paths):
                 self.selected_item = self.absolute_paths[idx]
+                
+                # For save-as dialogs, update the path entry with selected file
+                if self.method in ['asksaveasfile', 'asksaveasfilename']:
+                    self.update_entry(self.selected_item)
         except (ValueError, IndexError):
             pass
 
@@ -1396,6 +1468,10 @@ class _MiniDialog():
         # If it's a file:
         self.path_entry.delete(0, ctk.END)
         self.path_entry.insert(0, self.selected_item)
+        
+        # For files in open mode, auto-select and return
+        if self.method in ['askopenfile', 'askopenfilename']:
+            self._on_select()
 
 
     def _up(self):

{ctkfiledialog_plus-0.4.0 → ctkfiledialog_plus-0.5.1}/CTkFileDialog/_functions.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 from .Dialog import _DrawApp, _MiniDialog, Optional, List 
-from typing import Tuple, Literal 
+from typing import Tuple, Literal, TextIO
 from typeguard import typechecked 
 
 @typechecked
@@ -112,7 +112,7 @@ def askopenfilenames(style: Literal['Default', 'Mini'] = 'Default',
                      tool_tip: bool = False,
                      geometry: Tuple[str, str] = ('1320x720', '500x400'),
                      title: str = 'CTkFileDialog',
-                     ) -> tuple[str] | None:
+                     ) -> tuple[str, ...] | None:
     """
     Displays a file dialog for multiple file selection.
 
@@ -133,15 +133,16 @@ def askopenfilenames(style: Literal['Default', 'Mini'] = 'Default',
         title: Define the title from the app, default will be "CTkFileDialog"
 
     Returns:
-        tuple[str]: Tuple of selected file paths, or None if canceled
+        tuple[str, ...]: Tuple of selected file paths, or None if canceled
 
     Example:
         >>> selected_files = askopenfilenames(
         ...     filetypes=['.py', '.md'],
         ...     preview_img=True
         ... )
-        >>> for file in selected_files:
-        ...     process_file(file)
+        >>> if selected_files:
+        ...     for file in selected_files:
+        ...         process_file(file)
     """
 
     if style == 'Default':
@@ -220,7 +221,7 @@ def asksaveasfile(style: Literal['Default', 'Mini'] = 'Default',
                   geometry: Tuple[str, str] = ('1320x720', '500x400'),
                   title: str = 'CTkFileDialog',
                   **kwargs,
-                  ):
+                  ) -> TextIO | None:
     """
     Displays a save dialog and returns an open file object.
 
@@ -243,12 +244,13 @@ def asksaveasfile(style: Literal['Default', 'Mini'] = 'Default',
         **kwargs: Additional arguments passed to open()
 
     Returns:
-        TextIOWrapper: Open file object in write mode, or None if canceled
+        TextIO: Open file object in the specified mode, or None if canceled
 
     Example:
-        >>> with asksaveasfile(mode='w', filetypes=['.jpeg', 'jpg', 'mp4'] as f:
-        ...     if f:  # Check if not canceled
-        ...         f.write("Log entry\\n")
+        >>> f = asksaveasfile(mode='w', filetypes=['.jpeg', '.jpg', '.mp4'])
+        >>> if f:  # Check if not canceled
+        ...     f.write("Log entry\\n")
+        ...     f.close()
     """
     if style == 'Default':
         app = _DrawApp(filetypes=filetypes, current_path=initial_dir, hidden=hidden, preview_img=preview_img, method='asksaveasfile', autocomplete=autocomplete, video_preview=video_preview, tool_tip=tool_tip, geometry=geometry[0], title=title)
@@ -272,7 +274,7 @@ def askopenfile(style: Literal['Mini', 'Default'] = 'Default',
                 geometry: Tuple[str, str] = ('1320x720', '500x400'),
                 title: str = 'CTkFileDialog',
                 **kwargs,
-                ):
+                ) -> TextIO | None:
     """
     Displays an open file dialog and returns an open file object.
 
@@ -326,7 +328,7 @@ def askopenfiles(style: Literal['Default', 'Mini'] = 'Default',
                  geometry: Tuple[str, str] = ('1320x720', '500x400'),
                  title: str = 'CTkFileDialog',
                  **kwargs,
-                  ):
+                  ) -> tuple[TextIO, ...] | None:
     """
     Displays a multi-file open dialog and returns multiple open file objects.
 
@@ -352,7 +354,7 @@ def askopenfiles(style: Literal['Default', 'Mini'] = 'Default',
         tuple[TextIOWrapper]: Tuple of open file objects, or None if canceled
 
     Example:
-        >>> files = askopenfiles(mode='r', filetypes=[".txt")])
+        >>> files = askopenfiles(mode='r', filetypes=[".txt"])
         >>> if files:
         ...     for f in files:
         ...         print(f.read())

{ctkfiledialog_plus-0.4.0 → ctkfiledialog_plus-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CTKFileDialog-plus
-Version: 0.4.0
+Version: 0.5.1
 Summary: A modern file dialog for CustomTkinter
 Home-page: https://github.com/hmidani-abdelilah/CTkFileDialog-plus
 Author: abdelilah
@@ -61,10 +61,10 @@ python3 -m venv .venv
 .\.venv\Scripts\activate.ps1 # In Powershell
 pip3 install -r requirements.txt 
 
-# Or ussing pip 
+# Or using pip 
 
 python3 -m venv .venv 
-source .venv/bin/activate # In powershell -> .\.venv\Scripts\activate.ps1
+source .venv/bin/activate # In Powershell -> .\.venv\Scripts\activate.ps1
 pip3 install CTkFileDialog-plus
 
 ```
@@ -195,11 +195,11 @@ ctk.set_appearance_mode("Dark")
 ctk.set_default_color_theme("blue")
 
 def save_as_file():
-    file = asksaveasfile(autocomplete=True)
-    if file:
-        file.write("This file was created using the demo.")
-        file.close()
-        result_label.configure(text=f"File saved:\n{file.name}")
+    f = asksaveasfile(autocomplete=True)
+    if f:
+        f.write("This file was created using the demo.")
+        f.close()
+        result_label.configure(text=f"File saved:\n{f.name}")
 
 app = ctk.CTk()
 app.title("asksaveasfile Demo")
@@ -320,7 +320,7 @@ root.mainloop()
 
 ## Mini Dialog 
 
-This is a parameter of the file dialog, but it's more powerful than the default one. As I mentioned earlier, it doesn't support parameters like tooltip, preview_img, or video_preview.
+The mini dialog is a compact alternative to the Default dialog. It does not support `tooltip`, `preview_img`, or `video_preview`.
 
 ## 🌙 Dark Mode Preview
 

{ctkfiledialog_plus-0.4.0 → ctkfiledialog_plus-0.5.1}/README.md

@@ -42,10 +42,10 @@ python3 -m venv .venv
 .\.venv\Scripts\activate.ps1 # In Powershell
 pip3 install -r requirements.txt 
 
-# Or ussing pip 
+# Or using pip 
 
 python3 -m venv .venv 
-source .venv/bin/activate # In powershell -> .\.venv\Scripts\activate.ps1
+source .venv/bin/activate # In Powershell -> .\.venv\Scripts\activate.ps1
 pip3 install CTkFileDialog-plus
 
 ```
@@ -176,11 +176,11 @@ ctk.set_appearance_mode("Dark")
 ctk.set_default_color_theme("blue")
 
 def save_as_file():
-    file = asksaveasfile(autocomplete=True)
-    if file:
-        file.write("This file was created using the demo.")
-        file.close()
-        result_label.configure(text=f"File saved:\n{file.name}")
+    f = asksaveasfile(autocomplete=True)
+    if f:
+        f.write("This file was created using the demo.")
+        f.close()
+        result_label.configure(text=f"File saved:\n{f.name}")
 
 app = ctk.CTk()
 app.title("asksaveasfile Demo")
@@ -301,7 +301,7 @@ root.mainloop()
 
 ## Mini Dialog 
 
-This is a parameter of the file dialog, but it's more powerful than the default one. As I mentioned earlier, it doesn't support parameters like tooltip, preview_img, or video_preview.
+The mini dialog is a compact alternative to the Default dialog. It does not support `tooltip`, `preview_img`, or `video_preview`.
 
 ## 🌙 Dark Mode Preview
 

{ctkfiledialog_plus-0.4.0 → ctkfiledialog_plus-0.5.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "CTKFileDialog-plus"
-version = "0.4.0"
+version = "0.5.1"
 description = "A modern file dialog for CustomTkinter"
 readme = "README.md"
 authors = [{name="abdelilah", email="hmidaniabdelilah92@gmail.com"}]

{ctkfiledialog_plus-0.4.0 → ctkfiledialog_plus-0.5.1}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="CTkFileDialog-plus",
-    version="0.4.0",                   # bump for each release
+    version="0.5.1",                   # bump for each release
     author="abdelilah",
     author_email="hmidaniabdelilah92@gmail.com",
     description="A modern file dialog for CustomTkinter",