redcar-dev 0.13.3dev → 0.13.4dev

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

@@ -69,7 +69,7 @@ end
 #
 # and so on.
 module Redcar
-  VERSION         = '0.13.3dev' # also change in the gemspec!
+  VERSION         = '0.13.4dev' # also change in the gemspec!
   VERSION_MAJOR   = 0
   VERSION_MINOR   = 13
   VERSION_RELEASE = 0

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/menu/item.rb

@@ -18,19 +18,31 @@ module Redcar
       # 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]
+          @enabled = (options.key?(:enabled) ? options[:enabled] : true)
           if [:check, :radio].include?(@type)
             @checked = options[:checked]
           end
         else
-          @command = options || block
+          @command = command_or_options || block
         end
         
         @priority ||= Menu::DEFAULT_PRIORITY
@@ -41,7 +53,7 @@ module Redcar
         if @value
           @command.new.run(:value => @value)
         else  
-          @command.new.run#(:with_key => with_key)
+          @command.new.run
         end
       end
       
@@ -76,6 +88,10 @@ module Redcar
         false
       end
       
+      def enabled?
+        @enabled
+      end
+      
       def checked?
         @checked and (
           @checked.respond_to?(:call) ?

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_swt/lib/application_swt/icon.rb

@@ -4,7 +4,7 @@ module Redcar
     module Icon
       def self.swt_image(icon)
         case icon
-        when :directory
+        when :directory, :dir
           dir_image
         when :file
           file_image

data/plugins/application_swt/lib/application_swt/menu.rb

@@ -16,8 +16,6 @@ module Redcar
 
       attr_reader :menu_bar
 
-
-
       def self.menu_types
         [Swt::SWT::BAR, Swt::SWT::POP_UP]
       end
@@ -147,7 +145,11 @@ module Redcar
         else
           item.text = entry.text
         end
-        item.addSelectionListener(ProcSelectionListener.new(entry))
+        if entry.enabled?
+          item.addSelectionListener(ProcSelectionListener.new(entry))
+        else
+          item.enabled = false
+        end
       end
 
       class SelectionListener
@@ -177,14 +179,18 @@ module Redcar
         else
           item.text = entry.text
         end
-        item.add_selection_listener(SelectionListener.new(entry))
-        h = entry.command.add_listener(:active_changed) do |value|
-          unless item.disposed
-            item.enabled = value
+        if entry.enabled?
+          item.add_selection_listener(SelectionListener.new(entry))
+          h = entry.command.add_listener(:active_changed) do |value|
+            unless item.disposed
+              item.enabled = value
+            end
           end
-        end
-        @handlers << [entry.command, h]
-        if not entry.command.active?
+          @handlers << [entry.command, h]
+          if not entry.command.active?
+            item.enabled = false
+          end
+        else
           item.enabled = false
         end
       end

data/plugins/application_swt/lib/application_swt/notebook.rb

@@ -104,6 +104,12 @@ module Redcar
       def attach_view_listeners
         @tab_folder.add_ctab_folder2_listener(CTabFolder2Listener.new(self))
         @tab_folder.add_selection_listener(SelectionListener.new(self))
+        @tab_folder.add_listener(Swt::SWT::MenuDetect) do |event|
+          point = ApplicationSWT.display.map(nil, @tab_folder, Swt::Graphics::Point.new(event.x, event.y))
+          if item = @tab_folder.getItem(point)
+            @model.right_click_on_tab(tab_item_to_tab_model(item))
+          end
+        end
       end
       
       # Called by the models when a tab is selected by Redcar.
@@ -139,8 +145,11 @@ module Redcar
       private
       
       def focussed_tab
-        focussed_tab_item = tab_folder.get_selection
-        @model.tabs.detect {|tab| tab.controller.item == focussed_tab_item }
+        tab_item_to_tab_model(tab_folder.get_selection)
+      end
+      
+      def tab_item_to_tab_model(tab_item)
+        @model.tabs.detect {|tab| tab.controller.item == tab_item }
       end
       
     end

data/plugins/project/lib/project/find_recent_dialog.rb

@@ -4,11 +4,14 @@ module Redcar
     class FindRecentDialog < FilterListDialog
       def update_list(filter)
         recent = Project::Recent.storage['list']
-        recent = recent.map {|path| path.gsub(/^#{Regexp.escape(Redcar.home_dir)}\/?/, "")}
-        filter_and_rank_by(recent, filter)
+        recent = recent.map do |path| 
+          {:name => path.gsub(/^#{Regexp.escape(Redcar.home_dir)}\/?/, ""), :icon => :dir}
+        end
+        filter_and_rank_by(recent, filter) {|h| h[:name] }
       end
 
-      def selected(path, ix)
+      def selected(item, ix)
+        path = item[:name]
         unless path[0..0] == "/" or path =~ /^[A-Z]:\//
           path = Redcar.home_dir + "/" + path
         end

data/plugins/project/lib/project/manager.rb

@@ -421,6 +421,15 @@ module Redcar
         end
       end
 
+      def self.tab_context_menu(tab)
+        Menu::Builder.build do
+          if tab.is_a?(EditTab)
+            path = tab.edit_view.document.path
+            item("Copy path to clipboard", :enabled => !!path) { Redcar.app.clipboard << path if path }
+          end
+        end
+      end
+      
       # Uses our own context menu hook to provide context menu entries
       # @return [Menu]
       def self.project_context_menus(tree, node, controller)

data/redcar.gemspec

@@ -29,7 +29,7 @@ end
 
 Gem::Specification.new do |s|
   s.name        = "redcar-dev"
-  s.version     = "0.13.3dev" # also change in lib/redcar.rb
+  s.version     = "0.13.4dev" # also change in lib/redcar.rb
   s.platform    = "ruby"
   s.authors     = ["Daniel Lucraft"]
   s.email       = ["dan@fluentradical.com"]

metadata

@@ -2,7 +2,7 @@
 name: redcar-dev
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 0.13.3dev
+  version: 0.13.4dev
 platform: ruby
 authors: 
   - Daniel Lucraft
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-11 00:00:00 Z
+date: 2012-01-14 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: git