redcar 0.9.2 → 0.10

data/plugins/application/spec/application/treebook_spec.rb

@@ -1,25 +1,25 @@
 require File.join(File.dirname(__FILE__), "..", "spec_helper")
 
 describe Redcar::Treebook do
-  
+
   describe "a new treebook" do
     before do
       @treebook = Redcar::Treebook.new
     end
-    
+
     it "has no trees" do
       @treebook.trees.length.should == 0
     end
-    
+
     it "accepts a tree and notifies listeners" do
-      tree = "mock tree"
+      tree = MockTree.new("mock tree")
       tree_added = false
       @treebook.add_listener(:tree_added) do |tree|
         tree_added = tree
       end
-      
+
       @treebook.add_tree(tree)
-      
+
       tree_added.should == tree
       @treebook.trees.should == [tree]
     end

data/plugins/application/spec/spec_helper.rb

@@ -6,4 +6,13 @@ Redcar.load_unthreaded
 Dir[File.dirname(__FILE__) + "/application/controllers/*.rb"].each do |fn|
   require fn
 end
-  
+
+class MockTree
+  attr_reader :title
+
+  def initialize(title)
+    @title = title
+  end
+
+  def focus; end
+end

data/plugins/application_swt/lib/application_swt.rb

@@ -9,6 +9,10 @@ require "application_swt/dialogs/no_buttons_dialog"
 require "application_swt/dialogs/text_and_file_dialog"
 require "application_swt/dialogs/filter_list_dialog_controller"
 require "application_swt/dialogs/input_dialog"
+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/menu"
@@ -35,13 +39,31 @@ module Redcar
     def self.start
       if Redcar.gui
         Redcar.gui.register_controllers(
-            Redcar::Tab              => ApplicationSWT::Tab,
-            Redcar::HtmlTab          => ApplicationSWT::HtmlTab,
-            Redcar::FilterListDialog => ApplicationSWT::FilterListDialogController
+            Redcar::Tab                => ApplicationSWT::Tab,
+            Redcar::HtmlTab            => ApplicationSWT::HtmlTab,
+            Redcar::FilterListDialog   => ApplicationSWT::FilterListDialogController,
+            Redcar::ModelessListDialog => ApplicationSWT::ModelessListDialogController
           )
         Redcar.gui.register_dialog_adapter(ApplicationSWT::DialogAdapter.new)
       end
     end
+    
+    def self.selected_tab_background
+      Gradient.new(Redcar::ApplicationSWT.storage['selected_tab_background'])
+    end
+    
+    def self.unselected_tab_background
+      Gradient.new(Redcar::ApplicationSWT.storage['unselected_tab_background'])
+    end
+    
+    def self.storage
+      @storage ||= begin
+        storage = Plugin::Storage.new('application_swt')
+        storage.set_default('selected_tab_background', {0 => "#FEFEFE", 100 => "#EEEEEE"})
+        storage.set_default('unselected_tab_background', {0 => "#E5E5E5", 100 => "#D0D0D0"})
+        storage
+      end
+    end
 
     def self.add_debug_key_filters
       display.add_filter(Swt::SWT::KeyDown) do |a|

data/plugins/application_swt/lib/application_swt/dialog_adapter.rb

@@ -4,15 +4,15 @@ module Redcar
       def open_file(options)
         file_dialog(Swt::SWT::OPEN, options)
       end
-      
+
       def open_directory(options)
         directory_dialog(options)
       end
-      
+
       def save_file(options)
         file_dialog(Swt::SWT::SAVE, options)
       end
-      
+
       MESSAGE_BOX_TYPES = {
         :info     => Swt::SWT::ICON_INFORMATION,
         :error    => Swt::SWT::ICON_ERROR,
@@ -20,7 +20,7 @@ module Redcar
         :warning  => Swt::SWT::ICON_WARNING,
         :working  => Swt::SWT::ICON_WORKING
       }
-      
+
       BUTTONS = {
         :yes    => Swt::SWT::YES,
         :no     => Swt::SWT::NO,
@@ -30,16 +30,16 @@ module Redcar
         :abort  => Swt::SWT::ABORT,
         :ignore => Swt::SWT::IGNORE
       }
-      
+
       MESSAGE_BOX_BUTTON_COMBOS = {
         :ok                 => [:ok],
         :ok_cancel          => [:ok, :cancel],
-        :yes_no             => [:yes, :no], 
+        :yes_no             => [:yes, :no],
         :yes_no_cancel      => [:yes, :no, :cancel],
         :retry_cancel       => [:retry, :cancel],
         :abort_retry_ignore => [:abort, :retry, :ignore]
       }
-      
+
       def message_box(text, options)
         styles = 0
         styles = styles | MESSAGE_BOX_TYPES[options[:type]] if options[:type]
@@ -55,19 +55,19 @@ module Redcar
         end
         BUTTONS.invert[result]
       end
-      
+
       def buttons
         BUTTONS.keys
       end
-      
+
       def available_message_box_types
         MESSAGE_BOX_TYPES.keys
       end
-      
+
       def available_message_box_button_combos
         MESSAGE_BOX_BUTTON_COMBOS.keys
       end
-      
+
       def input(title, message, initial_value, &block)
         dialog = Dialogs::InputDialog.new(
                    parent_shell,
@@ -78,52 +78,73 @@ module Redcar
         button = (code == 0 ? :ok : :cancel)
         {:button => button, :value => dialog.value}
       end
-      
+
       def password_input(title, message)
         dialog = Dialogs::InputDialog.new(parent_shell, title, message, :password => true)
         code = dialog.open
         button = (code == 0 ? :ok : :cancel)
         {:button => button, :value => dialog.value}
       end
-      
+
       def tool_tip(message, location)
         tool_tip = Swt::Widgets::ToolTip.new(parent_shell, Swt::SWT::ICON_INFORMATION)
         tool_tip.set_message(message)
         tool_tip.set_location(*get_coordinates(location))
         tool_tip.set_visible(true)
       end
-      
+
       def popup_menu(menu, location)
         window = Redcar.app.focussed_window
         menu   = ApplicationSWT::Menu.new(window.controller, menu, nil, Swt::SWT::POP_UP)
         menu.move(*get_coordinates(location))
         menu.show
       end
-      
+
+      def popup_text(title, message, location,dimensions=nil)
+        if dimensions
+          box = ApplicationSWT::ModelessDialog.new(title,message,dimensions[0],dimensions[1])
+        else
+          box = ApplicationSWT::ModelessDialog.new(title,message)
+        end
+        box.open(parent_shell,*get_coordinates(location))
+      end
+
+      def popup_html(text,location,dimensions=nil)
+        if dimensions
+          box = ApplicationSWT::ModelessHtmlDialog.new(text,dimensions[0],dimensions[1])
+        else
+          box = ApplicationSWT::ModelessHtmlDialog.new(text)
+        end
+        box.open(parent_shell,*get_coordinates(location))
+      end
+
       private
-      
+
       def get_coordinates(location)
         edit_view = EditView.focussed_tab_edit_view
-        if location == :cursor and not edit_view
+        if (location == :cursor or location.to_s =~ /^(\d+)$/) and not edit_view
           location = :pointer
         end
         case location
         when :cursor
-          location = edit_view.controller.mate_text.viewer.get_text_widget.get_location_at_offset(edit_view.cursor_offset)
-          x, y = location.x, location.y
-          widget_offset = edit_view.controller.mate_text.viewer.get_text_widget.to_display(0,0)
-          x += widget_offset.x
-          y += widget_offset.y
+          x, y = Swt::GraphicsUtils.pixel_location_at_offset(edit_view.cursor_offset)
+        when :below_cursor
+          x, y = Swt::GraphicsUtils.below_pixel_location_at_offset(edit_view.cursor_offset)
         when :pointer
           location = ApplicationSWT.display.get_cursor_location
           x, y = location.x, location.y
+        else
+          if location.to_s =~ /^(\d+)$/
+            x, y = Swt::GraphicsUtils.pixel_location_at_offset($1.to_i)
+          end
         end
         [x, y]
       end
-      
+
       def file_dialog(type, options)
         dialog = Swt::Widgets::FileDialog.new(parent_shell, type)
-        dialog.setText("Save File");
+        dialog.setText("Save File")
+        dialog.setOverwrite(true)
         if options[:filter_path]
           dialog.setText("Save File As") if type == Swt::SWT::SAVE
           dialog.setText("Open File") if type == Swt::SWT::OPEN
@@ -133,7 +154,7 @@ module Redcar
           dialog.open
         end
       end
-      
+
       def directory_dialog(options)
         dialog = Swt::Widgets::DirectoryDialog.new(parent_shell)
         dialog.setText("Open Directory")
@@ -144,7 +165,7 @@ module Redcar
           dialog.open
         end
       end
-      
+
       def parent_shell
         if focussed_window = Redcar.app.focussed_window
           focussed_window.controller.shell
@@ -154,4 +175,4 @@ module Redcar
       end
     end
   end
-end
+end

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

@@ -58,7 +58,7 @@ module Redcar
         end
       end    
       
-      attr_reader :model
+      attr_reader :model, :dialog
       
       def initialize(model)
         @model = model
@@ -145,12 +145,23 @@ module Redcar
       def update_list_sync
         if @dialog
           s = Time.now
-          @update_thread = Thread.new(@dialog.text.get_text) do |text|
-            @model.update_list(text)
+          dialog = @dialog
+          this = self
+          Thread.new(@dialog.text.get_text) do |text|
+            begin
+              list = @model.update_list(text)
+              Redcar.update_gui do
+                this.populate_list(list)
+                if this.dialog
+                  this.dialog.list.set_selection(0)
+                  this.text_focus
+                end
+              end
+            rescue => e
+              puts e.message
+              puts e.backtrace
+            end
           end
-          populate_list(@update_thread.value)
-          @dialog.list.set_selection(0)
-          text_focus
         end
       end
       
@@ -209,12 +220,12 @@ module Redcar
         widget_selected
       end
       
-      private
-      
       def populate_list(contents)
-        @dialog.list.removeAll
-        contents.each do |text|
-          @dialog.list.add(text)
+        if @dialog
+          @dialog.list.removeAll
+          contents.each do |text|
+            @dialog.list.add(text)
+          end
         end
       end
     end

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

@@ -0,0 +1,113 @@
+
+module Redcar
+  class ApplicationSWT
+    class ModelessDialog
+
+      DEFAULT_WIDTH = 300
+      DEFAULT_HEIGHT_IN_ROWS = 4
+
+      def initialize(title,message,width=DEFAULT_WIDTH,height=DEFAULT_HEIGHT_IN_ROWS)
+        @title   = title
+        @message = message
+        @width   = width
+        @height  = height
+      end
+
+      def close
+        @text.remove_key_listener(@key_listener)
+        @text.remove_focus_listener(@focus_listener)
+        @shell.dispose
+      end
+
+      def open(parent,*location)
+        createDialogArea(parent)
+        @shell.set_location(*location)
+        @shell.open
+      end
+
+      def inspect
+        "#<Redcar::ModelessDialog width=#{@width}, height=#{@height}, location=#{@shell.get_location}>"
+      end
+
+      class KeyListener
+
+        def initialize(text)
+          @text = text
+        end
+
+        def key_pressed(e)
+        end
+
+        def key_released(e)
+          if e.stateMask == Swt::SWT::CTRL
+            case e.keyCode
+            when 97
+              e.widget.select_all
+            when 99
+              e.widget.copy
+            end
+          elsif e.stateMask == Swt::SWT::ALT
+          else
+            case e.keyCode
+            when Swt::SWT::ESC
+              @text.close
+            end
+          end
+        end
+      end
+
+      class FocusListener
+        def initialize(text)
+          @text = text
+        end
+
+        def focus_gained(e)
+        end
+
+        def focus_lost(e)
+          @text.close
+        end
+      end
+
+      private
+
+      def createDialogArea(parent)
+        display = ApplicationSWT.display
+        shell  = Swt::Widgets::Shell.new(parent, Swt::SWT::MODELESS)
+        layout = Swt::Layout::GridLayout.new
+        layout.marginHeight    = 0
+        layout.marginWidth     = 0
+        layout.verticalSpacing = 0
+        shell.setLayout(layout)
+
+        text = Swt::Custom::StyledText.new(shell, Swt::SWT::WRAP|Swt::SWT::V_SCROLL)
+        text.setLayoutData(Swt::Layout::GridData.new(Swt::Layout::GridData::FILL_BOTH))
+        text.set_editable false
+        new_line = "\n"
+        new_line = "\r\n" if Redcar.platform == :windows
+        text.set_text(@title + new_line + @message)
+        style1 = Swt::Custom::StyleRange.new
+        style1.start = 0
+        style1.length = @title.split(//).length
+        style1.fontStyle = Swt::SWT::BOLD
+        style1.foreground = display.getSystemColor(Swt::SWT::COLOR_WHITE)
+        text.setStyleRange(style1)
+        text.set_margins(2,2,2,2)
+        text.setBackground(Swt::Graphics::Color.new(display, 230, 240, 255))
+        text.setLineBackground(0, 1, Swt::Graphics::Color.new(display, 135, 178, 247))
+        @key_listener = KeyListener.new(self)
+        @focus_listener = FocusListener.new(self)
+        text.add_key_listener(@key_listener)
+        text.add_focus_listener(@focus_listener)
+        ApplicationSWT.register_shell(shell)
+        @text  = text
+        @shell = shell
+        shell.set_size(@width,convert_to_pixels(@height))
+      end
+
+      def convert_to_pixels(rows)
+        @text.get_line_height * rows
+      end
+    end
+  end
+end

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

@@ -0,0 +1,85 @@
+
+module Redcar
+  class ApplicationSWT
+    class ModelessHtmlDialog
+      attr_reader :width, :height
+
+      DEFAULT_WIDTH  = 300
+      DEFAULT_HEIGHT = 100
+
+      def initialize(text,width=DEFAULT_WIDTH,height=DEFAULT_HEIGHT)
+        @text   = text
+        @width  = width
+        @height = height
+      end
+
+      # Close and dispose of the dialog
+      def close
+        # @browser.remove_focus_listener(@focus_listener)
+        @browser.remove_key_listener(@key_listener)
+        @browser.dispose
+        @shell.dispose
+      end
+
+      # Opens the dialog.
+      #
+      # @returns the dialog
+      def open(parent,*location)
+        createDialogArea(parent)
+        @shell.set_location(*location)
+        @shell.open
+        # getting browser focus events does not work - SWT #84532
+        # @focus_listener = ModelessDialog::FocusListener.new(self)
+        # @browser.add_focus_listener(@focus_listener)
+        # @browser.set_focus
+        self
+      end
+
+      # Set the text to be rendered by the dialog
+      def text=(text)
+        @browser.set_text text
+      end
+
+      # Set the dialog to render a given URL
+      def url=(url)
+        @browser.set_url url
+      end
+
+      # Change the dialog size
+      def set_size(width,height)
+        @width  = width
+        @height = height
+        @shell.set_size(@width, @height)
+      end
+
+      # Refresh the rendered content
+      def refresh
+        @browser.refresh
+      end
+
+      def inspect
+        "#<Redcar::ModelessHtmlDialog width=#{@width}, height=#{@height}, location=#{@shell.get_location}>"
+      end
+
+      private
+
+      def createDialogArea(parent)
+        display = ApplicationSWT.display
+        @shell  = Swt::Widgets::Shell.new(parent, Swt::SWT::MODELESS)
+        layout = Swt::Layout::GridLayout.new
+        layout.marginHeight    = 0
+        layout.marginWidth     = 0
+        layout.verticalSpacing = 0
+        @shell.set_layout(layout)
+        @browser = Swt::Browser.new(@shell, Swt::SWT::MOZILLA)
+        @browser.set_layout_data(Swt::Layout::GridData.new(Swt::Layout::GridData::FILL_BOTH))
+        @shell.set_size(@width, @height)
+
+        @key_listener   = ModelessDialog::KeyListener.new(self)
+        @browser.add_key_listener(@key_listener)
+        @browser.set_text(@text)
+        ApplicationSWT.register_shell(@shell)
+      end
+    end
+  end
+end