redcar 0.6.1 → 0.7

data/plugins/application_swt/lib/swt/vtab_item.rb

@@ -0,0 +1,69 @@
+require File.expand_path("../vtab_label", __FILE__)
+
+module Swt
+  module Widgets
+    class VTabItem
+      attr_accessor :text, :control
+
+      def initialize(parent, style)
+        @parent = parent
+        @parent.add_item(self)
+      end
+
+      def text= title
+        @text = title
+        @label.title = title
+      end
+
+      def control= control
+        @control = control
+        @control.visible = active?
+        @control.layout_data = Swt::Layout::GridData.new.tap do |l|
+          l.horizontalAlignment = Swt::Layout::GridData::FILL
+          l.verticalAlignment = Swt::Layout::GridData::FILL
+          l.grabExcessHorizontalSpace = true
+          l.grabExcessVerticalSpace = true
+          l.exclude = active?
+        end
+      end
+
+      def draw_label(tab_area)
+        @label = VTabLabel.new(self, tab_area, Swt::SWT::NONE)
+      end
+
+      # This way up to the parent
+      def activate
+        @parent.selection = self
+      end
+
+      def active= boolean
+        @label.active = boolean
+        if @control
+          @control.visible = boolean
+          @control.layout_data.exclude = !boolean
+        end
+      end
+
+      def active?
+        @label.active
+      end
+
+      def selection_color_options
+        @parent.selection_color_options
+      end
+
+      def font= swt_font
+        @label.font = swt_font
+      end
+
+      def font
+        @label.font
+      end
+
+      def dispose
+        @control.dispose
+        @label.dispose
+      end
+    end
+  end
+end

data/plugins/application_swt/lib/swt/vtab_label.rb

@@ -0,0 +1,84 @@
+require File.expand_path("../graphics_utils", __FILE__)
+
+module Swt
+  module Widgets
+    class VTabLabel
+      attr_reader :active, :title
+      attr_accessor :font
+
+      include Swt::Events::MouseListener
+
+      def initialize(tab, parent, style)
+        @label = Swt::Widgets::Label.new(parent, style)
+        @active = false
+        @tab = tab
+        @parent = parent
+        @title = ""
+
+        @label.image = label_image
+        @label.add_paint_listener { |event| event.gc.draw_image(label_image, 0, 0) }
+        @label.add_mouse_listener(self)
+      end
+
+      def label_image
+        display = Swt::Widgets::Display.current
+        @img = nil if @dirty
+        @img ||= GraphicsUtils.create_rotated_text(@title, @font, @parent.foreground, @parent.background, Swt::SWT::UP) do |gc, extent|
+          fg, bg = gc.foreground, gc.background
+          if @active
+            options = @tab.selection_color_options
+            options[:percents].each_with_index do |p, idx|
+              gc.foreground = options[:colors][idx]
+              gc.background = options[:colors][idx + 1]
+              if options[:vertical]
+                h = idx > 0 ? extent.height * options[:percents][idx - 1] : 0
+                gc.fill_gradient_rectangle(0, h, extent.width, extent.height * p, true)
+              else
+                h = idx > 0 ? extent.width * options[:percents][idx - 1] : 0
+                gc.fill_gradient_rectangle(w, 0, extent.width * p, extent.height, false)
+              end
+            end
+          else
+            gc.fill_rectangle(0, 0, extent.width, extent.height)
+          end
+          gc.foreground = display.get_system_color(Swt::SWT::COLOR_WIDGET_NORMAL_SHADOW)
+          gc.draw_rectangle(0, 0, extent.width - 1, extent.height - 1)
+          gc.foreground, gc.background = fg, bg
+        end
+        @dirty = false
+        @img
+      end
+
+      def activate
+        @tab.activate
+      end
+
+      def active= boolean
+        @active = boolean
+        redraw
+      end
+
+      def title= (str)
+        @title = str
+        redraw
+      end
+
+      def redraw
+        @dirty = true
+        @label.image = label_image
+      end
+
+      def dispose
+        @label.dispose
+      end
+
+      def mouseUp(e)
+        activate
+      end
+
+      # Unused
+      def mouseDown(e); end
+      def mouseDoubleClick(e); end
+    end
+  end
+end

data/plugins/auto_indenter/lib/auto_indenter.rb

@@ -22,8 +22,10 @@ module Redcar
     def self.menus
       Menu::Builder.build do
         sub_menu "Edit" do
-            item "Indent", :command => AutoIndenter::IndentCommand, :priority => 63
-            item "Tidy File", :command => AutoIndenter::TidyCommand, :priority => 64
+            sub_menu "Formatting" do
+              item "Indent", :command => AutoIndenter::IndentCommand, :priority => 63
+              item "Tidy File", :command => AutoIndenter::TidyCommand, :priority => 64
+            end
         end
       end
     end

data/plugins/core/lib/core/controller.rb

@@ -1,5 +1,23 @@
 module Redcar
   module Controller
     attr_accessor :model
+    
+    def self.included(klass)
+      klass.class_eval <<-RUBY
+        def self.model_listeners
+          @model_listeners ||= []
+        end
+      
+        def self.model_listener(name)
+          model_listeners << name
+        end
+        
+        def create_model_listeners
+          self.class.model_listeners.each do |name|
+            @model.add_listener(name, &method(name))
+          end
+        end
+      RUBY
+    end
   end
 end

data/plugins/declarations/lib/declarations.rb

@@ -88,7 +88,7 @@ module Redcar
       path = match[:file]
       Project::Manager.open_file(path)
       regexp = Regexp.new(Regexp.escape(match[:match]))
-      DocumentSearch::FindNextRegex.new(regexp, true).run
+      DocumentSearch::FindNextRegex.new(regexp, true).run_in_focussed_tab_edit_view
     end
 
     class GoToTagCommand < EditTabCommand

data/plugins/document_search/lib/document_search.rb

@@ -6,19 +6,20 @@ module DocumentSearch
   def self.menus
     Redcar::Menu::Builder.build do
       sub_menu "Edit" do
-        group(:priority => 20) do
-          item "Regex Search",       SearchForwardCommand
+        sub_menu "Search", :priority => 50 do
+          item "Document Search",       SearchForwardCommand
           item "Repeat Last Search", RepeatPreviousSearchForwardCommand
           item "Search and Replace", SearchAndReplaceCommand
         end
+        separator
       end
     end
   end
   
   def self.toolbars
     Redcar::ToolBar::Builder.build do
-      item "Search Document", :command => DocumentSearch::SearchForwardCommand, :icon => File.join(Redcar::ICONS_DIRECTORY, "magnifier.png"), :barname => :search
-      item "Repeat Last Search", :command => DocumentSearch::RepeatPreviousSearchForwardCommand, :icon => File.join(Redcar::ICONS_DIRECTORY, "magnifier--arrow.png"), :barname => :search
+      item "Search Document", :command => DocumentSearch::SearchForwardCommand, :icon => File.join(Redcar::ICONS_DIRECTORY, "magnifier.png"), :barname => :edit
+      item "Repeat Last Search", :command => DocumentSearch::RepeatPreviousSearchForwardCommand, :icon => File.join(Redcar::ICONS_DIRECTORY, "magnifier--arrow.png"), :barname => :edit
     end
   end
   
@@ -63,7 +64,8 @@ module DocumentSearch
       if !@previous_is_regex
         current_query = Regexp.escape(current_query)
       end
-      FindNextRegex.new(Regexp.new(current_query, !@previous_match_case), true).run
+      cmd = FindNextRegex.new(Regexp.new(current_query, !@previous_match_case), true)
+      cmd.run_in_focussed_tab_edit_view
     end
   end
     
@@ -91,7 +93,7 @@ module DocumentSearch
     end
   end
 
-  class FindNextRegex < Redcar::EditTabCommand
+  class FindNextRegex < Redcar::DocumentCommand
     def initialize(re, wrap=nil)
       @re = re
       @wrap = wrap

data/plugins/document_search/lib/document_search/replace.rb

@@ -1,15 +1,22 @@
 module DocumentSearch
-  class Replace
-    def initialize(doc)
-      @doc = doc
+  class ReplaceNextCommand < Redcar::DocumentCommand
+    
+    attr_reader :query, :replace, :search_method
+    
+    def initialize(query, replace, search_method)
+      @query, @replace, @search_method = query, replace, search_method
     end
     
-    def replace_next(query, replace, &body)
+    def body
+      Search.method(search_method)
+    end
+    
+    def execute
       # Get the current line and then get the line segment from the cursor or selection to the end of the line
-      latest_point = [@doc.cursor_offset, @doc.selection_offset].max
-      curr_line_number = @doc.line_at_offset(latest_point)
-      cursor_line_offset = latest_point - @doc.offset_at_line(curr_line_number)
-      curr_line = @doc.get_line(curr_line_number)
+      latest_point = [doc.cursor_offset, doc.selection_offset].max
+      curr_line_number = doc.line_at_offset(latest_point)
+      cursor_line_offset = latest_point - doc.offset_at_line(curr_line_number)
+      curr_line = doc.get_line(curr_line_number)
       line_seg = curr_line[cursor_line_offset..-1]
       
       # Call the search method passed by the caller
@@ -19,63 +26,76 @@ module DocumentSearch
       if new_line
         # Add the replacment to the end of the line, and then replace in the document
         curr_line[cursor_line_offset..-1] = new_line
-        @doc.replace_line(@doc.cursor_line, curr_line.chomp)
-        line_offset = @doc.offset_at_line(@doc.cursor_line)
-        @doc.set_selection_range(cursor_line_offset + line_offset + startoff, cursor_line_offset + line_offset + endoff)
+        doc.replace_line(doc.cursor_line, curr_line.chomp)
+        line_offset = doc.offset_at_line(doc.cursor_line)
+        doc.set_selection_range(cursor_line_offset + line_offset + startoff, cursor_line_offset + line_offset + endoff)
         return 1
       end
       
       #Look at the rest of the lines starting at the next line
-      start_line = @doc.cursor_line
-      (start_line+1..@doc.line_count-1).each do |i|
-        new_line, startoff, endoff = body.call(@doc.get_line(i), query, replace)
+      start_line = doc.cursor_line
+      (start_line+1..doc.line_count-1).each do |i|
+        new_line, startoff, endoff = body.call(doc.get_line(i), query, replace)
         if new_line
-          @doc.replace_line(i, new_line.chomp)
-          line_offset = @doc.offset_at_line(i)
-          @doc.set_selection_range(line_offset + startoff, line_offset + endoff)
-          @doc.ensure_visible(@doc.offset_at_line(i))
+          doc.replace_line(i, new_line.chomp)
+          line_offset = doc.offset_at_line(i)
+          doc.set_selection_range(line_offset + startoff, line_offset + endoff)
+          doc.ensure_visible(doc.offset_at_line(i))
           return 1
         end
       end
       
       #Look at the rest of the lines starting at the beginning
-      start_line = @doc.cursor_line
+      start_line = doc.cursor_line
       (0..start_line-1).each do |i|
-        new_line, startoff, endoff = body.call(@doc.get_line(i), query, replace)
+        new_line, startoff, endoff = body.call(doc.get_line(i), query, replace)
         
         if new_line
-          @doc.replace_line(i, new_line.chomp)
-          line_offset = @doc.offset_at_line(i)
-          @doc.set_selection_range(line_offset + startoff, line_offset + endoff)
-          @doc.ensure_visible(@doc.offset_at_line(i))
+          doc.replace_line(i, new_line.chomp)
+          line_offset = doc.offset_at_line(i)
+          doc.set_selection_range(line_offset + startoff, line_offset + endoff)
+          doc.ensure_visible(doc.offset_at_line(i))
           return 1
         end
       end
       0
     end
+  end
+  
+  class ReplaceAllCommand < Redcar::DocumentCommand
+    
+    attr_reader :query, :replace, :search_method
     
     # Replace All starts at the begnning of the doc and iterates over all of the lines.
-    def replace_all(query, replace, &body)
+    def initialize(query, replace, search_method)
+      @query, @replace, @search_method = query, replace, search_method
+    end
+    
+    def body
+      Search.method(search_method)
+    end
+    
+    def execute
       count = 0
       last_match_line = nil
       startoff = nil
       endoff = nil
-      (0..(@doc.line_count-1)).each do |i|
+      (0..(doc.line_count-1)).each do |i|
         begin
-          line, a, b = body.call(@doc.get_line(i), query, replace)
+          line, a, b = body.call(doc.get_line(i), query, replace)
           if line
             startoff = a
             endoff = b
             last_match_line = i
-            @doc.replace_line(i, line.chomp)
+            doc.replace_line(i, line.chomp)
             count += 1
           end
         end while line != nil
       end
       if last_match_line
-        line_offset = @doc.offset_at_line(last_match_line)
-        @doc.set_selection_range(line_offset + startoff, line_offset + endoff)
-        @doc.ensure_visible(@doc.offset_at_line(last_match_line))
+        line_offset = doc.offset_at_line(last_match_line)
+        doc.set_selection_range(line_offset + startoff, line_offset + endoff)
+        doc.ensure_visible(doc.offset_at_line(last_match_line))
       end
       count
     end

data/plugins/document_search/lib/document_search/search_and_replace.rb

@@ -43,16 +43,17 @@ module DocumentSearch
       current_replace = @previous_replace
       case @previous_search_type
       when "Regex"
-        search_method = Search.method(:regex_search_method)
+        search_method = :regex_search_method
       when "Plain"
-        search_method = Search.method(:plain_search_method)
+        search_method = :plain_search_method
       when "Glob"
-        search_method = Search.method(:glob_search_method)
+        search_method = :glob_search_method
       else
-        search_method = Search.method(:regex_search_method)
+        search_method = :regex_search_method
       end
       adoc = Redcar.app.focussed_notebook_tab.document
-      count = Replace.new(adoc).replace_next(current_query, current_replace, &search_method)
+      cmd = ReplaceNextCommand.new(current_query, current_replace, search_method)
+      count = cmd.run(:env => {:edit_view => Redcar::EditView.focussed_tab_edit_view})
       if count == 0
         Redcar::Application::Dialog.message_box("No instance of the search string were found", {:type => :info, :buttons => :ok})
       end
@@ -63,16 +64,16 @@ module DocumentSearch
       current_replace = @previous_replace
       case @previous_search_type
       when "Regex"
-        search_method = Search.method(:regex_search_method)
+        search_method = :regex_search_method
       when "Plain"
-        search_method = Search.method(:plain_search_method)
+        search_method = :plain_search_method
       when "Glob"
-        search_method = Search.method(:glob_search_method)
+        search_method = :glob_search_method
       else
-        search_method = Search.method(:regex_search_method)
+        search_method = :regex_search_method
       end
-      adoc = Redcar.app.focussed_notebook_tab.document
-      count = Replace.new(adoc).replace_all(current_query, current_replace, &search_method)
+      cmd = ReplaceAllCommand.new(current_query, current_replace, search_method)
+      count = cmd.run(:env => {:edit_view => Redcar::EditView.focussed_tab_edit_view})
       if count == 0 or count > 1
         message = "Replaced #{count} occurrences"
       else

data/plugins/edit_view/features/step_definitions/editing_steps.rb

@@ -7,18 +7,6 @@ def escape_text(text)
   text.gsub("\t", "\\t").gsub("\n", "\\n").gsub("\r", "\\r").gsub("\"", "\\\"")
 end
 
-Given /^the contents? is:$/ do |string|
-  start_index = string.index('<c>') || 0
-  end_index = string.index('<s>') && string.index('<s>') - 3 || 0
-  string.gsub!('<s>','')
-  When %{I replace the contents with "#{string}"}
-  When %{I select from #{start_index} to #{end_index}}
-end
-
-Then /^the content? should be:$/ do |string|
-  Then %{the contents should be "#{escape_text(string)}"}
-end
-
 When /^I undo$/ do
   Redcar::Top::UndoCommand.new.run
 end
@@ -32,11 +20,6 @@ When /^I select from (\d+) to (\d+)$/ do |start_offset, end_offset|
   doc.set_selection_range(start_offset.to_i, end_offset.to_i)
 end
 
-When /^I select all$/ do
-  doc = Redcar.app.focussed_window.focussed_notebook.focussed_tab.edit_view.document
-  doc.set_selection_range(0, doc.length)
-end
-
 When /^I copy text$/ do
   Redcar::Top::CopyCommand.new.run
 end
@@ -232,6 +215,39 @@ When /^I select the word (right of|left of|around|at) (\d+)$/ do |direction, off
   doc.set_selection_range(range.first, range.last)
 end
 
+When /^I turn block selection on$/ do
+  Redcar::EditView.focussed_edit_view_document.block_selection_mode?.should == false
+  Redcar::Top::ToggleBlockSelectionCommand.new.run
+end
+
+When /^I turn block selection off$/ do
+  Redcar::EditView.focussed_edit_view_document.block_selection_mode?.should == true
+  Redcar::Top::ToggleBlockSelectionCommand.new.run
+end
 
+def escape_text(text)
+  text.gsub("\t", "\\t").gsub("\n", "\\n").gsub("\r", "\\r").gsub("\"", "\\\"")
+end
 
+Given /^the contents? is:$/ do |string|
+  cursor_index    = string.index('<c>')
+  selection_index = string.index('<s>')
+  string = string.gsub('<s>', '').gsub('<c>', '')
+  When %{I replace the contents with "#{string}"}
+  
+  if cursor_index and selection_index 
+    if cursor_index < selection_index
+      selection_index -= 3
+    else
+      cursor_index -= 3
+    end
+    When %{I select from #{selection_index} to #{cursor_index}}
+  elsif cursor_index
+    When "I move the cursor to #{cursor_index}"
+  end
+end
+
+Then /^the content? should be:$/ do |string|
+  Then %{the contents should be "#{escape_text(string)}"}
+end