Added FreeBSD support and improved dialog windows

Author: RainingComputers

Icons/OS_Icons_Original/freebsd_large.png

@@ -4,9 +4,21 @@
 
 switch [tk windowingsystem] {
   x11 {
-    package ifneeded tkdnd 2.8 \
-      "source \{$dir/tkdnd.tcl\} ; \
-       tkdnd::initialise \{$dir\} libtkdnd2.8.so tkdnd"
+    switch [lindex $::tcl_platform(os) 0] {
+      Linux {
+        package ifneeded tkdnd 2.8 \
+          "source \{$dir/tkdnd.tcl\} ; \
+           tkdnd::initialise \{$dir\} libtkdnd2.8.so tkdnd"
+      }
+      FreeBSD {
+        package ifneeded tkdnd 2.8 \
+          "source \{$dir/tkdnd.tcl\} ; \
+           tkdnd::initialise \{$dir\} libtkdnd2.8_FreeBSD.so tkdnd"        
+      }
+      default {
+        error "unknown x11 platform"
+      }
+    }
   }
   win32 -
   windows {
@@ -17,4 +29,4 @@ switch [tk windowingsystem] {
   default {
     error "unknown Tk windowing system"
   }
-}
+}

Icons/OS_Icons_Original/freebsd_large_backup.png

@@ -4,9 +4,21 @@
 
 switch [tk windowingsystem] {
   x11 {
-    package ifneeded tkdnd 2.8 \
-      "source \{$dir/tkdnd.tcl\} ; \
-       tkdnd::initialise \{$dir\} libtkdnd2.8.so tkdnd"
+    switch [lindex $::tcl_platform(os) 0] {
+      Linux {
+        package ifneeded tkdnd 2.8 \
+          "source \{$dir/tkdnd.tcl\} ; \
+           tkdnd::initialise \{$dir\} libtkdnd2.8.so tkdnd"
+      }
+      FreeBSD {
+        package ifneeded tkdnd 2.8 \
+          "source \{$dir/tkdnd.tcl\} ; \
+           tkdnd::initialise \{$dir\} libtkdnd2.8_FreeBSD.so tkdnd"        
+      }
+      default {
+        error "unknown x11 platform"
+      }
+    }
   }
   win32 -
   windows {

Icons/OS_Icons_Original/linux_large.png

@@ -100,3 +100,4 @@ def parse_uri_list(self, uri_list):
             else:
                 file_list.append(item)
         return file_list
+        

Icons/OS_Icons_Original/windows_large.png

@@ -48,14 +48,28 @@
         print('Installing pypiwin32...')
         os.system(python_path + ' -m pip install pypiwin32==219')
         input('Press enter to continue...')       
-
 #if Linux
-if(platform.system() == 'Linux'):
+elif(platform.system() == 'Linux'):
     print('Platform: Linux')
     print('Upgrading pip...')
     os.system('python3 -m pip install --upgrade pip')
     print('Installing pramiko...')
     os.system('python3 -m pip install paramiko')
-    os.system('python3 -m pip install psutil')
     print('Installing psutil...')
+    os.system('python3 -m pip install psutil')
     input('Press enter to continue...')
+#if FreeBSD
+elif(platform.system() == 'FreeBSD'):
+    if(os.geteuid() != 0):
+        print('You need to have root privileges to run this script.')
+        input('Press enter to continue...')
+    print('Platform: FreeBSD')
+    print('Upgrading pip...')
+    os.system('python3.6 -m pip install --upgrade pip')
+    print('Installing tkinter...')
+    os.system('pkg install py36-tkinter-3.6.5_6')
+    print('Installing pramiko...')
+    os.system('python3.6 -m pip install paramiko')
+    print('Installing psutil...')
+    os.system('python3.6 -m pip install psutil')
+    input('Press enter to continue...')

Icons/freebsd_large.png

@@ -96,7 +96,7 @@ def __init__(self, master):
 
        #Set window title and size
         master.wm_title('whipFTP')
-        master.minsize(width = 860, height = 560)
+        master.minsize(width = 930, height = 600)
 
        #Variable for holding the font
         self.default_font = font.nametofont("TkDefaultFont")
@@ -303,7 +303,8 @@ def bind_events(self):
         self.cut_button.bind('<Motion>', lambda event, arg = 'Cut.': self.update_status(event, arg)) 
         self.copy_button.bind('<Motion>', lambda event, arg = 'Copy.': self.update_status(event, arg)) 
         self.paste_button.bind('<Motion>', lambda event, arg = 'Paste.': self.update_status(event, arg)) 
-        self.search_button.bind('<Motion>', lambda event, arg = 'Find.': self.update_status(event, arg)) 
+        self.search_button.bind('<Motion>', lambda event, arg = 'Find.': self.update_status(event, arg))
+        self.goto_button.bind('<Motion>', lambda event, arg = 'Goto.': self.update_status(event, arg)) 
         self.up_button.bind('<Motion>', lambda event, arg = 'Go to parent directory.': self.update_status(event, arg)) 
         self.info_button.bind('<Motion>', lambda event, arg = 'About/Info.': self.update_status(event, arg)) 
 
@@ -377,7 +378,7 @@ def update_file_list(self):
         self.disable_toolbar()
        #Set search to false
         self.search_performed = False
-        self.update_status(message = 'Retrieving file list, Hidden files: {}.'.format(self.ftpController.hidden_files))
+        self.update_status(message = 'Retrieving file list, Hidden files: {}, Please wait...'.format(self.ftpController.hidden_files))
         self.lock_status_bar()
         del self.file_list[:]
         del self.detailed_file_list[:]
@@ -1120,7 +1121,7 @@ def progress(self, file_name, status):
 
 
     def info(self):
-        self.info_window = Filedialogs.message_dialog(self.master, 'About', self.whipFTP_icon, 'whipFTP v4.3, Written by:\nVishnu Shankar') 
+        self.info_window = Filedialogs.about_dialog(self.master, 'About', self.whipFTP_icon, 'whipFTP v5.0', '© Vishnu Shankar') 
 
 
 

Icons/linux_large.png

@@ -125,7 +125,88 @@ def __init__(self, master, Title, icon, message):
 
     def destroy(self):
         self.message_dialog_window.destroy()
-        
+
+class about_dialog:
+
+    def __init__(self, master, Title, icon, software_version, author):
+
+       #Change to script's directory
+        abspath = os.path.abspath(__file__)
+        dname = os.path.dirname(abspath)
+        os.chdir(dname)
+
+        os_name = platform.system() + ' ' + platform.release() 
+
+       #Load icons
+        if(platform.system() == 'Linux'):
+            self.os_icon = PhotoImage(file='Icons/linux_large.png')
+        elif(platform.system() == 'FreeBSD'):
+            self.os_icon = PhotoImage(file='Icons/freebsd_large.png')
+        else:
+            self.os_icon = PhotoImage(file='Icons/windows_large.png')
+
+        python_version = 'python v' + platform.python_version()
+        if(sys.maxsize > (2**31-1)):
+            python_version += ' (64 bit)'
+        else:
+            python_version += ' (32 bit)'
+
+        message = software_version + '\n' +  python_version + '\n' + os_name +'\n' + author
+
+       #Create a new dialog box window
+        self.about_dialog_window = Toplevel()
+
+       #Make it non-resizeble, set title
+        self.about_dialog_window.resizable(False, False)
+        self.about_dialog_window.title(Title)
+
+       #Create frames 
+        self.icon_frame = ttk.Frame(self.about_dialog_window)
+        self.icon_frame.pack(side = 'left', fill = Y)
+        self.entry_frame = ttk.Frame(self.about_dialog_window)
+        self.entry_frame.pack(side = 'left', fill = Y)
+        self.os_icon_frame = ttk.Frame(self.about_dialog_window)
+        self.os_icon_frame.pack(side = 'left', fill = Y)
+
+       #Create the label showing main icon
+        ttk.Label(self.icon_frame, image = icon).pack(padx = 3, pady = 3)
+
+       #Create the label
+        ttk.Label(self.entry_frame, text = message, anchor = 'w').pack(padx = 3, fill = X, expand = True)
+
+       #Create the label showing os icon
+        ttk.Label(self.os_icon_frame, image = self.os_icon).pack(padx = 3, pady = 3)
+
+       #Create buttons
+        self.rename_ok_button = ttk.Button(self.entry_frame, text = 'OK', command = self.destroy)
+        self.rename_ok_button.pack(pady = 3, padx = 3 )
+
+       #center the window
+        self.about_dialog_window.withdraw()
+        self.about_dialog_window.update()
+        x = master.winfo_rootx()
+        y = master.winfo_rooty()
+        main_height =master.winfo_height()
+        main_width = master.winfo_width()
+        window_height = self.about_dialog_window.winfo_reqheight()
+        window_width = self.about_dialog_window.winfo_reqwidth()
+        geom = '+%d+%d' % ((x + main_width//2 - window_width//2), (y + main_height//2 - window_height//2))  
+        self.about_dialog_window.geometry(geom)
+        self.about_dialog_window.deiconify()
+
+       #Prevent new task in taskbar
+        self.about_dialog_window.transient(master)  
+
+       #Focus on the dialog box, freeze controll of main window
+        self.about_dialog_window.focus_force()
+        while True:
+            try:
+                self.about_dialog_window.grab_set()
+                break
+            except: continue
+
+    def destroy(self):
+        self.about_dialog_window.destroy()        
 
 class warning_dialog:
 
@@ -699,14 +780,16 @@ def __init__(self, master, Title, func_command, directory_mode = False):
         if(platform.system() == 'Linux' or platform.system() == 'FreeBSD'):
             common_file_list = []
             for home_folders in ['', 'Desktop', 'Documents', 'Downloads', 'Music', 'Pictures', 'Videos']:
-                common_file_list.append(os.getcwd()+'/'+home_folders)
+                if(os.path.exists(os.getcwd()+'/'+home_folders)):
+                    common_file_list.append(os.getcwd()+'/'+home_folders)
             for drive in psutil.disk_partitions():
                 common_file_list.append(drive.mountpoint)
             self.directory_text['values'] = common_file_list
         elif(platform.system() == 'Windows'):
             common_file_list = []
             for home_folders in ['', 'Desktop', 'Documents', 'Downloads', 'Music', 'Pictures', 'Videos']:
-                common_file_list.append(os.getcwd()+'\\'+home_folders)
+                if(os.path.exists(os.getcwd()+'/'+home_folders)):
+                    common_file_list.append(os.getcwd()+'\\'+home_folders)
            #See SO link: https://stackoverflow.com/questions/827371/is-there-a-way-to-list-all-the-available-drive-letters-in-python
             drives = win32api.GetLogicalDriveStrings()
             drives = drives.split('\000')[:-1]
@@ -904,7 +987,9 @@ def delta(event):
 
     def mouse_select(self, event):
        #Check for directory mode
-        if(self.directory_mode is True): return
+        if(self.directory_mode is True and not isfile(self.file_list[self.current_file_index])):
+           self.change_dir(event)
+           return
        #Store start position for drag select
         self.start_x = self.x_cell_pos
         self.start_y = self.y_cell_pos