redcar 0.3.2dev → 0.3.3

data/plugins/application_swt/lib/application_swt/html_tab.rb

@@ -10,6 +10,7 @@ module Redcar
       end
       
       def create_tab_widget
+        Swt::Graphics::Device.DEBUG = true
         @browser = Swt::Browser.new(notebook.tab_folder, Swt::SWT::NONE)
         @widget = @browser
         @item.control = @widget

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

@@ -15,11 +15,12 @@ module Redcar
         [Swt::SWT::BAR, Swt::SWT::POP_UP]
       end
       
-      def initialize(window, menu_model, type)
+      def initialize(window, menu_model, keymap, type)
         unless Menu.menu_types.include?(type)
           raise "type should be in #{Menu.menu_types.inspect}"
         end
         @window = window
+        @keymap = keymap
         @menu_bar = Swt::Widgets::Menu.new(window.shell, type)
         return unless menu_model
         @handlers = []
@@ -31,7 +32,7 @@ module Redcar
       end
       
       def close
-        @handlers.each {|obj, h| obj.remove_listener(h)}
+        @handlers.each {|obj, h| obj.remove_listener(h) }
         @menu_bar.dispose
         @result
       end
@@ -67,7 +68,7 @@ module Redcar
       end
       
       def connect_command_to_item(item, entry)
-        if key_specifier = entry.command.get_key
+        if key_specifier = @keymap.command_to_key(entry.command)
           if key_string    = BindingTranslator.platform_key_string(key_specifier)
             item.text = entry.text + "\t" + key_string
             item.set_accelerator(BindingTranslator.key(key_string))

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

@@ -26,12 +26,16 @@ module Redcar
             value += Swt::SWT::ESC
           elsif key_string =~ /Space$/
             value += " "[0]
+          elsif key_string =~ /Page Up$/
+            value += Swt::SWT::PAGE_UP
+          elsif key_string =~ /Page Down$/
+            value += Swt::SWT::PAGE_DOWN
           else
             value += key_string[-1]
           end
         end
         
-        def self.key_string(key_event)
+        def self.modifiers(key_event)
           modifiers = []
           modifier_values.each do |string, constant|
             if (key_event.stateMask & constant) != 0
@@ -39,6 +43,10 @@ module Redcar
             end
           end
           modifiers = modifiers.sort_by {|m| MODIFIERS.index(m) }
+        end
+        
+        def self.key_string(key_event)
+          modifiers = modifiers(key_event)
           if key_event.character == 0
             modifiers.join("+")
           else
@@ -64,9 +72,9 @@ module Redcar
         
         def self.modifier_values
           {
-            "Cmd" => Swt::SWT::COMMAND,
-            "Ctrl" => Swt::SWT::CTRL,
-            "Alt" => Swt::SWT::ALT,
+            "Cmd"   => Swt::SWT::COMMAND,
+            "Ctrl"  => Swt::SWT::CTRL,
+            "Alt"   => Swt::SWT::ALT,
             "Shift" => Swt::SWT::SHIFT,
           }
         end

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

@@ -1,6 +1,8 @@
 module Redcar
   class ApplicationSWT
     class Speedbar
+      include Redcar::ReentryHelpers
+      
       attr_reader :widget
       
       def initialize(window, parent, model)
@@ -13,6 +15,9 @@ module Redcar
         if widget = focussable_widgets.first
           widget.set_focus
         end
+        @handlers = Hash.new {|h,k| h[k] = []}
+        @parent.layout
+        @model.after_draw if @model.respond_to?(:after_draw)
       end
       
       def close
@@ -37,7 +42,7 @@ module Redcar
       end
       
       def key_items
-        @model.__items.select {|i| i.respond_to?(:key) }
+        @model.__items.select {|i| i.respond_to?(:key) and i.key }
       end
       
       def keyable_widgets
@@ -49,6 +54,11 @@ module Redcar
       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
@@ -57,69 +67,135 @@ module Redcar
         layout = Swt::Layout::GridLayout.new(num_columns + 1, false)
         layout.verticalSpacing = 0
         layout.marginHeight = 0
+        layout.marginTop = 5
         @composite.setLayout(layout)
         image = Swt::Graphics::Image.new(ApplicationSWT.display, Redcar::Speedbar.close_image_path)
         label = Swt::Widgets::Label.new(@composite, 0)
         label.set_image(image)
 	
 	    label.add_mouse_listener(MouseListener.new(self))
-	
+	  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
-            textbox = Swt::Widgets::Text.new(@composite, Swt::SWT::BORDER)
-            textbox.set_text(item.value)
+            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
-            textbox.set_layout_data(gridData)
-            textbox.add_modify_listener do
-              item.value = textbox.get_text
-              if item.listener
-                begin
-                  @model.__context.instance_exec(item.value, &item.listener)
-                rescue => err
-                  error_in_listener(err)
+            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
+                if item.listener
+                  begin
+                    @model.instance_exec(item.value, &item.listener)
+                  rescue => err
+                    error_in_listener(err)
+                  end
                 end
               end
             end
-            keyable_widgets << textbox
-            focussable_widgets << textbox
+            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)
             if item.listener
               button.add_selection_listener do
                 begin
-                  @model.__context.instance_exec(&item.listener)
+                  @model.instance_exec(&item.listener)
                 rescue => err
                   error_in_listener(err)
                 end
               end
             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
+                if item.listener
+                  rescue_speedbar_errors do
+                    @model.instance_exec(item.value, &item.listener)
+                  end
+                end
+              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
               if item.listener
                 begin
-                  @model.__context.instance_exec(item.value, &item.listener)
+                  @model.instance_exec(item.value, &item.listener)
                 rescue => err
                   error_in_listener(err)
                 end
               end
             end
-            keyable_widgets << button
+            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
         end
-        @parent.layout
       end
       
       class KeyListener
@@ -169,7 +245,7 @@ module Redcar
           if Menu::BindingTranslator.matches?(key_string, key_item.key)
             e.doit = false
             begin
-              @model.__context.instance_exec(&key_item.listener)
+              @model.instance_exec(&key_item.listener)
             rescue Object => err
               error_in_listener(err)
             end
@@ -177,6 +253,16 @@ module Redcar
         end
       end
       
+      def rescue_speedbar_errors
+        begin
+          yield
+        rescue Object => e
+          puts "*** Error in speedbar"
+          puts e.class.to_s + ": " + e.message
+          puts e.backtrace
+        end
+      end
+      
       def error_in_listener(e)
         puts "*** Error in speedbar listener: #{e.message}"
         puts e.backtrace.map {|l| "    " + l}

data/plugins/application_swt/lib/application_swt/swt_wrapper.rb

@@ -67,6 +67,7 @@ module Swt
     import org.eclipse.swt.custom.SashForm
     import org.eclipse.swt.custom.StackLayout
     import org.eclipse.swt.custom.ST
+    import org.eclipse.swt.custom.StyledText
   end
   
   module DND
@@ -85,6 +86,7 @@ module Swt
   
   module Graphics
     import org.eclipse.swt.graphics.Color
+    import org.eclipse.swt.graphics.Device
     import org.eclipse.swt.graphics.Font
     import org.eclipse.swt.graphics.GC
     import org.eclipse.swt.graphics.Image

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

@@ -5,23 +5,23 @@ module Redcar
       attr_reader :shell, :window, :shell_listener
       
       class ShellListener
-        include ListenerHelpers
+        include ReentryHelpers
         
         def initialize(controller)
           @controller = controller
         end
         
         def shell_closed(e)
-          ignore_within_self do
+          @controller.window.close
+          @controller.window.ignore(:closing) do
             e.doit = false
-            @controller.swt_event_closed
           end
         end
 
         def shell_activated(e)
-          ignore_within_self do
+          @controller.window.focus
+          @controller.window.ignore(:focussing) do
             e.doit = false
-            @controller.swt_event_activated
           end
         end
         
@@ -40,11 +40,12 @@ module Redcar
         create_treebook_controller
         reset_sash_widths
         @treebook_unopened = true
+        set_icon File.join(Redcar.root, %w(plugins application icons redcar_icon_beta.png))
       end
       
       def add_listeners
         @window.add_listener(:show,          &method(:show))
-        @window.add_listener(:menu_changed,  &method(:menu_changed))
+        @window.add_listener(:refresh_menu,  &method(:refresh_menu))
         @window.add_listener(:popup_menu,    &method(:popup_menu))
         @window.add_listener(:title_changed, &method(:title_changed))
         @window.add_listener(:new_notebook,  &method(:new_notebook))
@@ -66,8 +67,35 @@ module Redcar
         @window.treebook.add_listener(:tree_removed) do
           reset_sash_widths
         end
+        @shell.add_key_listener(KeyListener.new(self))
       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
+        p :tab_pressedwin
+        elsif key_event.character == Swt::SWT::ESC
+        p :esc_pressedwin
+        end
+      end
+      
+      def verify_key(key_event)
+      p :verkey
+        if key_event.character == Swt::SWT::TAB
+        p :tab_pressed
+        key_event.doit = false
+        end
+      end
+      
+      def key_released(key_event)
+      end
+    end
+    
       def create_treebook_controller
         treebook = @window.treebook
         controller = ApplicationSWT::Treebook.new(
@@ -82,13 +110,24 @@ module Redcar
         @shell.text = window.title
       end
       
-      def menu_changed(menu)
-        @menu_controller = ApplicationSWT::Menu.new(self, menu, Swt::SWT::BAR)
+      def refresh_menu
+        @menu_controller = ApplicationSWT::Menu.new(self, @window.menu, @window.keymap, Swt::SWT::BAR)
         shell.menu_bar = @menu_controller.menu_bar
       end
       
+      def set_icon(path)
+         icon = Swt::Graphics::Image.new(ApplicationSWT.display, path)
+         shell.image = icon
+       end
+
+      def bring_to_front
+        @shell.set_minimized(false)
+        @shell.force_active
+        @shell.set_minimized(false)
+      end        
+      
       def popup_menu(menu)
-        menu.controller = ApplicationSWT::Menu.new(self, menu, Swt::SWT::POP_UP)
+        menu.controller = ApplicationSWT::Menu.new(self, menu, nil, Swt::SWT::POP_UP)
         menu.controller.show
       end
       
@@ -137,14 +176,6 @@ module Redcar
         @menu_controller.close
       end
         
-      def swt_event_closed
-        @window.close
-      end
-        
-      def swt_event_activated
-        @window.focus
-      end
-      
       private
       
       SASH_WIDTH = 5
@@ -180,11 +211,12 @@ module Redcar
       	@right_composite.setLayout(@grid_layout)
       	
         @notebook_sash     = Swt::Custom::SashForm.new(@right_composite, orientation)
-        grid_data = Swt::Layout::GridData.new
-        grid_data.grabExcessHorizontalSpace = true
-        grid_data.horizontalAlignment = Swt::Layout::GridData::FILL
-        grid_data.grabExcessVerticalSpace = true
-        grid_data.verticalAlignment = Swt::Layout::GridData::FILL
+        #grid_data = Swt::Layout::GridData.new
+        #grid_data.grabExcessHorizontalSpace = true
+        #grid_data.horizontalAlignment = Swt::Layout::GridData::FILL
+        #grid_data.grabExcessVerticalSpace = true
+        #grid_data.verticalAlignment = Swt::Layout::GridData::FILL
+        grid_data = Swt::Layout::GridData.new(Swt::Layout::GridData::FILL_BOTH)
       	@notebook_sash.setLayoutData(grid_data)
       	@notebook_sash.setSashWidth(SASH_WIDTH)
       end
@@ -215,7 +247,7 @@ module Redcar
         width = (100/@window.notebooks.length).to_i
         widths = [width]*@window.notebooks.length
       	@notebook_sash.setWeights(widths.to_java(:int))
-    	end
+      end
     end
   end
 end