redcar 0.9.2 → 0.10

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

@@ -0,0 +1,85 @@
+
+module Redcar
+  # A type of dialog for displaying a list inside a tab. Example uses include
+  # selection dialogs for code completion or dynamically opening files based on
+  # tab content.
+  # Modeless List dialogs can also add sub-lists, by implementing the 'previous_list'
+  # and/or 'next_list' methods, which are called when a ARROW_LEFT or ARROW_RIGHT
+  # key event is generated.
+  #
+  # Subclasses should implement the 'selected' method,
+  # and optionally 'previous_list' and 'next_list' if applicable.
+  class ModelessListDialog
+    include Redcar::Model
+    include Redcar::Observable
+
+    def initialize(close_on_lost_focus=true)
+      @close_on_lost_focus = close_on_lost_focus
+      self.controller = Redcar.gui.controller_for(self).new(self)
+    end
+
+    # Set the size of the list dialog. The width is measured in pixels
+    # and the height in rows of text
+    def set_size(width,height)
+      notify_listeners(:set_size, width,height)
+    end
+    # Set the location of the list dialog relative to an offset in a tab
+    def set_location(offset)
+      notify_listeners(:set_location,offset)
+    end
+
+    def open
+      notify_listeners(:open)
+    end
+
+    def close
+      notify_listeners(:close)
+    end
+
+    # Whether to close the list dialog when focus is lost
+    def close_on_lost_focus
+      @close_on_lost_focus
+    end
+
+    # Get a 'previous' list, where applicable, based on the
+    # currently selected item in the list
+    #
+    # @return [Array<String>] list items
+    def previous_list
+    end
+
+    # Get a 'next' list, where applicable, based on the
+    # currently selected item in the list
+    #
+    # @return [Array<String>] list items
+    def next_list
+    end
+
+    # Update the items in the dialog list
+    #
+    # @param [Array<String>] items
+    def update_list(items)
+      notify_listeners :update_list, items
+    end
+
+    # Do an action, based on the index of the selected item
+    def selected(index)
+      p "'#{select(index)}' (at index #{index}) was selected!"
+      close
+    end
+
+    # Get the text of an item at an index
+    #
+    # @return [String]
+    def select(index)
+      self.controller.select index
+    end
+
+    # The index of the currently selected text
+    #
+    # @return [Integer]
+    def selection_index
+      self.controller.selection_index
+    end
+  end
+end

data/plugins/application/lib/application/keymap.rb

@@ -4,36 +4,38 @@ module Redcar
     def self.build(name, platform, &block)
       Builder.new(name, platform, &block).keymap
     end
-    
+
     attr_reader :name, :platforms
     attr_accessor :map
-      
+
     def initialize(name, platforms)
       @name, @platforms = name, [*platforms]
       @map = {}
     end
-    
+
     def link(key_string, command)
       @map[key_string] = command
     end
-    
+
     def command(key_string)
       @map[key_string]
     end
-    
+
     def command_to_key(command)
       @map.invert[command]
     end
-    
+
     def length
       @map.length
     end
-    
+
     def merge(other)
       keymap = Keymap.new(@name, @platforms)
+      (@map.keys & other.map.keys).each do |key|
+        puts "conflicting keybinding #{key}: #{@map[key].inspect} is being overwritten by #{other.map[key].inspect}"
+      end
       keymap.map = @map.merge(other.map)
       keymap
     end
   end
 end
- 

data/plugins/application/lib/application/menu.rb

@@ -3,43 +3,55 @@ module Redcar
   class Menu
     include Enumerable
     include Redcar::Model
-    
+
     # Default priority for all menu's and items if they aren't explicitly provided
     DEFAULT_PRIORITY = 50
-    
+
+    # Default mnemonic values for primary menus
+    MNEMONICS = {
+      "File"    => "&File",
+      "Edit"    => "&Edit",
+      "Project" => "&Project",
+      "Debug"   => "&Debug",
+      "View"    => "&View",
+      "Plugins" => "P&lugins",
+      "Bundles" => "&Bundles",
+      "Help"    => "&Help"
+    }
+
     attr_reader :text, :entries, :priority
-  
+
     # A Menu will initially have nothing in it.
     def initialize(text=nil, options={})
-      @text, @entries, @priority = text || "", [], options[:priority]
+      @text, @entries, @priority = Menu.parse(text), [], options[:priority]
     end
-  
+
     # Iterate over each entry, sorted by priority
     def each
       sorted = {:first => [], :last => []}
       entries.each {|e| (sorted[e.priority || Menu::DEFAULT_PRIORITY] ||= []) << e}
-      
+
       # Get the nasty Symbols out of the hash so we can sort it
       first = sorted.delete(:first)
       last = sorted.delete(:last)
-      
+
       # Yield up the results
       first.each {|val| yield val }
       sorted.keys.sort.each {|i| sorted[i].each {|val| yield val }}
       last.each {|val| yield val }
     end
-  
+
     # Add a Redcar::MenuItem or a Redcar::Menu
     def <<(entry)
       entries << entry
       self
     end
-  
+
     # Number of entries in the menu
     def length
       entries.length
     end
-    
+
     # Fetch the sub_menu with the given name
     #
     # @param [String]
@@ -47,16 +59,16 @@ module Redcar
     def sub_menu(text)
       detect {|e| e.text == text and e.is_a?(Menu) }
     end
-    
+
     def entry(text)
       detect {|e| e.text == text }
     end
-    
+
     # Append items and sub_menus using the same syntax as Menu::Builder
     def build(&block)
       Menu::Builder.new(self, &block)
     end
-    
+
     def ==(other)
       return false unless length == other.length
       return false unless text == other.text
@@ -65,15 +77,15 @@ module Redcar
       end
       true
     end
-    
+
     def is_unique?
       false
     end
-    
+
     def lazy_text?
       false
     end
-    
+
     # Merge two Menu trees together. Modifies this Menu.
     #
     # @param [Menu] another Menu
@@ -91,5 +103,15 @@ module Redcar
         end
       end
     end
+
+    # Get menu text from a string, adding mnemonics where applicable
+    def self.parse(menu_text)
+      menu_text = "" unless menu_text
+      if Redcar.platform != :osx and mnemonic = MNEMONICS[menu_text]
+        mnemonic
+      else
+        menu_text
+      end
+    end
   end
 end

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

@@ -17,6 +17,7 @@ module Redcar
       @trees << tree
       @focussed_tree = tree
       notify_listeners(:tree_added, tree)
+      tree.focus
       Redcar.app.repeat_event(:tree_added) if Redcar.app
     end
 
@@ -27,6 +28,7 @@ module Redcar
       return if @focussed_tree == tree
       @focussed_tree = tree
       notify_listeners(:tree_focussed, tree)
+      tree.focus
     end
 
     # Remove a tree from this treebook
@@ -43,6 +45,34 @@ module Redcar
       end
     end
 
+    def switch_down
+      if @trees.any?
+        if @focussed_tree
+          index = @trees.index @focussed_tree
+        else
+          index = -1
+        end
+        new_tree_index = index + 1
+        new_tree_index = 0 if new_tree_index < 0 or new_tree_index >= @trees.size
+        tree = @trees[new_tree_index]
+        focus_tree(tree) if tree
+      end
+    end
+
+    def switch_up
+      if @trees.any?
+        if @focussed_tree
+          index = @trees.index @focussed_tree
+        else
+          index = 1
+        end
+        new_tree_index = index - 1
+        new_tree_index = @trees.size - 1 if new_tree_index < 0 or new_tree_index >= @trees.size
+        tree = @trees[new_tree_index]
+        focus_tree(tree) if tree
+      end
+    end
+
     private
 
     # Tell the Treebook that this tree has been focussed in the GUI.

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

@@ -68,7 +68,7 @@ module Redcar
     #
     # @events [(:new_notebook, notebook)]
     def create_notebook
-      return if @notebooks.length == 2
+    #  return if @notebooks.length == 2
       notebook = Redcar::Notebook.new(self)
       @notebooks << notebook
       if @notebooks.length == 1
@@ -78,6 +78,22 @@ module Redcar
       notify_listeners(:new_notebook, notebook)
     end
 
+    def enlarge_notebook(index)
+      notify_listeners(:enlarge_notebook,index)
+    end
+
+    def adjust_treebook_width(more=true)
+      if more
+        notify_listeners(:increase_treebook_width)
+      else
+        notify_listeners(:decrease_treebook_width)
+      end
+    end
+
+    def reset_notebook_widths
+      notify_listeners(:reset_notebook_widths)
+    end
+
     def attach_notebook_listeners(notebook)
       notebook.add_listener(:tab_focussed) do |tab|
         notify_listeners(:tab_focussed, tab)
@@ -143,7 +159,9 @@ module Redcar
     end
 
     def nonfocussed_notebook
-      @notebooks.find {|nb| nb != @focussed_notebook }
+        i = @notebooks.index @focussed_notebook
+        @notebooks[(i + 1) % @notebooks.length]
+      #@notebooks.find {|nb| nb != @focussed_notebook }
     end
 
     # Sets the orientation of the notebooks.

data/plugins/application/spec/application/command/executor_spec.rb

@@ -3,6 +3,7 @@ require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
 class Redcar::Command
   describe Executor do
     class FakeApp
+      def repeat_event(event); end
       attr_accessor :history
     end
     

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

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), "..", "spec_helper")
 
 describe Redcar::Menu do
   class DummyCommand; end
-  
+
   describe "with no entries and no text" do
     before do
       @menu = Redcar::Menu.new
@@ -15,8 +15,8 @@ describe Redcar::Menu do
     it "reports length" do
       @menu.length.should == 0
     end
-  end  
-  
+  end
+
   describe "with entries in it and text" do
     before do
       @menu = Redcar::Menu.new("Edit") \
@@ -28,17 +28,17 @@ describe Redcar::Menu do
     it "reports length" do
       @menu.length.should == 3
     end
-    
+
     it "has text" do
-      @menu.text.should == "Edit"
+      @menu.text.should == Redcar::Menu.parse("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
@@ -47,24 +47,24 @@ describe Redcar::Menu do
       @menu.entries.first.text.should == "Cut"
     end
   end
-  
+
   def build(name=nil, &block)
     Redcar::Menu::Builder.build(name, &block)
   end
-  
+
   describe "merging Menus" do
     it "adds items" do
       menu = build "Plugins" do
         item "Foo", 1
         item "Bar", 2
       end
-      
+
       menu2 = build "Plugins" do
         item "Bar", 3
       end
-      
+
       menu.merge(menu2)
-      
+
       menu.should == build("Plugins") do
         item "Foo", 1
         item "Bar", 3
@@ -76,45 +76,45 @@ describe Redcar::Menu do
         sub_menu "REPL" do
         end
       end
-      
+
       menu2 = build "Plugins" do
         sub_menu "My Plugin" do
         end
       end
-      
+
       menu.merge(menu2)
-      
+
       menu.should == build("Plugins") do
         sub_menu "REPL" do
         end
         sub_menu "My Plugin" do
         end
-        
+
       end
     end
-    
+
     it "replaces a menu with an item and vice versa" do
       menu = build "Plugins" do
         item "My Plugin", 201
         sub_menu "REPL" do
         end
       end
-      
+
       menu2 = build "Plugins" do
         item "REPL", 101
         sub_menu "My Plugin" do
         end
       end
-      
+
       menu.merge(menu2)
-      
+
       menu.should == build("Plugins") do
         sub_menu "My Plugin" do
         end
         item "REPL", 101
       end
     end
-    
+
     it "puts newer ones on the end" do
       menu = build "Plugins" do
         sub_menu "REPL" do
@@ -130,9 +130,9 @@ describe Redcar::Menu do
           item "Open", 101
         end
       end
-      
+
       menu.merge(menu2)
-      
+
       menu.should == build("Plugins") do
         sub_menu "REPL" do
         end
@@ -144,7 +144,7 @@ describe Redcar::Menu do
       end
 
     end
-    
+
     it "uses the priority of whichever menu has one" do
       menu  = build("Main"){ sub_menu("Project"){} }
       menu2 = build("Main"){ sub_menu("Project", :priority => 10){} }
@@ -156,12 +156,12 @@ describe Redcar::Menu do
       menu.merge(menu2)
       menu.entries.first.priority.should == 10
     end
-    
+
     it "preserves own priority when merging" do
       menu  = build("Main"){ sub_menu("Project", :priority => 10){} }
       menu2 = build("Main"){ sub_menu("Project", :priority => 5){} }
       menu.merge(menu2)
-      menu.entries.first.priority.should == 10      
+      menu.entries.first.priority.should == 10
     end
   end
 end