redcar 0.9.2 → 0.10

data/plugins/project_search/vendor/lucene/spec/lucene/query_dsl_spec.rb

@@ -0,0 +1,142 @@
+$LOAD_PATH << File.expand_path(File.dirname(__FILE__) + "/../../lib")
+$LOAD_PATH << File.expand_path(File.dirname(__FILE__) + "/..")
+require 'lucene'
+require 'lucene/spec_helper'
+
+
+describe Lucene::QueryDSL, 'used from Index.find' do
+  
+  before(:each) do
+    setup_lucene
+    @index = Index.new('my_index')
+    @index.field_infos[:value][:type] = Fixnum
+    @index << {:id => '42', :name => 'andreas', :foo => 'bar', :value => 1}
+    @index << {:id => '43', :name => 'andreas', :foo => 'baaz', :value => 2}    
+    @index << {:id => '44', :name => 'x', :foo => 'bar', :value => 3}        
+    @index << {:id => '45', :name => ['x','y','z']}            
+    
+    @doc1 = @index.uncommited['42']
+    @doc2 = @index.uncommited['43']
+    @doc3 = @index.uncommited['44']
+    @doc4 = @index.uncommited['45']
+    @index.commit
+  end
+
+  it "should find a document using a simple dsl query" do
+    hits = @index.find { name == 'andreas'}
+    
+    hits.size.should == 2
+    hits.should include(@doc1, @doc2)
+  end
+
+  it "should find a document using a compound | expression" do
+    hits = @index.find { (name == 'andreas') | (name == 'x')}
+    hits.size.should == 4
+    hits.should include(@doc1, @doc2, @doc3, @doc4)
+    
+    hits = @index.find { (name == 'andreasx') | (name == 'x')}
+    hits.size.should == 2
+    hits.should include(@doc3, @doc4)
+    
+  end
+
+  it "should find a document using a compound & expression with the same key" do
+    hits = @index.find { (name == 'y') & (name == 'x')}
+    hits.size.should == 1
+    hits.should include(@doc4)
+    
+    hits = @index.find { (name == 'y') & (name == 'x') & (name == 'a')}
+    hits.size.should == 0
+  end
+
+  it "should find with Range" do
+    hits = @index.find { value == 2..9 }
+    hits.size.should == 2
+    hits.should include(@doc2, @doc3)
+  end
+
+  it "should find with Range in a compound expression " do
+    hits = @index.find { (name == 'andreas') & (value == 2..9) }
+    hits.size.should == 1
+    hits.should include(@doc2)
+  end
+
+  
+  it "should find with a compound & expression" do
+    hits = @index.find { (name == 'andreas') & (foo == 'bar')}
+    
+    hits.size.should == 1
+    hits.should include(@doc1)
+  end
+  
+end
+
+describe Lucene::QueryDSL do
+
+  it "should parse & expressions" do
+    expr = Lucene::QueryDSL.parse{ (name == 'andreas') & (age == 30)}
+    expr.op.should == :&
+    expr.left.left.should == :name
+    expr.left.right.should == 'andreas'
+    
+    expr.right.left.should == :age
+    expr.right.right.should == 30
+  end
+
+  it "should parse | expressions" do
+    expr = Lucene::QueryDSL.parse{ (name == 'andreas') | (age == 30)}
+    expr.op.should == :|
+    expr.left.left.should == :name
+    expr.left.right.should == 'andreas'
+    
+    expr.right.left.should == :age
+    expr.right.right.should == 30
+  end
+
+  it "should parse range expressions" do
+    expr = Lucene::QueryDSL.parse{ name == 1..3}
+    
+    expr.left.should == :name
+    expr.right.should be_kind_of(Range)
+    expr.right.first.should == 1
+    expr.right.last.should == 3
+  end
+  
+  it "should generate a lucene query" do
+    expr = Lucene::QueryDSL.parse{ name == 'andreas' }
+    query = expr.to_lucene(Lucene::IndexInfo.new(:id))
+    query.should be_kind_of(Java::OrgApacheLuceneSearch::TermQuery)
+    term = query.getTerm
+    term.field.should == 'name'
+    term.text.should == 'andreas'
+  end
+  
+  it "should know which fields are being used in a query" do
+    expr = Lucene::QueryDSL.parse{ name == 'andreas' }
+    expr._fields.should == [:name]
+    
+    expr = Lucene::QueryDSL.parse{ (name == 'andreas') | (age == 1) }
+    expr._fields.should == [:name, :age]
+  end
+
+  
+  it "should generate a lucene query" do
+    expr = Lucene::QueryDSL.parse{ (name == 'andreas') & (age == 1) }
+    query = expr.to_lucene(Lucene::IndexInfo.new(:id))
+    
+    query.should be_kind_of(Java::OrgApacheLuceneSearch::BooleanQuery)
+        
+    clauses = query.getClauses() 
+    clauses.size.should == 2
+    
+    term0 = clauses[0].getQuery.getTerm
+    term0.field.should == 'name'
+    term0.text.should == 'andreas'
+
+    term1 = clauses[1].getQuery.getTerm
+    term1.field.should == 'age'
+    term1.text.should == '1'
+  end
+  
+end
+

data/plugins/project_search/vendor/lucene/spec/lucene/sort_spec.rb

@@ -0,0 +1,101 @@
+$LOAD_PATH << File.expand_path(File.dirname(__FILE__) + "/../../lib")
+$LOAD_PATH << File.expand_path(File.dirname(__FILE__) + "/..")
+require 'lucene'
+require 'lucene/spec_helper'
+
+describe "Index.find and sort" do
+  before(:all) do
+    setup_lucene
+    @index = Index.new('myindex')
+    @index.clear
+    @index << {:id => '1', :name => 'zzz', :category=>'abc', :group=>'z'}
+    @index << {:id => '2', :name => 'andreas', :category=>'abc',:group=>'z'}
+    @index << {:id => '3', :name => 'ted', :category=>'xyz',:group=>'z'}
+    @index << {:id => '4', :name => 'zoo', :category=>'abc',:group=>'z'}
+    @index << {:id => '5', :name => 'ted', :category=>'abc',:group=>'z'}
+    @index << {:id => '6', :name => 'ted', :category=>'zyx',:group=>'z'}
+    @index.commit
+  end
+
+  it "should handle find and sort by name using Asc" do
+    r = @index.find(:group => 'z', :sort_by=>Asc[:name])
+    r.size.should == 6
+    r[0][:id].should == '2'
+    r[4][:id].should == '4'
+    r[5][:id].should == '1'
+  end
+
+  it "should handle find and sort by name using Asc" do
+    r = @index.find(:group => 'z', :sort_by=>Desc[:name])
+    r.size.should == 6
+    r[0][:id].should == '1'
+    r[1][:id].should == '4'
+    r[5][:id].should == '2'
+  end
+
+  it "should handle find and sort by name" do
+    r = @index.find(:group => 'z', :sort_by=>:name)
+    r.size.should == 6
+    r[0][:id].should == '2'
+    r[4][:id].should == '4'
+    r[5][:id].should == '1'
+
+    sort_category = r[1][:id] == '5' &&
+      r[2][:id] == '3' &&
+      r[3][:id] == '6'
+    sort_category.should == false
+  end
+
+  it "should handle find and sort by name and category using Asc" do
+    r = @index.find(:group => 'z', :sort_by=>Asc[:name, :category])
+    r.size.should == 6
+    r[0][:id].should == '2'
+    r[4][:id].should == '4'
+    r[5][:id].should == '1'
+    r[1][:id].should == '5'
+    r[2][:id].should == '3'
+    r[3][:id].should == '6'
+  end
+
+  it "should handle find and sort by name and category using two Asc" do
+    r = @index.find(:group => 'z', :sort_by=>[Asc[:name], Asc[:category]])
+    r.size.should == 6
+    r[0][:id].should == '2'
+    r[4][:id].should == '4'
+    r[5][:id].should == '1'
+    r[1][:id].should == '5'
+    r[2][:id].should == '3'
+    r[3][:id].should == '6'
+  end
+
+    it "should handle find and sort by ASC name and DESC category" do
+    r = @index.find(:group => 'z', :sort_by=>[Asc[:name], Desc[:category]])
+    r.size.should == 6
+    r[0][:id].should == '2'
+    r[4][:id].should == '4'
+    r[5][:id].should == '1'
+    r[1][:id].should == '6'
+    r[2][:id].should == '3'
+    r[3][:id].should == '5'
+  end
+
+  it "should handle find and sort by name and category" do
+    r = @index.find(:group => 'z', :sort_by=>[:name,:category])
+    r.size.should == 6
+    r[0][:id].should == '2'
+    r[4][:id].should == '4'
+    r[5][:id].should == '1'
+    r[1][:id].should == '5'
+    r[2][:id].should == '3'
+    r[3][:id].should == '6'
+  end
+
+  it "should handle find with string and sort by name" do
+    r = @index.find("group:z", :sort_by=>:name)
+    r.size.should == 6
+    r[0][:id].should == '2'
+    r[4][:id].should == '4'
+    r[5][:id].should == '1'
+  end
+
+end

data/plugins/project_search/vendor/lucene/spec/lucene/spec_helper.rb

@@ -0,0 +1,10 @@
+require 'fileutils'
+
+include Lucene
+
+def setup_lucene
+  # make sure any previous transaction has commited
+  Lucene::Transaction.current.commit if Lucene::Transaction.running?
+  Lucene::Config.delete_all
+  Lucene::Config[:store_on_file] = false
+end

data/plugins/project_search/vendor/lucene/spec/lucene/transaction_spec.rb

@@ -0,0 +1,118 @@
+$LOAD_PATH << File.expand_path(File.dirname(__FILE__) + "/../../lib")
+$LOAD_PATH << File.expand_path(File.dirname(__FILE__) + "/..")
+require 'lucene'
+require 'lucene/spec_helper'
+
+
+describe Lucene::Transaction do
+  
+  before(:each) do
+    setup_lucene
+  end
+  
+  it "should have a to_s method" do
+    t = Lucene::Transaction.new 
+    t.to_s.should match(/Transaction \[commited=false, rollback=false, indexes=0, object_id=/)
+  end
+  
+  it "should reuse Index instance in the same transaction" do
+    # given
+    index = nil
+    Lucene::Transaction.run do
+      index1 = Index.new('var/index/foo')        
+      index2 = Index.new('var/index/foo')        
+      index1.object_id.should == index2.object_id
+    end  # when it commits&
+  end
+
+  it "should create a new instance of Index if running in a new transaction" do
+    # given
+    index1 = nil
+    index2 = nil
+    Lucene::Transaction.run do
+      index1 = Index.new('var/index/foo')        
+    end 
+    
+    Lucene::Transaction.run do
+      index2 = Index.new('var/index/foo')        
+    end 
+
+    index1.object_id.should_not == index2.object_id
+  end
+  
+  it "should update all indexes when it commits" do
+    # given
+    index = nil
+    Lucene::Transaction.run do
+      index = Index.new('var/index/foo')        
+      index << {:id => '1', :name => 'andreas'}
+    end  # when it commits&
+      
+    # then
+    result = index.find('name' => 'andreas')
+    result.size.should == 1    
+    result[0][:id].should == '1'
+  end
+    
+  it "should not index docuements when transaction has rolled back" do
+    # given
+    index = nil
+    Lucene::Transaction.run do |t|
+      index = Index.new('var/index/foo')        
+      index << {:id => '1', :name => 'andreas'}
+      t.failure
+    end  # when it commits
+      
+    # then
+    result = index.find('name' => 'andreas')
+    result.size.should == 0
+  end
+    
+    
+  it "should not find uncommited documents for a different thread" do
+    # given
+    t1 = Thread.start do 
+      Lucene::Transaction.new
+      index = Index.new('var/index/foo')
+      index << {:id => '1', :name => 'andreas'}
+      index = Index.new('var/index/foo')
+      index.uncommited['1'].should_not be_nil
+    end
+
+    t1.join
+    index = Index.new('var/index/foo')
+    index.uncommited['1'].should be_nil
+  end
+    
+  it "should update an index from several threads" do
+    threads = []
+    for i in 1..10 do
+      for k in 1..5 do      
+        threads << Thread.start(i,k) do |ii,kk|
+          Lucene::Transaction.run do |t|
+            index = Index.new('var/index/foo')        
+            id = (ii*10 + kk).to_s
+            value = "thread#{ii}#{kk}"
+            index << {:id => id, :name => value}
+          end  # when it commits&
+        end
+      end
+    end
+      
+      
+    threads.each {|t| t.join}
+  
+    # make sure we can find those    
+    index = Index.new 'var/index/foo'    
+    for i in 1..10 do
+      for k in 1..5 do
+        value = "thread#{i}#{k}"
+        result = index.find(:name => value)
+        result.size.should == 1
+        result[0][:id].should == (i*10 +k).to_s
+      end
+    end
+  end
+  
+end
+

data/plugins/redcar/features/alter_font_size.feature

@@ -0,0 +1,25 @@
+Feature: The font size can be increased and decreased within bounds
+
+  Background:
+    Given I open a new edit tab
+    And I replace the contents with "Hello! Hello! Hello!"
+
+  Scenario: The font size can be increased until it reaches maximum size
+    When I set the font size to 14
+    Then the font size should be 14
+    And I increase the font size
+    Then the font size should be 15
+    When I set the font size to maximum
+    And I increase the font size
+    And I increase the font size
+    Then the font size should be maximum
+
+  Scenario: The font size can be decreased until it reaches minimum size
+    When I set the font size to 21
+    Then the font size should be 21
+    And I decrease the font size
+    Then the font size should be 20
+    When I set the font size to minimum
+    And I decrease the font size
+    And I decrease the font size
+    Then the font size should be minimum

data/plugins/redcar/features/step_definitions/font_steps.rb

@@ -0,0 +1,34 @@
+When /^I set the font size to (\d+|maximum|minimum)$/ do |arg1|
+  if arg1 =~ /\d+/
+    size = arg1.to_i
+  elsif arg1 == 'maximum'
+    size = Redcar::EditView::MAX_FONT_SIZE
+  else
+    size = Redcar::EditView::MIN_FONT_SIZE
+  end
+  Given "I would type \"#{size}\" in an input box"
+  When "I set the font size"
+end
+
+When /^I (de|in)crease the font size$/ do |direction|
+  if direction == 'in'
+    Redcar::Top::IncreaseFontSize.new.run
+  else
+    Redcar::Top::DecreaseFontSize.new.run
+  end
+end
+
+When /^I set the font size$/ do
+  Redcar::Top::SelectFontSize.new.run
+end
+
+Then /^the font size should be (\d+|maximum|minimum)$/ do |size|
+  current = Redcar::EditView.font_size
+  if size =~ /\d+/
+    current.should == size.to_i
+  elsif size == 'maximum'
+    current.should == Redcar::EditView::MAX_FONT_SIZE
+  else
+    current.should == Redcar::EditView::MIN_FONT_SIZE
+  end
+end

data/plugins/redcar/redcar.rb

@@ -16,11 +16,13 @@ module Redcar
   end
 
   def self.update_gui
+    result = nil
     Swt.sync_exec do
       safely do
-        yield
+        result = yield
       end
     end
+    result
   end
 
   class TimeoutError < StandardError; end
@@ -95,12 +97,12 @@ module Redcar
     end
 
     class NewNotebookCommand < Command
-      sensitize :single_notebook
+#      sensitize :single_notebook
 
       def execute
-        unless win.notebooks.length > 1
+        #unless win.notebooks.length > 1
           win.create_notebook
-        end
+       # end
       end
     end
 
@@ -263,12 +265,57 @@ module Redcar
 
       def execute
         current_notebook = tab.notebook
-        target_notebook = win.notebooks.detect {|nb| nb != current_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
 
+    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
+
     class CloseTreeCommand < TreeCommand
       def execute
         win = Redcar.app.focussed_window
@@ -302,9 +349,9 @@ Ruby Version: #{RUBY_VERSION}
 Jruby version: #{JRUBY_VERSION}
 Redcar.environment: #{Redcar.environment}
         TXT
-        new_tab.title= 'About'
         new_tab.edit_view.reset_undo
         new_tab.document.set_modified(false)
+        new_tab.title= 'About'
       end
     end
 
@@ -312,9 +359,9 @@ Redcar.environment: #{Redcar.environment}
       def execute
         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
         new_tab.edit_view.document.set_modified(false)
+        new_tab.title = 'Changes'
       end
     end
 
@@ -342,6 +389,7 @@ Redcar.environment: #{Redcar.environment}
       def execute
         if tab.is_a?(EditTab)
           if tab.edit_view.document.modified?
+            tab.focus
             result = Application::Dialog.message_box(
               "This tab has unsaved changes. \n\nSave before closing?",
               :buttons => :yes_no_cancel
@@ -359,6 +407,7 @@ Redcar.environment: #{Redcar.environment}
           end
         elsif tab.is_a?(HtmlTab)
           if tab.html_view.controller and message = tab.html_view.controller.ask_before_closing
+            tab.focus
             result = Application::Dialog.message_box(
               message,
               :buttons => :yes_no_cancel
@@ -391,6 +440,45 @@ Redcar.environment: #{Redcar.environment}
       end
     end
 
+    class CloseAll < Redcar::Command
+      def execute
+        window = Redcar.app.focussed_window
+        tabs = window.all_tabs
+        tabs.each do |t|
+          Redcar::Top::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
+            Redcar::Top::CloseTabCommand.new(t).run
+          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 SwitchTabDownCommand < TabCommand
 
       def execute
@@ -438,6 +526,10 @@ Redcar.environment: #{Redcar.environment}
     class MoveHomeCommand < DocumentCommand
 
       def execute
+        if doc.mirror.is_a?(Redcar::REPL::ReplMirror)
+          # do not do the default home command on a line with a prompt
+          return unless tab.go_to_home?
+        end
         line_ix = doc.line_at_offset(doc.cursor_offset)
         line    = doc.get_line(line_ix)
         prefix  = line[0...doc.cursor_line_offset]
@@ -759,6 +851,53 @@ Redcar.environment: #{Redcar.environment}
       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
+
+    ["In","De"].each do |prefix|
+      const_set("#{prefix}creaseTreebookWidthCommand", Class.new(TreebookWidthCommand)).class_eval do
+        define_method :increment do
+          prefix == "In" ? 1 : -1
+        end
+      end
+    end
+
+    class EnlargeNotebookCommand < Command
+      sensitize :multiple_notebooks
+      def index
+        raise "Please define me!"
+      end
+
+      def execute
+        if win = Redcar.app.focussed_window
+          win.enlarge_notebook(index)
+        end
+      end
+    end
+
+    ["First","Second"].each do |book|
+      const_set("Enlarge#{book}NotebookCommand", Class.new(EnlargeNotebookCommand)).class_eval do
+        define_method :index do
+          book == "First" ? 0 : 1
+        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
@@ -769,6 +908,16 @@ Redcar.environment: #{Redcar.environment}
       end
     end
 
+    class ResetNotebookWidthsCommand < Command
+      sensitize :multiple_notebooks
+
+      def execute
+        if win = Redcar.app.focussed_window
+          win.reset_notebook_widths
+        end
+      end
+    end
+
     class ToggleFullscreen < Command
       def execute
         Redcar.app.focussed_window.fullscreen = !Redcar.app.focussed_window.fullscreen
@@ -795,13 +944,13 @@ Redcar.environment: #{Redcar.environment}
       end
     end
 
-    class SelectNewFont < Command
+    class SelectNewFont < EditTabCommand
       def execute
         Redcar::EditView::SelectFontDialog.new.open
       end
     end
 
-    class SelectTheme < Command
+    class SelectTheme < EditTabCommand
       def execute
         Redcar::EditView::SelectThemeDialog.new.open
       end
@@ -818,16 +967,39 @@ Redcar.environment: #{Redcar.environment}
       def execute; end
     end
 
-    class SelectFontSize < Command
+    class SelectFontSize < EditTabCommand
       def execute
-        result = Application::Dialog.input("Font Size", "Please enter new font size", Redcar::EditView.font_size.to_s) do |text|
-          if text.to_i  > 1 and text.to_i < 25
-            nil
+        max    = Redcar::EditView::MAX_FONT_SIZE
+        min    = Redcar::EditView::MIN_FONT_SIZE
+        result = Application::Dialog.input(
+          "Font Size",
+          "Please enter new font size",
+          Redcar::EditView.font_size.to_s)
+        if result[:button] == :ok
+          value = result[:value].to_i
+          if value >= min and value <= max
+            Redcar::EditView.font_size = value
           else
-            "the font size must be > 1 and < 25"
+            Application::Dialog.message_box(
+              "The font size must be between #{min} and #{max}")
           end
-      	end
-        Redcar::EditView.font_size = result[:value].to_i if result[:button ] == :ok
+        end
+      end
+    end
+
+    class IncreaseFontSize < EditTabCommand
+      def execute
+        unless (current = Redcar::EditView.font_size) >= Redcar::EditView::MAX_FONT_SIZE
+          Redcar::EditView.font_size = current+1
+        end
+      end
+    end
+
+    class DecreaseFontSize < EditTabCommand
+      def execute
+        unless (current = Redcar::EditView.font_size) <= Redcar::EditView::MIN_FONT_SIZE
+          Redcar::EditView.font_size = current-1
+        end
       end
     end
 
@@ -844,11 +1016,12 @@ Redcar.environment: #{Redcar.environment}
         link "Cmd+Shift+S", Project::FileSaveAsCommand
         link "Cmd+W",       CloseTabCommand
         link "Cmd+Shift+W", CloseWindowCommand
+        link "Alt+Shift+W",   CloseTreeCommand
         link "Cmd+Q",       QuitCommand
 
         #link "Cmd+Return",   MoveNextLineCommand
 
-        link "Cmd+Shift+E", EditView::InfoSpeedbarCommand
+        link "Ctrl+Shift+E", EditView::InfoSpeedbarCommand
         link "Cmd+Z",       UndoCommand
         link "Cmd+Shift+Z", RedoCommand
         link "Cmd+X",       CutCommand
@@ -865,16 +1038,14 @@ Redcar.environment: #{Redcar.environment}
         link "Cmd+]",       IncreaseIndentCommand
         link "Cmd+Shift+I", AutoIndenter::IndentCommand
         link "Cmd+L",       GotoLineCommand
-        link "Cmd+F",       DocumentSearch::SearchForwardCommand
-        link "Cmd+H",       DocumentSearch::SearchAndReplaceCommand
-        #link "Cmd+Shift+F", DocumentSearch::RepeatPreviousSearchForwardCommand
-        link "Cmd+Ctrl+F",  DocumentSearch::SearchAndReplaceCommand
-        link "Cmd+Shift+F", Redcar::FindInProject::OpenSearch
         link "Cmd+A",       SelectAllCommand
         link "Ctrl+W",      SelectWordCommand
+        link "Ctrl+L",      SelectLineCommand
         link "Cmd+B",       ToggleBlockSelectionCommand
-        #link "Escape", AutoCompleter::AutoCompleteCommand
-        link "Ctrl+Escape",  AutoCompleter::MenuAutoCompleterCommand
+        link "Escape",      AutoCompleter::AutoCompleteCommand
+        link "Ctrl+Escape", AutoCompleter::MenuAutoCompleterCommand
+        link "Ctrl+Space",   AutoCompleter::AutoCompleteCommand
+        link "Ctrl+Shift+Space", AutoCompleter::MenuAutoCompleterCommand
 
         link "Ctrl+U",       EditView::UpcaseTextCommand
         link "Ctrl+Shift+U", EditView::DowncaseTextCommand
@@ -882,23 +1053,35 @@ Redcar.environment: #{Redcar.environment}
         link "Ctrl+G",       EditView::OppositeCaseTextCommand
         link "Ctrl+_",       EditView::CamelSnakePascalRotateTextCommand
         link "Ctrl+=",       EditView::AlignAssignmentCommand
+        link "Ctrl+Shift+^", SortLinesCommand
 
+        link "Cmd+Shift+F",     Redcar::FindInProject::OpenSearch
         link "Cmd+T",           Project::FindFileCommand
         link "Cmd+Shift+Alt+O", MoveTabToOtherNotebookCommand
         link "Cmd+Alt+O",       SwitchNotebookCommand
+        link "Alt+Shift+[",     SwitchTreeUpCommand
+        link "Alt+Shift+]",     SwitchTreeDownCommand
         link "Cmd+Shift+[",     SwitchTabDownCommand
         link "Cmd+Shift+]",     SwitchTabUpCommand
         link "Ctrl+Shift+[",    MoveTabDownCommand
         link "Ctrl+Shift+]",    MoveTabUpCommand
-        link "F11",             ToggleFullscreen
+        link "Cmd+Shift++",     ToggleFullscreen
+        link "Cmd+Shift+T",     OpenTreeFinderCommand
+        link "Alt+Shift+J",     IncreaseTreebookWidthCommand
+        link "Alt+Shift+H",     DecreaseTreebookWidthCommand
+        link "Cmd+Shift+>",     EnlargeFirstNotebookCommand
+        link "Cmd+Shift+<",     EnlargeSecondNotebookCommand
+        link "Cmd+Shift+L",     ResetNotebookWidthsCommand
+        link "Cmd+Shift+:",     RotateNotebooksCommand
+        link "Alt+Shift+N",     CloseNotebookCommand
         link "Cmd+Alt+I",       ToggleInvisibles
-        link "Ctrl+R",          Runnables::RunEditTabCommand
-        link "Cmd+I",           OutlineView::OpenOutlineViewCommand
+        link "Cmd++",           IncreaseFontSize
+        link "Cmd+-",           DecreaseFontSize
 
         link "Ctrl+Shift+P",    PrintScopeCommand
         link "Cmd+Shift+H",     ToggleTreesCommand
 
-        link "Cmd+Shift+R",     PluginManagerUi::ReloadLastReloadedCommand
+        # link "Cmd+Shift+R",     PluginManagerUi::ReloadLastReloadedCommand
 
         link "Cmd+Alt+S", Snippets::OpenSnippetExplorer
         #Textmate.attach_keybindings(self, :osx)
@@ -921,6 +1104,7 @@ Redcar.environment: #{Redcar.environment}
         link "Ctrl+Shift+S", Project::FileSaveAsCommand
         link "Ctrl+W",       CloseTabCommand
         link "Ctrl+Shift+W", CloseWindowCommand
+        link "Alt+Shift+W",  CloseTreeCommand
         link "Ctrl+Q",       QuitCommand
 
         link "Ctrl+Enter",   MoveNextLineCommand
@@ -935,47 +1119,59 @@ Redcar.environment: #{Redcar.environment}
 
         link "Ctrl+Home",    MoveTopCommand
         link "Home",         MoveHomeCommand
+        link "Ctrl+Alt+A",   MoveHomeCommand
         link "End",          MoveEndCommand
+        link "Ctrl+Alt+E",   MoveEndCommand
         link "Ctrl+End",     MoveBottomCommand
 
         link "Ctrl+[",       DecreaseIndentCommand
         link "Ctrl+]",       IncreaseIndentCommand
         link "Ctrl+Shift+[", AutoIndenter::IndentCommand
         link "Ctrl+L",       GotoLineCommand
-        link "Ctrl+F",       DocumentSearch::SearchForwardCommand
-        link "Ctrl+H",       DocumentSearch::SearchAndReplaceCommand
-        link "F3",           DocumentSearch::RepeatPreviousSearchForwardCommand
-        link "Ctrl+Shift+F", Redcar::FindInProject::OpenSearch
-        link "Ctrl+A",       SelectAllCommand
+        link "Ctrl+A", SelectAllCommand
         link "Ctrl+Alt+W",   SelectWordCommand
+        link "Ctrl+Alt+L",   SelectLineCommand
         link "Ctrl+B",       ToggleBlockSelectionCommand
-        link "Ctrl+Space",       AutoCompleter::AutoCompleteCommand
+        link "Escape",       AutoCompleter::AutoCompleteCommand
+        link "Ctrl+Escape",  AutoCompleter::MenuAutoCompleterCommand
+        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
-        link "Ctrl+G",       EditView::OppositeCaseTextCommand
+        link "Ctrl+Alt+Shift+U",   EditView::OppositeCaseTextCommand
         link "Ctrl+_",       EditView::CamelSnakePascalRotateTextCommand
         link "Ctrl+=",       EditView::AlignAssignmentCommand
+        link "Ctrl+Shift+^", SortLinesCommand
 
+        link "Ctrl+Shift+F",     Redcar::FindInProject::OpenSearch
         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+Shift+H",     ToggleTreesCommand
+        link "Alt+Page Up",         SwitchTreeUpCommand
+        link "Alt+Page Down",       SwitchTreeDownCommand
         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+Shift+T",         OpenTreeFinderCommand
+        link "Alt+Shift+J",      IncreaseTreebookWidthCommand
+        link "Alt+Shift+H",      DecreaseTreebookWidthCommand
+        link "Ctrl+Shift+>",     EnlargeFirstNotebookCommand
+        link "Ctrl+Shift+<",     EnlargeSecondNotebookCommand
+        link "Ctrl+Shift+L",     ResetNotebookWidthsCommand
+        link "Ctrl+Shift+:",     RotateNotebooksCommand
+        link "Alt+Shift+N",      CloseNotebookCommand
+        # link "Ctrl+Shift+R",     PluginManagerUi::ReloadLastReloadedCommand
         link "F11",              ToggleFullscreen
         link "Ctrl+Alt+I",       ToggleInvisibles
-        link "Ctrl+I",           OutlineView::OpenOutlineViewCommand
+        link "Ctrl++",           IncreaseFontSize
+        link "Ctrl+-",           DecreaseFontSize
 
         link "Ctrl+Alt+S", Snippets::OpenSnippetExplorer
 
@@ -1018,6 +1214,8 @@ Redcar.environment: #{Redcar.environment}
             item "Close Tab", CloseTabCommand
             item "Close Tree", CloseTreeCommand
             item "Close Window", CloseWindowCommand
+            item "Close Others", CloseOthers
+            item "Close All", CloseAll
           end
 
           group(:priority => :last) do
@@ -1084,17 +1282,28 @@ Redcar.environment: #{Redcar.environment}
         end
         sub_menu "View", :priority => 30 do
           sub_menu "Appearance", :priority => 5 do
-            item "Font", SelectNewFont
-            item "Font Size", SelectFontSize
-            item "Theme", SelectTheme
+            item "Select Theme", SelectTheme
+            separator
+            item "Select Font" , SelectNewFont
+            item "Select Font Size"  , SelectFontSize
+            item "Increase Font Size", IncreaseFontSize
+            item "Decrease Font Size", DecreaseFontSize
           end
           group(:priority => 10) do
             separator
-            item "Toggle Tree Visibility", :command => ToggleTreesCommand
             item "Toggle Fullscreen", :command => ToggleFullscreen, :type => :check, :active => window ? window.fullscreen : false
           end
           group(:priority => 15) do
             separator
+            sub_menu "Trees" do
+              item "Open Tree Finder", OpenTreeFinderCommand
+              item "Toggle Tree Visibility", ToggleTreesCommand
+              item "Increase Tree Width", IncreaseTreebookWidthCommand
+              item "Decrease Tree Width", DecreaseTreebookWidthCommand
+              separator
+              item "Previous Tree", SwitchTreeUpCommand
+              item "Next Tree", SwitchTreeDownCommand
+            end
             lazy_sub_menu "Windows" do
               GenerateWindowsMenu.new(self).run
             end
@@ -1104,6 +1313,10 @@ Redcar.environment: #{Redcar.environment}
               item "Rotate Notebooks", RotateNotebooksCommand
               item "Move Tab To Other Notebook", MoveTabToOtherNotebookCommand
               item "Switch Notebooks", SwitchNotebookCommand
+              separator
+              item "Enlarge First Notebook", EnlargeFirstNotebookCommand
+              item "Enlarge Second Notebook", EnlargeSecondNotebookCommand
+              item "Reset Notebook Widths", ResetNotebookWidthsCommand
             end
             sub_menu "Tabs" do
               item "Previous Tab", SwitchTabDownCommand