Added human readable file sizes, fixed some missing keyboard shortcuts.

Author: seediffusion

dialogs.py

@@ -1,3 +1,5 @@
+# --- START OF FILE dialogs.py ---
+
 import wx
 import theme
 import stat
@@ -7,6 +9,21 @@
 import shutil
 from sftp_helpers import upload_item, download_item, delete_item
 
+def human_readable_size(size_bytes):
+    """Converts a size in bytes to a human-readable format."""
+    if size_bytes < 1024:
+        return f"{size_bytes} B"
+    size_name = ("B", "KB", "MB", "GB", "TB")
+    import math
+    try:
+        i = int(math.floor(math.log(size_bytes, 1024)))
+        p = math.pow(1024, i)
+        s = round(size_bytes / p, 1)
+        return f"{s} {size_name[i]}"
+    except (ValueError, IndexError):
+        return str(size_bytes)
+
+
 class AddServerDialog(wx.Dialog):
     def __init__(self, parent, title="Add SSH Server", server_to_edit=None):
         super(AddServerDialog, self).__init__(parent, title=title, size=(400, 420))
@@ -140,12 +157,9 @@ class FileBrowserDialog(wx.Dialog):
     def __init__(self, parent, sftp_client, edit_callback):
         super(FileBrowserDialog, self).__init__(parent, title="SFTP File Browser", size=(600, 480))
 
-        self.sftp = sftp_client
-        self.current_path = self.sftp.getcwd() or "/"
-        self.edit_callback = edit_callback
-        self.progress_dialog = None
-        self.copy_temp_dir = None
-
+        self.sftp, self.current_path, self.edit_callback = sftp_client, sftp_client.getcwd() or "/", edit_callback
+        self.progress_dialog, self.copy_temp_dir = None, None
+        
         panel = wx.Panel(self)
         self.vbox = wx.BoxSizer(wx.VERTICAL)
         self.path_text = wx.StaticText(panel, label=self.current_path)
@@ -157,14 +171,16 @@ def __init__(self, parent, sftp_client, edit_callback):
         self.vbox.Add(self.file_list, 1, wx.ALL|wx.EXPAND, 5)
 
         hbox_buttons = wx.BoxSizer(wx.HORIZONTAL)
-        self.upload_button = wx.Button(panel, label="Upload")
-        self.download_button = wx.Button(panel, label="Download")
-        self.copy_button = wx.Button(panel, label="Copy")
-        self.edit_button = wx.Button(panel, label="Edit")
-        self.delete_button = wx.Button(panel, label="Delete")
-        close_button = wx.Button(panel, label="Close", id=wx.ID_CANCEL)
+        self.upload_button = wx.Button(panel, label="&Upload")
+        self.new_button = wx.Button(panel, label="&New...")
+        self.download_button = wx.Button(panel, label="&Download")
+        self.copy_button = wx.Button(panel, label="&Copy")
+        self.edit_button = wx.Button(panel, label="&Edit")
+        self.delete_button = wx.Button(panel, label="&Delete")
+        close_button = wx.Button(panel, label="&Close", id=wx.ID_CANCEL)
 
         hbox_buttons.Add(self.upload_button)
+        hbox_buttons.Add(self.new_button, flag=wx.LEFT, border=5)
         hbox_buttons.Add(self.download_button, flag=wx.LEFT, border=5)
         hbox_buttons.Add(self.copy_button, flag=wx.LEFT, border=5)
         hbox_buttons.Add(self.edit_button, flag=wx.LEFT, border=5)
@@ -177,12 +193,14 @@ def __init__(self, parent, sftp_client, edit_callback):
         self.vbox.Add(self.status_text, 0, wx.LEFT|wx.RIGHT|wx.BOTTOM|wx.EXPAND, 5)
         panel.SetSizer(self.vbox)
 
+        self.Bind(wx.EVT_ACTIVATE, self.on_activate)
         self.file_list.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self.on_item_activated)
         self.file_list.Bind(wx.EVT_LIST_ITEM_SELECTED, self.on_selection_changed)
         self.file_list.Bind(wx.EVT_LIST_ITEM_DESELECTED, self.on_selection_changed)
         self.file_list.Bind(wx.EVT_KEY_DOWN, self.on_key_down)
         self.edit_button.Bind(wx.EVT_BUTTON, self.on_edit_button)
         self.upload_button.Bind(wx.EVT_BUTTON, self.on_upload)
+        self.new_button.Bind(wx.EVT_BUTTON, self.on_new)
         self.download_button.Bind(wx.EVT_BUTTON, self.on_download)
         self.copy_button.Bind(wx.EVT_BUTTON, self.on_copy)
         self.delete_button.Bind(wx.EVT_BUTTON, self.on_delete)
@@ -191,6 +209,30 @@ def __init__(self, parent, sftp_client, edit_callback):
         theme.apply_dark_theme(self)
         self.populate_files()
 
+    def on_activate(self, event):
+        if event.GetActive():
+            self.populate_files()
+        event.Skip()
+
+    def populate_files(self):
+        self.path_text.SetLabel(f"Path: {self.current_path}")
+        self.file_list.DeleteAllItems()
+        if self.current_path != "/":
+            index = self.file_list.InsertItem(self.file_list.GetItemCount(), "..")
+            self.file_list.SetItem(index, 2, "Parent Directory")
+        try:
+            for attr in self.sftp.listdir_attr(self.current_path):
+                index = self.file_list.InsertItem(self.file_list.GetItemCount(), attr.filename)
+                self.file_list.SetItem(index, 1, human_readable_size(attr.st_size))
+                file_mode = attr.st_mode
+                if stat.S_ISDIR(file_mode):
+                    self.file_list.SetItem(index, 2, "Directory")
+                else:
+                    self.file_list.SetItem(index, 2, "File")
+        except Exception as e:
+            wx.MessageBox(f"Could not list directory: {e}", "SFTP Error", wx.ICON_ERROR)
+        self.on_selection_changed(None)
+
     def on_close(self, event):
         if self.copy_temp_dir and os.path.exists(self.copy_temp_dir):
             try: shutil.rmtree(self.copy_temp_dir)
@@ -275,7 +317,7 @@ def _upload_worker(self, local_paths):
         try:
             for i, local_path in enumerate(local_paths):
                 filename = os.path.basename(local_path)
-                remote_path = f"{self.current_path}/{filename}"
+                remote_path = f"{self.current_path}/{filename}" if self.current_path != "/" else f"/{filename}"
                 wx.CallAfter(self.progress_dialog.Update, 0, f"Uploading {filename} ({i+1}/{len(local_paths)})...")
                 def progress_callback(transferred, total):
                     if self.progress_dialog:
@@ -363,23 +405,6 @@ def get_selected_remote_paths(self):
             else: paths.append(f"{self.current_path}/{name}")
         return paths
 
-    def populate_files(self):
-        self.path_text.SetLabel(f"Path: {self.current_path}")
-        self.file_list.DeleteAllItems()
-        if self.current_path != "/":
-            index = self.file_list.InsertItem(self.file_list.GetItemCount(), "..")
-            self.file_list.SetItem(index, 2, "Parent Directory")
-        try:
-            for attr in self.sftp.listdir_attr(self.current_path):
-                index = self.file_list.InsertItem(self.file_list.GetItemCount(), attr.filename)
-                self.file_list.SetItem(index, 1, str(attr.st_size))
-                file_mode = attr.st_mode
-                if stat.S_ISDIR(file_mode): self.file_list.SetItem(index, 2, "Directory")
-                else: self.file_list.SetItem(index, 2, "File")
-        except Exception as e:
-            wx.MessageBox(f"Could not list directory: {e}", "SFTP Error", wx.ICON_ERROR)
-        self.on_selection_changed(None)
-        
     def on_item_activated(self, event):
         item_text = event.GetText()
         item_type = self.file_list.GetItemText(event.GetIndex(), col=2)
@@ -394,11 +419,44 @@ def on_edit_button(self, event):
         remote_paths = self.get_selected_remote_paths()
         if remote_paths:
             self.edit_callback(remote_paths[0])
-            # self.Close() <-- This line is removed to keep the browser open.
+            # self.Close() # This is correctly removed now.
 
-    def on_paste_upload(self):
+    def on_paste_upload(self, event):
         data = wx.FileDataObject()
         if wx.TheClipboard.Open():
             success = wx.TheClipboard.GetData(data)
             wx.TheClipboard.Close()
-            if success: self.start_upload_thread(data.GetFilenames())
+            if success: self.start_upload_thread(data.GetFilenames())
+
+    def on_new(self, event):
+        menu = wx.Menu()
+        dir_item = menu.Append(wx.ID_ANY, "Directory")
+        file_item = menu.Append(wx.ID_ANY, "File")
+        self.Bind(wx.EVT_MENU, self.on_new_directory, dir_item)
+        self.Bind(wx.EVT_MENU, self.on_new_file, file_item)
+        self.PopupMenu(menu)
+
+    def on_new_directory(self, event):
+        with wx.TextEntryDialog(self, "Enter name for the new directory:", "Create Directory") as dlg:
+            if dlg.ShowModal() == wx.ID_OK:
+                name = dlg.GetValue().strip()
+                if not name: return
+                remote_path = f"{self.current_path}/{name}" if self.current_path != "/" else f"/{name}"
+                try:
+                    self.sftp.mkdir(remote_path)
+                    self.populate_files()
+                except Exception as e:
+                    wx.MessageBox(f"Failed to create directory: {e}", "Error", wx.ICON_ERROR)
+
+    def on_new_file(self, event):
+        with wx.TextEntryDialog(self, "Enter name for the new file:", "Create File") as dlg:
+            if dlg.ShowModal() == wx.ID_OK:
+                name = dlg.GetValue().strip()
+                if not name: return
+                remote_path = f"{self.current_path}/{name}" if self.current_path != "/" else f"/{name}"
+                try:
+                    with self.sftp.open(remote_path, 'w') as f:
+                        pass
+                    self.populate_files()
+                except Exception as e:
+                    wx.MessageBox(f"Failed to create file: {e}", "Error", wx.ICON_ERROR)

editor_frame.py

@@ -1,37 +1,42 @@
+# --- START OF FILE editor_frame.py ---
+
 import wx
 import os
 import theme
 from menu_mixin import SettingsMenuMixin
 
-# --- NEW: Dialogs for Find and Replace functionality ---
 class FindDialog(wx.Dialog):
     def __init__(self, parent, title):
         super(FindDialog, self).__init__(parent, title=title)
         self.parent = parent
         panel = wx.Panel(self)
         vbox = wx.BoxSizer(wx.VERTICAL)
-
-        self.find_text = wx.TextCtrl(panel)
+        self.find_text = wx.TextCtrl(panel, style=wx.TE_PROCESS_ENTER)
         vbox.Add(wx.StaticText(panel, label="Find what:"), 0, wx.ALL, 5)
         vbox.Add(self.find_text, 0, wx.EXPAND|wx.ALL, 5)
 
+        # --- NEW: Direction controls ---
+        self.direction_radio = wx.RadioBox(panel, label="Direction", choices=["Down", "Up"])
+        vbox.Add(self.direction_radio, 0, wx.EXPAND|wx.ALL, 5)
+        
         self.case_checkbox = wx.CheckBox(panel, label="Match case")
         vbox.Add(self.case_checkbox, 0, wx.ALL, 5)
 
-        # --- FIX: Add a horizontal sizer for buttons ---
         hbox = wx.BoxSizer(wx.HORIZONTAL)
-        find_next_btn = wx.Button(panel, label="Find Next")
-        close_btn = wx.Button(panel, label="Close", id=wx.ID_CANCEL) # Use standard Cancel ID
+        find_next_btn = wx.Button(panel, label="Find &Next")
+        close_btn = wx.Button(panel, label="&Close", id=wx.ID_CANCEL)
         hbox.Add(find_next_btn)
         hbox.Add(close_btn, 0, wx.LEFT, 5)
         vbox.Add(hbox, 0, wx.ALIGN_CENTER|wx.ALL, 5)
 
         panel.SetSizer(vbox)
         find_next_btn.Bind(wx.EVT_BUTTON, self.on_find_next)
+        self.find_text.Bind(wx.EVT_TEXT_ENTER, self.on_find_next)
         self.find_text.SetFocus()
 
     def on_find_next(self, event):
-        self.parent.do_find(self.find_text.GetValue(), self.case_checkbox.IsChecked())
+        direction = self.direction_radio.GetStringSelection().lower()
+        self.parent.do_find(self.find_text.GetValue(), self.case_checkbox.IsChecked(), direction)
 
 class ReplaceDialog(wx.Dialog):
     def __init__(self, parent, title):
@@ -41,44 +46,52 @@ def __init__(self, parent, title):
         vbox = wx.BoxSizer(wx.VERTICAL)
 
         vbox.Add(wx.StaticText(panel, label="Find what:"), 0, wx.ALL, 5)
-        self.find_text = wx.TextCtrl(panel)
+        self.find_text = wx.TextCtrl(panel, style=wx.TE_PROCESS_ENTER)
         vbox.Add(self.find_text, 0, wx.EXPAND|wx.ALL, 5)
 
         vbox.Add(wx.StaticText(panel, label="Replace with:"), 0, wx.ALL, 5)
-        self.replace_text = wx.TextCtrl(panel)
+        self.replace_text = wx.TextCtrl(panel, style=wx.TE_PROCESS_ENTER)
         vbox.Add(self.replace_text, 0, wx.EXPAND|wx.ALL, 5)
 
+        # --- NEW: Direction controls ---
+        self.direction_radio = wx.RadioBox(panel, label="Direction", choices=["Down", "Up"])
+        vbox.Add(self.direction_radio, 0, wx.EXPAND|wx.ALL, 5)
+        
         self.case_checkbox = wx.CheckBox(panel, label="Match case")
         vbox.Add(self.case_checkbox, 0, wx.ALL, 5)
 
         hbox = wx.BoxSizer(wx.HORIZONTAL)
-        find_next_btn = wx.Button(panel, label="Find Next")
-        replace_btn = wx.Button(panel, label="Replace")
-        replace_all_btn = wx.Button(panel, label="Replace All")
-        close_btn = wx.Button(panel, label="Close", id=wx.ID_CANCEL) # Use standard Cancel ID
+        find_next_btn = wx.Button(panel, label="Find &Next")
+        replace_btn = wx.Button(panel, label="&Replace")
+        replace_all_btn = wx.Button(panel, label="Replace &All")
+        close_btn = wx.Button(panel, label="&Close", id=wx.ID_CANCEL)
         hbox.Add(find_next_btn)
         hbox.Add(replace_btn, 0, wx.LEFT, 5)
         hbox.Add(replace_all_btn, 0, wx.LEFT, 5)
-        hbox.Add(close_btn, 0, wx.LEFT, 15) # Add extra space
+        hbox.Add(close_btn, 0, wx.LEFT, 15)
         vbox.Add(hbox, 0, wx.EXPAND|wx.ALL, 5)
 
         panel.SetSizer(vbox)
         find_next_btn.Bind(wx.EVT_BUTTON, self.on_find_next)
         replace_btn.Bind(wx.EVT_BUTTON, self.on_replace)
         replace_all_btn.Bind(wx.EVT_BUTTON, self.on_replace_all)
+        self.find_text.Bind(wx.EVT_TEXT_ENTER, self.on_find_next)
+        self.replace_text.Bind(wx.EVT_TEXT_ENTER, self.on_find_next)
         self.find_text.SetFocus()
 
     def on_find_next(self, event):
-        self.parent.do_find(self.find_text.GetValue(), self.case_checkbox.IsChecked())
+        direction = self.direction_radio.GetStringSelection().lower()
+        self.parent.do_find(self.find_text.GetValue(), self.case_checkbox.IsChecked(), direction)
 
     def on_replace(self, event):
-        self.parent.do_replace(self.find_text.GetValue(), self.replace_text.GetValue(), self.case_checkbox.IsChecked())
+        direction = self.direction_radio.GetStringSelection().lower()
+        self.parent.do_replace(self.find_text.GetValue(), self.replace_text.GetValue(), self.case_checkbox.IsChecked(), direction)
 
     def on_replace_all(self, event):
         self.parent.do_replace_all(self.find_text.GetValue(), self.replace_text.GetValue(), self.case_checkbox.IsChecked())
 
-
 class EditorFrame(wx.Frame, SettingsMenuMixin):
+    # ... (__init__ is updated for new menu items) ...
     def __init__(self, parent, title, local_path, remote_path, sftp_client):
         super(EditorFrame, self).__init__(parent, title=title, size=(800, 600))
         self.local_path, self.remote_path, self.sftp = local_path, remote_path, sftp_client
@@ -100,6 +113,7 @@ def __init__(self, parent, title, local_path, remote_path, sftp_client):
         paste_item = edit_menu.Append(wx.ID_PASTE, "&Paste\tCtrl+V")
         search_menu = wx.Menu()
         find_item = search_menu.Append(wx.ID_FIND, "&Find\tCtrl+F")
+        find_next_item = search_menu.Append(wx.ID_ANY, "Find &Next\tF3") # NEW
         replace_item = search_menu.Append(wx.ID_REPLACE, "Find and &Replace\tCtrl+H")
         goto_item = search_menu.Append(wx.ID_ANY, "&Go To Line\tCtrl+G")
         menu_bar.Append(file_menu, "&File")
@@ -117,6 +131,7 @@ def __init__(self, parent, title, local_path, remote_path, sftp_client):
         self.Bind(wx.EVT_MENU, lambda e: self.text_ctrl.Copy(), copy_item)
         self.Bind(wx.EVT_MENU, lambda e: self.text_ctrl.Paste(), paste_item)
         self.Bind(wx.EVT_MENU, self.on_find, find_item)
+        self.Bind(wx.EVT_MENU, lambda e: self.do_find(self.last_search_string, "matchcase" in self.last_search_flags, "down"), find_next_item)
         self.Bind(wx.EVT_MENU, self.on_replace, replace_item)
         self.Bind(wx.EVT_MENU, self.on_go_to_line, goto_item)
         self.Bind(wx.EVT_CLOSE, self.on_close)
@@ -125,37 +140,51 @@ def __init__(self, parent, title, local_path, remote_path, sftp_client):
         self.load_file_content()
         self.Show()
 
-    def on_find(self, event):
-        with FindDialog(self, "Find") as dlg:
-            dlg.ShowModal()
-    def on_replace(self, event):
-        with ReplaceDialog(self, "Find and Replace") as dlg:
-            dlg.ShowModal()
-    def do_find(self, find_string, match_case):
+    # --- UPDATED: `do_find` now handles direction ---
+    def do_find(self, find_string, match_case, direction="down"):
+        if not find_string: return
         self.last_search_string = find_string
-        flags = wx.FR_DOWN
-        if match_case: flags |= wx.FR_MATCHCASE
-        self.last_search_flags = flags
+        
         content = self.text_ctrl.GetValue()
+        search_content = content if match_case else content.lower()
+        search_string = find_string if match_case else find_string.lower()
+
         start = self.text_ctrl.GetInsertionPoint()
-        if not match_case:
-            content = content.lower()
-            find_string = find_string.lower()
-        pos = content.find(find_string, start)
-        if pos == -1: pos = content.find(find_string, 0)
+        
+        pos = -1
+        if direction == "down":
+            pos = search_content.find(search_string, start)
+            if pos == -1: # Wrap search
+                pos = search_content.find(search_string, 0)
+        else: # direction == "up"
+            pos = search_content.rfind(search_string, 0, start)
+            if pos == -1: # Wrap search
+                pos = search_content.rfind(search_string)
+        
         if pos != -1:
             self.text_ctrl.SetSelection(pos, pos + len(find_string))
             self.text_ctrl.SetFocus()
         else:
             wx.MessageBox(f"'{find_string}' not found.", "Find", wx.ICON_INFORMATION)
-    def do_replace(self, find_string, replace_string, match_case):
+
+    # --- UPDATED: `do_replace` now passes direction ---
+    def do_replace(self, find_string, replace_string, match_case, direction="down"):
         start, end = self.text_ctrl.GetSelection()
         selected_text = self.text_ctrl.GetStringSelection()
+        
         compare_text = selected_text if match_case else selected_text.lower()
         compare_find = find_string if match_case else find_string.lower()
+
         if compare_text == compare_find:
             self.text_ctrl.Replace(start, end, replace_string)
-        self.do_find(find_string, match_case)
+        
+        self.do_find(find_string, match_case, direction)
+
+    # ... (rest of file is unchanged) ...
+    def on_find(self, event):
+        with FindDialog(self, "Find") as dlg: dlg.ShowModal()
+    def on_replace(self, event):
+        with ReplaceDialog(self, "Find and Replace") as dlg: dlg.ShowModal()
     def do_replace_all(self, find_string, replace_string, match_case):
         content = self.text_ctrl.GetValue()
         if match_case: