redcar 0.3.2dev → 0.3.3

data/plugins/edit_view/lib/edit_view/tab_settings.rb

@@ -0,0 +1,40 @@
+module Redcar
+  class EditView
+    class TabSettings
+      DEFAULT_SOFTNESS = true
+      DEFAULT_TAB_WIDTH = 2
+      TAB_WIDTHS        = %w(2 3 4 5 6 8)
+      
+      attr_reader :tab_widths, :softnesses
+    
+      def initialize
+        @tab_widths = EditView.storage['tab_widths'] || {}
+        @softnesses = EditView.storage['softnesses'] || {}
+      end
+      
+      def width_for(grammar_name)
+        tab_widths[grammar_name] || DEFAULT_TAB_WIDTH
+      end
+      
+      def set_width_for(grammar_name, width)
+        width = width.to_i
+        if tab_widths[grammar_name] != width
+          tab_widths[grammar_name] = width
+          EditView.storage['tab_widths'] = tab_widths
+        end
+      end
+      
+      def softness_for(grammar_name)
+        softnesses[grammar_name] == nil ? DEFAULT_SOFTNESS : softnesses[grammar_name]
+      end
+      
+      def set_softness_for(grammar_name, boolean)
+        boolean = !!boolean
+        if softnesses[grammar_name] != boolean
+          softnesses[grammar_name] = boolean
+          EditView.storage['softnesses'] = softnesses
+        end
+      end
+    end
+  end
+end

data/plugins/edit_view/spec/edit_view/document_spec.rb

@@ -13,6 +13,14 @@ describe Redcar::Document do
     def text=(val)
       @text = val
     end
+    
+    def length
+     @text.length
+    end
+    
+    def get_range(from_here, to_here)
+     @text[from_here, to_here]
+    end
   end
   
   class TestMirror
@@ -44,6 +52,11 @@ describe Redcar::Document do
     @mirror
   end
   
+  it "should allow for retrieving all text" do
+    @controller.text = "a\nb\n"
+    @doc.get_all_text.should == "a\nb\n"
+  end
+  
   describe "with no mirror" do
     it "reads from the mirror when it is set" do
       @doc.mirror = TestMirror.new
@@ -67,6 +80,19 @@ describe Redcar::Document do
       @doc.save!
       @mirror.read.should == "Saved text"
     end
+    
+    it "should allow for a path method" do
+      @doc.path.should == nil
+      def @mirror.path
+         'abc'
+      end
+      @doc.path.should == 'abc'    
+      def @mirror.path
+         nil
+      end
+      @doc.path.should == nil      
+    end
+    
   end
 end
 

data/plugins/edit_view/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 $:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
 require 'redcar'
-Redcar.boot
 Redcar.load

data/plugins/edit_view_swt/lib/edit_view_swt.rb

@@ -24,58 +24,30 @@ module Redcar
       JavaMateView::ThemeManager.load_themes(Redcar.root + "/textmate/")
     end
     
-    attr_reader :mate_text, :widget
-
-    def initialize(model, edit_tab)
+    attr_reader :mate_text, :widget, :model
+      
+    def initialize(model, parent, options={})
+      @options = options
       @model = model
-      @edit_tab = edit_tab
+      @parent = parent
       @handlers = []
       create_mate_text
-      create_grammar_selector
       create_document
       attach_listeners
-      @mate_text.add_grammar_listener do |new_grammar|
-        @model.set_grammar(new_grammar)
-      end
-      @mate_text.set_grammar_by_name "Plain Text"
-      @mate_text.set_theme_by_name(ARGV.option("theme") || "Twilight")
+      @mate_text.set_grammar_by_name("Plain Text")
+      @model.set_grammar("Plain Text")
+      @mate_text.set_theme_by_name(EditView.theme)
       create_undo_manager
       @document.attach_modification_listeners # comes after undo manager
       remove_control_keybindings
+      mate_text.add_grammar_listener do |new_grammar|
+        @model.set_grammar(new_grammar)
+      end
     end
     
     def create_mate_text
-      parent = @edit_tab.notebook.tab_folder
-      @widget = Swt::Widgets::Composite.new(parent, Swt::SWT::NONE)
-      layout = Swt::Layout::GridLayout.new
-      layout.verticalSpacing = 0
-      layout.marginHeight = 0
-      layout.horizontalSpacing = 0
-      layout.marginWidth = 0
-      layout.numColumns = 2
-      @widget.layout = layout
-      @mate_text = JavaMateView::MateText.new(@widget)
-      if Redcar.platform == :osx
-        default_font = "Monaco"
-        default_font_size = 15
-      elsif Redcar.platform == :linux
-        default_font = "Monospace"
-        default_font_size = 11
-      elsif Redcar.platform == :windows
-        default_font = "FixedSys"
-        default_font_size = 15
-      end
-      @mate_text.set_font(ARGV.option("font") || default_font, 
-                          (ARGV.option("font-size") || default_font_size).to_i)
-      @edit_tab.item.control = @widget
-      
-      @mate_text.layoutData = Swt::Layout::GridData.construct do |data|
-        data.horizontalAlignment = Swt::Layout::GridData::FILL
-        data.verticalAlignment = Swt::Layout::GridData::FILL
-        data.grabExcessHorizontalSpace = true
-        data.grabExcessVerticalSpace = true
-        data.horizontalSpan = 2  
-      end
+      @mate_text = JavaMateView::MateText.new(@parent, !!@options[:single_line])
+      @mate_text.set_font(EditView.font, EditView.font_size)
       
       @model.controller = self
     end
@@ -109,50 +81,63 @@ module Redcar
       @undo_manager.reset
     end
     
-    def create_grammar_selector
-      @combo = Swt::Widgets::Combo.new @widget, Swt::SWT::READ_ONLY
-      bundles  = JavaMateView::Bundle.bundles.to_a
-      grammars = bundles.map {|b| b.grammars.to_a}.flatten
-      items    = grammars.map {|g| g.name}.sort_by {|name| name.downcase }
-      @combo.items = items.to_java(:string)
-      
-      @mate_text.add_grammar_listener do |new_grammar|
-        @combo.select(items.index(new_grammar))
-      end
-      
-      @combo.add_selection_listener do |event|
-        @mate_text.set_grammar_by_name(@combo.text)
-      end
-      
-      @widget.pack
-    end
-    
     def create_document
       @document = EditViewSWT::Document.new(@model.document, @mate_text.mate_document)
       @model.document.controller = @document
       h1 = @model.document.add_listener(:before => :new_mirror, 
             &method(:update_grammar))
       h2 = @model.add_listener(:grammar_changed, &method(:model_grammar_changed))
+      h3 = @model.add_listener(:focussed, &method(:focus))
+      h4 = @model.add_listener(:tab_width_changed) do |new_tab_width|
+        @mate_text.get_control.set_tabs(new_tab_width)
+      end
       @mate_text.getTextWidget.addFocusListener(FocusListener.new(self))
       @mate_text.getTextWidget.addVerifyListener(VerifyListener.new(@model.document, self))
       @mate_text.getTextWidget.addModifyListener(ModifyListener.new(@model.document, self))
-      @handlers << [@model.document, h1] << [@model, h2]
+      @mate_text.get_control.add_verify_key_listener(VerifyKeyListener.new(self))
+      @handlers << [@model.document, h1] << [@model, h2] << [@model, h3] << [@model, h4]
+    end
+    
+    class VerifyKeyListener
+      def initialize(edit_view_swt)
+        @edit_view_swt = edit_view_swt
+      end
+      
+      def verify_key(key_event)
+        if key_event.character == Swt::SWT::TAB
+          key_event.doit = !@edit_view_swt.model.tab_pressed(ApplicationSWT::Menu::BindingTranslator.modifiers(key_event))
+        elsif key_event.character == Swt::SWT::ESC
+          key_event.doit = !@edit_view_swt.model.esc_pressed(ApplicationSWT::Menu::BindingTranslator.modifiers(key_event))
+        elsif key_event.keyCode == Swt::SWT::ARROW_LEFT
+          key_event.doit = !@edit_view_swt.model.left_pressed(ApplicationSWT::Menu::BindingTranslator.modifiers(key_event))
+        elsif key_event.keyCode == Swt::SWT::ARROW_RIGHT
+          key_event.doit = !@edit_view_swt.model.right_pressed(ApplicationSWT::Menu::BindingTranslator.modifiers(key_event))
+        elsif key_event.character == Swt::SWT::DEL
+          key_event.doit = !@edit_view_swt.model.delete_pressed(ApplicationSWT::Menu::BindingTranslator.modifiers(key_event))
+        elsif key_event.character == Swt::SWT::BS
+          key_event.doit = !@edit_view_swt.model.backspace_pressed(ApplicationSWT::Menu::BindingTranslator.modifiers(key_event))
+        end
+      end
     end
     
     def swt_focus_gained
-      @model.gained_focus
+      EditView.focussed_edit_view = @model
+      @model.focus
+    end
+    
+    def swt_focus_lost
+      EditView.focussed_edit_view = nil
     end
     
     def focus
-      @mate_text.set_focus
+      @mate_text.get_control.set_focus
     end
     
     def has_focus?
       focus_control = ApplicationSWT.display.get_focus_control
-      focus_control.parent.parent == @mate_text
+      focus_control == @mate_text.get_control
     end
   
-  
     def attach_listeners
       # h = @document.add_listener(:set_text, &method(:reparse))
       # @handlers << [@document, h]
@@ -172,6 +157,7 @@ module Redcar
     end
     
     def scroll_to_line(line_index)
+      @mate_text.parser.last_visible_line_changed(line_index + 100)
       @mate_text.viewer.set_top_index(line_index)
     end
     
@@ -192,10 +178,12 @@ module Redcar
       return if @mate_text.set_grammar_by_filename(title)
       contents = new_mirror.read
       first_line = contents.to_s.split("\n").first
-      @mate_text.set_grammar_by_first_line(first_line) if first_line
+      grammar = @mate_text.set_grammar_by_first_line(first_line) if first_line
+      grammar ||= "Plain Text"
+      @model.set_grammar(grammar)
     end
     
-    STRIP_KEYS = { 
+    STRIP_KEYS = {
       :cut   => 120|Swt::SWT::MOD1,
       :copy  => 99|Swt::SWT::MOD1,
       :paste => 118|Swt::SWT::MOD1
@@ -209,8 +197,6 @@ module Redcar
     end
     
     def dispose
-      @combo.dispose
-      @widget.dispose
       @handlers.each {|obj, h| obj.remove_listener(h) }
       @handlers.clear
     end
@@ -224,7 +210,9 @@ module Redcar
         @obj.swt_focus_gained
       end
 
-      def focusLost(_); end
+      def focusLost(_)
+        @obj.swt_focus_lost
+      end
     end
     
     class VerifyListener

data/plugins/edit_view_swt/lib/edit_view_swt/document.rb

@@ -16,6 +16,10 @@ module Redcar
         styledText.add_selection_listener(SelectionListener.new(@model))
       end
       
+      def single_line?
+        @swt_mate_document.mateText.isSingleLine
+      end
+      
       def to_s
         jface_document.get
       end
@@ -65,6 +69,11 @@ module Redcar
         styledText.get_caret_offset
       end
       
+      def selection_offset
+        range = styledText.get_selection_range
+        range.x == cursor_offset ? range.x + range.y : range.x
+      end
+      
       def cursor_offset=(offset)
         styledText.set_caret_offset(offset)
       end
@@ -81,9 +90,21 @@ module Redcar
         end
       end
       
-      def set_selection_range(start, _end)
-        styledText.set_selection(start, _end)
-        @model.selection_range_changed(start, _end)
+      def set_selection_range(cursor_offset, selection_offset)
+        if block_selection_mode?
+          start_offset, end_offset = *[cursor_offset, selection_offset].sort
+          start_location = styledText.getLocationAtOffset(start_offset)
+          end_location   = styledText.getLocationAtOffset(end_offset)
+          styledText.set_block_selection_bounds(
+            start_location.x, 
+            start_location.y,
+            end_location.x - start_location.x,
+            end_location.y - start_location.y + styledText.get_line_height
+          )
+        else
+          styledText.set_selection_range(selection_offset, cursor_offset - selection_offset)
+        end
+        @model.selection_range_changed(cursor_offset, selection_offset)
       end
       
       def block_selection_mode?

data/plugins/edit_view_swt/lib/edit_view_swt/edit_tab.rb

@@ -10,12 +10,6 @@ module Redcar
         @model.add_listener(:changed_title) { |title| @item.text = title }
       end
       
-      def create_tab_widget
-        @edit_view = EditViewSWT.new(model.edit_view, self)
-        @widget = @edit_view.widget
-        @item.control = @widget
-      end
-      
       # Focuses the CTabItem within the CTabFolder, and gives the keyboard
       # focus to the EditViewSWT.
       def focus
@@ -26,8 +20,31 @@ module Redcar
       # Close the EditTab, disposing of any resources along the way.
       def close
         @edit_view.dispose
+        @widget.dispose
         super
       end
+      
+      private
+      
+      def create_tab_widget
+        @widget = Swt::Widgets::Composite.new(notebook.tab_folder, Swt::SWT::NONE)
+        layout = Swt::Layout::GridLayout.new(1, false)
+        layout.verticalSpacing = 0
+        layout.marginHeight = 0
+        layout.horizontalSpacing = 0
+        layout.marginWidth = 0
+        @widget.layout = layout
+        @edit_view = EditViewSWT.new(model.edit_view, @widget)
+        
+        grid_data = Swt::Layout::GridData.new(
+                      Swt::Layout::GridData::FILL_BOTH | 
+                      Swt::Layout::GridData::VERTICAL_ALIGN_FILL |
+                      Swt::Layout::GridData::HORIZONTAL_ALIGN_FILL)
+        @edit_view.mate_text.get_control.parent.set_layout_data(grid_data)
+
+        @item.control = @widget
+        @widget.pack
+      end
     end
   end
 end

data/plugins/edit_view_swt/spec/spec_helper.rb

@@ -2,5 +2,4 @@ $:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
 require 'redcar'
 
-Redcar.boot
 Redcar.load

data/plugins/edit_view_swt/vendor/java-mateview.rb

@@ -2,11 +2,28 @@
 Dir[File.dirname(__FILE__) + "/*.jar"].each {|fn| require fn }
 
 module JavaMateView
-  import com.redcareditor.mate.MateText
-  import com.redcareditor.mate.Grammar
   import com.redcareditor.mate.Bundle
+  import com.redcareditor.mate.Grammar
+  import com.redcareditor.mate.MateText
   import com.redcareditor.mate.Parser
+  import com.redcareditor.mate.Pattern
+  import com.redcareditor.mate.Scope
   import com.redcareditor.theme.Theme
   import com.redcareditor.theme.ThemeManager
+  
+  class MateText
+    def set_root_scope_by_content_name(grammar_name, name)
+      scope = JavaMateView::Scope.new(self, "re")
+      bs = JavaMateView::Bundle.bundles
+      ruby = bs.detect {|b| b.name == grammar_name}
+      ps = ruby.grammars.first.patterns
+      dps = ps.select {|pt| pt.is_a?(Java::ComRedcareditorMate::DoublePattern) }  
+      rps = dps.detect {|pt| pt.contentName == name }
+      scope.pattern = rps
+      scope.isOpen = true
+      self.parser.root = scope
+    end
+  end
 end
 
+ 

data/plugins/encryption/encryption.rb

@@ -0,0 +1,38 @@
+
+require 'openssl'
+require File.dirname(__FILE__) + "/jarmor-1.1"
+require File.dirname(__FILE__) + "/ezcrypto"
+
+module Encryption
+  def self.menus
+    Redcar::Menu::Builder.build do
+      sub_menu "Plugins" do
+        sub_menu "Encryption" do
+          item "Encrypt Document", EncryptDocumentCommand
+          item "Decrypt Document", DecryptDocumentCommand
+        end
+      end
+    end
+  end
+
+  class DecryptDocumentCommand < Redcar::EditTabCommand
+    def execute
+      result = Redcar::Application::Dialog.input(win, "Password", "Enter password")
+      pw = result[:value]
+      begin
+        doc.text = EncryptionTools.dearmour_and_decrypt(doc.to_s, pw)
+      rescue => e
+        Redcar::Application::Dialog.message_box(win, "Couldn't decrypt!", :type => :error)
+      end
+    end
+  end
+  
+  class EncryptDocumentCommand < Redcar::EditTabCommand
+    def execute
+      result = Redcar::Application::Dialog.input(win, "Password", "Enter password")
+      pw = result[:value]
+      doc.text = EncryptionTools.encrypt_and_armour(doc.to_s, pw)
+    end
+  end
+end
+