redcar-dev 0.12.10dev-java → 0.12.11dev-java

data/lib/redcar.rb

@@ -57,7 +57,7 @@ end
 #
 # and so on.
 module Redcar
-  VERSION         = '0.12.10dev' # also change in the gemspec!
+  VERSION         = '0.12.11dev' # also change in the gemspec!
   VERSION_MAJOR   = 0
   VERSION_MINOR   = 12
   VERSION_RELEASE = 0

data/plugins/application/lib/application.rb

@@ -185,12 +185,7 @@ module Redcar
       @storage ||= begin
         storage = Plugin::Storage.new('application_plugin')
         storage.set_default('stay_resident_after_last_window_closed', false)
-        # Don't show the toolbar by default on Mac OS X
-        if Redcar.platform == :osx
-          storage.set_default('show_toolbar', false)
-        else
-          storage.set_default('show_toolbar', true)
-        end
+        storage.set_default('show_toolbar', true)
         storage
       end
     end

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

@@ -7,7 +7,7 @@ module Redcar
     ToggleItem  = ObservableStruct.new(:name, :text, :key, :listener, :value)
     TextBoxItem = ObservableStruct.new(:name, :listener, :value, :edit_view)
     ButtonItem  = ObservableStruct.new(:name, :text, :key, :listener)
-    ComboItem   = ObservableStruct.new(:name, :items, :value, :listener)
+    ComboItem   = ObservableStruct.new(:name, :items, :value, :editable, :listener)
     SliderItem  = ObservableStruct.new(:name, :value, :minimum, :maximum, :increment, :enabled, :listener)
     KeyItem     = ObservableStruct.new(:key, :listener)
 
@@ -79,8 +79,8 @@ module Redcar
       define_item_finder(name)
     end
 
-    def self.combo(name, items=[], value=nil, &block)
-      append_item ComboItem.new(name, items, value, block)
+    def self.combo(name, items=[], value=nil, editable=false,&block)
+      append_item ComboItem.new(name, items, value, editable, block)
       define_item_finder(name)
     end
 

data/plugins/application_swt/lib/application_swt.rb

@@ -154,9 +154,9 @@ module Redcar
     end
 
     def refresh_toolbar
-      if Redcar.platform == :osx and @fake_shell
-        fake_toolbar_controller = ApplicationSWT::ToolBar.new(FakeWindow.new(@fake_shell), Redcar.app.main_toolbar, Swt::SWT::FLAT)
-      end
+      # if Redcar.platform == :osx and @fake_shell
+      #   fake_toolbar_controller = ApplicationSWT::ToolBar.new(FakeWindow.new(@fake_shell), Redcar.app.main_toolbar, Swt::SWT::FLAT)
+      # end
     end
 
     def add_listeners

data/plugins/application_swt/lib/application_swt/speedbar/combo_item.rb

@@ -3,10 +3,23 @@ module Redcar
     class Speedbar
       class ComboItem
         def initialize(speedbar, composite, item)
-          combo = Swt::Widgets::Combo.new(composite, Swt::SWT::READ_ONLY)
+          if @editable = item.editable
+            type = Swt::SWT::DROP_DOWN
+          else
+            type = Swt::SWT::READ_ONLY
+          end
+          combo = Swt::Widgets::Combo.new(composite, type)
           combo.items = item.items.to_java(:string)
-          if item.value
-            combo.select(item.items.index(item.value))
+          if @editable
+            combo.set_text(item.value || "")
+            combo.add_modify_listener do
+              speedbar.ignore(item.name) do
+                item.value = combo.text
+                speedbar.execute_listener_in_model(item, item.value)
+              end
+            end
+          else
+            combo.select(item.items.index(item.value)) if item.value
           end
           combo.add_selection_listener do
             speedbar.ignore(item.name) do
@@ -18,14 +31,18 @@ module Redcar
             speedbar.rescue_speedbar_errors do
               speedbar.ignore(item.name) do
                 combo.items = item.items.to_java(:string)
-                item.value = nil
+                item.value = @editable ? "" : nil
               end
             end
           end
           item.add_listener(:changed_value) do |new_value|
             speedbar.rescue_speedbar_errors do
               speedbar.ignore(item.name) do
-                combo.select(item.items.index(item.value))
+                if @editable
+                  combo.set_text(item.value)
+                else
+                  combo.select(item.items.index(item.value))
+                end
               end
             end
           end

data/plugins/application_swt/lib/application_swt/toolbar.rb

@@ -7,15 +7,14 @@ module Redcar
 
       def self.icons
         @icons = {
-          :new => File.join(Redcar.icons_directory, "document-text.png"),
-          :open => File.join(Redcar.icons_directory, "folder-open-document.png"),
-          :open_dir => File.join(Redcar.icons_directory, "blue-folder-horizontal-open.png"),
-          :save => File.join(Redcar.icons_directory, "disk.png"),
-          :save_as => File.join(Redcar.icons_directory, "disk--plus.png"),
-          #:save_all => File.join(ICONS_DIR, "save_all.png"),
-          :undo => File.join(Redcar.icons_directory, "arrow-circle-225-left.png"),
-          :redo => File.join(Redcar.icons_directory, "arrow-circle-315.png"),
-          :search => File.join(Redcar.icons_directory, "binocular.png")
+          :new       => File.join(Redcar.icons_directory, "document-text.png"),
+          :open      => File.join(Redcar.icons_directory, "folder-open-document.png"),
+          :open_dir  => File.join(Redcar.icons_directory, "blue-folder-horizontal-open.png"),
+          :save      => File.join(Redcar.icons_directory, "disk.png"),
+          :save_as   => File.join(Redcar.icons_directory, "disk--plus.png"),
+          :undo      => File.join(Redcar.icons_directory, "arrow-circle-225-left.png"),
+          :redo      => File.join(Redcar.icons_directory, "arrow-circle-315.png"),
+          :search    => File.join(Redcar.icons_directory, "binocular.png")
         }
       end
 
@@ -30,30 +29,13 @@ module Redcar
       attr_reader :coolbar, :toolbar, :coolitem, :toolbars, :coolitems
 
       def initialize(window, toolbar_model, options={})
-        # @toolbars = {}
-        # @coolitems = {} 
-        @entries = Hash.new {|h,k| h[k] = [] }
-        @toolbar = window.shell.getToolBar
-        p @toolbar
-        # @coolbar = Swt::Widgets::CoolBar.new(window.shell, Swt::SWT::FLAT | Swt::SWT::HORIZONTAL)
         return unless toolbar_model
+        
+        @entries = Hash.new {|h,k| h[k] = [] }
+        @toolbar = main_toolbar(window)
         toolbar_model.each do |entry|
           name = entry.barname || :new
           @entries[name] << entry
-        #   name = entry.barname || :new
-        #   if not @toolbars[name]
-        #     if name == :core
-        #       coolitem = Swt::Widgets::CoolItem.new(@coolbar, Swt::SWT::FLAT, 0)
-        #     else
-        #       coolitem = Swt::Widgets::CoolItem.new(@coolbar, Swt::SWT::FLAT)
-        #     end
-        #     
-        #     @toolbars[name] = create_toolbar(@coolbar)
-        #     @coolitems[name] = coolitem
-        #   else
-        #     @toolbar = @toolbars[name]
-        #     coolitem = @coolitems[name]
-        #   end
         end
         add_entries_to_toolbar(@toolbar, @entries[:core])
         @entries.each do |name, es|
@@ -61,34 +43,27 @@ module Redcar
           add_entries_to_toolbar(@toolbar, es)
           sep = Swt::Widgets::ToolItem.new(@toolbar, Swt::SWT::DEFAULT)
         end
-        # @toolbars.each do |name, toolbar|
-        #   coolitem = @coolitems[name]
-        #   toolbar_data = @entries[name]
-        #   coolitem.setControl(toolbar)
-        # 
-        #   p = toolbar.computeSize(Swt::SWT::DEFAULT, Swt::SWT::DEFAULT)
-        #   point = coolitem.computeSize(p.x, p.y)
-        #   coolitem.setSize(point.x, point.y)
-        # end
-        # 
-        # @coolbar.setLocked(true)
-        # @coolbar.pack()
+        @toolbar.pack unless Redcar.platform == :osx
       end
 
-      # def create_toolbar
-      #   @toolbar = Swt::Widgets::ToolBar.new(composite, Swt::SWT::FLAT)
-      #   @toolbar.set_visible(false)
-      #   @toolbar
-      # end
+      def main_toolbar(window)
+        if Redcar.platform == :osx
+          window.shell.getToolBar
+        else
+          Swt::Widgets::ToolBar.new(window.shell, Swt::SWT::FLAT | Swt::SWT::HORIZONTAL)
+        end
+      end
       
       def show
-        # @toolbars.each_value { |toolbar| toolbar.set_visible(true) }
         @toolbar.set_visible(true)
       end
 
       def hide
-        # @toolbars.each_value { |toolbar| toolbar.dispose() }
-        @toolbar.dispose()
+        unless @toolbar.disposed?
+          @toolbar.set_visible(false)
+          @toolbar.getItems.each {|i| i.dispose }
+          # @toolbar.dispose unless Redcar.platform == :osx
+        end
       end
 
       def close
@@ -97,29 +72,24 @@ module Redcar
       end
 
       def height
-        return 0
-        h = 0
-        @toolbar.getItems.each do |i|
-          h = ( h > i.getSize.y ) ? h : i.getSize.y
-        end
-        h
+        return 0 if Redcar.platform == :osx
+        point = @toolbar.computeSize(Swt::SWT::DEFAULT, Swt::SWT::DEFAULT, true)
+        return point.y
       end
 
       private
 
       def add_entries_to_toolbar(toolbar, toolbar_model)
-
         toolbar_model.each do |entry|
           if entry.is_a?(Redcar::ToolBar::LazyToolBar)
             toolbar_header = Swt::Widgets::ToolItem.new(toolbar, Swt::SWT::CASCADE)
             toolbar_header.text = entry.text
-            #new_toolbar = Swt::Widgets::ToolBar.new(@window.shell, Swt::SWT::DROP_DOWN)
             new_toolbar = Swt::Widgets::ToolBar.new(toolbar)
             toolbar_header.toolbar = new_toolbar
-            # toolbar_header.add_arm_listener do
-            #   new_toolbar.get_items.each {|i| i.dispose }
-            #   add_entries_to_toolbar(new_toolbar, entry)
-            # end
+            toolbar_header.add_arm_listener do
+              new_toolbar.get_items.each {|i| i.dispose }
+              add_entries_to_toolbar(new_toolbar, entry)
+            end
           elsif entry.is_a?(Redcar::ToolBar)
             new_toolbar = Swt::Widgets::ToolBar.new(toolbar)
             add_entries_to_toolbar(new_toolbar, entry)

data/plugins/application_swt/lib/application_swt/window.rb

@@ -159,7 +159,7 @@ module Redcar
       def refresh_toolbar
         if Redcar.app.show_toolbar?
           @toolbar_controller = ApplicationSWT::ToolBar.new(self, Redcar.app.main_toolbar, Swt::SWT::HORIZONTAL | Swt::SWT::BORDER)
-          @toolbar_controller.show()
+          @toolbar_controller.show
           @toolbar_height = @toolbar_controller.height.to_i
         else
           @toolbar_controller.hide() if @toolbar_controller

data/plugins/redcar/redcar.rb

@@ -76,7 +76,7 @@ module Redcar
         window = Redcar.app.focussed_window
         Redcar.app.windows.each do |win|
           @builder.item(win.title, :type => :radio, :active => (win == window)) do
-            FocusWindowCommand.new(win).run
+            Application::FocusWindowCommand.new(win).run
           end
         end
       end
@@ -245,31 +245,31 @@ Redcar.environment: #{Redcar.environment}
         doc.ensure_visible(doc.length)
       end
     end
-    
+
     class MoveUpCommand < EditTabCommand
       def execute
         tab.edit_view.invoke_action(:LINE_UP)
       end
     end
-    
+
     class MoveDownCommand < EditTabCommand
       def execute
         tab.edit_view.invoke_action(:LINE_DOWN)
       end
     end
-    
+
     class ForwardCharCommand < DocumentCommand
       def execute
         doc.cursor_offset = [doc.cursor_offset + 1, doc.length].min
       end
     end
-    
+
     class BackwardCharCommand < DocumentCommand
       def execute
         doc.cursor_offset = [doc.cursor_offset - 1, 0].max
       end
     end
-    
+
     class OpenLineCommand < DocumentCommand
       def execute
         prev = doc.cursor_offset
@@ -485,12 +485,12 @@ Redcar.environment: #{Redcar.environment}
         doc.scroll_to_line(last_line_ix + 1)
       end
     end
-    
+
     class TransposeCharactersCommand < Redcar::DocumentCommand
       def execute
         line        = doc.get_line(doc.cursor_line)
         line_offset = doc.cursor_line_offset
-        
+
         if line_offset > 0 and line.length >= 2
           if line_offset < line.length - 1
             first_char  = line.chars[line_offset - 1].to_s
@@ -858,7 +858,7 @@ Redcar.environment: #{Redcar.environment}
             item "Quit", Application::QuitCommand
           end
         end
-        
+
         sub_menu "Edit", :priority => 5 do
           group(:priority => :first) do
             item "Tab Info",  EditView::InfoSpeedbarCommand
@@ -897,17 +897,17 @@ Redcar.environment: #{Redcar.environment}
               item "Home",    MoveHomeCommand
               item "End",     MoveEndCommand
               item "Bottom",  MoveBottomCommand
-              
+
               separator
-              
+
               item "Forward Character",  ForwardCharCommand
               item "Backward Character", BackwardCharCommand
               item "Previous Line",      MoveUpCommand
               item "Next Line",          MoveDownCommand
               item "Open Line",          OpenLineCommand
-              
+
               separator
-              
+
               item "Delete Character",   DeleteCharCommand
               item "Backspace",          BackspaceCommand
               item "Transpose",          TransposeCharactersCommand

metadata

@@ -2,7 +2,7 @@
 name: redcar-dev
 version: !ruby/object:Gem::Version 
   prerelease: 7
-  version: 0.12.10dev
+  version: 0.12.11dev
 platform: java
 authors: 
   - Daniel Lucraft