redcar 0.3.10.1dev → 0.4

data/plugins/pair_highlighter/lib/pair_highlighter/document_controller.rb

@@ -0,0 +1,185 @@
+
+module Redcar
+  class PairHighlighter
+    class DocumentController
+
+      attr_accessor :gc, :styledText, :document, :mate_text, :theme_name
+      attr_accessor :height, :width, :highlighted
+ 
+      include Redcar::Document::Controller
+      include Redcar::Document::Controller::ModificationCallbacks
+      include Redcar::Document::Controller::CursorCallbacks
+
+      def set_highlight_colour
+        if @theme_name == EditView.theme
+          return @colour if @colour
+        end
+            
+        @theme_name = EditView.theme
+        @theme = @mate_text.colourer.getTheme()
+        @colour = @theme.globalSettings.get("pairHighlight")
+      	if @colour
+      	  @colour = JavaMateView::SwtColourer.getColour(@colour)
+      	else
+          @colour = ApplicationSWT.display.system_color Swt::SWT::COLOR_GRAY	      	  
+      	end
+      	@colour
+      end
+
+      def before_modify(start_offset, end_offset, text)
+        @wait = @wait + 1
+      end
+
+      def after_modify
+        @wait = @wait - 1
+	    end
+
+      def initialize
+        @i = 0
+        @wait = 0
+        @theme_name = nil
+        @highlight = Highlighted.new
+        @open_pair_chars = ["{", "(", "["]
+        @close_pair_chars = ["}", ")", "]"]
+        @pair_chars = @open_pair_chars + @close_pair_chars
+      end
+
+      def highlight_pair(current, pair)
+        if current == nil or pair == nil
+          clear
+          return
+        elsif current == @highlight.current || current == @highlight.pair || pair == @highlight.current || pair == @highlight.pair
+          return
+        end
+
+        #puts "Highligh on offset " + current.to_s() + " and its pair at " + pair.to_s()
+        if document.length > 0
+          clear
+          #puts "Highligh on offset " + current.to_s() + " and its pair at " + pair.to_s()
+          gc = Swt::Graphics::GC.new(@styledText)
+          gc.setBackground(set_highlight_colour) 
+          gc.setAlpha(98)
+          gc.fill_rectangle(styledText.getTextBounds(current, current))
+          gc.fill_rectangle(styledText.getTextBounds(pair, pair))          
+          @highlight.set_on(current, pair)
+          gc.dispose() if gc
+        end
+      end
+      
+      def clear
+        if @highlight.on?
+	        styledText.redrawRange(@highlight.current, 1, false) if @highlight.current < document.length
+	        styledText.redrawRange(@highlight.pair, 1, false) # if on the same line
+          @highlight.clear
+        end
+      end
+      
+      def find_pair(step, offset, search_char, current_char)
+        if offset == 0
+          return nil
+        end
+        state = 1;
+        quotes = false
+        doublequotes = false
+        
+        while offset > 0 and offset < document.length - 1
+          offset = offset + step;
+          @newchar = styledText.getTextRange(offset, 1)
+          if @newchar == search_char and !quotes and !doublequotes
+            state = state - 1
+          elsif @newchar == current_char and !quotes and !doublequotes
+            state = state + 1
+          elsif @newchar == '"'
+            doublequotes = !doublequotes
+          elsif @newchar == "'"
+            quotes = !quotes
+          end
+          if state == 0
+            return offset
+          end
+        end
+        
+        if state != 0
+          return nil
+        end
+      end
+
+      def pair_of_offset(offset)
+        @char = document.get_range(offset, 1)
+        @index = @open_pair_chars.index(@char)
+        @newoffset = nil
+
+        if @index
+          @newoffset = find_pair(1, offset, @close_pair_chars[@index], @open_pair_chars[@index])
+        else
+          @index = @close_pair_chars.index(@char)
+          if @index
+            @newoffset = find_pair(-1, offset, @open_pair_chars[@index], @close_pair_chars[@index])
+          end
+        end
+        return @newoffset
+      end
+
+      def cursor_moved(offset)
+        if @wait > 0
+          return
+        end
+        
+        pair = nil
+        
+        if offset >= document.length
+            @char_next = nil
+        else
+            @char_next = document.get_range(offset, 1)    
+        end
+        
+        if offset > 0
+            @char_prev = document.get_range(offset-1, 1) 
+        else
+            @char_prev = nil
+        end
+        
+        if @char_next and @pair_chars.include?(@char_next)
+            pair = pair_of_offset(offset)            
+        elsif @char_prev and @pair_chars.include?(@char_prev)
+            offset = offset - 1
+            pair = pair_of_offset(offset)
+        else
+            clear
+        end
+        
+        highlight_pair(offset, pair)
+      end
+    end
+    
+    class Highlighted
+      attr_accessor :on, :current, :pair
+      
+      def initialize
+        clear
+      end
+      
+      def clear
+        @on = false
+        @current = nil
+        @pair = nil
+      end
+      
+      def on?
+        if @on
+          true
+        else
+          false
+        end
+      end
+      
+      def set_on(current, pair)
+        if current and pair
+          @on = true
+          @current = current
+          @pair = pair
+        end
+      end
+    end
+  end
+end

data/plugins/pair_highlighter/plugin.rb

@@ -0,0 +1,9 @@
+
+Plugin.define do
+  name    "pair_highlighter"
+  version "1.0"
+  file    "lib", "pair_highlighter"
+  object  "Redcar::PairHighlighter"
+  dependencies "edit_view", ">0",
+               "textmate",  ">0"
+end

data/plugins/project/features/open_directory_tree.feature

@@ -3,7 +3,7 @@ Feature: Open directory tree
   Scenario: Open directory
     Given I will choose "." from the "open_directory" dialog
     When I open a directory
-    Then I should see "bin,config,lib,plugins" in the tree
+    Then I should see "bin,lib,plugins" in the tree
 
   Scenario: Open directory then another directory
     Given I will choose "." from the "open_directory" dialog

data/plugins/project/features/refresh_directory_tree.feature

@@ -3,7 +3,7 @@ Feature: Refresh directory tree
   Scenario: Does not refresh instantly
     Given I will choose "." from the "open_directory" dialog
     When I open a directory
-    Then I should see "bin,config,lib,plugins" in the tree
+    Then I should see "bin,lib,plugins" in the tree
     And I should not see "testyfile.txt" in the tree
     When I touch the file "./testyfile.txt"
     Then I should not see "testyfile.txt" in the tree
@@ -11,29 +11,29 @@ Feature: Refresh directory tree
   Scenario: I can manually refresh the tree
     Given I will choose "." from the "open_directory" dialog
     When I open a directory
-    Then I should see "bin,config,lib,plugins" in the tree
+    Then I should see "bin,lib,plugins" in the tree
     And I should not see "testyfile.txt" in the tree
     When I touch the file "./testyfile.txt"
     And I refresh the directory tree
-    Then I should see "bin,config,lib,plugins,testyfile.txt" in the tree
-    
+    Then I should see "bin,lib,plugins,testyfile.txt" in the tree
+
   Scenario: Changing windows refreshed the tree
     Given I will choose "." from the "open_directory" dialog
     When I open a directory
-    Then I should see "bin,config,lib,plugins" in the tree
+    Then I should see "bin,lib,plugins" in the tree
     And I should not see "testyfile.txt" in the tree
     When I touch the file "./testyfile.txt"
     When I open a new window
     And I focus the working directory window through the gui
-    Then I should see "bin,config,lib,plugins,testyfile.txt" in the tree
+    Then I should see "bin,lib,plugins,testyfile.txt" in the tree
     
   Scenario: Refreshing the tree leaves rows expanded as they were before
     Given I will choose "." from the "open_directory" dialog
     When I open a directory
     And I expand the tree row "lib"
-    Then I should see "bin,config,lib,freebase2,plugins" in the tree
+    Then I should see "bin,lib,redcar.rb,plugins" in the tree
     And I refresh the directory tree
-    Then I should see "bin,config,lib,freebase2,plugins" in the tree
+    Then I should see "bin,lib,redcar.rb,plugins" in the tree
   
   Scenario: Tree is moved
     Given I will choose "plugins/project/spec/fixtures/myproject" from the "open_directory" dialog

data/plugins/project/features/step_definitions/file_steps.rb

@@ -8,7 +8,7 @@ When /^I open a file$/ do
 end
 
 Given /^I have opened "([^\"]*)"$/ do |arg1|
-  Redcar::Project::FileOpenCommand.new(arg1).run
+  Redcar::Project::FileOpenCommand.new(File.expand_path(arg1)).run
 end
 
 When /^I save the tab$/ do
@@ -34,7 +34,7 @@ end
 
 When /^I put a lot of lines into the file "([^\"]*)"$/ do |file|
   File.open(file, "w") do |f|
-    200.times { |i| f.puts (i*20).to_s }
+    200.times { |i| f.puts(i * 20) }
   end
 end
 

data/plugins/project/lib/project.rb

@@ -68,6 +68,9 @@ module Redcar
       window.treebook.add_tree(@tree)
       window.title = File.basename(@tree.tree_mirror.path)
       Manager.open_project_sensitivity.recompute
+      Redcar.plugin_manager.objects_implementing(:project_loaded).each do |i|
+        i.project_loaded(self)
+      end
       RecentDirectories.store_path(path)
       Manager.storage['last_open_dir'] = path
       Project.window_projects[window] = self
@@ -78,6 +81,9 @@ module Redcar
       Project.window_projects.delete(window)
       window.title = Window::DEFAULT_TITLE
       Manager.open_project_sensitivity.recompute
+      Redcar.plugin_manager.objects_implementing(:project_closed).each do |i|
+        i.project_closed(self)
+      end
     end
     
     # Refresh the DirMirror Tree for the given Window, if 
@@ -142,9 +148,7 @@ module Redcar
     end
     
     def gained_focus
-      if @lost_application_focus
-        refresh
-      end
+      refresh
       @lost_application_focus = nil
     end
     
@@ -159,7 +163,7 @@ module Redcar
     end
     
     def config_files(glob)
-      file_glob = File.join(config_dir, glob)
+      file_glob = File.join("{#{config_dir},#{Redcar.user_dir}}", glob)
       Dir[file_glob]
     end
   end

data/plugins/project/lib/project/adapters/remote_protocols/ftp.rb

@@ -19,13 +19,10 @@ module Redcar
           def touch(file)
             local_path, local_file = split_paths(file)
 
-            puts "Creating: #{file} as: #{local_file}... "
             FileUtils.mkdir_p local_path
             FileUtils.touch local_file
 
-            print "Uploading: #{local_file} as #{file}... "
             upload local_file, file
-            puts "done"
           end
 
           def mkdir(new_dir_path)
@@ -34,7 +31,6 @@ module Redcar
 
           def mv(path, new_path)
             target = "#{new_path}/#{File.basename(path)}"
-            puts "Renaming: #{path} To: #{target}"
             exec :rename, path, target
           end
           

data/plugins/project/lib/project/adapters/remote_protocols/protocol.rb

@@ -36,10 +36,8 @@ module Redcar
           def load(file)
             local_path, local_file = split_paths(file)
 
-            print "Downloading: #{file} as: #{local_file}... "
             FileUtils.mkdir_p local_path
             download file, local_file
-            puts "done"
             File.open(local_file, 'rb') do |f|; f.read; end
           end
           
@@ -47,9 +45,7 @@ module Redcar
             local_path, local_file = split_paths(file)
 
             ret = File.open(local_file, "wb") {|f| f.print contents }
-            print "Uploading: #{local_file} as #{file}... "
             upload local_file, file
-            puts "done"
             
             ret
           end

data/plugins/project/lib/project/adapters/remote_protocols/sftp.rb

@@ -163,7 +163,6 @@ module Redcar
           end
           
           def sftp_exec(method, *args)
-            puts "sftp_exec: #{method}, #{args.inspect}"
             begin
               Redcar.timeout(10) do
                 connection.sftp.send(method, *args)

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

@@ -152,10 +152,8 @@ module Redcar
           return
         end
         if project = find_projects_containing_path(path).first
-          p [:found_containing_project, project.path]
           window = project.window
         else
-          p [:didn_t_find_containing_project]
           window = windows_without_projects.first || Redcar.app.new_window
         end
         open_file_in_window(path, window, adapter)

data/plugins/project/spec/project/adapters/remote_protocols/ftp_spec.rb

@@ -1,5 +1,9 @@
 require File.join(File.dirname(__FILE__), "..", "..", "..", "spec_helper")
 
+require 'net/ssh'
+require 'net/ftp'
+require 'net/ftp/list'
+
 class Redcar::Project
   describe Adapters::RemoteProtocols::FTP do
     let(:conn) { double('connection') }

data/plugins/project/spec/project/adapters/remote_protocols/sftp_spec.rb

@@ -1,5 +1,8 @@
 require File.join(File.dirname(__FILE__), "..", "..", "..", "spec_helper")
 
+require 'net/ssh'
+require 'net/sftp'
+
 class Redcar::Project
   describe Adapters::RemoteProtocols::SFTP do
     let(:conn) { double('connection').as_null_object }

data/plugins/redcar/plugin.rb

@@ -12,5 +12,6 @@ Plugin.define do
                "document_search",   ">0",
                "runnables",         ">0",
                "HTML View",         ">=0.3.2",
-               "Plugin Manager UI", ">=0.3.2"
+               "Plugin Manager UI", ">=0.3.2",
+               "outline_view",      ">0"
 end

data/plugins/redcar/redcar.rb

@@ -13,7 +13,7 @@ module Redcar
       puts e.backtrace
     end
   end
-  
+
   def self.update_gui
     ApplicationSWT.sync_exec do
       safely do
@@ -21,9 +21,9 @@ module Redcar
       end
     end
   end
-  
+
   class TimeoutError < StandardError; end
-  
+
   def self.timeout(limit)
     x = Thread.current
     result = nil
@@ -47,14 +47,14 @@ module Redcar
     end
     result
   end
-  
+
   module Top
     class QuitCommand < Command
-      
+
       def execute
         check_for_modified_tabs_and_quit
       end
-      
+
       private
 
       def check_for_modified_tabs_and_quit
@@ -65,8 +65,8 @@ module Redcar
           :continue => lambda { check_for_running_processes_and_quit },
           :cancel   => nil
         ).check
-      end        
-      
+      end
+
       def check_for_running_processes_and_quit
         Runnables::RunningProcessChecker.new(
           Redcar.app.all_tabs.select {|t| t.is_a?(HtmlTab)},
@@ -77,9 +77,9 @@ module Redcar
         ).check
       end
     end
-    
+
     class NewCommand < Command
-      
+
       def execute
         tab = win.new_tab(Redcar::EditTab)
         tab.title = "untitled"
@@ -87,42 +87,42 @@ module Redcar
         tab
       end
     end
-    
+
     class NewNotebookCommand < Command
       sensitize :single_notebook
-      
+
       def execute
         unless win.notebooks.length > 1
           win.create_notebook
         end
       end
     end
-    
+
     class NewWindowCommand < Command
-      
+
       def initialize(title=nil)
         @title = title
       end
-      
+
       def execute
         window = Redcar.app.new_window
         window.title = @title if @title
       end
     end
-    
+
     class CloseWindowCommand < Command
       def initialize(window=nil)
         @window = window
       end
-    
+
       def execute
         check_for_modified_tabs_and_close_window
         quit_if_no_windows if [:linux, :windows].include?(Redcar.platform)
         @window = nil
       end
-      
+
       private
-      
+
       def quit_if_no_windows
         if Redcar.app.windows.length == 0
           if Application.storage['stay_resident_after_last_window_closed'] && !(ARGV.include?("--multiple-instance"))
@@ -132,68 +132,68 @@ module Redcar
           end
         end
       end
-      
+
       def check_for_modified_tabs_and_close_window
         EditView::ModifiedTabsChecker.new(
-          win.notebooks.map(&:tabs).flatten.select {|t| t.is_a?(EditTab)}, 
+          win.notebooks.map(&:tabs).flatten.select {|t| t.is_a?(EditTab)},
           "Save all before closing the window?",
           :none     => lambda { check_for_running_processes_and_close_window },
           :continue => lambda { check_for_running_processes_and_close_window },
           :cancel   => nil
         ).check
       end
-      
+
       def check_for_running_processes_and_close_window
         Runnables::RunningProcessChecker.new(
-          win.notebooks.map(&:tabs).flatten.select {|t| t.is_a?(HtmlTab)}, 
+          win.notebooks.map(&:tabs).flatten.select {|t| t.is_a?(HtmlTab)},
           "Kill them and close the window?",
           :none     => lambda { win.close },
           :continue => lambda { win.close },
           :cancel   => nil
         ).check
       end
-      
+
       def win
         @window || super
       end
     end
-    
+
     class FocusWindowCommand < Command
       def initialize(window=nil)
         @window = window
       end
-    
+
       def execute
         win.focus
         @window = nil
       end
-      
+
       def win
         @window || super
       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
@@ -201,10 +201,10 @@ module Redcar
         end
       end
     end
-    
+
     class MoveTabToOtherNotebookCommand < Command
       sensitize :multiple_notebooks, :open_tab
-          
+
       def execute
         current_notebook = tab.notebook
         target_notebook = win.notebooks.detect {|nb| nb != current_notebook}
@@ -212,7 +212,7 @@ module Redcar
         tab.focus
       end
     end
-    
+
     class CloseTreeCommand < Command
       def execute
         treebook = Redcar.app.focussed_window.treebook
@@ -220,14 +220,14 @@ module Redcar
         treebook.remove_tree(tree)
       end
     end
-    
+
     class AboutCommand < Command
       def execute
-        new_tab = Top::NewCommand.new.run          
+        new_tab = Top::NewCommand.new.run
         new_tab.document.text = "About: Redcar\nVersion: #{Redcar::VERSION}\n" +
-          "Ruby Version: #{RUBY_VERSION}\n" + 
-          "Jruby version: #{JRUBY_VERSION}\n" + 
-          "Redcar.environment: #{Redcar.environment}\n" + 
+          "Ruby Version: #{RUBY_VERSION}\n" +
+          "Jruby version: #{JRUBY_VERSION}\n" +
+          "Redcar.environment: #{Redcar.environment}\n" +
           "http://redcareditor.com"
         new_tab.title= 'About'
         new_tab.edit_view.reset_undo
@@ -237,7 +237,7 @@ module Redcar
 
     class ChangelogCommand < Command
       def execute
-        new_tab = Top::NewCommand.new.run          
+        new_tab = Top::NewCommand.new.run
         new_tab.document.text = File.read(File.join(File.dirname(__FILE__), "..", "..", "CHANGES"))
         new_tab.title = 'Changes'
         new_tab.edit_view.reset_undo
@@ -256,16 +256,16 @@ module Redcar
         Application::Dialog.tool_tip(tab.edit_view.document.cursor_scope.gsub(" ", "\n"), :cursor)
       end
     end
-    
+
     class CloseTabCommand < TabCommand
       def initialize(tab=nil)
         @tab = tab
       end
-      
+
       def tab
         @tab || super
       end
-      
+
       def execute
         if tab.is_a?(EditTab)
           if tab.edit_view.document.modified?
@@ -305,9 +305,9 @@ module Redcar
         end
         @tab = nil
       end
-      
+
       private
-      
+
       def close_tab
         win = tab.notebook.window
         tab.close
@@ -317,59 +317,59 @@ module Redcar
         #end
       end
     end
-    
+
     class SwitchTabDownCommand < Command
-       
+
       def execute
         win.focussed_notebook.switch_down
       end
     end
-    
+
     class SwitchTabUpCommand < Command
-       
+
       def execute
         win.focussed_notebook.switch_up
       end
     end
-    
+
     class MoveTabUpCommand < Command
-      
+
       def execute
         win.focussed_notebook.move_up
       end
     end
-    
+
     class MoveTabDownCommand < Command
-      
+
       def execute
         win.focussed_notebook.move_down
       end
     end
-    
+
     class UndoCommand < EditTabCommand
       sensitize :undoable
-      
+
       def execute
         tab.edit_view.undo
       end
     end
-    
+
     class RedoCommand < EditTabCommand
       sensitize :redoable
-      
+
       def execute
         tab.edit_view.redo
       end
     end
-    
+
     class MoveHomeCommand < EditTabCommand
-      
+
       def execute
         doc     = tab.edit_view.document
         line_ix = doc.line_at_offset(doc.cursor_offset)
         line    = doc.get_line(line_ix)
         prefix  = line[0...doc.cursor_line_offset]
-        
+
         if prefix =~ /^\s*$/
           # move to start of line
           new_offset = doc.offset_at_line(line_ix)
@@ -384,18 +384,18 @@ module Redcar
         doc.ensure_visible(doc.cursor_offset)
       end
     end
-    
+
     class MoveTopCommand < EditTabCommand
-      
+
       def execute
         doc = tab.edit_view.document
         doc.cursor_offset = 0
         doc.ensure_visible(0)
       end
     end
-    
+
     class MoveEndCommand < EditTabCommand
-      
+
       def execute
         doc = tab.edit_view.document
         line_ix = doc.line_at_offset(doc.cursor_offset)
@@ -407,16 +407,16 @@ module Redcar
         doc.ensure_visible(doc.cursor_offset)
       end
     end
-    
+
     class MoveBottomCommand < EditTabCommand
-      
+
       def execute
         doc = tab.edit_view.document
         doc.cursor_offset = doc.length
         doc.ensure_visible(doc.length)
       end
     end
-    
+
     class ChangeIndentCommand < EditTabCommand
       def execute
         doc = tab.edit_view.document
@@ -445,9 +445,9 @@ module Redcar
         end
       end
     end
-    
+
     class DecreaseIndentCommand < ChangeIndentCommand
-      
+
       def indent_line(doc, line_ix)
         use_spaces = true
         num_spaces = 2
@@ -473,7 +473,7 @@ module Redcar
     end
 
     class IncreaseIndentCommand < ChangeIndentCommand
-      
+
       def indent_line(doc, line_ix)
         line            = doc.get_line(line_ix)
         if doc.edit_view.soft_tabs?
@@ -486,20 +486,20 @@ module Redcar
     end
 
     class SelectAllCommand < Redcar::EditTabCommand
-    
+
       def execute
         doc.select_all
       end
     end
-    
+
     class SelectLineCommand < Redcar::EditTabCommand
-    
+
       def execute
         doc.set_selection_range(
           doc.cursor_line_start_offset, doc.cursor_line_end_offset)
       end
     end
-    
+
     class SelectWordCommand < Redcar::EditTabCommand
 
       def execute
@@ -507,9 +507,9 @@ module Redcar
         doc.set_selection_range(range.first, range.last)
       end
     end
-    
+
     class CutCommand < Redcar::DocumentCommand
-    
+
       def execute
         if doc.selection?
           text = doc.selection_ranges.map do |range|
@@ -523,14 +523,14 @@ module Redcar
           end
         else
           Redcar.app.clipboard << doc.get_line(doc.cursor_line)
-          doc.delete(doc.cursor_line_start_offset, 
+          doc.delete(doc.cursor_line_start_offset,
                      doc.cursor_line_end_offset - doc.cursor_line_start_offset)
         end
       end
     end
-    
+
     class CopyCommand < Redcar::DocumentCommand
-    
+
       def execute
         if doc.selection?
           text = doc.selection_ranges.map do |range|
@@ -542,10 +542,10 @@ module Redcar
         end
       end
     end
-    
+
     class PasteCommand < Redcar::DocumentCommand
       sensitize :clipboard_not_empty
-      
+
       def execute
         start_offset = doc.selection_ranges.first.begin
         start_line   = doc.line_at_offset(start_offset)
@@ -579,9 +579,9 @@ module Redcar
         end
       end
     end
-    
+
     class DuplicateCommand < Redcar::DocumentCommand
-    
+
       def execute
         doc = tab.edit_view.document
         if doc.selection?
@@ -592,15 +592,15 @@ module Redcar
         else
           last_line_ix = doc.cursor_line
           text = doc.get_line(doc.cursor_line)
-        end          
+        end
         if last_line_ix == (doc.line_count - 1)
           text = "\n#{text}"
         end
         doc.insert(doc.offset_at_line_end(last_line_ix), text)
         doc.scroll_to_line(last_line_ix + 1)
-      end        
+      end
     end
-    
+
     class DialogExample < Redcar::Command
       def execute
       	builder = Menu::Builder.new do
@@ -616,14 +616,14 @@ module Redcar
       	win.popup_menu(builder.menu)
       end
     end
-    
+
     class GotoLineCommand < Redcar::EditTabCommand
-      
+
       class Speedbar < Redcar::Speedbar
         label :goto_label, "Goto line:"
-        
+
         textbox :line
-        
+
         button :go, "Go", "Return" do
           new_line_ix = line.value.to_i - 1
           if new_line_ix < doc.line_count and new_line_ix >= 0
@@ -632,28 +632,28 @@ module Redcar
             win.close_speedbar
           end
         end
-        
+
         def initialize(command)
           @command = command
         end
-        
+
         def doc; @command.doc; end
         def win; @command.send(:win); end
       end
-      
+
       def execute
         @speedbar = GotoLineCommand::Speedbar.new(self)
         win.open_speedbar(@speedbar)
       end
     end
-    
+
     class ToggleBlockSelectionCommand < Redcar::EditTabCommand
-      
+
       def execute
         doc.block_selection_mode = !doc.block_selection_mode?
       end
     end
-    
+
     # define commands from SelectTab1Command to SelectTab9Command
     (1..9).each do |tab_num|
       const_set("SelectTab#{tab_num}Command", Class.new(Redcar::Command)).class_eval do
@@ -663,25 +663,25 @@ module Redcar
         end
       end
     end
-    
+
     class ToggleInvisibles < Redcar::EditTabCommand
       def execute
         EditView.show_invisibles = !EditView.show_invisibles?
       end
     end
-    
+
     class ToggleLineNumbers < Redcar::EditTabCommand
       def execute
         EditView.show_line_numbers = !EditView.show_line_numbers?
       end
     end
-    
+
     class ToggleAnnotations < Redcar::EditTabCommand
       def execute
         EditView.show_annotations = !EditView.show_annotations?
       end
     end
-    
+
     class SelectNewFont < Command
       def execute
         Redcar::EditView::SelectFontDialog.new.open
@@ -694,6 +694,12 @@ module Redcar
       end
     end
     
+    class ShowTheme < Command
+      def execute
+        
+      end
+    end
+    
     class SelectFontSize < Command
       def execute
         result = Application::Dialog.input("Font Size", "Please enter new font size", Redcar::EditView.font_size.to_s) do |text|
@@ -706,7 +712,7 @@ module Redcar
         Redcar::EditView.font_size = result[:value].to_i if result[:button ] == :ok
       end
     end
-    
+
     def self.keymaps
       osx = Redcar::Keymap.build("main", :osx) do
         link "Cmd+N",       NewCommand
@@ -729,13 +735,13 @@ module Redcar
         link "Cmd+X",       CutCommand
         link "Cmd+C",       CopyCommand
         link "Cmd+V",       PasteCommand
-        link "Cmd+D",       DuplicateCommand        
-        
+        link "Cmd+D",       DuplicateCommand
+
         link "Home",        MoveTopCommand
         link "Ctrl+A",      MoveHomeCommand
         link "Ctrl+E",      MoveEndCommand
         link "End",         MoveBottomCommand
-        
+
         link "Cmd+[",       DecreaseIndentCommand
         link "Cmd+]",       IncreaseIndentCommand
         link "Cmd+Shift+I", AutoIndenter::IndentCommand
@@ -748,7 +754,7 @@ module Redcar
         link "Cmd+B",       ToggleBlockSelectionCommand
         #link "Escape", AutoCompleter::AutoCompleteCommand
         link "Ctrl+Escape",  AutoCompleter::MenuAutoCompleterCommand
-        
+
         link "Ctrl+U",       EditView::UpcaseTextCommand
         link "Ctrl+Shift+U", EditView::DowncaseTextCommand
         link "Ctrl+Alt+U",   EditView::TitlizeTextCommand
@@ -762,13 +768,14 @@ module Redcar
         link "Cmd+Shift+]",     SwitchTabUpCommand
         link "Ctrl+Shift+[",    MoveTabDownCommand
         link "Ctrl+Shift+]",    MoveTabUpCommand
-        link "Ctrl+R",          Runnables::RunEditTabCommand
         link "Cmd+Alt+I",       ToggleInvisibles
-
-        link "Ctrl+Shift+P",    PrintScopeCommand
+        link "Ctrl+R",          Runnables::RunEditTabCommand
+        link "Cmd+I",           OutlineView::OpenOutlineViewCommand
         
+        link "Ctrl+Shift+P",    PrintScopeCommand
+
         link "Cmd+Shift+R",     PluginManagerUi::ReloadLastReloadedCommand
-        
+
         link "Cmd+Alt+S", Snippets::OpenSnippetExplorer
         #Textmate.attach_keybindings(self, :osx)
 
@@ -800,12 +807,12 @@ module Redcar
         link "Ctrl+C",       CopyCommand
         link "Ctrl+V",       PasteCommand
         link "Ctrl+D",       DuplicateCommand
-        
+
         link "Ctrl+Home",    MoveTopCommand
         link "Home",         MoveHomeCommand
         link "End",          MoveEndCommand
         link "Ctrl+End",     MoveBottomCommand
-        
+
         link "Ctrl+[",       DecreaseIndentCommand
         link "Ctrl+]",       IncreaseIndentCommand
         link "Ctrl+Shift+[", AutoIndenter::IndentCommand
@@ -817,7 +824,7 @@ module Redcar
         link "Ctrl+B",       ToggleBlockSelectionCommand
         link "Ctrl+Space",       AutoCompleter::AutoCompleteCommand
         link "Ctrl+Shift+Space", AutoCompleter::MenuAutoCompleterCommand
-        
+
         link "Ctrl+U",       EditView::UpcaseTextCommand
         link "Ctrl+Shift+U", EditView::DowncaseTextCommand
         link "Ctrl+Alt+U",   EditView::TitlizeTextCommand
@@ -826,19 +833,21 @@ module Redcar
 
         link "Ctrl+T",           Project::FindFileCommand
         link "Ctrl+Shift+Alt+O", MoveTabToOtherNotebookCommand
+
         link "Ctrl+R",           Runnables::RunEditTabCommand
-        
+
         link "Ctrl+Shift+P",    PrintScopeCommand
 
         link "Ctrl+Alt+O",       SwitchNotebookCommand
-        
+
         link "Ctrl+Page Up",         SwitchTabDownCommand
         link "Ctrl+Page Down",       SwitchTabUpCommand
         link "Ctrl+Shift+Page Up",   MoveTabDownCommand
         link "Ctrl+Shift+Page Down", MoveTabUpCommand
         link "Ctrl+Shift+R",     PluginManagerUi::ReloadLastReloadedCommand
         link "Ctrl+Alt+I",       ToggleInvisibles
-
+        link "Ctrl+I",           OutlineView::OpenOutlineViewCommand
+        
         link "Ctrl+Alt+S", Snippets::OpenSnippetExplorer
         #Textmate.attach_keybindings(self, :linux)
 
@@ -848,10 +857,10 @@ module Redcar
         end
 
       end
-      
+
       [linwin, osx]
     end
-    
+
     def self.menus
       Menu::Builder.build do
         sub_menu "File", :priority => :first do
@@ -859,28 +868,29 @@ module Redcar
             item "New", NewCommand
             item "New Window", NewWindowCommand
           end
-          
+
           group(:priority => 10) do
             separator
             item "Close Tab", CloseTabCommand
             item "Close Tree", CloseTreeCommand
             item "Close Window", CloseWindowCommand
           end
-          
+
           group(:priority => :last) do
             separator
             item "Quit", QuitCommand
           end
         end
         sub_menu "Edit", :priority => 5 do
-          item "Tab Info",  EditView::InfoSpeedbarCommand
-          
+          group(:priority => :first) do
+            item "Tab Info",  EditView::InfoSpeedbarCommand
+          end
           group(:priority => 10) do
             separator
             item "Undo", UndoCommand
             item "Redo", RedoCommand
           end
-          
+
           group(:priority => 15) do
             separator
             item "Cut", CutCommand
@@ -888,7 +898,7 @@ module Redcar
             item "Paste", PasteCommand
             item "Duplicate Region", DuplicateCommand
           end
-          
+
           group(:priority => 25) do
             separator
             item "Top",     MoveTopCommand
@@ -896,18 +906,18 @@ module Redcar
             item "End",     MoveEndCommand
             item "Bottom",  MoveBottomCommand
           end
-          
+
           group(:priority => 60) do
             separator
             item "Increase Indent", IncreaseIndentCommand
             item "Decrease Indent", DecreaseIndentCommand
           end
-          
+
           group(:priority => 70) do
             separator
             item "Goto Line", GotoLineCommand
           end
-          
+
           group(:priority => 80) do
             separator
             sub_menu "Select" do
@@ -949,14 +959,15 @@ module Redcar
              end
           end
           separator
-          item "Toggle Invisibles", ToggleInvisibles
-          item "Toggle Line Numbers", ToggleLineNumbers
-          item "Toggle Annotations", ToggleAnnotations
+          item "Toggle Invisibles", :command => ToggleInvisibles, :type => :check, :active => EditView.show_invisibles?
+          item "Toggle Line Numbers", :command => ToggleLineNumbers, :type => :check, :active => EditView.show_line_numbers?
+          item "Toggle Annotations", :command => ToggleAnnotations, :type => :check, :active => EditView.show_annotations?
         end
         sub_menu "Bundles", :priority => 45 do
           group(:priority => :first) do
             item "Find Snippet", Snippets::OpenSnippetExplorer
             item "Installed Bundles", Textmate::InstalledBundles
+            item "View Bundles in Tree", Textmate::ShowSnippetTree
           end
           group(:priority => 15) do
             separator
@@ -971,33 +982,33 @@ module Redcar
         end
       end
     end
-    
+
     class ApplicationEventHandler
       def tab_focus(tab)
         tab.focus
       end
-    
+
       def tab_close(tab)
         CloseTabCommand.new(tab).run
       end
-      
+
       def window_close(win)
         CloseWindowCommand.new(win).run
       end
-      
+
       def application_close(app)
         QuitCommand.new.run
       end
-      
+
       def window_focus(win)
         FocusWindowCommand.new(win).run
       end
     end
-    
+
     def self.application_event_handler
       ApplicationEventHandler.new
     end
-    
+
     def self.start(args=[])
       puts "loading plugins took #{Time.now - PROCESS_START_TIME}"
       Application.start