redcar 0.9.2 → 0.10

data/plugins/application_swt/lib/application_swt/dialogs/modeless_list_dialog_controller.rb

@@ -0,0 +1,143 @@
+
+module Redcar
+  class ApplicationSWT
+    class ModelessListDialogController
+
+      DEFAULT_HEIGHT_IN_ROWS = 4
+      DEFAULT_WIDTH  = 300
+
+      def initialize(model)
+        @model  = model
+        parent  = ApplicationSWT.display
+        @shell  = Swt::Widgets::Shell.new(parent, Swt::SWT::MODELESS)
+        @list   = Swt::Widgets::List.new(@shell, Swt::SWT::V_SCROLL | Swt::SWT::SINGLE)
+        layout  = Swt::Layout::GridLayout.new(1, true)
+        layout.marginHeight    = 0
+        layout.marginWidth     = 0
+        layout.verticalSpacing = 0
+        @shell.setLayout(layout)
+        @list.set_layout_data(Swt::Layout::GridData.new(Swt::Layout::GridData::FILL_BOTH))
+        @key_listener = KeyListener.new(@model)
+        if @model.close_on_lost_focus
+          @focus_listener = FocusListener.new(@model)
+          @list.add_focus_listener(@focus_listener)
+        end
+        @list.add_key_listener(@key_listener)
+        @shell.pack
+        @shell.set_size DEFAULT_WIDTH, convert_to_pixels(DEFAULT_HEIGHT_IN_ROWS)
+        attach_listeners
+      end
+
+      def set_size(width,height)
+        @shell.set_size width, convert_to_pixels(height)
+      end
+
+      def convert_to_pixels(rows)
+        @list.get_item_height * rows
+      end
+
+      def set_location(offset)
+        x, y = Swt::GraphicsUtils.below_pixel_location_at_offset(offset)
+        @shell.set_location(x,y) if x and y
+      end
+
+      # Item at a particular index
+      def select(index)
+        items = @list.get_items
+        if items.size > index and index >= 0
+          item = items[index]
+          item = item[2,item.length] if item =~ /^(\d)\s.*/
+        end
+        item
+      end
+
+      # The currently selected value
+      def selection_value
+        @list.get_selection.first
+      end
+
+      # Zero-based selected index
+      def selection_index
+        @list.get_selection_index
+      end
+
+      # Close the dialog
+      def close
+        @list.remove_key_listener(@key_listener)
+        @list.remove_focus_listener(@focus_listener) if @focus_listener
+        @shell.dispose
+      end
+
+      # Open the dialog
+      def open
+        ApplicationSWT.register_shell(@shell)
+        @shell.open
+      end
+
+      # Update the list items
+      #
+      # @param [Array<String>] items
+      def update_list(items)
+        (0..9).each do |i|
+          items[i] = "#{i+1} #{items[i]}" if items.size > i
+        end
+        @list.set_items items
+      end
+
+      def attach_listeners
+        @model.add_listener(:open, &method(:open))
+        @model.add_listener(:close, &method(:close))
+        @model.add_listener(:set_location, &method(:set_location))
+        @model.add_listener(:set_size, &method(:set_size))
+        @model.add_listener(:update_list, &method(:update_list))
+      end
+
+      class KeyListener
+
+        def initialize(model)
+          @model = model
+        end
+
+        def key_pressed(e)
+          case e.keyCode
+          when Swt::SWT::CR, Swt::SWT::LF
+            index = @model.selection_index
+            @model.selected(index)
+          when Swt::SWT::ARROW_RIGHT
+            items = @model.next_list
+            @model.update_list(items) if items
+          when Swt::SWT::ARROW_LEFT
+            items = @model.previous_list
+            @model.update_list(items) if items
+          when Swt::SWT::ESC
+            @model.close
+          else
+            (0..9).each do |i|
+              if e.keyCode == Swt::SWT.const_get("KEYPAD_#{i}") or
+                e.keyCode == i + 48
+                @model.selected(i - 1)
+                break
+              end
+            end
+          end
+        end
+
+        def key_released(e)
+        end
+      end
+
+      class FocusListener
+        def initialize(model)
+          @model = model
+        end
+
+        def focus_gained(e)
+        end
+
+        def focus_lost(e)
+          @model.close
+        end
+      end
+    end
+  end
+end

data/plugins/application_swt/lib/application_swt/gradient.rb

@@ -0,0 +1,61 @@
+module Redcar
+  class ApplicationSWT
+    class Gradient
+      # Expects a hash with gradient color locations from 1-100 as keys
+      # and 6-character hex RGB strings as values
+      def initialize(color_stops_or_solid_color)
+        if color_stops_or_solid_color.is_a?(String)
+          color_stops = {100 => color_stops_or_solid_color}
+        else
+          color_stops = color_stops_or_solid_color
+        end
+          
+        raise ArgumentError, "Color stops must be in the range 0-100" if color_stops.any? { |position, color| (position < 0) || (position > 100) }
+        @color_stops = color_stops
+        make_start_and_end_stops_explicit!
+      end
+      
+      def to_hash
+        @color_stops
+      end
+  
+      def swt_stops
+        stops_with_implicit_zero = @color_stops.keys.sort - [0]
+        stops_with_implicit_zero.to_java(:int)
+      end
+  
+      def swt_colors
+        hex_rgb_strings = @color_stops.sort.map { |position, color| color }
+        swt_colors = hex_rgb_strings.map do |hex_rgb_string|
+          if hex_rgb_string =~ /^ (\W+)? ([0-9A-Fa-f]{3}{1,2}) (\W+)? $/x
+            hex_string = Regexp.last_match.captures[1]
+            if(hex_string.size == 3) # Shorthand
+              hex_string = hex_string.split('').map{ |hex_string| hex_string * 2 }.join('')
+            end
+            
+            color_components = hex_string.scan(/.{2}/)          
+            int_components = color_components.map { |component| component.to_i(16) }
+            Swt::Graphics::Color.new(ApplicationSWT.display, *int_components[0...3])
+            
+          elsif Swt::SWT.const_defined?(const_name = "COLOR_#{ hex_rgb_string.upcase }")
+            swt_const = Swt::SWT.const_get(const_name)
+            ApplicationSWT.display.get_system_color(swt_const)
+              
+          else
+            raise "Colors must be RGB hex strings or SWT color names"
+          end
+        end
+        
+        swt_colors.to_java(Swt::Graphics::Color)
+      end
+      
+      private
+
+      def make_start_and_end_stops_explicit!
+        @color_stops[0] ||= @color_stops[@color_stops.keys.min]
+        @color_stops[100] ||= @color_stops[@color_stops.keys.max]
+      end
+      
+    end
+  end
+end

data/plugins/application_swt/lib/application_swt/menu/binding_translator.rb

@@ -28,14 +28,14 @@ module Redcar
             value += " "[0]
           elsif key_string =~ /(F\d+)/
             value += Swt::SWT.const_get $1
-          elsif key_string =~ /(Right|Left|Up|Down)/
-            value += Swt::SWT.const_get 'ARROW_'+$1.upcase
-          elsif key_string =~ /Tab/
-            value += Swt::SWT::TAB
           elsif key_string =~ /Page Up$/
             value += Swt::SWT::PAGE_UP
           elsif key_string =~ /Page Down$/
             value += Swt::SWT::PAGE_DOWN
+          elsif key_string =~ /(Right|Left|Up|Down)/
+            value += Swt::SWT.const_get 'ARROW_'+$1.upcase
+          elsif key_string =~ /Tab/
+            value += Swt::SWT::TAB
           elsif key_string =~ /Home$/
             value += Swt::SWT::HOME
           elsif key_string =~ /End$/

data/plugins/application_swt/lib/application_swt/notebook.rb

@@ -80,14 +80,11 @@ module Redcar
       end
       
       def style_tab_folder
-        colors = [
-          Swt::Graphics::Color.new(ApplicationSWT.display, 230, 240, 255),
-          Swt::Graphics::Color.new(ApplicationSWT.display, 170, 199, 246),
-          Swt::Graphics::Color.new(ApplicationSWT.display, 135, 178, 247)
-        ].to_java(Swt::Graphics::Color)
-        percents = [60, 85].to_java(:int)
-        
-        @tab_folder.setSelectionBackground(colors, percents, true)
+        selected_tab_background = Redcar::ApplicationSWT.selected_tab_background
+        @tab_folder.set_selection_background(selected_tab_background.swt_colors, selected_tab_background.swt_stops, true)
+
+        unselected_tab_background = Redcar::ApplicationSWT.unselected_tab_background
+        @tab_folder.set_background(unselected_tab_background.swt_colors, unselected_tab_background.swt_stops, true)
       end
       
       def attach_model_listeners

data/plugins/application_swt/lib/application_swt/speedbar.rb

@@ -45,6 +45,7 @@ module Redcar
       end
 
       def num_columns
+        return @model.num_columns if @model.respond_to?(:num_columns)
         @model.__items.select {|i| !i.is_a?(Redcar::Speedbar::KeyItem) }.length
       end
 

data/plugins/application_swt/lib/application_swt/treebook.rb

@@ -38,13 +38,12 @@ module Redcar
 
       def create_tree_view
         @tab_folder = Swt::Widgets::VTabFolder.new(@window.tree_sash, Swt::SWT::NONE)
-        colors = [
-          Swt::Graphics::Color.new(ApplicationSWT.display, 230, 240, 255),
-          Swt::Graphics::Color.new(ApplicationSWT.display, 170, 199, 246),
-          Swt::Graphics::Color.new(ApplicationSWT.display, 135, 178, 247)
-        ]
-        percents = [60, 85]
-        @tab_folder.set_selection_background(colors, percents, true)
+
+        selected_tab_background = Redcar::ApplicationSWT.selected_tab_background
+        @tab_folder.set_selection_background(selected_tab_background.swt_colors, selected_tab_background.swt_stops, true)
+
+        unselected_tab_background = Redcar::ApplicationSWT.unselected_tab_background
+        @tab_folder.set_background(unselected_tab_background.swt_colors, unselected_tab_background.swt_stops, true)
 
         attach_view_listeners
 
@@ -71,4 +70,3 @@ module Redcar
     end
   end
 end
-

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

@@ -3,40 +3,40 @@ module Redcar
   class ApplicationSWT
     class Window
       attr_reader :shell, :window
-      
+
       SASH_WIDTH             = 5
       TREEBOOK_WIDTH         = 200
       MINIMUM_TREEBOOK_WIDTH = 0
       VISIBLE_TREEBOOK_WIDTH = 25
       TOOLBAR_HEIGHT         = 25
       @toolbar_height        = 30
-      
+
       class ShellListener
         include org.eclipse.swt.events.ShellListener
-        
+
         def initialize(controller)
           @win = controller.window
         end
-        
+
         def shell_closed(e)
           unless Redcar.app.events.ignore?(:window_close, @win)
             e.doit = false
             Redcar.app.events.create(:window_close, @win)
           end
         end
-        
+
         def shell_activated(e)
           unless Redcar.app.events.ignore?(:window_focus, @win)
             e.doit = false
             Redcar.app.events.create(:window_focus, @win)
           end
         end
-        
+
         def shell_deactivated(_); end
         def shell_deiconified(_); end
         def shell_iconified(_); end
       end
-      
+
       def initialize(window)
         @window = window
         @notebook_handlers = Hash.new {|h,k| h[k] = []}
@@ -49,7 +49,7 @@ module Redcar
         @treebook_unopened = true
         set_icon
       end
-      
+
       def add_listeners
         @window.add_listener(:show,          &method(:show))
         @window.add_listener(:refresh_menu,  &method(:refresh_menu))
@@ -65,7 +65,11 @@ module Redcar
         @window.add_listener(:focussed,      &method(:focussed))
         @window.add_listener(:speedbar_opened, &method(:speedbar_opened))
         @window.add_listener(:speedbar_closed, &method(:speedbar_closed))
-        
+        @window.add_listener(:enlarge_notebook, &method(:enlarge_notebook))
+        @window.add_listener(:reset_notebook_widths, &method(:reset_notebook_sash_widths))
+        @window.add_listener(:increase_treebook_width, &method(:increase_treebook_width))
+        @window.add_listener(:decrease_treebook_width, &method(:decrease_treebook_width))
+
         @window.add_listener(:toggle_trees_visible, &method(:toggle_sash_widths))
         @window.treebook.add_listener(:tree_added) do
           if @treebook_unopened or not @window.trees_visible?
@@ -79,38 +83,38 @@ module Redcar
             @treebook_unopened = false
           end
         end
-        
+
         @window.treebook.add_listener(:tree_removed) do
           reset_sash_widths
         end
         @shell.add_key_listener(KeyListener.new(self))
       end
-      
+
       def treebook_hidden?
         treebook_width <= VISIBLE_TREEBOOK_WIDTH
       end
-      
+
       def treebook_width
         @sash.layout_data.left.offset
       end
-      
+
       def default_treebook_width
         TREEBOOK_WIDTH + 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
         end
-        
+
         def key_pressed(key_event)
           p key_event
           if key_event.character == Swt::SWT::TAB
@@ -119,7 +123,7 @@ module Redcar
             p :esc_pressedwin
           end
         end
-        
+
         def verify_key(key_event)
           p :verkey
           if key_event.character == Swt::SWT::TAB
@@ -127,11 +131,11 @@ module Redcar
             key_event.doit = false
           end
         end
-        
+
         def key_released(key_event)
         end
       end
-      
+
       def create_treebook_controller
         treebook = @window.treebook
         controller = ApplicationSWT::Treebook.new(
@@ -139,19 +143,19 @@ module Redcar
         treebook)
         treebook.controller = controller
       end
-      
+
       def show
         @shell.open
         @shell.text = window.title
       end
-      
+
       def refresh_menu
         old_menu_bar = shell.menu_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)
@@ -163,11 +167,11 @@ module Redcar
         end
         reset_sash_height
       end
-      
+
       def set_icon
         shell.image = Icon.swt_image(icon_file)
       end
-      
+
       def icon_file
         if Redcar::VERSION =~ /dev$/
           :redcar_icon_beta_dev
@@ -175,7 +179,7 @@ module Redcar
           :redcar_icon_beta
         end
       end
-      
+
       def bring_to_front
         @shell.set_minimized(false) # unminimize, just in case
         @shell.redraw
@@ -186,34 +190,34 @@ module Redcar
         @shell.force_active # doesn't do anything, really
         @shell.set_active
       end
-      
+
       def popup_menu(menu)
         menu.controller = ApplicationSWT::Menu.new(self, menu, nil, Swt::SWT::POP_UP)
         menu.controller.show
       end
-      
+
       def popup_menu_with_numbers(menu)
         menu.controller = ApplicationSWT::Menu.new(self, menu, nil, Swt::SWT::POP_UP, :numbers => true)
         menu.controller.show
       end
-      
+
       def speedbar_opened(speedbar)
         speedbar.controller = ApplicationSWT::Speedbar.new(@window, right_composite, speedbar)
       end
-      
+
       def speedbar_closed(speedbar)
         speedbar.controller.close
       end
-      
+
       def title_changed(new_title)
         @shell.text = new_title
       end
-      
+
       def new_notebook(notebook_model)
         notebook_controller = ApplicationSWT::Notebook.new(notebook_model, @notebook_sash)
         reset_notebook_sash_widths
       end
-      
+
       def notebook_removed(notebook_model)
         notebook_controller = notebook_model.controller
         @notebook_handlers[notebook_model].each do |h|
@@ -222,32 +226,32 @@ module Redcar
         notebook_controller.dispose
         reset_notebook_sash_widths
       end
-      
+
       def notebook_orientation_changed(new_orientation)
         orientation = horizontal_vertical(new_orientation)
         @notebook_sash.setOrientation(orientation)
       end
-      
+
       def focussed(_)
         @shell.set_active
       end
-      
+
       def closed(_)
         @shell.close
         @menu_controller.close
         @toolbar_controller.close if @toolbar_controller
       end
-      
+
       def dispose
         @shell.dispose
         @menu_controller.close
         @toolbar_controller.close
       end
-      
+
       attr_reader :right_composite, :left_composite, :tree_composite, :tree_layout, :tree_sash
-      
+
       private
-      
+
       def create_shell
         @shell = Swt::Widgets::Shell.new(ApplicationSWT.display)
         @shell.layout = Swt::Layout::FormLayout.new
@@ -260,10 +264,10 @@ module Redcar
         end
         ApplicationSWT.register_shell(@shell)
       end
-      
+
       def create_sashes(window_model)
         orientation = horizontal_vertical(window_model.notebook_orientation)
-        
+
         @left_composite = Swt::Widgets::Composite.new(@shell, Swt::SWT::NONE)
         @left_composite.layout = Swt::Layout::GridLayout.new(1, false).tap do |l|
           l.verticalSpacing = 0
@@ -271,9 +275,9 @@ module Redcar
           l.horizontalSpacing = 0
           l.marginWidth = 0
         end
-        
+
         @sash = Swt::Widgets::Sash.new(@shell, Swt::SWT::VERTICAL)
-        
+
         @right_composite = Swt::Widgets::Composite.new(@shell, Swt::SWT::NONE)
         @right_composite.layout = Swt::Layout::GridLayout.new(1, false).tap do |l|
           l.verticalSpacing = 0
@@ -281,13 +285,13 @@ module Redcar
           l.horizontalSpacing = 0
           l.marginWidth = 0
         end
-        
+
         @sash.layout_data = Swt::Layout::FormData.new.tap do |d|
           d.left = Swt::Layout::FormAttachment.new(0, 0)
           d.top =  Swt::Layout::FormAttachment.new(0, 5 + TOOLBAR_HEIGHT)
           d.bottom = Swt::Layout::FormAttachment.new(100, 0)
         end
-        
+
         @sash.add_selection_listener do |e|
           sash_rect = @sash.bounds
           shell_rect = @shell.client_area
@@ -302,31 +306,31 @@ module Redcar
             @shell.layout
           end
         end
-        
+
         @left_composite.layout_data = Swt::Layout::FormData.new.tap do |l|
           l.left = Swt::Layout::FormAttachment.new(0, 5)
           l.right = Swt::Layout::FormAttachment.new(@sash, 0)
           l.top = Swt::Layout::FormAttachment.new(0, 5 + TOOLBAR_HEIGHT)
           l.bottom = Swt::Layout::FormAttachment.new(100, -5)
         end
-        
+
         @right_composite.layout_data = Swt::Layout::FormData.new.tap do |d|
           d.left = Swt::Layout::FormAttachment.new(@sash, 0)
           d.right = Swt::Layout::FormAttachment.new(100, -5)
           d.top = Swt::Layout::FormAttachment.new(0, 5 + TOOLBAR_HEIGHT)
           d.bottom = Swt::Layout::FormAttachment.new(100, -5)
         end
-        
+
         @tree_sash = Swt::Custom::SashForm.new(@left_composite, orientation)
         grid_data = Swt::Layout::GridData.new(Swt::Layout::GridData::FILL_BOTH)
         @tree_sash.layout_data = grid_data
-        
+
         @notebook_sash = Swt::Custom::SashForm.new(@right_composite, orientation)
         grid_data = Swt::Layout::GridData.new(Swt::Layout::GridData::FILL_BOTH)
         @notebook_sash.layout_data = grid_data
         @notebook_sash.sash_width = SASH_WIDTH
       end
-      
+
       def horizontal_vertical(symbol)
         case symbol
         when :horizontal
@@ -335,7 +339,7 @@ module Redcar
           Swt::SWT::VERTICAL
         end
       end
-      
+
       def reset_sash_widths
         @treebook_unopened = !@window.treebook.trees.any?
         width = 0
@@ -348,7 +352,7 @@ module Redcar
         end
         set_sash_widths(width)
       end
-      
+
       def toggle_sash_widths
         if treebook_hidden?
           reset_sash_widths
@@ -357,18 +361,42 @@ module Redcar
           set_sash_widths(MINIMUM_TREEBOOK_WIDTH)
         end
       end
-      
+
+      def decrease_treebook_width
+        width = treebook_width
+        unless width < MINIMUM_TREEBOOK_WIDTH + SASH_WIDTH
+          set_sash_widths(width-SASH_WIDTH)
+        end
+      end
+
+      def increase_treebook_width
+        set_sash_widths(treebook_width+SASH_WIDTH)
+      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 enlarge_notebook(index=0)
+        if @window.notebooks.length > 1
+          widths = @notebook_sash.getWeights
+          small = index == 0 ? 1 : 0
+          total = widths[index] + widths[small]
+          unless widths[index]/total > 0.95
+            widths[small] = widths[small].to_i - SASH_WIDTH
+            widths[index] = widths[index].to_i + SASH_WIDTH
+            @notebook_sash.setWeights(widths.to_a.to_java(:int))
+          end
+        end
+      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)
@@ -376,7 +404,7 @@ module Redcar
         @shell.layout
         @shell.redraw
       end
-      
+
     end
   end
 end