redcar 0.8.1 → 0.9.0

data/plugins/application/features/step_definitions/window_steps.rb

@@ -3,10 +3,15 @@ Then /^the window should have title "([^\"]*)"$/ do |expected_title|
   active_shell.get_text.should == expected_title
 end
 
-When /^I manually widen the treebook (only a few pixels|to show the sash)$/ do |w|
-  if w =~ /^only/
-    focussed_window.controller.send(:set_sash_widths, Redcar::ApplicationSWT::Window::SASH_WIDTH-1)
+When /^I set the treebook width to (the default|only a few pixels|the minimum width|\d+ pixels)$/ do |w|
+  if w == "only a few pixels"
+    width = 10
+  elsif w == "the minimum width"
+    width = Redcar::ApplicationSWT::Window::MINIMUM_TREEBOOK_WIDTH
+  elsif w == "the default"
+    width = default_treebook_width
   else
-    focussed_window.controller.send(:set_sash_widths, Redcar::ApplicationSWT::Window::SASH_WIDTH)
+    width = w.split(" ")[0].to_i
   end
+  focussed_window.controller.send(:set_sash_widths, width)
 end

data/plugins/application/features/support/env.rb

@@ -1,3 +1,5 @@
+require File.expand_path("../fake_event", __FILE__)
+
 class TestingError < StandardError
 end
 
@@ -20,10 +22,22 @@ module SwtHelper
   def focussed_window
     Redcar.app.focussed_window
   end
+  
+  def focussed_treebook_width
+    Redcar.app.focussed_window.controller.treebook_width
+  end
 
   def focussed_tree
     focussed_window.treebook.focussed_tree
   end
+  
+  def default_treebook_width
+    Redcar.app.focussed_window.controller.default_treebook_width
+  end
+  
+  def tree_with_title(title)
+    focussed_window.treebook.trees.detect {|t| t.tree_mirror.title == title }
+  end
 
   def dialog(type)
     dialogs.detect {|d| d.is_a?(type) }
@@ -56,6 +70,11 @@ module SwtHelper
     find_node_with_text(all_children, node_text) unless all_children.empty?
   end
 
+  def swt_label_for_item(vtabitem)
+    vtablabel = vtabitem.instance_variable_get "@label"
+    vtablabel.instance_variable_get "@label"
+  end
+
   module TreeHelpers
     def items
       getItems.to_a
@@ -141,7 +160,7 @@ end
 
 World(SwtHelper)
 
-def close_everything
+def close_everything  
   Redcar.app.task_queue.cancel_all
   Swt.sync_exec do
     dialogs.each {|d| d.controller.model.close }

data/plugins/application/features/support/fake_event.rb

@@ -0,0 +1,14 @@
+require 'ostruct'
+
+class FakeEvent
+  def initialize(event_type, widget, options = {})
+    untyped_event = Swt::Widgets::Event.new.tap do |e|
+      e.display = Swt.display
+      e.widget = widget
+      e.x = options[:x] || 0
+      e.y = options[:y] || 0
+      e.button = options[:button] if options[:button]
+    end
+    widget.notify_listeners(event_type, untyped_event)
+  end
+end

data/plugins/application/lib/application.rb

@@ -57,6 +57,24 @@ module Redcar
             win.focussed_notebook.focussed_tab
           end
         end,
+        Sensitivity.new(:open_htmltab, Redcar.app, false, [:focussed_window, :tab_focussed]) do |tab|
+          if win = Redcar.app.focussed_window and
+            tab = win.focussed_notebook.focussed_tab
+            tab.is_a?(HtmlTab)
+          end
+        end,
+        Sensitivity.new(:open_trees, Redcar.app, false, [:focussed_window, :tree_added, :tree_removed]) do |tree|
+          if win = Redcar.app.focussed_window
+            trees = win.treebook.trees
+            trees and trees.length > 0
+          end
+        end,
+        Sensitivity.new(:focussed_committed_mirror, Redcar.app, false,
+          [:focussed_window, :notebook_change, :mirror_committed, :tab_focussed]) do
+          if win = Redcar.app.focussed_window and tab = win.focussed_notebook.focussed_tab
+            begin;tab.edit_view.document.mirror.path;rescue;false;end
+          end
+        end,
         Sensitivity.new(:single_notebook, Redcar.app, true, [:focussed_window, :notebook_change]) do
           if win = Redcar.app.focussed_window
             win.notebooks.length == 1
@@ -72,7 +90,8 @@ module Redcar
           if win = Redcar.app.focussed_window and notebook = win.nonfocussed_notebook
             notebook.tabs.any?
           end
-        end
+        end,
+        Sensitivity.new(:always_disabled, Redcar.app, false,[]) do; false; end
       ]
     end
 
@@ -86,13 +105,6 @@ module Redcar
       create_history
       @event_spewer = EventSpewer.new
       @task_queue   = TaskQueue.new
-
-      # Don't show the toolbar by default on Mac OS X
-      if Redcar.platform == :osx
-        Application.storage['show_toolbar'] = false
-      end
-
-      # Otherwise, use previous setting
       @show_toolbar = !!Application.storage['show_toolbar']
     end
 
@@ -149,10 +161,15 @@ module Redcar
 
     def self.storage
       @storage ||= begin
-         storage = Plugin::Storage.new('application_plugin')
-         storage.set_default('stay_resident_after_last_window_closed', false)
-         storage.set_default('show_toolbar', true)
-         storage
+        storage = Plugin::Storage.new('application_plugin')
+        storage.set_default('stay_resident_after_last_window_closed', false)
+        # Don't show the toolbar by default on Mac OS X
+        if Redcar.platform == :osx
+          storage.set_default('show_toolbar', false)
+        else
+          storage.set_default('show_toolbar', true)
+        end
+        storage
       end
     end
 

data/plugins/application/lib/application/dialogs/filter_list_dialog.rb

@@ -42,6 +42,14 @@ module Redcar
       puts "Hooray! You selected #{text} at index #{ix}"
     end
     
+    # Called by the controller when the user moves through the list.
+    #
+    # @param [String] the list row text that is now highlighted
+    # @param [Integer] the index of the row that is now highlighted
+    def moved_to(text, ix)
+      # Override with the code you wish you had
+    end
+
     # Helper method for fuzzily filtering a list
     #
     # @param [Array<A>]     list        the list to filter
@@ -83,6 +91,17 @@ module Redcar
       score_match_pairs.map {|a| a.last }
     end
     
+    # The time interval in seconds in which moved_to events are ignored
+    # Override to select different interval
+    def step_time
+      1
+    end
+
+    def step?
+      @last_step ||= Time.now - step_time
+      @last_step + step_time <= Time.now
+    end
+
     private
     
     def make_regex(text)

data/plugins/application/lib/application/speedbar.rb

@@ -2,14 +2,15 @@
 module Redcar
   class Speedbar
     include Redcar::Model
-    
+
     LabelItem   = ObservableStruct.new(:name, :text)
     ToggleItem  = ObservableStruct.new(:name, :text, :key, :listener, :value)
     TextBoxItem = ObservableStruct.new(:name, :listener, :value, :edit_view)
     ButtonItem  = ObservableStruct.new(:name, :text, :key, :listener)
     ComboItem   = ObservableStruct.new(:name, :items, :value, :listener)
+    SliderItem  = ObservableStruct.new(:name, :value, :minimum, :maximum, :increment, :enabled, :listener)
     KeyItem     = ObservableStruct.new(:key, :listener)
-    
+
     def self.items
       @items ||= []
     end
@@ -18,11 +19,11 @@ module Redcar
       return if items.detect {|i| i.respond_to?(:name) and i.name == item.name }
       items << item
     end
-    
+
     def self.close_image_path
-      File.join(Redcar.root, %w(plugins application icons close.png))
+      File.join(Redcar::ICONS_DIRECTORY, "/close.png")
     end
-    
+
     def self.define_item_finder(name)
       self.class_eval %Q{
         def #{name}
@@ -30,9 +31,9 @@ module Redcar
         end
       }
     end
-    
+
     def __get_item(name)
-      item = __items.detect do |i| 
+      item = __items.detect do |i|
         i.respond_to?(:name) and
           i.name.to_s == name
       end
@@ -41,15 +42,15 @@ module Redcar
       end
       item
     end
-    
+
     def __items
       @__items ||= self.class.items.map {|i| i.clone }
     end
-    
+
     def __get_item_by_text_or_name(name)
       __items.detect {|i| (i.respond_to?(:text) and i.text == name) or i.name.to_s == name.to_s }
     end
-    
+
     def __get_item_by_label(name)
       label = __items.detect {|i| i.is_a?(LabelItem) and (i.text == name or i.name.to_s == name.to_s)}
       if label
@@ -57,36 +58,41 @@ module Redcar
         __items[index_of_label + 1]
       end
     end
-    
+
     def self.label(name, text)
       append_item LabelItem.new(name, text)
       define_item_finder(name)
     end
-    
+
     def self.toggle(name, text, key, value=false, &block)
       append_item ToggleItem.new(name, text, key, block, value)
       define_item_finder(name)
     end
-    
+
     def self.textbox(name, value="", &block)
       append_item TextBoxItem.new(name, block, value)
       define_item_finder(name)
     end
-    
+
     def self.button(name, text, key, &block)
       append_item ButtonItem.new(name, text, key, block)
       define_item_finder(name)
     end
-    
+
     def self.combo(name, items=[], value=nil, &block)
       append_item ComboItem.new(name, items, value, block)
       define_item_finder(name)
     end
-    
+
+    def self.slider(name, value = 50, minimum = 0, maximum = 100, increment = 1, &block)
+      append_item SliderItem.new(name, value, minimum, maximum, increment, true, block)
+      define_item_finder(name)
+    end
+
     def self.key(key, &block)
       append_item KeyItem.new(key, block)
     end
-    
+
     def inspect
       "#<Speedbar #{__items.inspect}"
     end

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

@@ -2,16 +2,21 @@ module Redcar
   class Tab
     include Redcar::Model
     include Redcar::Observable
-    
-    DEFAULT_ICON = :file
-    
+
+    DEFAULT_ICON  = :file
+    NO_WRITE_ICON = :exclamation_red
+    MISSING_ICON  = :exclamation
+    CONFIG_ICON   = :hammer_screwdriver
+    HELP_ICON     = :question
+    WEB_ICON      = :globe
+
     attr_reader :notebook
-    
+
     def initialize(notebook)
       @notebook = notebook
       @title    = "unknown"
     end
-    
+
     # Close the tab (remove it from the Notebook).
     #
     # Events: close
@@ -20,8 +25,8 @@ module Redcar
         notify_listeners(:close)
       end
     end
-    
-    # Focus the tab within the notebook, and gives the keyboard focus to the 
+
+    # Focus the tab within the notebook, and gives the keyboard focus to the
     # contents of the tab, if appropriate.
     #
     # Events: focus
@@ -39,11 +44,11 @@ module Redcar
       @title = title
       notify_listeners(:changed_title, title)
     end
-    
+
     def icon
       @icon || DEFAULT_ICON
     end
-    
+
     def icon=(value)
       @icon = value
       notify_listeners(:changed_icon, icon)
@@ -58,30 +63,30 @@ module Redcar
       @notebook = notebook
     end
 
-    # Moves the tab to a new position in the notebook, if said position 
+    # Moves the tab to a new position in the notebook, if said position
     # is currently occupied. Defaults to the first position, if none
     # is passed.
-    #    
+    #
     # Events: moved (position)
     def move_to_position(position = 0)
       if (0..@notebook.tabs.size - 1).include?(position)
         notify_listeners(:moved, position)
       end
     end
-    
+
     def edit_tab?
       is_a?(EditTab)
     end
-    
+
     # Helper method to get the edit_view's document, if applicable.
     def document
       edit_view.document if edit_tab?
     end
-    
+
     # Helper method to get this tab's Mirror object for the current
     # document, if applicable.
     def document_mirror
       document.mirror if document
-    end    
+    end
   end
 end

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

@@ -2,14 +2,14 @@ module Redcar
   class Treebook
     include Redcar::Observable
     include Redcar::Model
-    
+
     attr_reader :trees, :focussed_tree
-    
+
     def initialize
       @trees = []
       @focussed_tree = nil
     end
-    
+
     # Add a tree to this treebook
     #
     # @param [Redcar::Tree]
@@ -17,16 +17,18 @@ module Redcar
       @trees << tree
       @focussed_tree = tree
       notify_listeners(:tree_added, tree)
+      Redcar.app.repeat_event(:tree_added) if Redcar.app
     end
-    
+
     # Bring the tree to the front
     #
     # @param [Redcar::Tree]
     def focus_tree(tree)
+      return if @focussed_tree == tree
       @focussed_tree = tree
       notify_listeners(:tree_focussed, tree)
     end
-    
+
     # Remove a tree from this treebook
     #
     # @param [Redcar::Tree]
@@ -37,11 +39,12 @@ module Redcar
         if tree == focussed_tree
           focus_tree(trees.first) if trees.any?
         end
+        Redcar.app.repeat_event(:tree_removed) if Redcar.app
       end
     end
-    
+
     private
-    
+
     # Tell the Treebook that this tree has been focussed in the GUI.
     def set_focussed_tree(tree)
       @focussed_tree = tree

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

@@ -35,7 +35,7 @@ module Redcar
     end
 
     def trees_visible?
-      controller.treebook_visible?
+      not controller.treebook_hidden?
     end
 
     def title