redcar 0.7 → 0.8

data/plugins/application_swt/lib/application_swt.rb

@@ -140,36 +140,36 @@ module Redcar
       @model.add_listener(:refresh_menu, &method(:refresh_menu))
     end
 
-    class Listener
+    class CocoaUIListener
+
       def initialize(name)
         @name = name
       end
 
       def handle_event(e)
-        Application::Dialog.message_box("#{@name} menu is not hooked up yet")
-      end
-    end
-
-    class QuitListener
-      def handle_event(e)
-        unless Redcar.app.events.ignore?(:application_close, Redcar.app)
-          e.doit = false
-          Redcar.app.events.create(:application_close, Redcar.app)
+        if    @name == :prefs
+          Redcar::PluginManagerUi::OpenPreferencesCommand.new.run
+        elsif @name == :about
+          Redcar::Top::AboutCommand.new.run
+        elsif @name == :quit
+          unless Redcar.app.events.ignore?(:application_close, Redcar.app)
+            e.doit = false
+            Redcar.app.events.create(:application_close, Redcar.app)
+          end
+        else
+          Application::Dialog.message_box("#{@name} menu is not hooked up yet")
         end
       end
     end
 
     def add_swt_listeners
       if Redcar.platform == :osx
-        quit_listener  = Listener.new(:quit)
-        about_listener = Listener.new(:about)
-        prefs_listener = Listener.new(:prefs)
         enhancer = com.redcareditor.application_swt.CocoaUIEnhancer.new("Redcar")
         enhancer.hook_application_menu(
           ApplicationSWT.display,
-          QuitListener.new,
-          about_listener,
-          prefs_listener
+          CocoaUIListener.new(:quit),
+          CocoaUIListener.new(:about),
+          CocoaUIListener.new(:prefs)
         )
       end
     end

data/plugins/application_swt/lib/application_swt/window.rb

@@ -64,8 +64,10 @@ module Redcar
         @window.add_listener(:speedbar_opened, &method(:speedbar_opened))
         @window.add_listener(:speedbar_closed, &method(:speedbar_closed))
 
+        @window.add_listener(:toggle_trees_visible, &method(:toggle_sash_widths))
+
         @window.treebook.add_listener(:tree_added) do
-          if @treebook_unopened
+          if @treebook_unopened or not @window.trees_visible?
             reset_sash_widths
             @treebook_unopened = false
           end
@@ -77,6 +79,18 @@ module Redcar
         @shell.add_key_listener(KeyListener.new(self))
       end
 
+      def treebook_visible?
+        @sash.layout_data.left.offset > SASH_WIDTH
+      end
+
+      def fullscreen
+        @shell.fullScreen()
+      end
+
+      def fullscreen=(value)
+        @shell.setFullScreen(value)
+      end
+
       class KeyListener
         def initialize(edit_view_swt)
           @edit_view_swt = edit_view_swt
@@ -118,11 +132,11 @@ module Redcar
 
       def refresh_menu
         old_menu_bar = shell.menu_bar
-        @menu_controller = ApplicationSWT::Menu.new(self, Redcar.app.main_menu, Redcar.app.main_keymap, Swt::SWT::BAR)
+        @menu_controller = ApplicationSWT::Menu.new(self, Redcar.app.main_menu(@window), Redcar.app.main_keymap, Swt::SWT::BAR)
         shell.menu_bar = @menu_controller.menu_bar
         old_menu_bar.dispose if old_menu_bar
       end
-      
+
       def refresh_toolbar
 	if Redcar.app.show_toolbar?
 		@toolbar_controller = ApplicationSWT::ToolBar.new(self, Redcar.app.main_toolbar, Swt::SWT::HORIZONTAL | Swt::SWT::BORDER)
@@ -134,7 +148,7 @@ module Redcar
 	end
 	reset_sash_height
       end
-      
+
       def set_icon
         path = File.join(icon_dir, icon_file)
         icon = Swt::Graphics::Image.new(ApplicationSWT.display, path)
@@ -323,20 +337,34 @@ module Redcar
         @shell.layout
       end
 
+      def toggle_sash_widths
+        if not treebook_visible?
+          reset_sash_widths
+        else
+          @sash.layout_data.left = Swt::Layout::FormAttachment.new(0, 0)
+          @shell.layout
+        end
+      end
+
+      def set_sash_widths(offset)
+        @sash.layout_data.left = Swt::Layout::FormAttachment.new(0, offset)
+        @shell.layout
+      end
+
       def reset_notebook_sash_widths
         width = (100/@window.notebooks.length).to_i
         widths = [width]*@window.notebooks.length
       	@notebook_sash.setWeights(widths.to_java(:int))
       end
-      
+
       def reset_sash_height
         @sash.layout_data.top =  Swt::Layout::FormAttachment.new(0, @toolbar_height.to_i)
         @left_composite.layout_data.top = Swt::Layout::FormAttachment.new(0, 5 + @toolbar_height.to_i)
         @right_composite.layout_data.top = Swt::Layout::FormAttachment.new(0, 5 + @toolbar_height.to_i)
-	@shell.layout        
+	@shell.layout
         @shell.redraw
       end
-      
+
     end
   end
 end

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

@@ -1,4 +1,2 @@
 
-RequireSupportFiles File.dirname(__FILE__) + "/../../../edit_view/features/"
-
 

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

@@ -1,2 +1 @@
 
-RequireSupportFiles File.dirname(__FILE__) + "/../../../edit_view/features/"

data/plugins/auto_pairer/features/auto_pairer.feature

@@ -1,86 +1,91 @@
 Feature: Automatically insert paired characters
-  # This isn't a proper test because I haven't found a way to simulate
-  # a keypress so that text is inserted and the cursor moves. Therefore these
-  # tests assume that the cursor may be in the wrong place at any moment.
 
   Scenario: Inserts quote marks
     When I open a new edit tab
-    And I insert "\"" at the cursor
-    Then the contents should be "\"\""
+    And I type "\""
+    Then the contents should be "\"<c>\""
+    
+  Scenario: Don't insert quote mark if we're already open
+    When I open a new edit tab
+    And I replace the contents with "foo \" bár q"
+    And I move to the end of the line
+    And I move left
+    When I type "\""
+    Then the contents should be "foo \" bár \"q"
     
   Scenario: Inserts parentheses
     When I open a new edit tab
-    And I insert "(" at the cursor
-    Then the contents should be "()"
+    And I type "("
+    Then the contents should be "(<c>)"
     
   Scenario: Delete start character (quotes)
     When I open a new edit tab
-    And I insert "\"" at the cursor
-    And I move the cursor to 1
-    And I press the Backspace key in the edit tab
+    And I type "\""
+    And I backspace
     Then the contents should be ""
 
   Scenario: Delete start character (parentheses)
     When I open a new edit tab
-    And I insert "(" at the cursor
-    And I move the cursor to 1
-    And I press the Backspace key in the edit tab
+    And I type "("
+    And I backspace
     Then the contents should be ""
 
   Scenario: Type over ends
     When I open a new edit tab
-    And I insert "(" at the cursor
-    And I move the cursor to 1
-    And I insert ")" at the cursor
-    Then the contents should be "()"
+    And I type "("
+    And I type ")"
+    Then the contents should be "()<c>"
   
   Scenario: Wrap selected text
     When I open a new edit tab
-    And I insert "Boris" at the cursor
+    And I type "Boris"
     And I select from 0 to 5
-    And I replace 0 to 5 with "("
-    Then the contents should be "(Boris)"
+    And I type "("
+    Then the contents should be "(Boris)<c>"
 
   Scenario: Inserts ending character nested
     When I open a new edit tab
-    And I insert "\"" at 0
-    And I insert "(" at 1
-    Then the contents should be "\"()\""
+    And I type "\""
+    And I type "("
+    Then the contents should be "\"(<c>)\""
     
   Scenario: Delete start character nested
     When I open a new edit tab
-    And I insert "\"" at 0
-    And I insert "(" at 1
-    And I move the cursor to 2
-    And I press the Backspace key in the edit tab
-    Then the contents should be "\"\""
-    And I move the cursor to 1
-    And I press the Backspace key in the edit tab
+    And I type "\""
+    And I type "("
+    And I backspace
+    Then the contents should be "\"<c>\""
+    When I backspace
     Then the contents should be ""
 
   Scenario: Type over ends nested
     When I open a new edit tab
-    And I insert "(" at 0
-    And I insert "\"" at 1
-    And I insert "\"" at 2
-    And I insert ")" at 3
-    Then the contents should be "(\"\")"
+    And I type "("
+    And I type "\""
+    And I type "\""
+    And I type ")"
+    Then the contents should be "(\"\")<c>"
   
   Scenario: Don't delete start character if moved away
     When I open a new edit tab
-    And I replace the contents with "0123456789"
-    And I insert "(" at 0
-    And I move the cursor to 5
-    And I move the cursor to 1
-    And I press the Backspace key in the edit tab
-    Then the contents should be ")0123456789"
+    And I type "0123456789"
+    And I move to the start of the line
+    And I type "("
+    And I move to the end of the line
+    And I move to the start of the line
+    And I move right
+    And I backspace
+    Then the contents should be "<c>)0123456789"
 
   Scenario: Don't type over end if moved away
     When I open a new edit tab
-    And I replace the contents with "0123456789"
-    And I insert "(" at 0
-    And I move the cursor to 5
-    And I insert ")" at 1
+    And I type "0123456789"
+    And I move to the start of the line
+    And I type "("
+    And I move to the end of the line
+    And I move to the start of the line
+    And I move right
+    And I type ")"
     Then the contents should be "())0123456789"
 
   

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

@@ -1,2 +1 @@
 
-RequireSupportFiles File.dirname(__FILE__) + "/../../../edit_view/features/"

data/plugins/auto_pairer/lib/auto_pairer/document_controller.rb

@@ -85,16 +85,21 @@ module Redcar
               end_mark_pair = find_mark_pair_by_end(start_offset)
               if end_mark_pair and end_mark_pair.text == text
                 @type_over_end = true
-                #@buffer.parser.stop_parsing
               end
             end
             # Insert matching ends
-            if !@type_over_end and @rules.include?(text) and !@ignore_insert and !@done
-              @insert_end = true
-              if document.selection?
-                @selected_text = document.selected_text
+            if !@type_over_end and @rules.include?(text) and !@ignore_insert and !@done and
+              line_num = document.line_at_offset(start_offset)
+              line = document.get_line(line_num)
+              offset_of_line = document.offset_at_line(line_num)
+              pre_text = line.chars[0..(start_offset-offset_of_line)].to_s
+              equal_ends = (@rules[text] == text)
+              if !equal_ends or pre_text.scan(text).length % 2 == 0
+                @insert_end = true
+                if document.selection?
+                  @selected_text = document.selected_text
+                end
               end
-#              @buffer.parser.stop_parsing
             end
           end
         end

data/plugins/clipboard-viewer/lib/clipboard_viewer.rb

@@ -0,0 +1,50 @@
+
+require 'clipboard_viewer/clipboard_bar'
+require 'clipboard_viewer/browser_controller'
+
+module Redcar
+  class ClipboardViewer
+
+    def self.menus
+      Redcar::Menu::Builder.build do
+        sub_menu "Plugins" do
+          sub_menu "Clipboard" do
+            item "Clipboard Viewer Bar", :command => OpenClipboardBar    , :priority => 18
+            item "Clipboard Browser"   , :command => OpenClipboardBrowser, :priority => 18
+          end
+        end
+      end
+    end
+
+    def self.storage
+      @storage ||= begin
+         storage = Plugin::Storage.new('clipboard_viewer')
+         storage.set_default('chars_to_display', 50)
+         storage.set_default('lines_to_display', 3)
+         storage
+      end
+    end
+
+    class OpenClipboardBar < Redcar::Command
+      def execute
+        window = Redcar.app.focussed_window
+        speedbar = Redcar::ClipboardViewer::ClipboardBar.new
+        window.open_speedbar(speedbar)
+      end
+    end
+
+    class OpenClipboardBrowser < Redcar::Command
+
+      def initialize(list=Redcar.app.clipboard)
+        @list = list || []
+      end
+
+      def execute
+        controller = BrowserController.new(@list)
+        tab = win.new_tab(HtmlTab)
+        tab.html_view.controller = controller
+        tab.focus
+      end
+    end
+  end
+end

data/plugins/clipboard-viewer/lib/clipboard_viewer/browser_controller.rb

@@ -0,0 +1,27 @@
+
+module Redcar
+  class ClipboardViewer
+    class BrowserController
+      include HtmlController
+
+      def initialize(list)
+        @list = list.to_a.reverse
+      end
+
+      def title
+        "Clipboard History"
+      end
+
+      def copy(idx)
+        text = @list[idx]
+        Redcar.app.clipboard >> text if text
+        false
+      end
+
+      def index
+        rhtml = ERB.new(File.read(File.join(File.dirname(__FILE__), "..","..", "views", "clipboard.html.erb")))
+        rhtml.result(binding)
+      end
+    end
+  end
+end

data/plugins/clipboard-viewer/lib/clipboard_viewer/clipboard_bar.rb

@@ -0,0 +1,67 @@
+module Redcar
+  class ClipboardViewer
+    class ClipboardBar < Redcar::Speedbar
+      include Redcar::Observable
+
+      def initialize
+        @size = ClipboardViewer.storage['chars_to_display'].to_i
+        @line_limit = ClipboardViewer.storage['lines_to_display'].to_i
+        load_list
+        @listener = Redcar.app.clipboard.add_listener(:added) {|t|load_list}
+      end
+
+      def close
+        Redcar.app.clipboard.remove_listener(@listener)
+      end
+
+      def load_list
+        @list = Redcar.app.clipboard || []
+        values = display_values(@list)
+        if values.length > 0
+          clip_list.items = values
+          clip_list.value = values.first
+        else
+          clip_list.items = [" "*(@size+5)]
+          clip_list.value = clip_list.items.first
+        end
+      end
+
+      combo :clip_list
+      button :paste_selected, "Paste!", "Return" do
+        tab = Redcar.app.focussed_window.focussed_notebook_tab
+        content = @list.to_a.reverse.detect do |r|
+          l = r.to_s
+          val = clip_list.value.to_s
+          val = val[0,val.length-3] if val =~ /\.\.\.$/
+          l.length >= val.length and l[0,val.length].to_s == val.to_s
+        end
+        tab.edit_view.document.insert_at_cursor(content.to_s) if tab.is_a?(EditTab) and content
+        load_list
+      end
+
+      button :browse, "Browse", nil do
+        OpenClipboardBrowser.new(@list).run
+      end
+
+      def display_values(list)
+        display = list.to_a.reverse.map do |l|
+          value = ""
+          r=0
+          l.to_s.each_line do |line|
+            value += line  if r <= @line_limit - 1
+            value += "..." if r == @line_limit
+            r+=1
+            break if r > @line_limit - 1
+          end
+          value = value[0,value.length-1] if value =~ /\n$/
+          if value.length > @size
+            value[0,@size]+"..."
+          else
+            value
+          end
+        end
+        display || []
+      end
+    end
+  end
+end