redcar-dev 0.12.27dev → 0.13.0dev

data/CHANGES

@@ -1,6 +1,13 @@
-Version 0.12 (TBA)
+Version 0.13 (TBA)
 ==================
 
+ * Move all language settings options into the Edit menu, for easier discoverability.(Dan Lucraft)
+ * Move the change tab language command into the Edit menu, and make it a filter list. (Dan Lucraft)
+
+
+Version 0.12 (7th January 2012)
+===============================
+
  * Features run all the way through again, and use Swtbot in places to 
    allow us to simulate events more accurately (Helpful for macros) (Dan Lucraft)
  * Added --no-splash option (Dan Lucraft)
@@ -21,9 +28,11 @@ Version 0.12 (TBA)
  * Added option to color tree background color via ApplicationSWT preferences (Delisa Mason)
  * Project tree has colourful icons (Delisa Mason)
  * Uses gems to install everything (Dan Lucraft)
+ * Uses Bundler to manage dependencies in development (Dan Lucraft)
  * Wildcards permitted in project search (Delisa Mason)
  * Installation entirely through Rubygems (Dan Lucraft)
  * Rad new icon (Delisa Mason)
+ * Checks for updates and displays if there is a new version in the Help menu (Dan Lucraft)
 
 Version 0.11 (23 March 2011)
 ============================

data/lib/redcar.rb

@@ -68,9 +68,9 @@ end
 #
 # and so on.
 module Redcar
-  VERSION         = '0.12.27dev' # also change in the gemspec!
+  VERSION         = '0.13.0dev' # also change in the gemspec!
   VERSION_MAJOR   = 0
-  VERSION_MINOR   = 12
+  VERSION_MINOR   = 13
   VERSION_RELEASE = 0
   
   ENVIRONMENTS = [:user, :debug, :test]

data/plugins/application/lib/application.rb

@@ -12,6 +12,7 @@ require 'application/dialog'
 require 'application/dialogs/filter_list_dialog'
 require 'application/dialogs/modeless_list_dialog'
 require 'application/event_spewer'
+require 'application/global_state'
 require 'application/keymap'
 require 'application/keymap/builder'
 require 'application/toolbar'
@@ -152,7 +153,6 @@ module Redcar
 
     # Create a new Application::Window, and the controller for it.
     def new_window(show=true)
-      s = Time.now
       new_window = Window.new
       windows << new_window
       notify_listeners(:new_window, new_window)
@@ -198,7 +198,7 @@ module Redcar
       @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.set_default('show_toolbar', Redcar.platform != :osx)
         storage.set_default('instance_id', java.util.UUID.randomUUID.to_s)
         storage.set_default('should_check_for_updates', true)
         storage

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

@@ -84,7 +84,7 @@ module Redcar
       #
       # The return value is a hash containing :button and :value.
       def self.input(title, message, initial_value="", &validator)
-        in_dialog { Redcar.gui.dialog_adapter.input(title, message, initial_value, &validator) }
+        in_dialog { Redcar.gui.dialog_adapter.input(title.to_s, message.to_s, initial_value.to_s, &validator) }
       end
 
       # Show a dialog containing a password entry box to the user, and blocks

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

@@ -20,10 +20,18 @@ module Redcar
       notify_listeners(:close)
     end
     
-    # Called by the controller when the user changes the filter.
+    # Called by the controller when the user changes the filter. 
+    #
+    # Should return either a list of strings, or a list of hashes, which must have at least
+    # the key :name set, and may also have the key :image.
+    #
+    # E.g. it returns ["feed.rb", "application_controller.rb"]
+    # or it returns [{:name => "feed.rb"}, {:name => "application_controller.rb"}]
+    #
+    # The methods selected and moved_to will be called with items from this list.
     #
     # @param [String] the filter entered by the user
-    # @return [Array<String>] the new list to display
+    # @return [Array<String> or Array<Hash>] the new list to display
     def update_list(filter)
       if filter == ""
         %w(foo bar baz qux quux corge)
@@ -36,9 +44,9 @@ module Redcar
     
     # Called by the controller when the user selects a row in the list.
     #
-    # @param [String] the list row text selected by the user
+    # @param [String or Hash] the item selected by the user
     # @param [Integer] the index of the row in the list selected by the user
-    def selected(text, ix)
+    def selected(item, ix)
       puts "Hooray! You selected #{text} at index #{ix}"
     end
     
@@ -46,7 +54,7 @@ module Redcar
     #
     # @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)
+    def moved_to(item, ix)
       # Override with the code you wish you had
     end
 

data/plugins/application/lib/application/global_state.rb

@@ -0,0 +1,21 @@
+module Redcar
+  class Application
+    class GlobalState
+      def app
+        Redcar.app
+      end
+      
+      def win
+        app and app.focussed_window
+      end
+      
+      def project
+        win and Project.in_window(win)
+      end
+
+      def tab
+        win and win.focussed_notebook_tab
+      end
+    end
+  end
+end

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

@@ -12,7 +12,7 @@ module Redcar
         end
       end
       
-      attr_reader :command, :priority, :value, :type, :active
+      attr_reader :command, :priority, :value, :type
   
       # Create a new Item, with the given text to display in the menu, and
       # either:
@@ -26,10 +26,9 @@ module Redcar
           @priority = options[:priority]
           @value = options[:value]
           @type = options[:type]
-          @active = options[:active] ? true : false
-        # This branch is for compatibility with old code. Please use :command 
-        # option in new code
-        # FIXME: Should this be removed at some point?
+          if [:check, :radio].include?(@type)
+            @checked = options[:checked]
+          end
         else
           @command = options || block
         end
@@ -55,11 +54,13 @@ module Redcar
       end
       
       def text
-        @text.is_a?(Proc) ? @text.call : @text
+        @text.respond_to?(:call) ? 
+          Redcar::Application::GlobalState.new.instance_eval(&@text) :
+          @text
       end
       
       def lazy_text?
-        @text.is_a?(Proc)
+        @text.respond_to?(:call)
       end
       
       def merge(other)
@@ -74,6 +75,14 @@ module Redcar
       def is_unique?
         false
       end
+      
+      def checked?
+        @checked and (
+          @checked.respond_to?(:call) ?
+            Redcar::Application::GlobalState.new.instance_eval(&@checked) :
+            @checked
+        )
+      end
     end
   end
 end

data/plugins/application/lib/application/updates.rb

@@ -31,12 +31,29 @@ module Redcar
       end
       
       def self.latest_version
-        @latest_version ||= Net::HTTP.get(URI.parse("http://s3.amazonaws.com/redcar2/current_version.txt?instance_id=#{Application.instance_id}")).strip
+        @latest_version ||= Net::HTTP.get(URI.parse(latest_version_url)).strip
+      end
+      
+      def self.latest_version_url
+        "http://s3.amazonaws.com/redcar2/current_version.txt?instance_id=#{Application.instance_id}&version=#{Redcar::VERSION}"
       end
       
       def self.newer_version?
-        latest_version_bits = latest_version.split(".").map(&:to_i)
-        [latest_version_bits, [Redcar::VERSION_MAJOR, Redcar::VERSION_MINOR, Redcar::VERSION_RELEASE]].sort.last == latest_version_bits
+        latest_version_bits = latest_version.chomp.split(".").map(&:to_i)
+        newer_than?(latest_version_bits, [Redcar::VERSION_MAJOR, Redcar::VERSION_MINOR, Redcar::VERSION_RELEASE])
+      end
+      
+      def self.newer_than?(new_bits, old_bits)
+        # if they are not the same length, pad with 0's to make comparison
+        # valid. E.g. 0.10.0 == 0.10
+        if new_bits.length > old_bits.length
+          old_bits += [0]*(new_bits.length - old_bits.length)
+        elsif old_bits.length > new_bits.length
+          new_bits += [0]*(old_bits.length - new_bits.length)
+        end
+        
+        return false if new_bits == old_bits
+        [new_bits, old_bits].sort.last == new_bits
       end
       
     end

data/plugins/application/spec/application/updates_spec.rb

@@ -0,0 +1,53 @@
+
+require "spec_helper"
+
+describe Redcar::Application::Updates do
+
+  describe "comparing versions logic" do
+
+    it "0.10 = 0.10" do
+      Redcar::Application::Updates.newer_than?([0, 10], [0, 10]).should be_false
+    end
+    
+    it "0.10.0 = 0.10" do
+      Redcar::Application::Updates.newer_than?([0, 10, 0], [0, 10]).should be_false
+    end
+
+    it "0.10 = 0.10.0" do
+      Redcar::Application::Updates.newer_than?([0, 10], [0, 10, 0]).should be_false
+    end
+    
+    it "0.10.1 > 0.10" do
+      Redcar::Application::Updates.newer_than?([0, 10, 1], [0, 10]).should be_true
+    end
+    
+    it "0.11 > 0.10" do
+      Redcar::Application::Updates.newer_than?([0, 11], [0, 10]).should be_true
+    end
+
+    it "0.11.1 > 0.10" do
+      Redcar::Application::Updates.newer_than?([0, 11, 1], [0, 10]).should be_true
+    end
+
+    it "0.11 > 0.10.1" do
+      Redcar::Application::Updates.newer_than?([0, 11], [0, 10, 1]).should be_true
+    end
+    
+    it "0.11.1 > 0.10.1" do
+      Redcar::Application::Updates.newer_than?([0, 11, 1], [0, 10, 1]).should be_true
+    end
+
+    it "0.9 < 0.10" do
+      Redcar::Application::Updates.newer_than?([0, 9], [0, 10]).should be_false
+    end
+
+    it "0.9.1 < 0.10" do
+      Redcar::Application::Updates.newer_than?([0, 9, 1], [0, 10]).should be_false
+    end
+
+    it "0.9 < 0.10.1" do
+      Redcar::Application::Updates.newer_than?([0, 9], [0, 10, 1]).should be_false
+    end
+
+  end
+end

data/plugins/application_swt/lib/application_swt.rb

@@ -13,8 +13,8 @@ require "application_swt/dialogs/modeless_dialog"
 require "application_swt/dialogs/modeless_html_dialog"
 require "application_swt/dialogs/modeless_list_dialog_controller"
 require "application_swt/gradient"
-require "application_swt/html_tab"
 require "application_swt/icon"
+require "application_swt/html_tab"
 require "application_swt/listener_helpers"
 require "application_swt/menu"
 require "application_swt/menu/binding_translator"

data/plugins/application_swt/lib/application_swt/dialogs/filter_list_dialog_controller.rb

@@ -14,20 +14,33 @@ module Redcar
         attr_accessor :controller
         
         def createDialogArea(parent)
+          # composite = Swt::Widgets::Composite.new(parent, Swt::SWT::NONE)
+          # layout = Swt::Layout::RowLayout.new(Swt::SWT::VERTICAL)
+          # composite.setLayout(layout)
+          # 
+          # @text = Swt::Widgets::Text.new(composite, Swt::SWT::SINGLE | Swt::SWT::LEFT | Swt::SWT::ICON_CANCEL | Swt::SWT::SEARCH)
+          # @text.set_layout_data(Swt::Layout::RowData.new(400, 20))
+          # @list = Swt::Widgets::List.new(composite, Swt::SWT::V_SCROLL | Swt::SWT::H_SCROLL | Swt::SWT::SINGLE)
+          # @list.set_layout_data(Swt::Layout::RowData.new(400, 200))
+          # controller.attach_listeners
+          # controller.update_list_sync
+          # get_shell.add_shell_listener(ShellListener.new(controller))
+          # ApplicationSWT.register_shell(get_shell)
+          # ApplicationSWT.register_dialog(get_shell, self)
+          # 
+          # @list.set_selection(0)
           composite = Swt::Widgets::Composite.new(parent, Swt::SWT::NONE)
           layout = Swt::Layout::RowLayout.new(Swt::SWT::VERTICAL)
           composite.setLayout(layout)
-
           @text = Swt::Widgets::Text.new(composite, Swt::SWT::SINGLE | Swt::SWT::LEFT | Swt::SWT::ICON_CANCEL | Swt::SWT::SEARCH)
           @text.set_layout_data(Swt::Layout::RowData.new(400, 20))
-          @list = Swt::Widgets::List.new(composite, Swt::SWT::V_SCROLL | Swt::SWT::H_SCROLL | Swt::SWT::SINGLE)
+          @list = Swt::Widgets::Table.new(composite, Swt::SWT::V_SCROLL | Swt::SWT::H_SCROLL | Swt::SWT::MULTI)
           @list.set_layout_data(Swt::Layout::RowData.new(400, 200))
           controller.attach_listeners
           controller.update_list_sync
           get_shell.add_shell_listener(ShellListener.new(controller))
-          ApplicationSWT.register_shell(get_shell)
-          ApplicationSWT.register_dialog(get_shell, self)
-
+          Redcar::ApplicationSWT.register_shell(get_shell)
+          Redcar::ApplicationSWT.register_dialog(get_shell, self)
           @list.set_selection(0)
         end
       end
@@ -167,7 +180,8 @@ module Redcar
       
       def widget_selected
         if @model.step?
-          @model.moved_to(@dialog.list.get_selection.first, @dialog.list.get_selection_index)
+          ix = @dialog.list.get_selection_index
+          @model.moved_to(@list[ix], ix)
         end
       end
 
@@ -185,7 +199,8 @@ module Redcar
 
       def selected
         wait_for_search if select_closest_match?
-        @model.selected(@dialog.list.get_selection.first, @dialog.list.get_selection_index)
+        ix = @dialog.list.get_selection_index
+        @model.selected(@list[ix], ix)
       end
       
       def key_pressed(key_event)
@@ -221,10 +236,20 @@ module Redcar
       end
       
       def populate_list(contents)
+        @list = contents
         if @dialog
-          @dialog.list.removeAll
-          contents.each do |text|
-            @dialog.list.add(text)
+          @dialog.list.remove_all
+          contents.each do |props|
+            if props.is_a?(String)
+              props = {:name => props}
+            end
+            props = {:name => ""}.merge(props)
+            item = Swt::Widgets::TableItem.new(@dialog.list, Swt::SWT::NONE)
+            item.text = props[:name]
+            image = ApplicationSWT::Icon.swt_image(props[:icon]) if props[:icon]
+            if image
+              item.image = image
+            end
           end
         end
       end

data/plugins/application_swt/lib/application_swt/menu.rb

@@ -31,11 +31,13 @@ module Redcar
         @keymap = keymap
         @menu_bar = Swt::Widgets::Menu.new(window.shell, type)
         @menu_bar.set_visible(false)
+        
         return unless menu_model
         @handlers = []
         @use_numbers = options[:numbers]
         @number = 1
-        add_entries_to_menu(@menu_bar, menu_model)
+        
+        add_entries_to_menu(@menu_bar, nil, menu_model)
         #puts "ApplicationSWT::Menu initialize took #{Time.now - s}s"
       end
 
@@ -59,7 +61,26 @@ module Redcar
         @use_numbers
       end
 
-      def add_entries_to_menu(menu, menu_model)
+      class MenuListener
+        attr_reader :items
+        
+        def initialize
+          @items = []
+        end
+        
+        def menu_shown(e)
+          items.each do |item, entry|
+            if entry.type == :check
+              item.setSelection(entry.checked?)
+            end
+          end
+        end
+        
+        def menu_hidden(e)
+        end
+      end
+
+      def add_entries_to_menu(menu, menu_listener, menu_model)
         menu_model.each do |entry|
           if entry.is_a?(Redcar::Menu::LazyMenu)
             menu_header = Swt::Widgets::MenuItem.new(menu, Swt::SWT::CASCADE)
@@ -68,7 +89,7 @@ module Redcar
             menu_header.menu = new_menu
             menu_header.add_arm_listener do
               new_menu.get_items.each {|i| i.dispose }
-              add_entries_to_menu(new_menu, entry)
+              add_entries_to_menu(new_menu, nil, entry)
             end
           elsif entry.is_a?(Redcar::Menu)
             menu_header = Swt::Widgets::MenuItem.new(menu, Swt::SWT::CASCADE)
@@ -76,7 +97,9 @@ module Redcar
             new_menu = Swt::Widgets::Menu.new(menu)
             menu_header.menu = new_menu
             menu_header.enabled = (entry.length > 0)
-            add_entries_to_menu(new_menu, entry)
+            new_menu_listener = MenuListener.new
+            add_entries_to_menu(new_menu, new_menu_listener, entry)
+            new_menu.add_menu_listener(new_menu_listener)
             menu_header.add_arm_listener do
               entry.entries.zip(new_menu.get_items) do |sub_entry, swt_item|
                 if sub_entry.lazy_text?
@@ -88,12 +111,15 @@ module Redcar
             item = Swt::Widgets::MenuItem.new(menu, Swt::SWT::SEPARATOR)
           elsif entry.is_a?(Redcar::Menu::Item)
             item = Swt::Widgets::MenuItem.new(menu, Menu.types[entry.type] || Swt::SWT::PUSH)
-            item.setSelection(entry.active)
             if entry.command.is_a?(Proc)
               connect_proc_to_item(item, entry)
             else
               connect_command_to_item(item, entry)
             end
+            if [:check, :radio].include? entry.type
+              menu_listener.items << [item, entry] if menu_listener
+              item.setSelection(entry.checked?)
+            end
           else
             raise "unknown object of type #{entry.class} in menu"
           end