redcar 0.3.0dev → 0.3.1dev

data/plugins/application/lib/application/sensitivity.rb

@@ -60,17 +60,21 @@ module Redcar
       @active
     end
     
+    def recompute(*args)
+      before = @active
+      @active = @boolean_finder.call(*args)
+      if before != @active
+        notify_listeners(:changed)
+        Sensitivity.broadcast_sensitivity_change(@name, @active)
+      end
+    end
+    
     private
     
     def connect_listeners
       @event_names.each do |event_name|
         @observed_object.add_listener(event_name) do |args|
-          before = @active
-          @active = @boolean_finder.call(*args)
-          if before != @active
-            notify_listeners(:changed)
-            Sensitivity.broadcast_sensitivity_change(@name, @active)
-          end
+          recompute(*args)
         end
       end
     end

data/plugins/application/lib/application/tab.rb

@@ -15,7 +15,6 @@ module Redcar
     # Events: close
     def close
       notify_listeners(:close)
-      @notebook.remove_tab!(self)
     end
     
     # Focus the tab within the notebook, and gives the keyboard focus to the 

data/plugins/application/lib/application/treebook.rb

@@ -26,5 +26,10 @@ module Redcar
         notify_listeners(:tree_removed, tree)
       end
     end
+    
+    # Refreshes all the trees in the Treebook. (See Tree#refresh).
+    def refresh_trees
+      @trees.each {|tree| tree.refresh }
+    end
   end
 end

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

@@ -56,8 +56,8 @@ module Redcar
     
     def attach_notebook_listeners(notebook)
       notebook.add_listener(:tab_focussed) do |tab|
+        notify_listeners(:tab_focussed, tab)
         if tab
-          notify_listeners(:tab_focussed, tab)
           self.focussed_notebook = tab.notebook
         else
           new_notebook = self.notebooks.sort_by {|nb| nb.tabs.length}.last
@@ -66,6 +66,14 @@ module Redcar
           end
         end
       end
+      notebook.add_listener(:tab_closed) do
+        notify_listeners(:tab_closed)
+      end
+      notebook.add_listener(:focussed_tab_changed) do |tab|
+        if notebook == focussed_notebook
+          notify_listeners(:focussed_tab_changed, tab)
+        end
+      end
     end
     
     def close_notebook
@@ -84,9 +92,20 @@ module Redcar
     end
     
     def focussed_notebook=(notebook)
+      if notebook != @focussed_notebook
+        set_focussed_notebook(notebook)
+        notify_listeners(:notebook_focussed, notebook)
+      end
+    end
+    
+    def set_focussed_notebook(notebook)
       @focussed_notebook = notebook
     end
     
+    def nonfocussed_notebook
+      @notebooks.find {|nb| nb != @focussed_notebook }
+    end
+    
     # Sets the orientation of the notebooks.
     #
     # @param [:horizontal, :vertical] 
@@ -118,6 +137,7 @@ module Redcar
     
     # Focus the Window.
     def focus
+      treebook.refresh_trees
       notify_listeners(:focussed, self)
     end
 

data/plugins/application/spec/application/menu/builder_spec.rb

@@ -1,18 +1,6 @@
 require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
 
 describe "Redcar::Menu::Builder DSL" do
-  # before do
-  #   @menu = Redcar::Menu.build do
-  #     item "New", :NewCommand
-  #     separator
-  #     item "Save", :SaveCommand
-  #     sub_menu "Export" do
-  #       item "PDF", :PDFCommand
-  #       item "HTML", :HTMLCommand
-  #     end
-  #   end
-  # end
-  
   it "creates a menu" do
     builder = Redcar::Menu::Builder.new {}
     builder.menu.should be_an_instance_of(Redcar::Menu)

data/plugins/application/spec/application/menu_spec.rb

@@ -33,4 +33,18 @@ describe Redcar::Menu do
       @menu.text.should == "Edit"
     end
   end
+  
+  describe "building entries" do
+    before do
+      @menu = Redcar::Menu.new
+    end
+    
+    it "should let you add items by building" do
+      @menu.build do
+        item "Cut", DummyCommand
+      end
+      @menu.length.should == 1
+      @menu.entries.first.text.should == "Cut"
+    end
+  end
 end

data/plugins/application/spec/spec_helper.rb

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

data/plugins/application_swt/lib/application_swt.rb

@@ -1,12 +1,16 @@
 
+require "application_swt/swt_wrapper"
+require "application_swt/swt/listener_helpers"
+
 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/menu"
 require "application_swt/menu/binding_translator"
 require "application_swt/notebook"
 require "application_swt/notebook/drag_and_drop_listener"
-require "application_swt/swt_wrapper"
 require "application_swt/tab"
 require "application_swt/treebook"
 require "application_swt/window"
@@ -25,7 +29,10 @@ module Redcar
       @gui = Redcar::Gui.new("swt")
       @gui.register_event_loop(EventLoop.new)
       @gui.register_features_runner(CucumberRunner.new)
-      @gui.register_controllers(Redcar::Tab => ApplicationSWT::Tab)
+      @gui.register_controllers(
+          Redcar::Tab              => ApplicationSWT::Tab,
+          Redcar::FilterListDialog => ApplicationSWT::FilterListDialogController
+        )
       @gui.register_dialog_adapter(ApplicationSWT::DialogAdapter.new)
     end
     

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

@@ -0,0 +1,128 @@
+module Redcar
+  class ApplicationSWT
+    class FilterListDialogController
+      class FilterListDialog < Dialogs::NoButtonsDialog
+        attr_reader :list, :text
+        attr_accessor :controller
+        
+        def createDialogArea(parent)
+          composite = Swt::Widgets::Composite.new(parent, Swt::SWT::NONE)
+          layout = Swt::Layout::RowLayout.new(Swt::SWT::VERTICAL)
+          composite.setLayout(layout)
+
+          @text = Swt::Widgets::Text.new(composite, Swt::SWT::SINGLE | Swt::SWT::LEFT | Swt::SWT::ICON_CANCEL)
+          @text.set_layout_data(Swt::Layout::RowData.new(400, 20))
+          @list = Swt::Widgets::List.new(composite, Swt::SWT::SINGLE)
+          @list.set_layout_data(Swt::Layout::RowData.new(400, 200))
+          controller.attach_listeners
+          controller.update_list
+          @list.set_selection(0)
+        end
+      end
+      
+      def initialize(model)
+        @model = model
+        @dialog = FilterListDialog.new(Redcar.app.focussed_window.controller.shell)
+        @dialog.controller = self
+        attach_model_listeners
+      end
+      
+      def attach_model_listeners
+        @model.add_listener(:open, &method(:open))
+        @model.add_listener(:close, &method(:close))
+      end
+
+      class ModifyListener
+        def initialize(controller)
+          @controller = controller
+        end
+        
+        def modify_text(e)
+          @controller.update_list
+        end
+      end
+      
+      class KeyListener
+        def initialize(controller)
+          @controller = controller
+        end
+        
+        def key_pressed(e)
+          e.doit = @controller.key_pressed(e)
+        end
+        
+        def key_released(e)
+        end
+      end
+      
+      def attach_listeners
+        @dialog.text.add_modify_listener(ModifyListener.new(self))
+        @dialog.text.add_key_listener(KeyListener.new(self))
+      end
+      
+      def open
+        @dialog.open
+        @dialog = nil
+      end
+      
+      def close
+        @dialog.close
+      end
+      
+      def update_list
+        @last_keypress = Time.now
+        Swt::Widgets::Display.getCurrent.timerExec(300, Swt::RRunnable.new { 
+          if @last_keypress and Time.now - @last_keypress > 0.250
+            @last_keypress = nil
+            s = Time.now
+            list = @model.update_list(@dialog.text.get_text)
+            puts "update list took #{Time.now - s}s"
+            populate_list(list)
+            @dialog.list.set_selection(0)
+          end
+        })
+      end
+      
+      def selected
+        @model.selected(@dialog.list.get_selection.first, @dialog.list.get_selection_index)
+      end
+      
+      def key_pressed(key_event)
+        case key_event.keyCode
+        when Swt::SWT::CR, Swt::SWT::LF
+          selected
+          false
+        when Swt::SWT::ARROW_DOWN
+          move_down
+          false
+        when Swt::SWT::ARROW_UP
+          move_up
+          false
+        else
+          true
+        end
+      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)
+      end
+      
+      def move_up
+        curr_ix = @dialog.list.get_selection_index
+        new_ix = [curr_ix - 1, 0].max
+        @dialog.list.set_selection(new_ix)
+      end
+      
+      private
+      
+      def populate_list(contents)
+        @dialog.list.removeAll
+        contents.each do |text|
+          @dialog.list.add(text)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module Redcar
+  class ApplicationSWT
+    module Dialogs
+      # A type of JFace Dialog with no button bar.
+      class NoButtonsDialog < JFace::Dialogs::Dialog
+      
+        def createContents(parent)
+          composite = Swt::Widgets::Composite.new(parent, 0)
+          layout = Swt::Layout::GridLayout.new
+          layout.marginHeight = 0
+          layout.marginWidth = 0
+          layout.verticalSpacing = 0
+          composite.setLayout(layout)
+          composite.setLayoutData(Swt::Layout::GridData.new(Swt::Layout::GridData::FILL_BOTH))
+          JFace::Dialogs::Dialog.applyDialogFont(composite)
+          initializeDialogUnits(composite)
+          dialogArea = createDialogArea(composite)
+          
+          composite
+        end
+      end
+    end
+  end
+end

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

@@ -43,7 +43,9 @@ module Redcar
               entry.selected
             end
             h = entry.command.add_listener(:active_changed) do |value|
-              item.enabled = value
+              unless item.disposed
+                item.enabled = value
+              end
             end
             @handlers << [entry.command, h]
             if not entry.command.active?

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

@@ -6,22 +6,36 @@ module Redcar
       attr_reader :tab_folder
       
       class CTabFolder2Listener
+        include ListenerHelpers
+        
         def initialize(controller)
           @controller = controller
         end
         
         def close(event)
-          @controller.swt_event_tab_closed(event.item)
+          ignore_within_self do
+            event.doit = false
+            if event.item
+              @controller.tab_widget_to_tab_model(event.item).close
+            end
+          end
         end
       end
       
       class SelectionListener
+        include ListenerHelpers
+        
         def initialize(controller)
           @controller = controller
         end
         
         def widgetSelected(event)
-          @controller.swt_event_tab_selected(event.item)
+          ignore_within_self do
+            event.doit = false
+            if event.item
+              @controller.tab_widget_to_tab_model(event.item).focus
+            end
+          end
         end
         
         def widgetDefaultSelected(*_)
@@ -35,7 +49,6 @@ module Redcar
         style_tab_folder
         attach_model_listeners
         attach_view_listeners
-        setup_drag_and_drop
       end
       
       def create_tab_folder(sash)
@@ -57,16 +70,6 @@ module Redcar
         @tab_folder.setSelectionBackground(colors, percents, true)
       end
       
-      def setup_drag_and_drop
-        # Doesn't work yet
-        # listener = DragAndDropListener.new(@tab_folder)
-        # @tab_folder.addListener(Swt::SWT::DragDetect, listener)
-        # @tab_folder.addListener(Swt::SWT::MouseUp, listener)
-        # @tab_folder.addListener(Swt::SWT::MouseMove, listener)
-        # @tab_folder.addListener(Swt::SWT::MouseExit, listener)
-        # @tab_folder.addListener(Swt::SWT::MouseEnter, listener)
-      end
-      
       def attach_model_listeners
         @model.add_listener(:tab_added) do |tab|
           tab.controller = Redcar.gui.controller_for(tab).new(tab, self)
@@ -79,27 +82,12 @@ module Redcar
         @tab_folder.add_selection_listener(SelectionListener.new(self))
       end
       
-      # Called by the SWT event listener when a tab is closed by the user.
-      def swt_event_tab_closed(tab_widget)
-        @model.remove_tab!(tab_widget_to_tab_model(tab_widget))
-      end
-      
-      # Called by the SWT event listener when a tab is selected by the user.
-      def swt_event_tab_selected(tab_widget)
-        @model.select_tab!(tab_widget_to_tab_model(tab_widget))
-      end
-      
       # Called by the models when a tab is selected by Redcar.
       def model_event_focus_tab(tab)
         tab_folder.set_selection(tab.item)
         @model.select_tab!(tab.model)
       end
 
-      # Called by SWT controllers when the tab is selected by the user.
-      def swt_event_tab_focussed(tab)
-        @model.select_tab!(tab)
-      end
-      
       def model_event_tab_moved(from_notebook, to_notebook, tab_model)
         tab_controller = tab_model.controller
         data           = tab_model.serialize
@@ -114,6 +102,10 @@ module Redcar
         @tab_folder.dispose
       end
       
+      def tab_widget_to_tab_model(tab_widget)
+        @model.tabs.detect {|tab| tab.controller.item == tab_widget }
+      end
+
       private
       
       def focussed_tab
@@ -121,9 +113,6 @@ module Redcar
         @model.tabs.detect {|tab| tab.controller.item == focussed_tab_item }
       end
       
-      def tab_widget_to_tab_model(tab_widget)
-        @model.tabs.detect {|tab| tab.controller.item == tab_widget }
-      end
     end
   end
 end