redcar 0.3.4.3 → 0.3.5

data/plugins/application/lib/application/command/executor.rb

@@ -5,8 +5,8 @@ module Redcar
       include Redcar::Core::HasLogger
       
       def self.current_environment
-        win = Redcar.app.focussed_window
-        tab = Redcar.app.focussed_window.focussed_notebook.focussed_tab
+        win = Redcar.app.focussed_window        
+        tab = Redcar.app.focussed_notebook_tab
         { :win => win,
           :tab => tab }
       end
@@ -22,10 +22,8 @@ module Redcar
           result = @command_instance.execute
         rescue Object => e
           @command_instance.error = e
-          log_error
         rescue java.lang.StackOverflowError => e
           @command_instance.error = e
-          log_error
         end
         record
         result
@@ -33,14 +31,6 @@ module Redcar
       
       private
       
-      def log_error
-        logger.error "* Error in command #{@command_instance.class}"
-        if @command_instance.error.respond_to?(:backtrace)
-          logger.error "  " + @command_instance.error.message.to_s
-          @command_instance.error.backtrace.each {|l| logger.error("  " + l) }
-        end
-      end
-      
       def record
         if Redcar.app.history
           Redcar.app.history.record(@command_instance)

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

@@ -2,18 +2,18 @@ module Redcar
   class Application
     class Dialog
       # Prompt the user with an open file dialog. Returns a path.
-      def self.open_file(window, options)
-        Redcar.gui.dialog_adapter.open_file(window, options)
+      def self.open_file(options)
+        Redcar.gui.dialog_adapter.open_file(options)
       end
       
       # Prompt the user with an open directory dialog. Returns a path.
-      def self.open_directory(window, options)
-        Redcar.gui.dialog_adapter.open_directory(window, options)
+      def self.open_directory(options)
+        Redcar.gui.dialog_adapter.open_directory(options)
       end
 
       # Prompt the user with an save file dialog. Returns a path.
-      def self.save_file(window, options)
-        Redcar.gui.dialog_adapter.save_file(window, options)
+      def self.save_file(options)
+        Redcar.gui.dialog_adapter.save_file(options)
       end
       
       # Show a message to the user. Requires a message and
@@ -26,17 +26,17 @@ module Redcar
       #
       # For example:
       #
-      # >> Application::Dialog.message_box(win, "YO!", :type => :info, 
+      # >> Application::Dialog.message_box("YO!", :type => :info, 
       # >>                                             :buttons => :yes_no_cancel)
       # => :yes
-      def self.message_box(window, text, options={})
+      def self.message_box(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)
+        Redcar.gui.dialog_adapter.message_box(text, options)
       end
       
       # Returns the list of valid button combos that can be passed
@@ -61,7 +61,7 @@ module Redcar
       #
       # Example:
       #
-      # Application::Dialog.input(win, "Number", "Please enter a big number", "101") do |text|
+      # Application::Dialog.input("Number", "Please enter a big number", "101") do |text|
       #	  if text.to_i > 100
       #	    nil
       #	  else
@@ -70,13 +70,13 @@ module Redcar
       #	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)
+      def self.input(title, message, initial_value="", &validator)
+        Redcar.gui.dialog_adapter.input(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)
+      def self.tool_tip(message)
+        Redcar.gui.dialog_adapter.tool_tip(message)
       end
     end
   end

data/plugins/application/lib/application/event_spewer.rb

@@ -0,0 +1,32 @@
+
+module Redcar
+  class Application
+    class EventSpewer
+      attr_accessor :within
+      
+      def initialize
+        @within = {}
+      end
+      
+      def ignore?(name, *args)
+        !!@within[[name, args]]
+      end
+      
+      def ignore(name, *args)
+        @within[[name, args]] = true
+        begin
+          yield
+        ensure
+          @within.delete([name, args])
+        end
+      end
+      
+      def create(name, *args)
+        Redcar.plugin_manager.objects_implementing(:application_event_handler).each do |object|
+          handler = object.application_event_handler
+          handler.send(name, *args) if handler.respond_to?(name)
+        end
+      end
+    end
+  end
+end

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

@@ -13,18 +13,18 @@ module Redcar
   
     # Iterate over each entry
     def each
-      @entries.each {|e| yield e}
+      entries.each {|e| yield e}
     end
   
     # Add a Redcar::MenuItem or a Redcar::Menu
     def <<(entry)
-      @entries << entry
+      entries << entry
       self
     end
   
     # Number of entries in the menu
     def length
-      @entries.length
+      entries.length
     end
     
     # Fetch the sub_menu with the given name
@@ -47,7 +47,7 @@ module Redcar
     def ==(other)
       return false unless length == other.length
       return false unless text == other.text
-      @entries.zip(other.entries) do |here, there|
+      entries.zip(other.entries) do |here, there|
         return false unless here.class == there.class and here == there
       end
       true
@@ -62,7 +62,7 @@ module Redcar
           if here.class == other_entry.class
             here.merge(other_entry)
           else
-            @entries[@entries.index(here)] = other_entry
+            entries[entries.index(here)] = other_entry
           end
         else
           self << other_entry

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

@@ -62,6 +62,11 @@ module Redcar
         @current_menu = old_menu
       end
       
+      def lazy_sub_menu(text, &block)
+        new_menu = LazyMenu.new(block, text)
+        @current_menu << new_menu
+      end
+      
       def append(item)
         @current_menu << item
       end

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

@@ -0,0 +1,24 @@
+
+module Redcar
+  class Menu
+    class LazyMenu < Menu
+      
+      def initialize(block, text=nil)
+        @text = text
+        @block = block
+      end
+      
+      def entries
+        Menu::Builder.build(&@block).entries
+      end
+      
+      def <<(*_)
+        raise
+      end
+      
+      def merge(*_)
+        raise
+      end
+    end
+  end
+end

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

@@ -1,14 +1,15 @@
 module Redcar
-  #
-  # Events: new_tab (tab)
   class Notebook
     include Redcar::Model
     include Redcar::Observable
     
-    def initialize
+    attr_reader :window
+    
+    def initialize(window)
       @tabs         = []
       @focussed_tab = nil
       @tab_handlers = Hash.new {|h,k| h[k] = [] }
+      @window       = window
     end
     
     def length

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

@@ -14,7 +14,9 @@ module Redcar
     #
     # Events: close
     def close
-      notify_listeners(:close)
+      Redcar.app.events.ignore(:tab_close, self) do
+        notify_listeners(:close)
+      end
     end
     
     # Focus the tab within the notebook, and gives the keyboard focus to the 
@@ -22,7 +24,9 @@ module Redcar
     #
     # Events: focus
     def focus
-      notify_listeners(:focus)
+      Redcar.app.events.ignore(:tab_focus, self) do
+        notify_listeners(:focus)
+      end
     end
     
     def title

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

@@ -1,6 +1,8 @@
 
 module Redcar
   class Window
+    DEFAULT_TITLE = "Redcar"
+    
     include Redcar::Model
     include Redcar::Observable
     
@@ -21,7 +23,7 @@ module Redcar
       create_notebook
       @treebook = Treebook.new
       @speedbar = nil
-      self.title = "Redcar"
+      self.title = DEFAULT_TITLE
     end
 
     def title
@@ -47,7 +49,7 @@ module Redcar
     # @events [(:new_notebook, notebook)]
     def create_notebook
       return if @notebooks.length == 2
-      notebook = Redcar::Notebook.new
+      notebook = Redcar::Notebook.new(self)
       @notebooks << notebook
       if @notebooks.length == 1
         self.focussed_notebook = notebook
@@ -170,11 +172,13 @@ module Redcar
     
     # Focus the Window.
     def focus
-      notify_listeners(:focussed, self)
+      Redcar.app.events.ignore(:window_focus, self) do
+        notify_listeners(:focussed, self)
+      end
     end
 
     def close
-      ignore(:closing) do
+      Redcar.app.events.ignore(:window_close, self) do
         notify_listeners(:about_to_close, self)
         notebooks.each do |notebook| 
           notebook.tabs.each {|tab| tab.close }

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

@@ -42,4 +42,20 @@ describe "Redcar::Menu::Builder DSL" do
     top_item = builder.menu.entries.last
     top_item.text.should == "Exit"
   end
-end
+  
+  it "adds lazy submenus to the menu" do
+    builder = Redcar::Menu::Builder.new do
+      lazy_sub_menu "Export" do
+        item "PDF", :PDFCommand
+      end
+    end
+    builder.menu.length.should == 1
+    
+    lazy_sub_menu = builder.menu.entries.first
+    lazy_sub_menu.should be_an_instance_of(Redcar::Menu::LazyMenu)
+    
+    lazy_sub_menu.entries.length.should == 1
+    lazy_sub_menu.entries.first.text.should == "PDF"
+  end
+end
+

data/plugins/application/spec/application/notebook_spec.rb

@@ -6,7 +6,7 @@ describe Redcar::Notebook do
     end
     
     before do
-      @notebook = Redcar::Notebook.new
+      @notebook = Redcar::Notebook.new(nil)
     end
     
     it "reports its length" do

data/plugins/application_swt/build.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project name="redcar.application_swt" default="dist" basedir=".">
+	<!-- set global properties for this build -->
+	<property name="src" location="src"/>
+	<property name="build" location="build"/>
+	<property name="dist"  location="lib/dist"/>
+	<property environment="env" />
+
+	<condition property="platform" value="osx">
+		<and>
+			<os family="mac" />
+			<os family="unix" />
+			<os arch="i386" />
+		</and>
+	</condition>
+
+	<condition property="platform" value="osx64">
+		<and>
+			<os family="mac" />
+			<os family="unix" />
+			<os arch="x86_64" />
+		</and>
+	</condition>
+
+	<condition property="platform" value="linux">
+		<and>
+			<os family="unix" />
+			<os arch="i386" />
+		</and>
+	</condition>
+
+	<condition property="platform" value="linux64">
+		<and>
+			<os family="unix" />
+			<os arch="amd64" />
+		</and>
+	</condition>
+
+	<condition property="platform" value="windows">
+		<os family="windows" />
+	</condition>
+
+	<path id="project.classpath">
+    <fileset dir="vendor/jface">
+			<include name="org.eclipse.jface.jar" />
+		</fileset>
+
+		<fileset dir="vendor/swt/${platform}">
+			<include name="*.jar" />
+		</fileset>
+	</path>
+
+	<target name="init">
+		<tstamp/>
+		<mkdir dir="${build}"/>
+	</target>
+
+	<target name="compile" depends="init" description="compile the source " >
+		<javac target="1.5" srcdir="${src}" destdir="${build}">
+			<classpath refid="project.classpath" />
+		</javac>
+	</target>
+
+	<target name="dist" depends="compile" description="generate the distribution" >
+		<mkdir dir="${dist}"/>
+		<jar jarfile="lib/dist/application_swt.jar" basedir="${build}"/>
+	</target>
+
+	<target 	name="clean"
+				description="clean up" >
+		<delete dir="${build}"/>
+		<delete dir="${dist}"/>
+	</target>
+</project>

data/plugins/application_swt/lib/application_swt.rb

@@ -21,6 +21,8 @@ require "application_swt/treebook"
 require "application_swt/window"
 require "application_swt/swt/grid_data"
 
+require "dist/application_swt"
+
 module Redcar
   class ApplicationSWT
     include Redcar::Controller
@@ -92,16 +94,93 @@ module Redcar
       shell.add_shell_listener(ShellListener.new)
     end
     
+    def self.shell_dialogs
+      @shell_dialogs ||= {}
+    end
+    
+    def self.register_dialog(shell, dialog)
+      shell_dialogs[shell] = dialog
+    end
+    
+    def self.unregister_dialog(dialog)
+      shell_dialogs.delete(shell_dialogs.invert[dialog])
+    end
+    
     def initialize(model)
       @model = model
       add_listeners
+      add_swt_listeners
       create_clipboard
+      create_fake_window
+    end
+    
+    def fake_shell
+      @fake_shell
     end
     
+    def create_fake_window
+      if Redcar.platform == :osx
+        @fake_shell = Swt::Widgets::Shell.new(ApplicationSWT.display, Swt::SWT::NO_TRIM)
+        @fake_shell.open
+        @fake_shell.set_size(0, 0)
+      end
+    end
+      
+    class FakeWindow
+      def initialize(shell)
+        @shell = shell
+      end
+      
+      attr_reader :shell
+    end
+
+    def refresh_menu
+      if Redcar.platform == :osx
+        old_menu_bar = @fake_shell.menu_bar
+        fake_menu_controller = ApplicationSWT::Menu.new(FakeWindow.new(@fake_shell), Redcar.app.main_menu, Redcar.app.main_keymap, Swt::SWT::BAR)
+        fake_shell.menu_bar = fake_menu_controller.menu_bar
+        old_menu_bar.dispose if old_menu_bar
+      end
+    end
+
     def add_listeners
       @model.add_listener(:new_window, &method(:new_window))
     end
     
+    class Listener
+      def initialize(name)
+        @name = name
+      end
+      
+      def handle_event(e)
+        Application::Dialog.message_box("#{@name} menu is not hooked up yet")
+      end
+    end
+    
+    class QuitListener
+      def handle_event(e)
+        unless Redcar.app.events.ignore?(:application_close, Redcar.app)
+          e.doit = false
+          Redcar.app.events.create(:application_close, Redcar.app)
+        end
+      end
+    end
+    
+    def add_swt_listeners
+      if Redcar.platform == :osx
+        quit_listener  = Listener.new(:quit)
+        about_listener = Listener.new(:about)
+        prefs_listener = Listener.new(:prefs)
+        enhancer = com.redcareditor.application_swt.CocoaUIEnhancer.new("Redcar")
+        enhancer.hook_application_menu(
+          ApplicationSWT.display,
+          QuitListener.new, 
+          about_listener, 
+          prefs_listener
+        )
+      end
+    end
+    
     def create_clipboard
       ApplicationSWT::Clipboard.new(@model.clipboard)
     end