redcar 0.11.0dev → 0.11

data/lib/redcar/usage.rb

@@ -28,6 +28,8 @@ module Redcar
         puts "     --home-dir=PATH  Use the specified directory as Redcar home directory"
         puts "                  -w  Open the specified files and wait until they are closed"
         puts "          -l[NUMBER]  Open a specified file at line NUMBER. Multiple comma-seperated args for multiple files are allowed."
+        puts "          --show-log  Print Redcar's log to stdout"
+        puts "   --log-level=LEVEL  Set the log level to LEVEL (default is info, options are debug, info, warn, error)"
         #puts "To associate with right click in windows explorer:"
         #puts
         #puts "  C:> redcar --associate_with_any_right_click"

data/plugins/application/features/step_definitions/tree_steps.rb

@@ -7,19 +7,19 @@ When /^I expand the tree row "([^\"]*)"$/ do |row|
 end
 
 When /^I toggle tree visibility$/ do
-  Redcar::Top::ToggleTreesCommand.new.run
+  Redcar::Application::ToggleTreesCommand.new.run
 end
 
 When "I close the tree" do
-  Redcar::Top::CloseTreeCommand.new.run
+  Redcar::Application::CloseTreeCommand.new.run
 end
 
 When /^I switch (up|down) a tree$/ do |type|
   case type
   when "down"
-    Redcar::Top::SwitchTreeDownCommand.new.run
+    Redcar::Application::SwitchTreeDownCommand.new.run
   when "up"
-    Redcar::Top::SwitchTreeUpCommand.new.run
+    Redcar::Application::SwitchTreeUpCommand.new.run
   end
 end
 

data/plugins/application/features/support/env.rb

@@ -200,14 +200,16 @@ def close_everything
     dialogs.each {|d| d.controller.model.close }
   end
   Redcar.app.windows.each do |win|
+    if p = Redcar::Project::Manager.in_window(win)
+      Swt.sync_exec do
+        p.close
+      end
+    end
     win.treebook.trees.each do |tree|
       Swt.sync_exec do
         win.treebook.remove_tree(tree)
       end
     end
-    if Redcar::Project::Manager.in_window(win)
-      Redcar::Project.window_projects.delete(win)
-    end
     win.notebooks.each do |notebook|
       while tab = notebook.tabs.first
         Swt.sync_exec do
@@ -215,7 +217,7 @@ def close_everything
         end
       end
     end
-    if win.notebooks.length == 2
+    while win.notebooks.length > 1
       Swt.sync_exec do
         win.close_notebook
       end
@@ -253,5 +255,3 @@ end
 at_exit {
   FileUtils.rm_rf(Redcar::Plugin::Storage.storage_dir)
 }
-
-

data/plugins/application/lib/application.rb

@@ -5,9 +5,9 @@ require 'application/command/executor'
 require 'application/command/history'
 require 'application/sensitive'
 require 'application/sensitivity'
-
 require 'application/clipboard'
 require 'application/command'
+
 require 'application/dialog'
 require 'application/dialogs/filter_list_dialog'
 require 'application/dialogs/modeless_list_dialog'
@@ -28,9 +28,19 @@ require 'application/notebook'
 require 'application/speedbar'
 require 'application/tab'
 require 'application/tab/command'
+require 'application/tree'
+require 'application/tree/command'
+require 'application/tree/controller'
+require 'application/tree/mirror'
 require 'application/treebook'
 require 'application/window'
 
+require 'application/commands/application_commands'
+require 'application/commands/tab_commands'
+require 'application/commands/notebook_commands'
+require 'application/commands/window_commands'
+require 'application/commands/treebook_commands'
+
 module Redcar
   # A Redcar process contains one Application instance. The application instance
   # (the app) contains:
@@ -226,6 +236,17 @@ module Redcar
       windows.each {|window| window.refresh_toolbar }
       controller.refresh_toolbar
     end
+    
+    # For every plugin that implements it, call the method with the given
+    # arguments and pass the result to the block.
+    #
+    # @param [Symbol] method_name
+    def call_on_plugins(method_name, *args)
+      Redcar.plugin_manager.objects_implementing(method_name).each do |object|
+        yield object.send(method_name, *args)
+      end
+      nil
+    end
 
     # Generate the main menu by combining menus from all plugins.
     #
@@ -267,7 +288,7 @@ module Redcar
         Redcar.plugin_manager.objects_implementing(:keymaps).each do |object|
           maps = object.keymaps
           unless maps
-            puts "#{object.inspect} implements :keymaps but :keymaps returns nil"
+            Redcar.log.warn("#{object.inspect} implements :keymaps but :keymaps returns nil")
             maps = []
           end
           keymaps = maps.select do |map|
@@ -275,10 +296,17 @@ module Redcar
           end
           keymap = keymaps.inject(keymap) {|k, nk| k.merge(nk) }
         end
-        keymap
+        apply_user_keybindings(keymap)
       end
     end
 
+    def apply_user_keybindings(keymap)
+      Redcar.plugin_manager.objects_implementing(:user_keybindings).each do |object|
+        keymap.map.merge!(object.user_keybindings)
+      end
+      keymap
+    end
+    
     # Loads sensitivities from all plugins.
     def load_sensitivities
       Redcar.plugin_manager.objects_implementing(:sensitivities).each do |object|

data/plugins/application/lib/application/command.rb

@@ -80,11 +80,17 @@ module Redcar
     
     def run(opts = {})
       @executor = Executor.new(self, opts)
+      s = Time.now
       result = @executor.execute
       remove_instance_variable(:@executor)
+      Redcar.log.debug("command #{self.inspect} (#{Time.now - s})")
       result
     end
     
+    def inspect
+      "#<#{self.class.name}>"
+    end
+    
     private
     
     def env

data/plugins/application/lib/application/command/executor.rb

@@ -2,7 +2,6 @@
 module Redcar
   class Command
     class Executor
-      include Redcar::Core::HasLogger
       
       attr_reader :options, :command_instance
       

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

@@ -0,0 +1,21 @@
+module Redcar
+  class Application
+    class QuitCommand < Command
+      def execute
+        Redcar.app.call_on_plugins(:quit_guard) do |guard|
+          return unless guard
+        end
+        Project::Manager.open_projects.each {|pr| pr.close }
+        Redcar.app.quit
+      end
+    end
+    
+    class ToggleToolbar < Command
+
+      def execute
+        Redcar.app.toggle_show_toolbar
+        Redcar.app.refresh_toolbar!
+      end
+    end
+  end
+end

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

@@ -0,0 +1,73 @@
+module Redcar
+  class Application
+    class OpenNewNotebookCommand < Command
+      
+      def execute
+        win.create_notebook
+      end
+    end
+    
+    class EnlargeNotebookCommand < Command
+      sensitize :multiple_notebooks
+      
+      def execute
+        if win = Redcar.app.focussed_window
+          win.enlarge_notebook(0)
+        end
+      end
+    end
+
+    class ResetNotebookWidthsCommand < Command
+      sensitize :multiple_notebooks
+
+      def execute
+        if win = Redcar.app.focussed_window
+          win.reset_notebook_widths
+        end
+      end
+    end
+
+    class RotateNotebooksCommand < Command
+      sensitize :multiple_notebooks
+
+      def execute
+        win.rotate_notebooks
+      end
+    end
+
+    class CloseNotebookCommand < Command
+      sensitize :multiple_notebooks
+
+      def execute
+        unless win.notebooks.length == 1
+          win.close_notebook
+        end
+      end
+    end
+
+    class SwitchNotebookCommand < Command
+      sensitize :multiple_notebooks, :other_notebook_has_tab
+
+      def execute
+        new_notebook = win.nonfocussed_notebook
+        if new_notebook.focussed_tab
+          new_notebook.focussed_tab.focus
+        end
+      end
+    end
+
+    class MoveTabToOtherNotebookCommand < Command
+      sensitize :multiple_notebooks, :open_tab
+
+      def execute
+        current_notebook = tab.notebook
+        i = win.notebooks.index current_notebook
+
+        target_notebook = win.notebooks[ (i + 1) % win.notebooks.length ]
+        target_notebook.grab_tab_from(current_notebook, tab)
+        tab.focus
+      end
+    end
+
+  end
+end

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

@@ -0,0 +1,105 @@
+module Redcar
+  class Application
+
+    class SwitchTabDownCommand < TabCommand
+
+      def execute
+        win.focussed_notebook.switch_down
+      end
+    end
+
+    class SwitchTabUpCommand < TabCommand
+
+      def execute
+        win.focussed_notebook.switch_up
+      end
+    end
+
+    class MoveTabUpCommand < TabCommand
+
+      def execute
+        win.focussed_notebook.move_up
+      end
+    end
+
+    class MoveTabDownCommand < TabCommand
+
+      def execute
+        win.focussed_notebook.move_down
+      end
+    end
+
+    class CloseTabCommand < TabCommand
+      def initialize(tab=nil)
+        @tab = tab
+      end
+
+      def tab
+        @tab || super
+      end
+
+      def execute
+        Redcar.app.call_on_plugins(:close_tab_guard, tab) do |guard|
+          return unless guard
+        end
+        close_tab
+        @tab = nil
+      end
+
+      private
+
+      def close_tab
+        win = tab.notebook.window
+        tab.close
+        # this will break a lot of features:
+        #if win.all_tabs.empty? and not Project::Manager.in_window(win)
+        #  win.close
+        #end
+      end
+    end
+
+    class CloseAll < Redcar::Command
+      def execute
+        window = Redcar.app.focussed_window
+        tabs = window.all_tabs
+        tabs.each do |t|
+          CloseTabCommand.new(t).run
+        end
+      end
+    end
+
+    class CloseOthers < Redcar::Command
+      def execute
+        window = Redcar.app.focussed_window
+        current_tab = Redcar.app.focussed_notebook_tab
+        tabs = window.all_tabs
+        tabs.each do |t|
+          unless t == current_tab
+            CloseTabCommand.new(t).run
+          end
+        end
+      end
+    end
+    
+    # define commands from SelectTab1Command to SelectTab9Command
+    (1..9).each do |tab_num|
+      const_set("SelectTab#{tab_num}Command", Class.new(Redcar::TabCommand)).class_eval do
+        define_method :execute do
+          notebook = Redcar.app.focussed_window_notebook
+          notebook.tabs[tab_num-1].focus if notebook.tabs[tab_num-1]
+        end
+      end
+    end
+  end
+end
+
+
+
+
+
+
+
+
+
+
+

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

@@ -0,0 +1,117 @@
+module Redcar
+  class Application
+    
+    class CloseTreeCommand < TreeCommand
+      def execute
+        win = Redcar.app.focussed_window
+        if win and treebook = win.treebook
+          if tree = treebook.focussed_tree
+            treebook.remove_tree(tree)
+          end
+        end
+      end
+    end
+
+    class ToggleTreesCommand < TreeCommand
+      def execute
+        win = Redcar.app.focussed_window
+        if win and treebook = win.treebook
+          if win.trees_visible?
+            win.set_trees_visible(false)
+          else
+            win.set_trees_visible(true)
+          end
+        end
+      end
+    end
+
+    class SwitchTreeDownCommand < TreeCommand
+
+      def execute
+        win = Redcar.app.focussed_window
+        win.treebook.switch_down
+      end
+    end
+
+    class SwitchTreeUpCommand < TreeCommand
+
+      def execute
+        win = Redcar.app.focussed_window
+        win.treebook.switch_up
+      end
+    end
+    
+    class TreebookWidthCommand < Command
+      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
+      end
+    end
+    
+    class DecreaseTreebookWidthCommand < TreebookWidthCommand
+      def decrement
+        -1
+      end
+    end
+
+    class OpenTreeFinderCommand < TreeCommand
+      def execute
+        if win = Redcar.app.focussed_window
+          if trees = win.treebook.trees and trees.any?
+            titles = []
+            trees.each {|t| titles << t.tree_mirror.title}
+            dialog = TreeFuzzyFilter.new(win,titles)
+            dialog.open
+          end
+        end
+      end
+
+      class TreeFuzzyFilter < FilterListDialog
+
+        def initialize(win,titles)
+          super()
+          @win = win
+          @titles = titles
+        end
+
+        def selected(text,ix)
+          if tree = @win.treebook.trees.detect do |tree|
+              tree.tree_mirror.title == text
+            end
+            if @win.treebook.focussed_tree == tree
+              @win.set_trees_visible(true) if not @win.trees_visible?
+            else
+              @win.treebook.focus_tree(tree)
+            end
+            tree.focus
+            close
+          end
+        end
+
+        def update_list(filter)
+          @titles.select do |t|
+            t.downcase.include?(filter.downcase)
+          end
+        end
+      end
+    end
+
+  end
+end