redcar 0.5.2dev → 0.5.3dev

data/plugins/application/lib/application/window.rb

@@ -148,12 +148,16 @@ module Redcar
       focussed_notebook.new_tab(*args, &block)
     end
     
-    attr_reader :menu, :keymap
+    attr_reader :menu, :toolbar, :keymap
 
     def menu=(menu)
       @menu = menu
     end
 
+    def toolbar=(toolbar)
+      @toolbar = toolbar
+    end
+
     def keymap=(keymap)
       @keymap = keymap
     end
@@ -170,6 +174,10 @@ module Redcar
       notify_listeners(:refresh_menu)
     end
     
+    def refresh_toolbar
+      notify_listeners(:refresh_toolbar)
+    end
+    
     # Focus the Window.
     def focus
       Redcar.app.events.ignore(:window_focus, self) do

data/plugins/application/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 $:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 require 'redcar'
 Redcar.environment = :test
-Redcar.load
+Redcar.load_unthreaded
 Dir[File.dirname(__FILE__) + "/application/controllers/*.rb"].each do |fn|
   require fn
 end

data/plugins/application_swt/lib/application_swt.rb

@@ -1,48 +1,43 @@
 
 SWT_APP_NAME = "Redcar"
 
-require "application_swt/swt_wrapper"
-require "application_swt/swt/listener_helpers"
 require "application_swt/tab"
 
 require "application_swt/clipboard"
-require "application_swt/cucumber_runner"
 require "application_swt/dialog_adapter"
 require "application_swt/dialogs/no_buttons_dialog"
 require "application_swt/dialogs/filter_list_dialog_controller"
-require "application_swt/event_loop"
 require "application_swt/html_tab"
 require "application_swt/menu"
 require "application_swt/menu/binding_translator"
+require "application_swt/toolbar"
+require "application_swt/toolbar/binding_translator"
 require "application_swt/notebook"
 require "application_swt/notebook/tab_transfer"
 require "application_swt/notebook/tab_drag_and_drop_listener"
 require "application_swt/speedbar"
 require "application_swt/treebook"
 require "application_swt/window"
-require "application_swt/swt/grid_data"
 
 require "application_swt-#{Redcar::VERSION}"
 
 module Redcar
   class ApplicationSWT
     include Redcar::Controller
-    
+        
     def self.display
       @display ||= Swt.display 
     end
 
     def self.start
-      Swt::Widgets::Display.app_name = Redcar::Application::NAME
-      @gui = Redcar::Gui.new("swt")
-      @gui.register_event_loop(EventLoop.new)
-      @gui.register_features_runner(CucumberRunner.new)
-      @gui.register_controllers(
-          Redcar::Tab              => ApplicationSWT::Tab,
-          Redcar::HtmlTab          => ApplicationSWT::HtmlTab,
-          Redcar::FilterListDialog => ApplicationSWT::FilterListDialogController
-        )
-      @gui.register_dialog_adapter(ApplicationSWT::DialogAdapter.new)
+      if Redcar.gui
+        Redcar.gui.register_controllers(
+            Redcar::Tab              => ApplicationSWT::Tab,
+            Redcar::HtmlTab          => ApplicationSWT::HtmlTab,
+            Redcar::FilterListDialog => ApplicationSWT::FilterListDialogController
+          )
+        Redcar.gui.register_dialog_adapter(ApplicationSWT::DialogAdapter.new)
+      end
     end
     
     def self.add_debug_key_filters
@@ -55,35 +50,12 @@ module Redcar
     end
     
     def self.gui
-      @gui
-    end
-    
-    # Runs the given block in the SWT Event thread
-    def self.sync_exec(&block)
-      runnable = Swt::RRunnable.new do
-        begin
-          block.call
-        rescue => e
-          puts "error in sync exec"
-          puts e.message
-          puts e.backtrace
-        end
-      end
-      unless Redcar::ApplicationSWT.display.is_disposed
-        Redcar::ApplicationSWT.display.syncExec(runnable)
-      end
+      Redcar.gui
     end
     
-    # Runs the given block in the SWT Event thread after
-    # the given number of milliseconds
-    def self.timer_exec(ms, &block)
-      runnable = Swt::RRunnable.new(&block)
-      Redcar::ApplicationSWT.display.timerExec(ms, runnable)
-    end
-
     class ShellListener
       def shell_deactivated(_)
-        ApplicationSWT.timer_exec(100) do
+        Swt.timer_exec(100) do
           unless Swt::Widgets::Display.get_current.get_active_shell
             Redcar.app.lost_application_focus
           end
@@ -154,8 +126,18 @@ module Redcar
       end
     end
 
+    def refresh_toolbar
+      if Redcar.platform == :osx
+        #old_toolbar_bar = @fake_shell.toolbar_bar
+        fake_toolbar_controller = ApplicationSWT::ToolBar.new(FakeWindow.new(@fake_shell), Redcar.app.main_toolbar, Swt::SWT::FLAT)
+        #fake_shell.toolbar_bar = fake_toolbar_controller.toolbar_bar
+        #old_toolbar_bar.dispose if old_toolbar_bar
+      end
+    end
+
     def add_listeners
       @model.add_listener(:new_window, &method(:new_window))
+      @model.add_listener(:refresh_menu, &method(:refresh_menu))
     end
     
     class Listener

data/plugins/application_swt/lib/application_swt/toolbar.rb

@@ -0,0 +1,134 @@
+module Redcar
+  class ApplicationSWT
+    class ToolBar
+
+      
+      FILE_DIR = File.join(Redcar.root, %w(share icons))
+      DEFAULT_ICON = File.join(Redcar.root, %w(share icons document.png))
+
+      def self.icons
+        @icons = {
+          :new => File.join(FILE_DIR, "document-text.png"),
+          :open => File.join(FILE_DIR, "folder-open-document.png"),
+          :save => File.join(FILE_DIR, "document-import.png"),
+          #:save_as => File.join(FILE_DIR, "save_as.png"),
+          #:save_all => File.join(FILE_DIR, "save_all.png"),
+          :undo => File.join(FILE_DIR, "arrow-circle-225-left.png"),
+          :redo => File.join(FILE_DIR, "arrow-circle-315.png"),
+          :search => File.join(FILE_DIR, "binocular.png")
+        }
+      end
+
+
+      def self.types
+        @types = { :check => Swt::SWT::CHECK, :radio => Swt::SWT::RADIO }
+      end
+
+      def self.items
+        @items ||= Hash.new {|h,k| h[k] = []}
+      end
+
+      def self.disable_items(key_string)
+        items[key_string].each {|i| p i.text; i.enabled = false}
+      end
+
+      attr_reader :toolbar_bar
+
+      def self.toolbar_types
+        [Swt::SWT::FLAT, Swt::SWT::HORIZONTAL]
+      end
+
+      def initialize(window, toolbar_model, options={})
+        s = Time.now
+        @window = window
+        @toolbar_bar = Swt::Widgets::ToolBar.new(window.shell, Swt::SWT::FLAT + Swt::SWT::SHADOW_OUT)
+        @toolbar_bar.set_visible(false)
+	      @toolbar_bar.setLayout(Swt::Layout::FormLayout.new)
+	      @toolbar_bar.setLayoutData(Swt::Layout::FormData.new)
+        return unless toolbar_model
+        add_entries_to_toolbar(@toolbar_bar, toolbar_model)
+        #puts "ApplicationSWT::ToolBar initialize took #{Time.now - s}s"
+        @toolbar_bar.pack
+      end
+
+      def show
+        @toolbar_bar.set_visible(true)
+      end
+
+      def hide
+        #@toolbar_bar.set_visible(false)
+	#@toolbar_bar.setRedraw(true)
+	@toolbar_bar.dispose()
+      end
+
+      def close
+        #@handlers.each {|obj, h| obj.remove_listener(h) }
+        @toolbar_bar.dispose
+        @result
+      end
+
+      def move(x, y)
+        @toolbar_bar.setLocation(x, y)
+      end
+
+      private
+
+      def add_entries_to_toolbar(toolbar, toolbar_model)
+
+        toolbar_model.each do |entry|
+          if entry.is_a?(Redcar::ToolBar::LazyToolBar)
+            toolbar_header = Swt::Widgets::ToolItem.new(toolbar, Swt::SWT::CASCADE)
+            toolbar_header.text = entry.text
+            #new_toolbar = Swt::Widgets::ToolBar.new(@window.shell, Swt::SWT::DROP_DOWN)
+            new_toolbar = Swt::Widgets::ToolBar.new(toolbar)
+            toolbar_header.toolbar = new_toolbar
+            toolbar_header.add_arm_listener do
+              new_toolbar.get_items.each {|i| i.dispose }
+              add_entries_to_toolbar(new_toolbar, entry)
+            end
+          elsif entry.is_a?(Redcar::ToolBar)
+            new_toolbar = Swt::Widgets::ToolBar.new(toolbar)
+            add_entries_to_toolbar(new_toolbar, entry)
+          elsif entry.is_a?(Redcar::ToolBar::Item::Separator)
+            item = Swt::Widgets::ToolItem.new(toolbar, Swt::SWT::SEPARATOR)
+          elsif entry.is_a?(Redcar::ToolBar::Item)
+            item = Swt::Widgets::ToolItem.new(toolbar, Swt::SWT::PUSH)
+            item.setEnabled(true)
+            item.setImage(Swt::Graphics::Image.new(ApplicationSWT.display, ToolBar.icons[entry.icon] || entry.icon || DEFAULT_ICON))
+            connect_command_to_item(item, entry)
+          else
+            raise "unknown object of type #{entry.class} in toolbar"
+          end
+        end
+      end
+
+      class SelectionListener
+        def initialize(entry)
+          @entry = entry
+        end
+
+        def widget_selected(e)
+          @entry.selected(e.stateMask != 0)
+        end
+
+        def widget_default_selected(e)
+          @entry.selected(e.stateMask != 0)
+        end
+      end
+
+      def connect_command_to_item(item, entry)
+        item.setToolTipText(entry.text)
+        item.add_selection_listener(SelectionListener.new(entry))
+        h = entry.command.add_listener(:active_changed) do |value|
+          unless item.disposed
+            item.enabled = value
+          end
+        end
+        #@handlers << [entry.command, h]
+        if not entry.command.active?
+          item.enabled = false
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,94 @@
+module Redcar
+  class ApplicationSWT
+    class ToolBar
+      module BindingTranslator
+        MODIFIERS = %w(Cmd Ctrl Alt Shift)
+        
+        def self.platform_key_string(key_specifier)
+          if key_specifier.is_a?(Hash)
+            key_string = key_specifier[Redcar.platform]
+          else
+            key_string = key_specifier
+          end
+          key_string.gsub("Escape", "")
+          key_string.gsub("Space", "")
+          key_string
+        end
+
+        def self.key(key_string)
+          value = 0
+          MODIFIERS.each do |modifier|
+            if key_string =~ /\b#{modifier}\b/
+              value += modifier_values[modifier]
+            end
+          end
+          if key_string =~ /Escape$/
+            value += Swt::SWT::ESC
+          elsif key_string =~ /Space$/
+            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 =~ /Home$/
+            value += Swt::SWT::HOME
+          elsif key_string =~ /End$/
+            value += Swt::SWT::END
+          else
+            value += key_string[-1]
+          end
+        end
+        
+        def self.modifiers(key_event)
+          modifiers = []
+          modifier_values.each do |string, constant|
+            if (key_event.stateMask & constant) != 0
+              modifiers << string
+            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
+            letter = java.lang.Character.new(key_event.character).toString.upcase # key_event.keyCode)
+            if modifiers.any?
+              modifiers.join("+") << "+" << (pretty_letter(letter) || letter)
+            else
+              (pretty_letter(letter) || letter)
+            end
+          end
+        end
+        
+        def self.matches?(key_string, key_string2)
+          key_string.split("+").sort ==
+            key_string2.split("+").sort
+        end
+        
+        def self.pretty_letter(char_string)
+          {"\r" => "Return"}[char_string]
+        end
+        
+        private
+        
+        def self.modifier_values
+          {
+            "Cmd"   => Swt::SWT::COMMAND,
+            "Ctrl"  => Swt::SWT::CTRL,
+            "Alt"   => Swt::SWT::ALT,
+            "Shift" => Swt::SWT::SHIFT,
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -6,6 +6,8 @@ module Redcar
 
       SASH_WIDTH = 5
       TREEBOOK_WIDTH = 200
+      TOOLBAR_HEIGHT = 25
+      @toolbar_height = 25
 
       class ShellListener
         include org.eclipse.swt.events.ShellListener
@@ -49,6 +51,7 @@ module Redcar
       def add_listeners
         @window.add_listener(:show,          &method(:show))
         @window.add_listener(:refresh_menu,  &method(:refresh_menu))
+        @window.add_listener(:refresh_toolbar,  &method(:refresh_toolbar))
         @window.add_listener(:popup_menu,    &method(:popup_menu))
         @window.add_listener(:popup_menu_with_numbers, &method(:popup_menu_with_numbers))
         @window.add_listener(:title_changed, &method(:title_changed))
@@ -120,6 +123,20 @@ module Redcar
         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)
+	        @toolbar_controller.show()
+		puts "Show toolbar"
+		@toolbar_height = 25
+	else
+		@toolbar_controller.hide() if @toolbar_controller
+		puts "Hide toolbar"
+		@toolbar_height = 0
+	end
+	reset_sash_height
+      end
+      
       def set_icon
         path = File.join(icon_dir, icon_file)
         icon = Swt::Graphics::Image.new(ApplicationSWT.display, path)
@@ -197,11 +214,13 @@ module Redcar
       def closed(_)
         @shell.close
         @menu_controller.close
+        @toolbar_controller.close
       end
 
       def dispose
         @shell.dispose
         @menu_controller.close
+        @toolbar_controller.close
       end
 
       attr_reader :right_composite, :left_composite, :tree_composite, :tree_layout, :tree_sash
@@ -244,7 +263,7 @@ module Redcar
 
         @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, 0)
+          d.top =  Swt::Layout::FormAttachment.new(0, TOOLBAR_HEIGHT)
           d.bottom = Swt::Layout::FormAttachment.new(100, 0)
         end
 
@@ -266,14 +285,14 @@ module Redcar
         @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)
+          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)
+          d.top = Swt::Layout::FormAttachment.new(0, 5 + TOOLBAR_HEIGHT)
           d.bottom = Swt::Layout::FormAttachment.new(100, -5)
         end
 
@@ -311,6 +330,16 @@ module Redcar
         widths = [width]*@window.notebooks.length
       	@notebook_sash.setWeights(widths.to_java(:int))
       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)
+        @right_composite.layout_data.top = Swt::Layout::FormAttachment.new(0, 5 + @toolbar_height.to_i)
+	@shell.layout        
+        @shell.redraw
+      end
+      
     end
   end
-end
+end