Piggy 0.4.2.4 → 0.4.3.0

data/lib/piggy-gui/ftp_browser_widget.rb

@@ -16,8 +16,8 @@ class FtpBrowserDialog < Fox::FXDialogBox
     @frame = FXVerticalFrame.new(self)
     @frame.setLayoutHints(LAYOUT_FILL_X|LAYOUT_FILL_Y)
     @browser = FtpBrowserWidget.new(@frame, options)
-    connect(SEL_CLOSE, method(:onCmdClose))
-    @browser.quitButton.connect(SEL_COMMAND, method(:onQuitButton))
+    connect(SEL_CLOSE, method(:on_cmd_close))
+    @browser.quitButton.connect(SEL_COMMAND, method(:on_quit_button))
   end
   
   def options
@@ -25,18 +25,18 @@ class FtpBrowserDialog < Fox::FXDialogBox
   end
   
   def create
-    resize(800, 600)
+    resize(@browser.preferred_width + 20, 600)
     place(PIGGY_WINDOW_PLACEMENT)
     super
   end
   
   # Send whenever this window is about to close
-  def onCmdClose(sender, sel, ptr)
-    @browser.prepareClosure
+  def on_cmd_close(sender, sel, ptr)
+    @browser.prepare_closure
     return 0
   end
   
-  def onQuitButton(sender, sel, ptr)
+  def on_quit_button(sender, sel, ptr)
     handle(sender, MKUINT(ID_ACCEPT, SEL_COMMAND), nil)
   end
 end
@@ -48,11 +48,11 @@ class FtpBrowserMainWindow < DirectoryDiffMainWindow
     super(app, options)
   end
   
-  def titleString
+  def title_string
     "Piggy FTP Browser"
   end
   
-  def setMainWidget(options)
+  def set_main_widget(options)
     @browser = FtpBrowserWidget.new(@frame, options)
   end
 end
@@ -66,139 +66,192 @@ class FtpBrowserWidget < DirectoryDiffWidget
     super(window, options)
   end
   
-  def loadIcons
+  def load_icons
     super
-    @reloadIcon = basicLoadIcon('reload.ico')
-    @autoSelectForDelIco =  basicLoadIcon('auto-select-for-del.ico')
-    @removeSelectedIco = basicLoadIcon('remove-selected.ico')
-    @autoSelectRightIcon = basicLoadIcon('auto-select-right.ico')
-    @uploadIcon = basicLoadIcon('auto-upload-right.ico')
-    @moveRightDirIcon = basicLoadIcon('move-right-dir.ico')
-    @moveRightFileIcon = basicLoadIcon('move-right-file.ico')
+    @reloadIcon = basic_load_icon('reload.ico')
+    @autoSelectForDelIco =  basic_load_icon('auto-select-for-del.ico')
+    @removeSelectedIco = basic_load_icon('remove-selected.ico')
+    @autoSelectRightIcon = basic_load_icon('auto-select-right.ico')
+    @uploadIcon = basic_load_icon('auto-upload-right.ico')
+    @moveRightDirIcon = basic_load_icon('move-right-dir.ico')
+    @moveRightFileIcon = basic_load_icon('move-right-file.ico')
+    @connectIcon = basic_load_icon('connect.ico')
+    @showDetailsIcon = basic_load_icon('show_details.ico')
+    @hideDetailsIcon = basic_load_icon('hide_details.ico')
   end
   
-  def initializeControlsOL
+  def initialize_controls_top_left
     @labels.push(FXLabel.new(@leftListPropFrame, "FTP server:"))
-    @serverField = FXTextField.new(@leftListPropFrame, 32)
+    @serverField = FXTextField.new(@leftListPropFrame, txt_field_num_chars)
     @serverField.setLayoutHints(LAYOUT_FILL_X|LAYOUT_FILL_COLUMN) 
     @labels.push(FXLabel.new(@leftListPropFrame, "User:"))
-    @userField = FXTextField.new(@leftListPropFrame, 32)
+    @userField = FXTextField.new(@leftListPropFrame, txt_field_num_chars)
     @userField.setLayoutHints(LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
     @labels.push(FXLabel.new(@leftListPropFrame, "Password:"))
-    @passwordField = FXTextField.new(@leftListPropFrame, 32)
+    pw_frame = new_hframe_without_padding(@leftListPropFrame)
+    @passwordField = FXTextField.new(pw_frame, txt_field_num_chars)
     @passwordField.setLayoutHints(LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)    
     @passwordField.setTextStyle(TEXTFIELD_PASSWD)
+    @connect_button = FXButton.new(pw_frame, "\tConnect", @connectIcon)
     @labels.push(FXLabel.new(@leftListPropFrame, "Destination path:"))
-    @leftPathField = FXTextField.new(@leftListPropFrame, 32)
-    @leftPathField.setLayoutHints(LAYOUT_FILL_X|LAYOUT_FILL_COLUMN) 
+    left_path_frame = new_hframe_without_padding(@leftListPropFrame)
+    @leftPathField = FXTextField.new(left_path_frame, txt_field_num_chars)
+    @leftPathField.setLayoutHints(LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
+    @details_button = FXButton.new(left_path_frame,
+      "\tShow connection details", @hideDetailsIcon)
+    @details_button.setFrameStyle(FRAME_NONE)
+    @details_button.disable
   end
 
-  def initializeControlsUL
+  def details_shown?
+    @passwordField.visible?
+  end
+
+  def initialize_controls_bottom_left
     @updateButton = FXButton.new(@leftButtonsFrame,
-				 "\tUpdate list",
-				 @reloadIcon)
+      "\tUpdate list",
+      @reloadIcon)
     super
     @autoSelectForDelButton = FXButton.new(@leftButtonsFrame,
-					   "\tChoose files automatically",
-					   @autoSelectForDelIco)
+      "\tChoose files automatically",
+      @autoSelectForDelIco)
     @removeSelectedLeftButton = FXButton.new(@leftButtonsFrame,
-					 "\tRemove selected files",
-					 @removeSelectedIco)
+      "\tRemove selected files",
+      @removeSelectedIco)
   end
   
-  def initializeControlsUR
+  def initialize_controls_bottom_right
     super
     @autoSelectRightButton = FXButton.new(@rightButtonsFrame,
-					  "\tChoose files automatically",
-					  @autoSelectRightIcon)
+      "\tChoose files automatically",
+      @autoSelectRightIcon)
     @uploadSelectedButton = FXButton.new(@rightButtonsFrame,
-					 "\tUpload selected",
-					 @uploadIcon)
+      "\tUpload selected",
+      @uploadIcon)
   end
-  
-  def connectEvents
+
+  def connect_events
     super
     @serverField.connect(SEL_COMMAND)  {
-      @options.ftpHost = @serverField.getText
+      @options.ftpHost = fox_2_ruby(@serverField.getText)
+      @connect_button.setState(STATE_UP)
     }
     @userField.connect(SEL_COMMAND)  {
-      @options.ftpUser = @userField.getText
+      @options.ftpUser = fox_2_ruby(@userField.getText)
+      @connect_button.setState(STATE_UP)
+    }
+    @passwordField.connect(SEL_COMMAND) {
+      @connect_button.setState(STATE_UP)
+    }
+    [@connect_button, @updateButton].each { |b|
+      b.connect(SEL_COMMAND, method(:on_cmd_update))
+    }
+    @autoSelectForDelButton.connect(SEL_COMMAND, method(:on_cmd_auto_select_left))
+    @removeSelectedLeftButton.connect(SEL_COMMAND, method(:on_cmd_remove_selected_left))
+    @autoSelectRightButton.connect(SEL_COMMAND, method(:on_cmd_auto_select_right))
+    @uploadSelectedButton.connect(SEL_COMMAND, method(:on_cmd_upload))
+    @details_button.connect(SEL_COMMAND) {
+      if(details_shown?)
+        hide_connection_details
+      else
+        show_connection_details
+      end
     }
-    @updateButton.connect(SEL_COMMAND, method(:onCmdUpdate))
-    @autoSelectForDelButton.connect(SEL_COMMAND, method(:onCmdAutoSelectLeft))
-    @removeSelectedLeftButton.connect(SEL_COMMAND, method(:onCmdRemoveSelectedLeft))
-    @autoSelectRightButton.connect(SEL_COMMAND, method(:onCmdAutoSelectRight))
-    @uploadSelectedButton.connect(SEL_COMMAND, method(:onCmdUpload))
   end
-  
-  def setDefaults
-    @serverField.setText(@options.ftpHost)
-    @userField.setText(@options.ftpUser)
-    @rightPathField.setText(@options.localDestinationPath)
-    @leftPathField.setText(@options.remoteDestinationPath)
+
+  def set_defaults
+    @serverField.setText(ruby_2_fox(@options.ftpHost))
+    @userField.setText(ruby_2_fox(@options.ftpUser))
+    @rightPathField.setText(fox_pah(@options.localDestinationPath))
+    @leftPathField.setText(ruby_2_fox(@options.remoteDestinationPath))
   end
   
   # accessing
 
-  def leftPath
+  def left_path
     @options.remoteDestinationPath
   end
   
-  def setLeftPath(p)
-    @options.remoteDestinationPath = FilePath.internPath(p)
-    @leftPathField.setText(leftPath) #fixme winpath
+  def set_left_path(p)
+    @options.remoteDestinationPath = FilePath.intern_path(p)
+    @leftPathField.setText(left_path)
   end
   
   def password
-    @passwordField.getText
+    fox_2_ruby(@passwordField.getText)
   end
   
   def host
-    @serverField.getText
+    fox_2_ruby(@serverField.getText)
   end
   
   def user
-    @userField.getText
+    fox_2_ruby(@userField.getText)
   end
-  
+
+  def connection_details_fields
+    [ @passwordField, @serverField, @userField, @connect_button ] +
+      @labels.slice(0..2)
+  end
+
   # update
+
+  def hide_connection_details
+    fields = connection_details_fields
+    fields.each { |f| f.hide }
+    @details_button.enable
+    @details_button.setIcon(@showDetailsIcon)
+    @left_frame.recalc
+  end
+
+  def show_connection_details
+    fields = connection_details_fields
+    fields.each { |f| f.show }
+    @details_button.setIcon(@hideDetailsIcon)
+    @left_frame.recalc
+  end
   
-  def updateStatusIconsRight
+  def update_status_icons_right
     (0..@rightFileList.getNumItems - 1).each do
       |index|
-      file = itemFilename(@rightFileList, index)
+      file = item_filename(@rightFileList, index)
       myInfo = @rightContents[file]
       otherInfo = @leftContents[file]
       icon = if myInfo.directory?
-	       otherInfo ? @dirIcon : @moveRightDirIcon
-	     else
-               if otherInfo
-                 otherInfo.mtime < myInfo.mtime ? @newerFileIcon : @fileIcon
-               else
-                 @moveRightFileIcon
-               end
-	     end
+        otherInfo ? @dirIcon : @moveRightDirIcon
+      else
+        if otherInfo
+          otherInfo.mtime < myInfo.mtime ? @newerFileIcon : @fileIcon
+        else
+          @moveRightFileIcon
+        end
+      end
       @rightFileList.setItemMiniIcon(index, icon)
     end
   end
   
-  def updateLeftList
-    updateFtpList if @connectionDataVerified
+  def update_left_list
+    if @connectionDataVerified
+      update_ftp_list
+    else
+      show_connection_details 
+    end
   end
   
-  def ftpDo(&block) # don't chdir in block
+  def ftp_do(&block) # don't chdir in block
     getApp.beginWaitCursor
     @leftFileList.clearItems
-    @leftContents = DirectoryContents.new(leftPath)
+    @leftContents = DirectoryContents.new(left_path)
     begin
       @connectionDataVerified = false
       @ftpAdapter.connect(host, user, password)
       @connectionDataVerified = true
-      @ftpAdapter.chdir(leftPath)
+      @connect_button.setState(STATE_DOWN)
+      @ftpAdapter.chdir(left_path)
       block.call # <------ the call
-      updateList(@ftpAdapter.nlst, @leftFileList, @leftContents) do
-	|file, path|
-	@ftpAdapter.info(file, path)
+      update_list(@ftpAdapter.nlst, @leftFileList, @leftContents) do
+        |file, path|
+        @ftpAdapter.info(file, path)
       end
     rescue SocketError => ex
       error(ex.message)
@@ -210,109 +263,110 @@ class FtpBrowserWidget < DirectoryDiffWidget
       error("Timeout - operation took longer than expected. \nCheck network connection and try again.")
     ensure
       @ftpAdapter.close
+      @connect_button.setState(STATE_UP) unless @connectionDataVerified
     end
     getApp.endWaitCursor
   end
   
-  def updateFtpList
-    ftpDo {} # every ftp action includes an update :-)
+  def update_ftp_list
+    ftp_do {} # every ftp action includes an update :-)
   end
 
   # actions
 
-  def autoSelectLeft
+  def auto_select_left
     list = @leftFileList
     list.killSelection
     (0..list.getNumItems-1).each do
       |index|
-      file = itemFilename(list, index)
+      file = item_filename(list, index)
       myInfo = @leftContents[file]
       otherInfo = @rightContents[file]
       select = if myInfo.directory?
-		 false
-	       elsif otherInfo
-		 false
-	       else
-		 true
-	       end
+        false
+      elsif otherInfo
+        false
+      else
+        true
+      end
       list.selectItem(index) if select
     end
   end
 
-  def autoSelectRight
+  def auto_select_right
     list = @rightFileList
     list.killSelection
     (0..list.getNumItems-1).each do
       |index|
-      file = itemFilename(list, index)
+      file = item_filename(list, index)
       myInfo = @rightContents[file]
       otherInfo = @leftContents[file]
       select = if myInfo.directory?
-		 false
-	       elsif otherInfo && otherInfo.directory?
-		 false
-	       elsif !otherInfo || otherInfo.mtime < myInfo.mtime
-		 true
-	       else
-		 false
-	       end
+        false
+      elsif otherInfo && otherInfo.directory?
+        false
+      elsif !otherInfo || otherInfo.mtime < myInfo.mtime
+        true
+      else
+        false
+      end
       list.selectItem(index) if select
     end
   end
 
-  def ftpDeleteLeft(files)
-    ftpDo {
+  def ftp_delete_left(files)
+    ftp_do do
       files.each { |file|
-	@ftpAdapter.delete(file) 
+        @ftpAdapter.delete(file)
       }
-    }
-    updateStatusIcons
+    end
+    update_status_icons
   end
 
-  def ftpUploadRight(hash, totalSize)
-    ftpDo do
+  def ftp_upload_right(hash, totalSize)
+    ftp_do do
       progressDialog = FXProgressDialog.new(self,
-					    'Transferring data',
-					    'Transferring data')
+        'Transferring data',
+        'Transferring data')
       begin
-	progressDialog.setProgress(1)
-	progressDialog.setTotal(totalSize)
-	progressDialog.create
-	progressDialog.show
-	progressDialog.repaint
-	hash.keys.sort.each do
-	  |file|
-	  @ftpAdapter.upload(rightPath, file) { |data|
-	    progressDialog.setMessage(ruby2Fox("Transferring #{File.basename(file)}"))
-	    progressDialog.increment(data.size)
-	    progressDialog.repaint
-	  }
-	end
+        progressDialog.setProgress(1)
+        progressDialog.setTotal(totalSize)
+        progressDialog.create
+        progressDialog.show
+        progressDialog.repaint
+        hash.keys.sort.each do
+          |file|
+          @ftpAdapter.upload(right_path, file) { |data|
+            progressDialog.setMessage(ruby_2_fox("Transferring #{File.basename(file)}"))
+            progressDialog.increment(data.size)
+            progressDialog.repaint
+          }
+        end
       ensure
-	progressDialog.hide
+        progressDialog.hide
       end
     end
-    updateStatusIcons
+    update_status_icons
   end
 
-  def askAndUploadSelection
-    sel = selectionInList(@rightFileList)
-    return false if sel.empty?
-    files = sel.collect { |e| FilePath.join(rightPath, e) }
-    uploadInfo = UploadInfo.new(files)
-    num = uploadInfo.numFiles
+  def ask_and_upload_selection
+    sel = selection_in_list(@rightFileList)
+    return false if !sel || sel.empty?
+    files = sel.collect { |e| FilePath.join(right_path, e) }
+    upload_info = UploadInfo.new(files)
+    num = upload_info.num_files
     if(num < 1)
       FXMessageBox.information(self, MBOX_OK, 'No files',
-			       'No files found in selected directories!')
+        'No files found in selected directories!')
       return false
     end
     answer = FXMessageBox.question(self, MBOX_YES_NO, 'Really upload?',
-				   "Upload #{num} fil#{num == 1 ? 'e' : 'es'}?")
-    ftpUploadRight(uploadInfo.bytesHash, uploadInfo.bytes) if answer == MBOX_CLICKED_YES
+      "Upload #{num} fil#{num == 1 ? 'e' : 'es'}?")
+    ftp_upload_right(upload_info.bytes_hash, upload_info.bytes) if answer == MBOX_CLICKED_YES
   end
   
-  def askAndFtpDeleteSelection
-    sel = selectionInList(@leftFileList)
+  def ask_and_ftp_delete_selection
+    sel = selection_in_list(@leftFileList)
     dirs = sel.select { |file|
       @leftContents[file].directory?
     }
@@ -320,35 +374,36 @@ class FtpBrowserWidget < DirectoryDiffWidget
     return false if sel.empty?
     num = sel.size
     answer = FXMessageBox.question(self, MBOX_YES_NO, 'Really delete?',
-				   "Delete #{num} fil#{num == 1 ? 'e' : 'es'}?")
-    ftpDeleteLeft(sel) if answer == MBOX_CLICKED_YES
+      "Delete #{num} fil#{num == 1 ? 'e' : 'es'}?")
+    ftp_delete_left(sel) if answer == MBOX_CLICKED_YES
   end
 
   # events
 
-  def onCmdUpdate(sender, sel, ptr)
-    updateFtpList
-    updateStatusIcons
+  def on_cmd_update(sender, sel, ptr)
+    update_ftp_list
+    update_status_icons
+    hide_connection_details if @connectionDataVerified
   end
 
-  def onCmdAutoSelectLeft(sender, sel, ptr)
-    autoSelectLeft
+  def on_cmd_auto_select_left(sender, sel, ptr)
+    auto_select_left
   end
 
-  def onCmdRemoveSelectedLeft(sender, sel, ptr)
-    askAndFtpDeleteSelection
+  def on_cmd_remove_selected_left(sender, sel, ptr)
+    ask_and_ftp_delete_selection
   end
 
-  def onCmdAutoSelectRight(sender, sel, ptr)
-    autoSelectRight
+  def on_cmd_auto_select_right(sender, sel, ptr)
+    auto_select_right
   end
 
-  def onCmdUpload(sender, sel, event)
-    askAndUploadSelection
+  def on_cmd_upload(sender, sel, event)
+    ask_and_upload_selection
   end
 		   
-  def onMenuLeftList(sender, sel, event)
-    selection = selectionInList(@leftFileList)
+  def on_menu_left_list(sender, sel, event)
+    selection = selection_in_list(@leftFileList)
     pane = FXMenuPane.new(self)
     # FXMenuSeparator.new(pane)
     item = FXMenuCommand.new(pane, "&Remove selected")
@@ -356,7 +411,7 @@ class FtpBrowserWidget < DirectoryDiffWidget
       item.disable
     else
       item.connect(SEL_COMMAND){ |sender, sel, event|
-	askAndFtpDeleteSelection
+        ask_and_ftp_delete_selection
       }
     end
     pane.create
@@ -365,15 +420,15 @@ class FtpBrowserWidget < DirectoryDiffWidget
     return 1
   end
 
-  def onMenuRightList(sender, sel, event)
-    selection = selectionInList(@rightFileList)
+  def on_menu_right_list(sender, sel, event)
+    selection = selection_in_list(@rightFileList)
     pane = FXMenuPane.new(self)
     item = FXMenuCommand.new(pane, "&Upload selected")
     if(selection.empty?)
       item.disable
     else
       item.connect(SEL_COMMAND){ |sender, sel, event|
-	askAndUploadSelection
+        ask_and_upload_selection
       }
     end
     # FXMenuSeparator.new(pane)
@@ -384,14 +439,15 @@ class FtpBrowserWidget < DirectoryDiffWidget
   end
   
   # open/close
-  
-  def inCreate
-    updateRightList
-    updateStatusIcons
-    @fourSplitter.setVSplit(2050)
+
+  def in_create
+    update_right_list
+    update_status_icons
+    puts preferred_width.to_s
+    @horizontal_splitter.setSplit(0, preferred_width/2)
   end
   
-  def prepareClosure
+  def prepare_closures
     @ftpAdapter.close
     super
   end

data/lib/piggy-gui/fullscreen.rb

@@ -10,15 +10,15 @@ class Fullscreen < Fox::FXMainWindow
   
   def initialize(*args)
     super(*args)
-    FXMAPFUNC(SEL_KEYPRESS, 0, :onKeyPress)
+    FXMAPFUNC(SEL_KEYPRESS, 0, :on_key_press)
   end
   
-  def onKeyPress(sender, sel, event)
+  def on_key_press(sender, sel, event)
     if event.code == KEY_Escape
       if FOXVERSION_GE_1_2
-	close(true)
+        close(true)
       else
-	hide()
+        hide()
       end
       return 1
     end