redcar 0.3.1dev → 0.3.2dev

data/plugins/application/lib/application/dialog.rb

@@ -15,6 +15,69 @@ module Redcar
       def self.save_file(window, options)
         Redcar.gui.dialog_adapter.save_file(window, options)
       end
+      
+      # Show a message to the user. Requires a message and
+      # options can be:
+      #
+      #  :type should be one of available_message_box_types
+      #  :buttons should be one of available_message_box_button_combos
+      #
+      # It will return a symbol representing the button the user clicked on:
+      #
+      # For example:
+      #
+      # >> Application::Dialog.message_box(win, "YO!", :type => :info, 
+      # >>                                             :buttons => :yes_no_cancel)
+      # => :yes
+      def self.message_box(window, text, options={})
+        if buttons = options[:buttons] and !available_message_box_button_combos.include?(buttons)
+          raise "option :buttons must be in #{available_message_box_button_combos.inspect}"
+        end
+        if type = options[:type] and !available_message_box_types.include?(type)
+          raise "option :type must be in #{available_message_box_button_types.inspect}"
+        end
+        Redcar.gui.dialog_adapter.message_box(window, text, options)
+      end
+      
+      # Returns the list of valid button combos that can be passed
+      # as an option to message_box.
+      def self.available_message_box_button_combos
+        Redcar.gui.dialog_adapter.available_message_box_button_combos
+      end
+      
+      # Returns the list of valid message box types that can be passed
+      # as an option to message_box
+      def self.available_message_box_types
+        Redcar.gui.dialog_adapter.available_message_box_types
+      end
+      
+      # Show a dialog containing a text entry box to the user, and blocks
+      # until they dismiss it.
+      #
+      # If a block is given, the block is considered an input validator. A return
+      # value of nil from the block means the value is valid, a return value
+      # of a String from the block means the value is invalid, and the returned
+      # String will be displayed as an error message.
+      #
+      # Example:
+      #
+      # Application::Dialog.input(win, "Number", "Please enter a big number", "101") do |text|
+      #	  if text.to_i > 100
+      #	    nil
+      #	  else
+      #	    "must be bigger than 100"
+      #	  end
+      #	end
+      #
+      # The return value is a hash containing :button and :value.
+      def self.input(window, title, message, initial_value="", &validator)
+        Redcar.gui.dialog_adapter.input(window, title, message, initial_value, &validator)
+      end
+      
+      # Shows a tool tip to the user, at the cursor location.
+      def self.tool_tip(window, message)
+        Redcar.gui.dialog_adapter.tool_tip(window, message)
+      end
     end
   end
 end

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

@@ -2,6 +2,7 @@
 module Redcar
   class Menu
     include Enumerable
+    include Redcar::Model
     
     attr_reader :text, :entries
   
@@ -34,9 +35,39 @@ module Redcar
       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
+      @entries.zip(other.entries) do |here, there|
+        return false unless here.class == there.class and here == there
+      end
+      true
+    end
+    
+    # Merge two Menu trees together. Modifies this Menu.
+    #
+    # @param [Menu] another Menu
+    def merge(other)
+      other.entries.each do |other_entry|
+        if here = entry(other_entry.text)
+          if here.class == other_entry.class
+            here.merge(other_entry)
+          else
+            @entries[@entries.index(here)] = other_entry
+          end
+        else
+          self << other_entry
+        end
+      end
+    end
   end
-end
+end

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

@@ -6,7 +6,7 @@ module Redcar
     #       item "Select All", SelectAllCommand
     #       sub_menu "Indent" do
     #         item "Increase", IncreaseIndentCommand
-    #         item "Decrease", DecreaseIndentCommand
+    #         item("Decrease") { puts "decrease selected" }
     #       end
     #     end
     #
@@ -16,11 +16,17 @@ module Redcar
     #     menu << Redcar::Menu::Item.new("Select All", SelectAllCommand)
     #     indent_menu = Redcar::Menu.new("Indent") 
     #     indent_menu << Redcar::Menu::Item.new("Increase", IncreaseIndentCommand)
-    #     indent_menu << Redcar::Menu::Item.new("Decrease", DecreaseIndentCommand)
+    #     indent_menu << Redcar::Menu::Item.new("Decrease") do
+    #       puts "decrease selected"
+    #     end
     #     menu << indent_menu
     class Builder
       attr_reader :menu
       
+      def self.build(name=nil, &block)
+        new(name, &block).menu
+      end
+      
       def initialize(menu_or_text=nil, &block)
         case menu_or_text
         when String, nil
@@ -34,8 +40,8 @@ module Redcar
       
       private
       
-      def item(text, command)
-        @current_menu << Item.new(text, command)
+      def item(text, command=nil, &block)
+        @current_menu << Item.new(text, command, &block)
       end
       
       def separator

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

@@ -10,10 +10,15 @@ module Redcar
       
       attr_reader :text, :command
   
-      # Create a new Item, with the given text to display in the menu, and the
-      # Redcar::Command that is run when the item is selected.
-      def initialize(text, command)
+      # Create a new Item, with the given text to display in the menu, and
+      # either:
+      #   the Redcar::Command that is run when the item is selected.
+      #   or a block to run when the item is selected
+      def initialize(text, command=nil, &block)
         @text, @command = text, command
+        if !command & block
+          @command = block
+        end
       end
       
       # Call this to signal that the menu item has been selected by the user.
@@ -21,6 +26,14 @@ module Redcar
       def selected
         @command.new.run
       end
+      
+      def merge(other)
+        @command = other.command
+      end
+      
+      def ==(other)
+        text == other.text and command == other.command
+      end
     end
   end
 end

data/plugins/application/lib/application/notebook.rb

@@ -99,6 +99,11 @@ module Redcar
           notify_listeners(:focussed_tab_changed, tab)
         end
       end
+      @tab_handlers[tab] << tab.add_listener(:selection_changed) do
+        if tab == focussed_tab
+          notify_listeners(:focussed_tab_selection_changed, tab)
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,73 @@
+
+module Redcar
+  class Speedbar
+    include Redcar::Model
+    
+    LabelItem   = Struct.new(:text)
+    ToggleItem  = Struct.new(:name, :text, :key, :listener, :value)
+    TextBoxItem = Struct.new(:name, :listener, :value)
+    ButtonItem  = Struct.new(:text, :key, :listener)
+    KeyItem     = Struct.new(:key, :listener)
+    
+    attr_reader :__items, :__context
+    
+    def initialize(context)
+      @__items = []
+      @__context = context
+      self.class.items.each {|i| @__items << i.clone }
+    end
+    
+    def self.items
+      @items ||= []
+    end
+
+    def self.append_item(item)
+      items << item
+    end
+    
+    def self.close_image_path
+      File.join(Redcar.root, %w(plugins application icons close.png))
+    end
+    
+    def self.define_value_finder(name)
+      self.class_eval %Q{
+        def #{name}
+          __get_value_of(#{name.to_s.inspect})
+        end
+      }
+    end
+    
+    def __get_value_of(name)
+      item = __items.detect do |i| 
+        i.respond_to?(:name) and
+          i.name.to_s == name
+      end
+      unless item
+        raise "can't find item #{name}"
+      end
+      item.value
+    end
+    
+    def self.label(text)
+      append_item LabelItem.new(text)
+    end
+    
+    def self.toggle(name, text, key, value=false, &block)
+      append_item ToggleItem.new(name, text, key, block, value)
+      define_value_finder(name)
+    end
+    
+    def self.textbox(name, value="", &block)
+      append_item TextBoxItem.new(name, block, value)
+      define_value_finder(name)
+    end
+    
+    def self.button(text, key, &block)
+      append_item ButtonItem.new(text, key, block)
+    end
+    
+    def self.key(key, &block)
+      append_item KeyItem.new(key, block)
+    end
+  end
+end

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

@@ -11,6 +11,7 @@ module Redcar
 
     attr_reader :notebooks, :notebook_orientation
     attr_reader :treebook
+    attr_reader :speedbar
     
     def initialize
       Window.all << self
@@ -19,6 +20,7 @@ module Redcar
       @notebook_orientation = :horizontal
       create_notebook
       @treebook = Treebook.new
+      @speedbar = nil
       self.title = "Redcar"
     end
 
@@ -74,6 +76,11 @@ module Redcar
           notify_listeners(:focussed_tab_changed, tab)
         end
       end
+      notebook.add_listener(:focussed_tab_selection_changed) do |tab|
+        if notebook == focussed_notebook
+          notify_listeners(:focussed_tab_selection_changed, tab)
+        end
+      end
     end
     
     def close_notebook
@@ -134,6 +141,10 @@ module Redcar
       @menu = menu
       notify_listeners(:menu_changed, menu)
     end
+
+    def popup_menu(menu)
+      notify_listeners(:popup_menu, menu)
+    end
     
     # Focus the Window.
     def focus
@@ -155,5 +166,19 @@ module Redcar
     def inspect
       "#<Redcar::Window \"#{title}\">"
     end
+    
+    def open_speedbar(speedbar)
+      if @speedbar
+        close_speedbar
+      end
+      @speedbar = speedbar
+      notify_listeners(:speedbar_opened, speedbar)
+    end
+    
+    def close_speedbar
+      notify_listeners(:speedbar_closed, @speedbar)
+      @speedbar = nil
+      focussed_notebook.focussed_tab.focus
+    end
   end
 end

data/plugins/application/plugin.rb

@@ -0,0 +1,8 @@
+
+Plugin.define do
+  name    "application"
+  version "1.0"
+  file    "lib", "application"
+  object  "Redcar::Application"
+  dependencies "core", ">0"
+end

data/plugins/application/spec/application/clipboard_spec.rb

@@ -0,0 +1,36 @@
+require File.join(File.dirname(__FILE__), "..", "spec_helper")
+
+describe Redcar::Clipboard do
+  before do
+    @clipboard = Redcar::Clipboard.new("test")
+  end
+  
+  it "accepts new contents" do
+    @clipboard << "havelock"
+    @clipboard.last.should == ["havelock"]
+  end
+  
+  it "reports it's length" do
+    @clipboard.length.should == 0
+    @clipboard << "havelock"
+    @clipboard.length.should == 1
+    @clipboard << "havelock2"
+    @clipboard.length.should == 2
+  end
+  
+  it "lets you get the items in reverse order" do
+    @clipboard << "havelock"
+    @clipboard << "samuel"
+    @clipboard << "sybil"
+    @clipboard[2].should == ["havelock"]
+    @clipboard[1].should == ["samuel"]
+    @clipboard[0].should == ["sybil"]
+  end
+  
+  it "has a maximum length" do
+    (Redcar::Clipboard.max_length + 1).times do |i|
+      @clipboard << "foo#{i}"
+    end
+    @clipboard.length.should == Redcar::Clipboard.max_length
+  end
+end

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

@@ -47,4 +47,76 @@ describe Redcar::Menu do
       @menu.entries.first.text.should == "Cut"
     end
   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
+      end
+    end
+
+    it "adds Menus" do
+      menu = build "Plugins" 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
+  end
+end
+
+
+
+