redcar 0.8.1 → 0.9.0

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

@@ -4,7 +4,8 @@ module Swt
       attr_accessor :tab_area, :content_area
       attr_reader :selection_color_options, :font, :items
 
-      SelectionEvent = Struct.new("Event", :item, :doit)
+      SelectionEvent  = Struct.new("Event", :item, :doit)
+      CTabFolderEvent = SelectionEvent
 
       def initialize(parent, style)
         super(parent, style | Swt::SWT::BORDER)
@@ -17,6 +18,7 @@ module Swt
 
         @items = []
         @selection_listeners = []
+        @ctab_folder2_listeners = []
         @font = Swt::Widgets::Display.current.system_font
 
         @tab_area = Swt::Widgets::Composite.new(self, Swt::SWT::NONE).tap do |t|
@@ -43,15 +45,16 @@ module Swt
         @items << tab
         tab.draw_label(@tab_area)
         tab.font = @font
-        tab.active = true if @items.size == 1
+        selection = tab if @items.size == 1
         layout
       end
 
       def remove_item(tab)
-        @items.delete(tab)
-        tab.dispose
-        selection = @items.first if tab.active?
-        layout
+        return unless tab = ensure_tab(tab)
+
+        evt = create_ctab_folder_event(tab)
+        call_listeners(@ctab_folder2_listeners, evt, :method => :close, :run_blocks => true)
+        do_remove_item(tab) if evt.doit
       end
 
       def get_item(selector)
@@ -69,33 +72,12 @@ module Swt
       end
 
       def selection=(tab)
-        return if tab.nil?
-        evt = SelectionEvent.new.tap do |e|
-          e.item = tab
-          e.doit = true
-        end
-        @selection_listeners.each do |l|
-          if l.respond_to? :call
-            l[evt]
-          else
-            l.widgetSelected(evt)
-          end
-        end
-        if evt.doit
-          silent_selection(tab)
-        end
-      end
+        tab = ensure_tab(tab)
+        return if tab.nil? or tab.active?
 
-      def silent_selection(tab)
-        return if tab.nil?
-        selection.active = false if selection
-        if tab.respond_to? :to_int
-          @items[tab].active = true
-        else
-          tab.active = true
-        end
-        layout
-        @tab_area.layout
+        evt = create_selection_event(tab)
+        call_listeners(@selection_listeners, evt, :method => :widgetSelected, :run_blocks => true)
+        do_selection(tab) if evt.doit
       end
 
       def selection_index
@@ -110,16 +92,79 @@ module Swt
         selection = tab
       end
 
+      # Mirrors the selection-listener behaviour of CTabFolder.
+      # Additionally accepts a block as listener. If a block is passed,
+      # only widgetSelected events will be passed, not widgetDefaultSelected.
       def add_selection_listener(listener = nil)
         return @selection_listeners << listener if listener
         raise ArgumentError, "Expected a listener or a block" unless block_given?
         @selection_listeners << Proc.new
       end
 
+      # Mirrors the CTabFolder2Listener behaviour of CTabFolder.
+      # You can also pass a a block as listener. Note that when you pass a
+      # block, only close events will be passed to it, not the minimize, maximize,
+      # restore or showList events.
+      def add_ctab_folder2_listener(listener = nil)
+        return @ctab_folder2_listeners << listener if listener
+        raise ArgumentError, "Expected a listener or a block" unless block_given?
+        @ctab_folder2_listeners << Proc.new
+      end
+
       def font= swt_font
         @font = swt_font
         @items.each { |tab| tab.font = swt_font }
       end
+
+      private
+
+      def ensure_tab(tab)
+        tab = @items[tab] if tab.respond_to? :to_int
+        tab
+      end
+
+      def do_selection(tab)
+        selection.active = false if selection
+        tab.active = true
+        relayout!
+      end
+
+      def do_remove_item(tab)
+        @items.delete(tab)
+        tab.dispose
+        selection = @items.first if tab.active?
+        relayout!
+      end
+
+      def relayout!
+        layout
+        @tab_area.layout
+      end
+
+      def create_selection_event(tab)
+        create_event(tab, SelectionEvent)
+      end
+
+      def create_ctab_folder_event(tab)
+        create_event(tab, CTabFolderEvent)
+      end
+
+      def create_event(tab, clazz)
+        clazz.new.tap do |e|
+          e.item = tab
+          e.doit = true
+        end
+      end
+
+      def call_listeners(list, evt, hash)
+        list.each do |l|
+          if hash[:run_blocks] and l.respond_to? :call
+            l[evt]
+          else
+            l.send(hash[:method], evt)
+          end
+        end
+      end
     end
   end
 end

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

@@ -4,6 +4,7 @@ module Swt
   module Widgets
     class VTabItem
       attr_accessor :text, :control
+      attr_reader :parent
 
       def initialize(parent, style)
         @parent = parent
@@ -60,6 +61,14 @@ module Swt
         @label.font
       end
 
+      def show_close= bool
+        @label.show_close = bool
+      end
+
+      def show_close
+        @label.show_close
+      end
+
       def dispose
         @control.dispose
         @label.dispose

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

@@ -3,10 +3,14 @@ require File.expand_path("../graphics_utils", __FILE__)
 module Swt
   module Widgets
     class VTabLabel
-      attr_reader :active, :title
+      attr_reader :active, :title, :show_close
       attr_accessor :font
 
       include Swt::Events::MouseListener
+      include Swt::Events::MouseTrackListener
+
+      CLOSE_ICON   = Redcar::ApplicationSWT::Icon.swt_image(:close)
+      ICON_PADDING = 3
 
       def initialize(tab, parent, style)
         @label = Swt::Widgets::Label.new(parent, style)
@@ -14,41 +18,56 @@ module Swt
         @tab = tab
         @parent = parent
         @title = ""
+        @icon = nil
+        @show_close = false
 
         @label.image = label_image
         @label.add_paint_listener { |event| event.gc.draw_image(label_image, 0, 0) }
         @label.add_mouse_listener(self)
+        self.show_close = true
       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)
+        unless @img
+          @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
-          else
-            gc.fill_rectangle(0, 0, extent.width, extent.height)
+            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
-          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
+          overlay_icon(@icon, @img)
         end
-        @dirty = false
         @img
       end
 
+      def overlay_icon(icon, image)
+        return unless icon
+        gc = GraphicsUtils::GC.new(image)
+        gc.draw_image(@icon, ICON_PADDING, ICON_PADDING)
+        gc.dispose
+      end
+
+      def dirty!
+        @img = nil
+      end
+
       def activate
         @tab.activate
       end
@@ -64,7 +83,7 @@ module Swt
       end
 
       def redraw
-        @dirty = true
+        dirty!
         @label.image = label_image
       end
 
@@ -72,13 +91,34 @@ module Swt
         @label.dispose
       end
 
+      def show_close= boolean
+        return if @show_close == boolean
+        @show_close = boolean
+        @show_close ? @label.add_mouse_track_listener(self) : @label.remove_mouse_track_listener(self)
+      end
+
       def mouseUp(e)
-        activate
+        if show_close and CLOSE_ICON.bounds.contains(e.x - ICON_PADDING, e.y - ICON_PADDING)
+          @tab.parent.remove_item(@tab)
+        else
+          activate if e.button == 1
+        end
+      end
+
+      def mouseEnter(e)
+        @icon = CLOSE_ICON
+        redraw
+      end
+
+      def mouseExit(e)
+        @icon = nil
+        redraw
       end
 
       # Unused
       def mouseDown(e); end
       def mouseDoubleClick(e); end
+      def mouseHover(e); end
     end
   end
 end

data/plugins/application_swt/plugin.rb

@@ -1,7 +1,7 @@
 
 Plugin.define do
   name    "application_swt"
-  version "1.0"
+  version "1.1"
   file    "lib", "application_swt"
   object  "Redcar::ApplicationSWT"
   dependencies "application", ">0",

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

@@ -48,8 +48,8 @@ module Redcar
           value = ""
           r=0
           l.to_s.each_line do |line|
-            value += line  if r <= @line_limit - 1
-            value += "..." if r == @line_limit
+            value << line  if r <= @line_limit - 1
+            value << "..." if r == @line_limit
             r+=1
             break if r > @line_limit - 1
           end

data/plugins/comment/features/line_comment.feature

@@ -60,6 +60,15 @@ Feature: Commenting lines by prefixing a comment string
     When I toggle comment lines
     Then the contents should be "# foo\n# bar\nbaz"
 
+  Scenario: Commenting when not all the lines begin with the comment symbol, reversed
+    When I replace the contents with "# foo\n# bar\nbaz"
+    And I switch the language to "Ruby"
+    And I select from 15 to 0
+    And I toggle comment lines
+    Then the contents should be "<c># # foo\n# # bar\n# baz<s>"
+    When I toggle comment lines
+    Then the contents should be "# foo\n# bar\nbaz"
+
   Scenario: Commenting a single line with the cursor on the next line
     When I replace the contents with "Two pieces\nof code"
     And I switch the language to "Ruby"
@@ -69,6 +78,15 @@ Feature: Commenting lines by prefixing a comment string
     When I toggle comment lines
     Then the contents should be "<s>Two pieces\n<c>of code"
 
+  Scenario: Commenting a single line with the cursor on the next line, reversed
+    When I replace the contents with "Two pieces\nof code"
+    And I switch the language to "Ruby"
+    And I select from 11 to 0
+    And I toggle comment lines
+    Then the contents should be "<c># Two pieces\n<s>of code"
+    When I toggle comment lines
+    Then the contents should be "<c>Two pieces\n<s>of code"
+
   Scenario: Commenting a single line with the cursor and selection point on the same line
     When I replace the contents with "Two pieces\nof code"
     And I switch the language to "Ruby"
@@ -104,6 +122,15 @@ Feature: Commenting lines by prefixing a comment string
     When I toggle comment lines
     Then the contents should be "Tw<s>o pieces\nof<c> code"
 
+  Scenario: Commenting several lines, not from the start of one of them, reversed
+    When I replace the contents with "Two pieces\nof code"
+    And I switch the language to "Ruby"
+    And I select from 13 to 2
+    And I toggle comment lines
+    Then the contents should be "Tw<c># o pieces\n# of<s> code"
+    When I toggle comment lines
+    Then the contents should be "Tw<c>o pieces\nof<s> code"
+
   Scenario: Commenting several lines, not from the start of one of them
     When I replace the contents with "    foo\n    bar"
     And I switch the language to "Ruby"
@@ -121,12 +148,97 @@ Feature: Commenting lines by prefixing a comment string
     Then the contents should be "<s>#     def foo\n#       dfo\n#     sdfj\n#   asdf\n# as<c>df"
 
   Scenario: Commenting several indented lines, beginning before the text starts
-    When I replace the contents with "      def foo\n        dfo"
+    Given the content is:
+				"""
+				  <s>    def foo
+				        dfo<c>
+				"""
     And I switch the language to "Ruby"
-    And I select from 2 to 25
     And I toggle comment lines
-    Then the contents should be "  <s>    # def foo\n      #   dfo<c>"
-
+    Then the content should be:
+				"""
+				  <s>    # def foo
+				      #   dfo<c>
+				"""
+
+  Scenario: Commenting several indented lines, beginning before the text starts, reversed
+    Given the content is:
+				"""
+				  <c>    def foo
+				        dfo<s>
+				"""
+    And I switch the language to "Ruby"
+    And I toggle comment lines
+    Then the content should be:
+				"""
+				  <c>    # def foo
+				      #   dfo<s>
+				"""
+
+  Scenario: Commenting several indented lines, beginning where the text starts
+    Given the content is:
+				"""
+				      <s>def foo
+				        dfo<c>
+				"""
+    And I switch the language to "Ruby"
+    And I toggle comment lines
+    Then the content should be:
+				"""
+				      <s># def foo
+				      #   dfo<c>
+				"""
+    And I toggle comment lines
+    Then the content should be:
+				"""
+				      <s>def foo
+				        dfo<c>
+				"""
+
+  Scenario: Commenting several indented lines, with a whitespace only line in between
+    Given the content is:
+        """
+            <s>doc.compound do
+              all_lines_are_already_commented = true
+              start_line_comment_offset       = nil
+              insertion_column                = 1000
+              
+              <c>(start_line..end_line).each do |line|
+        """
+    And I switch the language to "Ruby"
+    And I toggle comment lines
+    Then the content should be:
+        """
+            <s># doc.compound do
+            #   all_lines_are_already_commented = true
+            #   start_line_comment_offset       = nil
+            #   insertion_column                = 1000
+            #   
+            #   <c>(start_line..end_line).each do |line|
+        """
+        
+  Scenario: Commenting several indented lines, with a blank line in between
+    Given the content is:
+        """
+            <s>doc.compound do
+              all_lines_are_already_commented = true
+              start_line_comment_offset       = nil
+              insertion_column                = 1000
+        
+              <c>(start_line..end_line).each do |line|
+        """
+    And I switch the language to "Ruby"
+    And I toggle comment lines
+    Then the content should be:
+        """
+            <s># doc.compound do
+            #   all_lines_are_already_commented = true
+            #   start_line_comment_offset       = nil
+            #   insertion_column                = 1000
+            # 
+            #   <c>(start_line..end_line).each do |line|
+        """
+        
   # This is pretty damn marginal, and I'm tired...
   #Scenario: Commenting several lines, with mismatched indentation, beginning in the middle
   #  When I replace the contents with "    def foo\n      dfo\n    sdfj\n  asdf\nasdf"