redcar 0.12.1 → 0.13

data/CHANGES

@@ -1,3 +1,21 @@
+Version 0.13 (21st January 2012)
+================================
+
+ * Move all language settings options into the Edit menu, for easier discoverability.(Dan Lucraft)
+ * Move the change tab language command into the Edit menu, and make it a filter list. (Dan Lucraft)
+ * extended the FilterListDialog class to support icons, by merging in the outline_view plugin (Dan Lucraft)
+ * implemented project-wide Find declaration (Project/Find declaration) (Dan Lucraft)
+ * Don't use Bundler when running as a gem (Dan Lucraft)
+ * Parse Ruby with 1.9 syntax instead of 1.8 (Dan Lucraft)
+ * Made the auto indenter ignore blank lines when deciding on indentation. (Dan Lucraft)
+ * New API for tab context menus (Dan Lucraft)
+ * Copy path of file to clipboard tab context menu item (Dan Lucraft)
+ * New APIs on Window to get and set window location, size and tree width (Dan Lucraft)
+ * Remember project window location and size, and tree width between sessions (Markus Kahl)
+ * Remember open files between sessions (Christopher Wade)
+ * Remember cursor location and selection between sessions (Christopher Wade)
+ * Remove broken remote project support, and clean up Project classes. (Dan Lucraft)
+
 Version 0.12 (7th January 2012)
 ===============================
 

data/bin/redcar

@@ -9,6 +9,7 @@ file = File.readlink(file) while File.symlink?(file)
 $LOAD_PATH.unshift File.expand_path('../../lib', file)
 
 require "redcar_quick_start"
+
 if ARGV.include? '--silent'
   # reopen the standard pipes to nothingness if we were forked as part of jruby
   STDIN.reopen Redcar.null_device

data/lib/redcar.rb

@@ -23,8 +23,7 @@ entries_in_gem_home  = Dir[prospective_gem_home + "/*"].map {|path| File.basenam
 if (["cache", "gems"] - entries_in_gem_home).length == 0
   ENV["GEM_HOME"]       = prospective_gem_home
 else
-  require 'bundler'
-  Bundler.require(:default)
+  require 'bundler/setup'
 end
 
 require 'redcar-icons'
@@ -70,10 +69,10 @@ end
 #
 # and so on.
 module Redcar
-  VERSION         = '0.12.1' # also change in the gemspec!
+  VERSION         = '0.13' # also change in the gemspec!
   VERSION_MAJOR   = 0
-  VERSION_MINOR   = 12
-  VERSION_RELEASE = 1
+  VERSION_MINOR   = 13
+  VERSION_RELEASE = 0
   
   ENVIRONMENTS = [:user, :debug, :test]
   

data/lib/redcar/usage.rb

@@ -9,7 +9,6 @@ module Redcar
     
     def version_requested
       if ARGV.include?("-v")
-        puts "Redcar #{Redcar::VERSION}"
         exit
       end
     end

data/lib/redcar_quick_start.rb

@@ -33,7 +33,9 @@ module Redcar
   end
 
   def self.try_to_load_via_drb
-    return if ARGV.find {|arg| arg == "--multiple-instance" || arg == '--help' || arg == '-h'}
+    if ARGV.find {|arg| arg == "--multiple-instance" || arg == '--help' || arg == '-h' || arg == "-v"}
+      return false
+    end
     begin
       begin
         TCPSocket.new('127.0.0.1', drb_port).close

data/plugins/application/lib/application.rb

@@ -12,6 +12,7 @@ require 'application/dialog'
 require 'application/dialogs/filter_list_dialog'
 require 'application/dialogs/modeless_list_dialog'
 require 'application/event_spewer'
+require 'application/global_state'
 require 'application/keymap'
 require 'application/keymap/builder'
 require 'application/toolbar'

data/plugins/application/lib/application/commands/treebook_commands.rb

@@ -42,32 +42,25 @@ module Redcar
     end
     
     class TreebookWidthCommand < Command
+      MINIMUM_TREEBOOK_WIDTH = 0
+      WIDTH_INCREMENT        = 5
       sensitize :open_trees
-
-      def increment
-        raise "Please implement me!"
-      end
-
-      def execute
-        if win = Redcar.app.focussed_window
-          if increment > 0
-            win.adjust_treebook_width(true)
-          else
-            win.adjust_treebook_width(false)
-          end
-        end
-      end
     end
     
     class IncreaseTreebookWidthCommand < TreebookWidthCommand
-      def increment
-        1
+      def execute
+        win = Redcar.app.focussed_window
+        win.treebook_width = win.treebook_width + WIDTH_INCREMENT
       end
     end
     
     class DecreaseTreebookWidthCommand < TreebookWidthCommand
-      def decrement
-        -1
+      def execute
+        win = Redcar.app.focussed_window
+        new_width = win.treebook_width - WIDTH_INCREMENT
+        unless new_width < MINIMUM_TREEBOOK_WIDTH
+          win.treebook_width = new_width
+        end
       end
     end
 

data/plugins/application/lib/application/dialog.rb

@@ -84,7 +84,7 @@ module Redcar
       #
       # The return value is a hash containing :button and :value.
       def self.input(title, message, initial_value="", &validator)
-        in_dialog { Redcar.gui.dialog_adapter.input(title, message, initial_value, &validator) }
+        in_dialog { Redcar.gui.dialog_adapter.input(title.to_s, message.to_s, initial_value.to_s, &validator) }
       end
 
       # Show a dialog containing a password entry box to the user, and blocks

data/plugins/application/lib/application/dialogs/filter_list_dialog.rb

@@ -20,10 +20,18 @@ module Redcar
       notify_listeners(:close)
     end
     
-    # Called by the controller when the user changes the filter.
+    # Called by the controller when the user changes the filter. 
+    #
+    # Should return either a list of strings, or a list of hashes, which must have at least
+    # the key :name set, and may also have the key :image.
+    #
+    # E.g. it returns ["feed.rb", "application_controller.rb"]
+    # or it returns [{:name => "feed.rb"}, {:name => "application_controller.rb"}]
+    #
+    # The methods selected and moved_to will be called with items from this list.
     #
     # @param [String] the filter entered by the user
-    # @return [Array<String>] the new list to display
+    # @return [Array<String> or Array<Hash>] the new list to display
     def update_list(filter)
       if filter == ""
         %w(foo bar baz qux quux corge)
@@ -36,9 +44,9 @@ module Redcar
     
     # Called by the controller when the user selects a row in the list.
     #
-    # @param [String] the list row text selected by the user
+    # @param [String or Hash] the item selected by the user
     # @param [Integer] the index of the row in the list selected by the user
-    def selected(text, ix)
+    def selected(item, ix)
       puts "Hooray! You selected #{text} at index #{ix}"
     end
     
@@ -46,7 +54,7 @@ module Redcar
     #
     # @param [String] the list row text that is now highlighted
     # @param [Integer] the index of the row that is now highlighted
-    def moved_to(text, ix)
+    def moved_to(item, ix)
       # Override with the code you wish you had
     end
 

data/plugins/application/lib/application/global_state.rb

@@ -0,0 +1,21 @@
+module Redcar
+  class Application
+    class GlobalState
+      def app
+        Redcar.app
+      end
+      
+      def win
+        app and app.focussed_window
+      end
+      
+      def project
+        win and Project.in_window(win)
+      end
+
+      def tab
+        win and win.focussed_notebook_tab
+      end
+    end
+  end
+end

data/plugins/application/lib/application/menu/item.rb

@@ -12,26 +12,38 @@ module Redcar
         end
       end
       
-      attr_reader :command, :priority, :value, :type, :active
+      attr_reader :command, :priority, :value, :type
   
       # Create a new Item, with the given text to display in the menu, and
       # either:
       #   the Redcar::Command that is run when the item is selected.
       #   or a block to run when the item is selected
-      def initialize(text, options={}, &block)
+      #
+      # Instead of a command, a hash of options may be passed:
+      #  :command  - specify a command class
+      #  :priority - Integer, higher means lower in menus
+      #  :value    - if passed, the command class with be instantiation like:
+      #              Command.new(:value => value)
+      #  :enabled  - if set to false, this menu item will be permanently disabled
+      #  :type     - can be set to :check or :radio
+      #  :checked  - if type is check or radio, a block that will be run when 
+      #              the menu is displayed to determine whether this item is checked
+      def initialize(text, command_or_options={}, &block)
         @text = text
         
-        if options.respond_to?('[]')
+        if command_or_options.respond_to?('[]')
+          options = command_or_options
           @command = options[:command] || block
           @priority = options[:priority]
           @value = options[:value]
           @type = options[:type]
-          @active = options[:active] ? true : false
-        # This branch is for compatibility with old code. Please use :command 
-        # option in new code
-        # FIXME: Should this be removed at some point?
+          @enabled = (options.key?(:enabled) ? options[:enabled] : true)
+          if [:check, :radio].include?(@type)
+            @checked = options[:checked]
+          end
         else
-          @command = options || block
+          @enabled = true
+          @command = command_or_options || block
         end
         
         @priority ||= Menu::DEFAULT_PRIORITY
@@ -42,7 +54,7 @@ module Redcar
         if @value
           @command.new.run(:value => @value)
         else  
-          @command.new.run#(:with_key => with_key)
+          @command.new.run
         end
       end
       
@@ -55,11 +67,13 @@ module Redcar
       end
       
       def text
-        @text.is_a?(Proc) ? @text.call : @text
+        @text.respond_to?(:call) ? 
+          Redcar::Application::GlobalState.new.instance_eval(&@text) :
+          @text
       end
       
       def lazy_text?
-        @text.is_a?(Proc)
+        @text.respond_to?(:call)
       end
       
       def merge(other)
@@ -74,6 +88,18 @@ module Redcar
       def is_unique?
         false
       end
+      
+      def enabled?
+        @enabled
+      end
+      
+      def checked?
+        @checked and (
+          @checked.respond_to?(:call) ?
+            Redcar::Application::GlobalState.new.instance_eval(&@checked) :
+            @checked
+        )
+      end
     end
   end
 end

data/plugins/application/lib/application/notebook.rb

@@ -132,6 +132,18 @@ module Redcar
       end
       index
     end
+
+    # Triggers the display of the tab context menu at the current 
+    # cursor location.
+    def right_click_on_tab(tab)
+      menu = Menu.new
+      Redcar.plugin_manager.objects_implementing(:tab_context_menu).each do |object|
+        menu.merge(object.tab_context_menu(tab))
+      end
+
+      Application::Dialog.popup_menu(menu, :pointer)
+    end
+    
     
     def inspect
       "#<Redcar::Notebook #{object_id}>"

data/plugins/application/lib/application/tree/mirror.rb

@@ -78,17 +78,6 @@ module Redcar
         raise "not implemented"
       end
       
-      # Called when the whole tree needs to be refreshed. Implementations
-      # should do whatever they need to do to fetch full tree data, and then
-      # yield.
-      #
-      # The purpose is so that a refresh operation can run against some cached
-      # data, but then at the end of the method the mirror can discard the cache.
-      # Because refreshes typically generate large numbers of queries.
-      def refresh_operation(tree)
-        yield
-      end
-      
       # This is the required interface of a ROW in a TreeView.
       module NodeMirror
         include Redcar::Observable

data/plugins/application/lib/application/window.rb

@@ -63,7 +63,7 @@ module Redcar
     def fullscreen=(value)
       controller.fullscreen = value
     end
-
+    
     # Create a new notebook in this window.
     #
     # @events [(:new_notebook, notebook)]
@@ -82,14 +82,39 @@ module Redcar
       notify_listeners(:enlarge_notebook,index)
     end
 
-    def adjust_treebook_width(more=true)
-      if more
-        notify_listeners(:increase_treebook_width)
-      else
-        notify_listeners(:decrease_treebook_width)
+    # The width of a treebook in this window. (Even if there is none
+    # this is the width it would be.)
+    def treebook_width
+      if controller
+        controller.treebook_open_width
       end
     end
-
+    
+    # Set treebook width (does not reopen a hidden tree)
+    def treebook_width=(size)
+      if controller
+        controller.set_treebook_open_width(size)
+      end
+    end
+    
+    # Get dimensions and location of this window
+    #
+    # Returns: [x, y, width, height]
+    def bounds
+      if controller
+        controller.bounds
+      end
+    end
+    
+    # Set bounds of this window
+    #
+    # @dimensions [x, y, width, height]
+    def bounds=(new_bounds)
+      if controller
+        controller.set_bounds(new_bounds)
+      end
+    end
+    
     def reset_notebook_widths
       notify_listeners(:reset_notebook_widths)
     end

data/plugins/application_swt/lib/application_swt.rb

@@ -13,8 +13,8 @@ require "application_swt/dialogs/modeless_dialog"
 require "application_swt/dialogs/modeless_html_dialog"
 require "application_swt/dialogs/modeless_list_dialog_controller"
 require "application_swt/gradient"
-require "application_swt/html_tab"
 require "application_swt/icon"
+require "application_swt/html_tab"
 require "application_swt/listener_helpers"
 require "application_swt/menu"
 require "application_swt/menu/binding_translator"

data/plugins/application_swt/lib/application_swt/dialogs/filter_list_dialog_controller.rb

@@ -14,20 +14,33 @@ module Redcar
         attr_accessor :controller
         
         def createDialogArea(parent)
+          # composite = Swt::Widgets::Composite.new(parent, Swt::SWT::NONE)
+          # layout = Swt::Layout::RowLayout.new(Swt::SWT::VERTICAL)
+          # composite.setLayout(layout)
+          # 
+          # @text = Swt::Widgets::Text.new(composite, Swt::SWT::SINGLE | Swt::SWT::LEFT | Swt::SWT::ICON_CANCEL | Swt::SWT::SEARCH)
+          # @text.set_layout_data(Swt::Layout::RowData.new(400, 20))
+          # @list = Swt::Widgets::List.new(composite, Swt::SWT::V_SCROLL | Swt::SWT::H_SCROLL | Swt::SWT::SINGLE)
+          # @list.set_layout_data(Swt::Layout::RowData.new(400, 200))
+          # controller.attach_listeners
+          # controller.update_list_sync
+          # get_shell.add_shell_listener(ShellListener.new(controller))
+          # ApplicationSWT.register_shell(get_shell)
+          # ApplicationSWT.register_dialog(get_shell, self)
+          # 
+          # @list.set_selection(0)
           composite = Swt::Widgets::Composite.new(parent, Swt::SWT::NONE)
           layout = Swt::Layout::RowLayout.new(Swt::SWT::VERTICAL)
           composite.setLayout(layout)
-
           @text = Swt::Widgets::Text.new(composite, Swt::SWT::SINGLE | Swt::SWT::LEFT | Swt::SWT::ICON_CANCEL | Swt::SWT::SEARCH)
           @text.set_layout_data(Swt::Layout::RowData.new(400, 20))
-          @list = Swt::Widgets::List.new(composite, Swt::SWT::V_SCROLL | Swt::SWT::H_SCROLL | Swt::SWT::SINGLE)
+          @list = Swt::Widgets::Table.new(composite, Swt::SWT::V_SCROLL | Swt::SWT::H_SCROLL | Swt::SWT::MULTI)
           @list.set_layout_data(Swt::Layout::RowData.new(400, 200))
           controller.attach_listeners
           controller.update_list_sync
           get_shell.add_shell_listener(ShellListener.new(controller))
-          ApplicationSWT.register_shell(get_shell)
-          ApplicationSWT.register_dialog(get_shell, self)
-
+          Redcar::ApplicationSWT.register_shell(get_shell)
+          Redcar::ApplicationSWT.register_dialog(get_shell, self)
           @list.set_selection(0)
         end
       end
@@ -167,7 +180,8 @@ module Redcar
       
       def widget_selected
         if @model.step?
-          @model.moved_to(@dialog.list.get_selection.first, @dialog.list.get_selection_index)
+          ix = @dialog.list.get_selection_index
+          @model.moved_to(@list[ix], ix)
         end
       end
 
@@ -185,7 +199,8 @@ module Redcar
 
       def selected
         wait_for_search if select_closest_match?
-        @model.selected(@dialog.list.get_selection.first, @dialog.list.get_selection_index)
+        ix = @dialog.list.get_selection_index
+        @model.selected(@list[ix], ix)
       end
       
       def key_pressed(key_event)
@@ -221,10 +236,20 @@ module Redcar
       end
       
       def populate_list(contents)
+        @list = contents
         if @dialog
-          @dialog.list.removeAll
-          contents.each do |text|
-            @dialog.list.add(text)
+          @dialog.list.remove_all
+          contents.each do |props|
+            if props.is_a?(String)
+              props = {:name => props}
+            end
+            props = {:name => ""}.merge(props)
+            item = Swt::Widgets::TableItem.new(@dialog.list, Swt::SWT::NONE)
+            item.text = props[:name]
+            image = ApplicationSWT::Icon.swt_image(props[:icon]) if props[:icon]
+            if image
+              item.image = image
+            end
           end
         end
       end