redcar 0.7 → 0.8

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

@@ -147,11 +147,14 @@ def close_everything
     dialogs.each {|d| d.controller.model.close }
   end
   Redcar.app.windows.each do |win|
-    while tree = win.treebook.trees.first
+    win.treebook.trees.each do |tree|
       Swt.sync_exec do
         win.treebook.remove_tree(tree)
       end
     end
+    if Redcar::Project::Manager.in_window(win)
+      Redcar::Project.window_projects.delete(win)
+    end
     win.notebooks.each do |notebook|
       while tab = notebook.tabs.first
         Swt.sync_exec do
@@ -191,7 +194,7 @@ After do
   Redcar.app.history.clear
   total_mem = java.lang.Runtime.getRuntime.totalMemory
   free_mem  = java.lang.Runtime.getRuntime.freeMemory
-  p [:total, total_mem, :free, free_mem, :diff, total_mem - free_mem]
+  #p [:total, total_mem, :free, free_mem, :diff, total_mem - free_mem]
 end
 
 at_exit {

data/plugins/application/lib/application.rb

@@ -42,16 +42,16 @@ module Redcar
   # one place to hook into Redcar events.
   class Application
     NAME = "Redcar"
-    
+
     include Redcar::Model
     include Redcar::Observable
-    
+
     def self.start
       Redcar.app = Application.new
     end
-    
+
     def self.sensitivities
-      [ 
+      [
         Sensitivity.new(:open_tab, Redcar.app, false, [:focussed_window, :tab_focussed]) do |tab|
           if win = Redcar.app.focussed_window
             win.focussed_notebook.focussed_tab
@@ -67,7 +67,7 @@ module Redcar
             win.notebooks.length > 1
           end
         end,
-        Sensitivity.new(:other_notebook_has_tab, Redcar.app, false, 
+        Sensitivity.new(:other_notebook_has_tab, Redcar.app, false,
                         [:focussed_window, :focussed_notebook, :notebook_change, :tab_closed]) do
           if win = Redcar.app.focussed_window and notebook = win.nonfocussed_notebook
             notebook.tabs.any?
@@ -75,9 +75,9 @@ module Redcar
         end
       ]
     end
-    
+
     attr_reader :clipboard, :keymap, :menu, :toolbar, :history, :task_queue, :show_toolbar
-    
+
     # Create an application instance with a Redcar::Clipboard and a Redcar::History.
     def initialize
       @windows = []
@@ -86,27 +86,27 @@ 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
-    
+
     def events
       @event_spewer
     end
-  
+
     # Immediately stop the gui event loop.
-    # (You should probably be running QuitCommand instead.)    
+    # (You should probably be running QuitCommand instead.)
     def quit
       @task_queue.stop
       Redcar.gui.stop
     end
-    
+
     # All open windows
     #
     # @return [Array<Redcar::Window>]
@@ -127,14 +127,14 @@ module Redcar
       set_focussed_window(new_window)
       #puts "App#new_window took #{Time.now - s}s"
       new_window
-    end   
-    
+    end
+
     def make_sure_at_least_one_window_open
       if windows.length == 0
         new_window
       end
-    end 
-    
+    end
+
     # Removes a window from this Application. Should not be called by plugins,
     # use Window#close instead.
     def window_closed(window)
@@ -143,10 +143,10 @@ module Redcar
         self.focussed_window = windows.first
       end
       @window_handlers[window].each {|h| window.remove_listener(h) }
-      
+
       @window_handlers.delete(window)
     end
-    
+
     def self.storage
       @storage ||= begin
          storage = Plugin::Storage.new('application_plugin')
@@ -155,45 +155,45 @@ module Redcar
          storage
       end
     end
-    
+
     # All Redcar::Notebooks in all Windows.
     def all_notebooks
       windows.inject([]) { |arr, window| arr << window.notebooks }.flatten
     end
-    
+
     # All Redcar::Tabs in all Notebooks in all Windows.
     def all_tabs
       all_notebooks.inject([]) { |arr, notebook| arr << notebook.tabs }.flatten
     end
-    
+
     # The focussed Redcar::Notebook in the focussed window, or nil.
     def focussed_window_notebook
       focussed_window.focussed_notebook if focussed_window
     end
-    
+
     # The focussed Redcar::Tab in the focussed notebook in the focussed window.
     def focussed_notebook_tab
       focussed_window_notebook.focussed_tab if focussed_window_notebook
     end
 
-    # The focussed Redcar::Window.    
+    # The focussed Redcar::Window.
     def focussed_window
       @focussed_window
     end
-    
-    # Set which window the app thinks is focussed. 
+
+    # Set which window the app thinks is focussed.
     # Should not be called by plugins, use Window#focus instead.
     def focussed_window=(window)
       set_focussed_window(window)
       notify_listeners(:focussed_window, window)
     end
-    
+
     # Set which window the app thinks is focussed.
     # Should not be called by plugins, use Window#focus instead.
     def set_focussed_window(window)
       @focussed_window = window
     end
-    
+
     # Redraw the main menu, reloading all the Menus and Keymaps from the plugins.
     def refresh_menu!
       @main_menu = nil
@@ -201,27 +201,32 @@ module Redcar
       windows.each {|window| window.refresh_menu }
       notify_listeners(:refresh_menu)
     end
-    
+
     # Redraw the main toolbar, reloading all the ToolBars and Keymaps from the plugins.
     def refresh_toolbar!
       @main_toolbar = nil
       windows.each {|window| window.refresh_toolbar }
       controller.refresh_toolbar
     end
-    
+
     # Generate the main menu by combining menus from all plugins.
     #
     # @return [Redcar::Menu]
-    def main_menu
+    def main_menu(window=nil)
       @main_menu ||= begin
         menu = Menu.new
         Redcar.plugin_manager.objects_implementing(:menus).each do |object|
-          menu.merge(object.menus)
+          case object.method(:menus).arity
+          when 1
+            menu.merge(object.menus(window))
+          else
+            menu.merge(object.menus)
+          end
         end
         menu
       end
     end
-    
+
     # Generate the toolbar combining toolbars from all plugins.
     #
     # @return [Redcar::ToolBar]
@@ -234,7 +239,7 @@ module Redcar
         toolbar
       end
     end
-    
+
     # Generate the main keymap by merging the keymaps from all plugins.
     #
     # @return [Redcar::Keymap]
@@ -243,7 +248,7 @@ module Redcar
         keymap = Keymap.new("main", Redcar.platform)
         Redcar.plugin_manager.objects_implementing(:keymaps).each do |object|
           maps = object.keymaps
-          keymaps = maps.select do |map| 
+          keymaps = maps.select do |map|
             map.name == "main" and map.platforms.include?(Redcar.platform)
           end
           keymap = keymaps.inject(keymap) {|k, nk| k.merge(nk) }
@@ -251,14 +256,14 @@ module Redcar
         keymap
       end
     end
-    
+
     # Loads sensitivities from all plugins.
     def load_sensitivities
       Redcar.plugin_manager.objects_implementing(:sensitivities).each do |object|
         object.sensitivities
       end
     end
-    
+
     # Called by the Gui to tell the Application that it
     # has lost focus.
     def lost_application_focus
@@ -266,7 +271,7 @@ module Redcar
       @application_focus = false
       notify_listeners(:lost_focus, self)
     end
-    
+
     # Called by the Gui to tell the Application that it
     # has gained focus.
     def gained_application_focus
@@ -275,24 +280,24 @@ module Redcar
         notify_listeners(:focussed, self)
       end
     end
-    
+
     def has_focus?
       @application_focus
     end
-    
+
     def protect_application_focus
       @protect_application_focus = true
       r = yield
       @protect_application_focus = false
       r
     end
-    
+
     def repeat_event(type)
       notify_listeners(type)
     end
-    
+
     private
-    
+
     def attach_window_listeners(window)
       h1 = window.add_listener(:tab_focussed) do |tab|
         notify_listeners(:tab_focussed, tab)
@@ -331,17 +336,17 @@ module Redcar
       end
       @window_handlers[window] << h1 << h2 << h3 << h4 << h5 << h6 << h7 << h8 << h9 << h10
     end
-    
+
     def create_clipboard
       @clipboard       = Clipboard.new("application")
       @clipboard.add_listener(:added) { notify_listeners(:clipboard_added) }
     end
-    
+
     def create_history
       @history = Command::History.new
     end
 
-    public 
+    public
 
     def show_toolbar?
       @show_toolbar

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

@@ -2,10 +2,10 @@
 module Redcar
   class Window
     DEFAULT_TITLE = "Redcar"
-    
+
     include Redcar::Model
     include Redcar::Observable
-    
+
     # All instantiated windows
     def self.all
       @all ||= []
@@ -14,16 +14,28 @@ module Redcar
     attr_reader :notebooks, :notebook_orientation
     attr_reader :treebook
     attr_reader :speedbar
-    
+
     def initialize
       Window.all << self
       @visible   = false
       @notebooks = []
       @notebook_orientation = :horizontal
       create_notebook
-      @treebook = Treebook.new
-      @speedbar = nil
-      self.title = DEFAULT_TITLE
+      @treebook   = Treebook.new
+      @speedbar   = nil
+      self.title  = DEFAULT_TITLE
+    end
+
+    def set_trees_visible(value)
+      if value
+        notify_listeners(:toggle_trees_visible) unless trees_visible?
+      else
+        notify_listeners(:toggle_trees_visible) if trees_visible?
+      end
+    end
+
+    def trees_visible?
+      controller.treebook_visible?
     end
 
     def title
@@ -43,7 +55,15 @@ module Redcar
     def visible?
       @visible
     end
-    
+
+    def fullscreen
+      controller.fullscreen
+    end
+
+    def fullscreen=(value)
+      controller.fullscreen = value
+    end
+
     # Create a new notebook in this window.
     #
     # @events [(:new_notebook, notebook)]
@@ -57,7 +77,7 @@ module Redcar
       attach_notebook_listeners(notebook)
       notify_listeners(:new_notebook, notebook)
     end
-    
+
     def attach_notebook_listeners(notebook)
       notebook.add_listener(:tab_focussed) do |tab|
         notify_listeners(:tab_focussed, tab)
@@ -87,7 +107,7 @@ module Redcar
         end
       end
     end
-    
+
     def close_notebook
       return if @notebooks.length == 1
       first_notebook, second_notebook = *@notebooks
@@ -98,42 +118,42 @@ module Redcar
       self.focussed_notebook = first_notebook
       notify_listeners(:notebook_removed, second_notebook)
     end
-    
+
     def focussed_notebook
       @focussed_notebook
     end
-    
+
     def focussed_notebook_tab
       @focussed_notebook.focussed_tab
     end
-    
+
     def focussed_notebook_tab_document
       focussed_notebook_tab.document if focussed_notebook_tab
-    end    
-    
+    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] 
+    # @param [:horizontal, :vertical]
     def notebook_orientation=(key)
       @notebook_orientation = key
       notify_listeners(:notebook_orientation_changed, key)
     end
-    
+
     # Sets the orientation of the notebooks to whatever it is not currently.
     def rotate_notebooks
       if notebook_orientation == :horizontal
@@ -142,12 +162,12 @@ module Redcar
         self.notebook_orientation = :horizontal
       end
     end
-    
+
     # Delegates to the new_tab method in the Window's active Notebook.
     def new_tab(*args, &block)
       focussed_notebook.new_tab(*args, &block)
     end
-    
+
     attr_reader :menu, :toolbar, :keymap
 
     def menu=(menu)
@@ -165,30 +185,40 @@ module Redcar
     def popup_menu(menu)
       notify_listeners(:popup_menu, menu)
     end
-    
+
     def popup_menu_with_numbers(menu)
       notify_listeners(:popup_menu_with_numbers, menu)
     end
-    
+
     def refresh_menu
       notify_listeners(:refresh_menu)
     end
-    
+
     def refresh_toolbar
       notify_listeners(:refresh_toolbar)
     end
-    
+
     # Focus the Window.
     def focus
       Redcar.app.events.ignore(:window_focus, self) do
         notify_listeners(:focussed, self)
+        refresh_tabs
+      end
+    end
+
+    # Check all tabs for underlying files; mark if missing
+    def refresh_tabs
+      all_tabs.each do |tab|
+        if tab.is_a?(Redcar::EditTab)
+          tab.update_for_file_changes
+        end
       end
     end
 
     def close
       Redcar.app.events.ignore(:window_close, self) do
         notify_listeners(:about_to_close, self)
-        notebooks.each do |notebook| 
+        notebooks.each do |notebook|
           notebook.tabs.each {|tab| tab.close }
         end
         if notebooks.length > 1
@@ -197,11 +227,11 @@ module Redcar
         notify_listeners(:closed, self)
       end
     end
-    
+
     def inspect
       "#<Redcar::Window \"#{title}\">"
     end
-    
+
     def open_speedbar(speedbar)
       if @speedbar
         close_speedbar
@@ -209,7 +239,7 @@ module Redcar
       @speedbar = speedbar
       notify_listeners(:speedbar_opened, speedbar)
     end
-    
+
     def close_speedbar
       notify_listeners(:speedbar_closed, @speedbar)
       @speedbar.close if @speedbar.respond_to?(:close)
@@ -218,7 +248,7 @@ module Redcar
         tab.focus
       end
     end
-    
+
     def all_tabs
       notebooks.map {|nb| nb.tabs }.flatten
     end