redcar 0.8.1 → 0.9.0

data/plugins/application/plugin.rb

@@ -1,7 +1,7 @@
 
 Plugin.define do
   name    "application"
-  version "1.1"
+  version "1.2"
   file    "lib", "application"
   object  "Redcar::Application"
   dependencies "core", ">0"

data/plugins/application_swt/lib/application_swt/dialog_adapter.rb

@@ -89,8 +89,8 @@ module Redcar
       def tool_tip(message, location)
         tool_tip = Swt::Widgets::ToolTip.new(parent_shell, Swt::SWT::ICON_INFORMATION)
         tool_tip.set_message(message)
-        tool_tip.set_visible(true)
         tool_tip.set_location(*get_coordinates(location))
+        tool_tip.set_visible(true)
       end
       
       def popup_menu(menu, location)
@@ -125,8 +125,8 @@ module Redcar
         dialog = Swt::Widgets::FileDialog.new(parent_shell, type)
         dialog.setText("Save File");
         if options[:filter_path]
-	  dialog.setText("Save File As") if type == Swt::SWT::SAVE
-	  dialog.setText("Open File") if type == Swt::SWT::OPEN
+          dialog.setText("Save File As") if type == Swt::SWT::SAVE
+          dialog.setText("Open File") if type == Swt::SWT::OPEN
           dialog.set_filter_path(options[:filter_path])
         end
         Redcar.app.protect_application_focus do
@@ -136,7 +136,7 @@ module Redcar
       
       def directory_dialog(options)
         dialog = Swt::Widgets::DirectoryDialog.new(parent_shell)
-	dialog.setText("Open Directory")
+        dialog.setText("Open Directory")
         if options[:filter_path]
           dialog.set_filter_path(options[:filter_path])
         end

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

@@ -110,6 +110,7 @@ module Redcar
         
         def widgetSelected(e)
           @controller.text_focus
+          @controller.widget_selected
         end
       end
       
@@ -153,6 +154,12 @@ module Redcar
         end
       end
       
+      def widget_selected
+        if @model.step?
+          @model.moved_to(@dialog.list.get_selection.first, @dialog.list.get_selection_index)
+        end
+      end
+
       def text_focus
         @dialog.text.set_focus
       end
@@ -187,15 +194,19 @@ module Redcar
       end
       
       def move_down
-        curr_ix = @dialog.list.get_selection_index
-        new_ix = [curr_ix + 1, @dialog.list.get_item_count - 1].min
-        @dialog.list.set_selection(new_ix)
+        move_selection(1, @dialog.list.get_item_count - 1)
       end
       
       def move_up
+        move_selection(-1, 0)
+      end
+
+      def move_selection(step, border)
         curr_ix = @dialog.list.get_selection_index
-        new_ix = [curr_ix - 1, 0].max
+        new_ix = curr_ix + step
+        new_ix = border if (new_ix <=> border) == step
         @dialog.list.set_selection(new_ix)
+        widget_selected
       end
       
       private

data/plugins/application_swt/lib/application_swt/icon.rb

@@ -9,7 +9,7 @@ module Redcar
         when :file
           file_image
         when Symbol
-          image(File.expand_path(File.join(Redcar::ICONS_DIRECTORY, icon.to_s + ".png")))
+          image(File.expand_path(File.join(Redcar::ICONS_DIRECTORY, icon.to_s.gsub(/_/, "-") + ".png")))
         when String
           image(icon)
         end
@@ -24,13 +24,11 @@ module Redcar
       end
       
       def self.dir_image
-        path = File.join(Redcar.root, %w(plugins application icons darwin-folder.png))
-        image(path)
+        swt_image(:darwin_folder)
       end
       
       def self.file_image
-        path = File.join(Redcar.root, %w(plugins application icons darwin-file.png))
-        image(path)
+        swt_image(:darwin_file)
       end
     end
   end

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

@@ -8,9 +8,9 @@ module Redcar
         # A TabPaintListener allows clients to draw 
         # indicators next to a tab in the tab folder
         class TabPaintListener
-          include org.eclipse.swt.events.PaintListener    
+          include org.eclipse.swt.events.PaintListener
           attr_writer :item, :indicate_front
-      
+
           def paintControl(event)
             event.gc.background = ApplicationSWT.display.system_color Swt::SWT::COLOR_DARK_GRAY
             if @item && @item.bounds
@@ -100,10 +100,10 @@ module Redcar
           tab_controller.move_tab_widget_to_position(position)
         end
         
-        # Find the CTabItem targeted by a given event        
+        # Find the CTabItem targeted by a given event
         def event_to_tab_widget(event)
           if tab_folder.item_count > 0
-            tab_folder.item(tab_folder.to_control(event.x, event.y)) or 
+            tab_folder.item(tab_folder.to_control(event.x, event.y)) or
             tab_folder.items[tab_folder.item_count - 1]
           end
         end

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

@@ -4,22 +4,22 @@ module Redcar
       class TabTransfer < Swt::DND::ByteArrayTransfer
         
         class TabType
-          # Empty class for now, until we figure out which 
+          # Empty class for now, until we figure out which
           # information we want to attach to the transfer.
           # This _will_ be needed to DnD tabs between windows
         end
-      	
+        
         TAB_TYPE = "TabType"
         TAB_TYPE_ID = register_type(TAB_TYPE)
         @@instance = nil
-       
+        
         def self.get_instance
           @@instance || TabTransfer.new
         end
         
         def javaToNative(types, transfer_data)
           return if (types.nil? || types.empty? || (types.first.class != TabType))
-   
+          
           begin
             # write data to a byte array and then ask super to convert to
             out = java.io.ByteArrayOutputStream.new
@@ -40,7 +40,7 @@ module Redcar
           if (is_supported_type(transfer_data))
             buffer = super
             return nil unless buffer
-       		
+            
             data = []
             begin
               input = java.io.ByteArrayInputStream.new(buffer)

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

@@ -1,10 +1,17 @@
+require 'application_swt/speedbar/button_item'
+require 'application_swt/speedbar/combo_item'
+require 'application_swt/speedbar/label_item'
+require 'application_swt/speedbar/slider_item'
+require 'application_swt/speedbar/text_box_item'
+require 'application_swt/speedbar/toggle_item'
+
 module Redcar
   class ApplicationSWT
     class Speedbar
       include Redcar::ReentryHelpers
-      
+
       attr_reader :widget
-      
+
       def initialize(window, parent, model)
         @window_model = window
         @parent = parent
@@ -19,12 +26,12 @@ module Redcar
         @parent.layout
         @model.after_draw if @model.respond_to?(:after_draw)
       end
-      
+
       def close
         @composite.dispose
         @parent.layout
       end
-      
+
       def disable_menu_items
         key_strings = []
         @model.__items.each do |i|
@@ -36,34 +43,34 @@ module Redcar
           ApplicationSWT::Menu.disable_items(key_string)
         end
       end
-      
+
       def num_columns
         @model.__items.select {|i| !i.is_a?(Redcar::Speedbar::KeyItem) }.length
       end
-      
+
       def key_items
         @model.__items.select {|i| i.respond_to?(:key) and i.key }
       end
-      
+
       def keyable_widgets
         @keyable_widgets ||= []
       end
-      
+
       def focussable_widgets
         @focussable_widgets ||= []
       end
-      
+
       def create_widgets
         create_bar_widget
         create_item_widgets
       end
-      
+
       def create_bar_widget
         @composite = Swt::Widgets::Composite.new(@parent, Swt::SWT::NONE)
         grid_data = Swt::Layout::GridData.new
         grid_data.grabExcessHorizontalSpace = true
         grid_data.horizontalAlignment = Swt::Layout::GridData::FILL
-      	@composite.setLayoutData(grid_data)
+        @composite.setLayoutData(grid_data)
         layout = Swt::Layout::GridLayout.new(num_columns + 1, false)
         layout.verticalSpacing = 0
         layout.marginHeight = 0
@@ -75,7 +82,7 @@ module Redcar
 
         label.add_mouse_listener(MouseListener.new(self))
       end
-      
+
       def execute_listener_in_model(item, *args)
         if item.listener
           begin
@@ -85,144 +92,51 @@ module Redcar
           end
         end
       end
-      
+
       def create_item_widgets
         @model.__items.each do |item|
-          case item
-          when Redcar::Speedbar::LabelItem
-            label = Swt::Widgets::Label.new(@composite, 0)
-            label.set_text(item.text)
-            item.add_listener(:changed_text) do |new_text|
-              label.set_text(item.text)
-            end
-          when Redcar::Speedbar::TextBoxItem
-            edit_view = EditView.new
-            item.edit_view = edit_view
-            edit_view_swt = EditViewSWT.new(edit_view, @composite, :single_line => true)
-            mate_text = edit_view_swt.mate_text
-            mate_text.set_font(EditView.font, EditView.font_size)
-            mate_text.getControl.set_text(item.value)
-            mate_text.set_grammar_by_name "Ruby"
-            mate_text.set_theme_by_name(EditView.theme)
-            mate_text.set_root_scope_by_content_name("Ruby", "string.regexp.classic.ruby")
-            gridData = Swt::Layout::GridData.new
-            gridData.grabExcessHorizontalSpace = true
-            gridData.horizontalAlignment = Swt::Layout::GridData::FILL
-            mate_text.getControl.set_layout_data(gridData)
-            edit_view.document.add_listener(:changed) do
-              ignore(item.name) do
-                item.value = edit_view.document.to_s
-                execute_listener_in_model(item, item.value)
-              end
-            end
-            item.add_listener(:changed_value) do |new_value|
-              ignore(item.name) do
-                mate_text.getControl.set_text(new_value)
-              end
-            end
-            keyable_widgets << mate_text.getControl
-            focussable_widgets << mate_text.getControl
-          when Redcar::Speedbar::ButtonItem
-            button = Swt::Widgets::Button.new(@composite, 0)
-            button.set_text(item.text)
-            button.add_selection_listener do
-              execute_listener_in_model(item)
-            end
-            item.add_listener(:changed_text) do |new_text|
-              button.set_text(item.text)
-            end
-            keyable_widgets << button
-            focussable_widgets << button
-          when Redcar::Speedbar::ComboItem
-            combo = Swt::Widgets::Combo.new(@composite, Swt::SWT::READ_ONLY)
-            combo.items = item.items.to_java(:string)
-            if item.value
-              combo.select(item.items.index(item.value))
-            end
-            combo.add_selection_listener do
-              ignore(item.name) do
-                item.value = combo.text
-                execute_listener_in_model(item, item.value)
-              end
-            end
-            item.add_listener(:changed_items) do |new_items|
-              rescue_speedbar_errors do
-                ignore(item.name) do
-                  combo.items = item.items.to_java(:string)
-                  item.value = nil
-                end
-              end
-            end
-            item.add_listener(:changed_value) do |new_value|
-              rescue_speedbar_errors do
-                ignore(item.name) do
-                  combo.select(item.items.index(item.value))
-                end
-              end
-            end
-            keyable_widgets    << combo
-            focussable_widgets << combo
-          when Redcar::Speedbar::ToggleItem
-            button = Swt::Widgets::Button.new(@composite, Swt::SWT::CHECK)
-            button.set_text(item.text)
-            button.set_selection(!!item.value)
-            button.add_selection_listener do
-              item.value = button.get_selection
-              execute_listener_in_model(item, item.value)
-            end
-            item.add_listener(:changed_text) do |new_text|
-              rescue_speedbar_errors do
-                button.set_text = new_text
-              end
-            end
-            item.add_listener(:changed_value) do |new_value|
-              rescue_speedbar_errors do
-                button.set_selection(!!new_value)
-              end
-            end
-            keyable_widgets    << button
-            focussable_widgets << button
-          end
+          swt_klass = self.class.const_get(item.class.to_s.split("::").last)
+          swt_klass.new(self, @composite, item)
         end
       end
-      
+
       class KeyListener
         def initialize(speedbar)
           @speedbar = speedbar
         end
-        
+
         def key_pressed(e)
           @speedbar.key_press(e)
         end
-        
+
         def key_released(e)
         end
       end
-      
+
       class MouseListener
         def initialize(speedbar)
           @speedbar = speedbar
         end
-        
+
         def mouse_down(*_); end
-        
+
         def mouse_up(*_)
           @speedbar.close_pressed
         end
-        
+
         def mouse_double_click(*_); end
       end
-      
+
       def attach_key_listeners
         keyable_widgets.each do |widget|
           widget.add_key_listener(KeyListener.new(self))
         end
       end
-      
+
       def close_pressed
         @window_model.close_speedbar
       end
-      
+
       def key_press(e)
         return if Application::Dialog.in_dialog?
         key_string = Menu::BindingTranslator.key_string(e)
@@ -241,7 +155,7 @@ module Redcar
           end
         end
       end
-      
+
       def rescue_speedbar_errors
         begin
           yield
@@ -255,7 +169,7 @@ module Redcar
           end
         end
       end
-      
+
       def error_in_listener(e)
         if e.class.name == "TestingError"
           raise e

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

@@ -0,0 +1,20 @@
+module Redcar
+  class ApplicationSWT
+    class Speedbar
+      class ButtonItem
+        def initialize(speedbar, composite, item)
+          button = Swt::Widgets::Button.new(composite, 0)
+          button.set_text(item.text)
+          button.add_selection_listener do
+            speedbar.execute_listener_in_model(item)
+          end
+          item.add_listener(:changed_text) do |new_text|
+            button.set_text(item.text)
+          end
+          speedbar.keyable_widgets << button
+          speedbar.focussable_widgets << button
+        end
+      end
+    end
+  end
+end