redcar 0.8.1 → 0.9.0

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

@@ -0,0 +1,38 @@
+module Redcar
+  class ApplicationSWT
+    class Speedbar
+      class ComboItem
+        def initialize(speedbar, composite, item)
+          combo = Swt::Widgets::Combo.new(composite, Swt::SWT::READ_ONLY)
+          combo.items = item.items.to_java(:string)
+          if item.value
+            combo.select(item.items.index(item.value))
+          end
+          combo.add_selection_listener do
+            speedbar.ignore(item.name) do
+              item.value = combo.text
+              speedbar.execute_listener_in_model(item, item.value)
+            end
+          end
+          item.add_listener(:changed_items) do |new_items|
+            speedbar.rescue_speedbar_errors do
+              speedbar.ignore(item.name) do
+                combo.items = item.items.to_java(:string)
+                item.value = 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))
+              end
+            end
+          end
+          speedbar.keyable_widgets    << combo
+          speedbar.focussable_widgets << combo
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module Redcar
+  class ApplicationSWT
+    class Speedbar
+      class LabelItem
+        def initialize(speedbar, composite, item)
+          label = Swt::Widgets::Label.new(composite, 0)
+          label.set_text(item.text)
+          item.add_listener(:changed_text) do |new_text|
+            label.set_text(item.text)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+module Redcar
+  class ApplicationSWT
+    class Speedbar
+      class SliderItem
+        def initialize(speedbar, composite, item)
+          slider = Swt::Widgets::Slider.new(composite, Swt::SWT::HORIZONTAL)
+          grid_data = Swt::Layout::GridData.new
+          grid_data.grabExcessHorizontalSpace = true
+          grid_data.horizontalAlignment = Swt::Layout::GridData::FILL
+          slider.layout_data = grid_data
+          slider.selection = item.value
+          slider.maximum   = item.maximum   || 100
+          slider.minimum   = item.minimum   || 0
+          slider.increment = item.increment || 5
+          slider.add_selection_listener do
+            item.value = slider.selection
+            speedbar.execute_listener_in_model(item, item.value)
+          end
+          [:minimum, :maximum, :increment, :enabled].each do |ivar|
+            item.add_listener(:"changed_#{ivar}") do |new_value|
+              speedbar.rescue_speedbar_errors { slider.send(:"#{ivar}=", new_value) }
+            end
+          end
+          item.add_listener(:changed_value) do |new_value|
+            speedbar.rescue_speedbar_errors { slider.selection = new_value }
+          end
+          speedbar.focussable_widgets << slider
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+module Redcar
+  class ApplicationSWT
+    class Speedbar
+      class TextBoxItem
+        def initialize(speedbar, composite, item)
+          edit_view = EditView.new
+          item.edit_view = edit_view
+          edit_view_swt = EditViewSWT.new(edit_view, composite, :single_line => true)
+          mate_text = edit_view_swt.mate_text
+          mate_text.set_font(EditView.font, EditView.font_size)
+          mate_text.getControl.set_text(item.value)
+          mate_text.set_grammar_by_name "Ruby"
+          mate_text.set_theme_by_name(EditView.theme)
+          mate_text.set_root_scope_by_content_name("Ruby", "string.regexp.classic.ruby")
+          gridData = Swt::Layout::GridData.new
+          gridData.grabExcessHorizontalSpace = true
+          gridData.horizontalAlignment = Swt::Layout::GridData::FILL
+          mate_text.getControl.set_layout_data(gridData)
+          edit_view.document.add_listener(:changed) do
+            speedbar.ignore(item.name) do
+              item.value = edit_view.document.to_s
+              speedbar.execute_listener_in_model(item, item.value)
+            end
+          end
+          item.add_listener(:changed_value) do |new_value|
+            speedbar.ignore(item.name) do
+              mate_text.getControl.set_text(new_value)
+            end
+          end
+          speedbar.keyable_widgets << mate_text.getControl
+          speedbar.focussable_widgets << mate_text.getControl
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+module Redcar
+  class ApplicationSWT
+    class Speedbar
+      class ToggleItem
+        def initialize(speedbar, composite, item)
+          button = Swt::Widgets::Button.new(composite, Swt::SWT::CHECK)
+          button.set_text(item.text)
+          button.set_selection(!!item.value)
+          button.add_selection_listener do
+            item.value = button.get_selection
+            speedbar.execute_listener_in_model(item, item.value)
+          end
+          item.add_listener(:changed_text) do |new_text|
+            speedbar.rescue_speedbar_errors do
+              button.set_text = new_text
+            end
+          end
+          item.add_listener(:changed_value) do |new_value|
+            speedbar.rescue_speedbar_errors do
+              button.set_selection(!!new_value)
+            end
+          end
+          speedbar.keyable_widgets    << button
+          speedbar.focussable_widgets << button
+        end
+      end
+    end
+  end
+end

data/plugins/application_swt/lib/application_swt/tab.rb

@@ -4,8 +4,6 @@ module Redcar
       
       attr_reader :item, :model, :notebook, :widget
       
-      FILE_ICON = File.join(Redcar.root, %w(plugins application lib application assets file.png))
-      
       def initialize(model, notebook, position = nil)
         @model, @notebook = model, notebook
         create_item_widget(position || @notebook.tab_folder.item_count)
@@ -17,7 +15,7 @@ module Redcar
         position ||= notebook.tab_folder.item_count
         if @item
           @item.dispose
-        end        
+        end
         @item = Swt::Custom::CTabItem.new(notebook.tab_folder, Swt::SWT::CLOSE, position)
         set_icon(@model.icon)
       end

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

@@ -33,47 +33,46 @@ module Redcar
 
       def initialize(window, toolbar_model, options={})
         s = Time.now
-	      @toolbars = {}
- 	@coolitems = {} 
+        @toolbars = {}
+        @coolitems = {} 
         @entries = Hash.new{|hash, key| hash[key] = Array.new}
         @coolbar = Swt::Widgets::CoolBar.new(window.shell, Swt::SWT::FLAT | Swt::SWT::HORIZONTAL)
         return unless toolbar_model
-      	toolbar_model.each do |entry|
+        toolbar_model.each do |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)   	
+              @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]
+          else
+            @toolbar = @toolbars[@name]
             @coolitem = @coolitems[@name]
           end
-	          @entries[@name] << entry
+            @entries[@name] << entry
         end
-        
-        @toolbars.each_key { |key|
-          
+
+        @toolbars.each_key do |key|
+
           @toolbar = @toolbars[key]
-	        @coolitem = @coolitems[key]
-	        @toolbar_data = @entries[key]       
-	        @coolitem.setControl(@toolbar)	  	  
-          
+          @coolitem = @coolitems[key]
+          @toolbar_data = @entries[key]
+          @coolitem.setControl(@toolbar)
+
           add_entries_to_toolbar(@toolbar, @toolbar_data)
           @p = @toolbar.computeSize(Swt::SWT::DEFAULT, Swt::SWT::DEFAULT)
           @point = @coolitem.computeSize(@p.x, @p.y)
           #@coolitem.setPreferredSize(@point)
           #@coolitem.setMinimumSize(@point)
           @coolitem.setSize(@point.x, @point.y)
-	      }
-	
+        end
+
         #puts "ApplicationSWT::ToolBar initialize took #{Time.now - s}s"
-        
-	      @coolbar.setLocked(true)
+        @coolbar.setLocked(true)
         @coolbar.pack()
       end
 

data/plugins/application_swt/lib/application_swt/treebook.rb

@@ -23,7 +23,7 @@ module Redcar
         i.text = tree.tree_mirror.title
         i.control = TreeViewSWT.new(@tab_folder, tree)
         tree.controller = i.control
-        @tab_folder.silent_selection(i)
+        @tab_folder.selection = i
       end
 
       def tree_removed(tree)
@@ -33,25 +33,40 @@ module Redcar
 
       def tree_focussed(tree)
         item = @tab_folder.get_item(tree.tree_mirror.title)
-        @tab_folder.silent_selection(item)
+        @tab_folder.selection = item
       end
 
       def create_tree_view
         @tab_folder = Swt::Widgets::VTabFolder.new(@window.tree_sash, Swt::SWT::NONE)
-        colors = [ Swt::Graphics::Color.new(display, 230, 240, 255),
-          Swt::Graphics::Color.new(display, 170, 199, 246),
-          Swt::Graphics::Color.new(display, 135, 178, 247) ]
+        colors = [
+          Swt::Graphics::Color.new(ApplicationSWT.display, 230, 240, 255),
+          Swt::Graphics::Color.new(ApplicationSWT.display, 170, 199, 246),
+          Swt::Graphics::Color.new(ApplicationSWT.display, 135, 178, 247)
+        ]
         percents = [60, 85]
         @tab_folder.set_selection_background(colors, percents, true)
 
-        @tab_folder.add_selection_listener do |event|
+        attach_view_listeners
+
+        @tab_folder.layout
+        @window.left_composite.layout
+      end
+
+      def attach_view_listeners
+        @tab_folder.add_ctab_folder2_listener do |event|
+          # Close event
           tab_item = event.item
           tree_view_swt = tab_item.control
-          @model.focus_tree(tree_view_swt.model)
+          @model.remove_tree(tree_view_swt.model)
         end
 
-        @tab_folder.layout
-        @window.left_composite.layout
+        @tab_folder.add_selection_listener do |event|
+          # Widget selected event
+          tab_item = event.item
+          tree_view_swt = tab_item.control
+          tree = tree_view_swt.model
+          @model.focus_tree(tree)
+        end
       end
     end
   end

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

@@ -3,41 +3,43 @@ module Redcar
   class ApplicationSWT
     class Window
       attr_reader :shell, :window
-
-      SASH_WIDTH = 5
-      TREEBOOK_WIDTH = 200
-      TOOLBAR_HEIGHT = 25
-      @toolbar_height = 30
-
+      
+      SASH_WIDTH             = 5
+      TREEBOOK_WIDTH         = 200
+      MINIMUM_TREEBOOK_WIDTH = 0
+      VISIBLE_TREEBOOK_WIDTH = 25
+      TOOLBAR_HEIGHT         = 25
+      @toolbar_height        = 30
+      
       class ShellListener
         include org.eclipse.swt.events.ShellListener
-
+        
         def initialize(controller)
           @win = controller.window
         end
-
+        
         def shell_closed(e)
           unless Redcar.app.events.ignore?(:window_close, @win)
             e.doit = false
             Redcar.app.events.create(:window_close, @win)
           end
         end
-
+        
         def shell_activated(e)
           unless Redcar.app.events.ignore?(:window_focus, @win)
             e.doit = false
             Redcar.app.events.create(:window_focus, @win)
           end
         end
-
+        
         def shell_deactivated(_); end
         def shell_deiconified(_); end
         def shell_iconified(_); end
       end
-
+      
       def initialize(window)
         @window = window
-      	@notebook_handlers = Hash.new {|h,k| h[k] = []}
+        @notebook_handlers = Hash.new {|h,k| h[k] = []}
         create_shell
         create_sashes(window)
         new_notebook(window.notebooks.first)
@@ -47,7 +49,7 @@ module Redcar
         @treebook_unopened = true
         set_icon
       end
-
+      
       def add_listeners
         @window.add_listener(:show,          &method(:show))
         @window.add_listener(:refresh_menu,  &method(:refresh_menu))
@@ -63,110 +65,117 @@ module Redcar
         @window.add_listener(:focussed,      &method(:focussed))
         @window.add_listener(:speedbar_opened, &method(:speedbar_opened))
         @window.add_listener(:speedbar_closed, &method(:speedbar_closed))
-
+        
         @window.add_listener(:toggle_trees_visible, &method(:toggle_sash_widths))
-
         @window.treebook.add_listener(:tree_added) do
           if @treebook_unopened or not @window.trees_visible?
             reset_sash_widths
             @treebook_unopened = false
           end
         end
-
+        @window.treebook.add_listener(:tree_focussed) do |tree|
+          if @treebook_unopened or not @window.trees_visible?
+            reset_sash_widths
+            @treebook_unopened = false
+          end
+        end
+        
         @window.treebook.add_listener(:tree_removed) do
           reset_sash_widths
         end
         @shell.add_key_listener(KeyListener.new(self))
       end
-
-      def treebook_visible?
-        @sash.layout_data.left.offset > SASH_WIDTH
+      
+      def treebook_hidden?
+        treebook_width <= VISIBLE_TREEBOOK_WIDTH
       end
-
+      
+      def treebook_width
+        @sash.layout_data.left.offset
+      end
+      
+      def default_treebook_width
+        TREEBOOK_WIDTH + SASH_WIDTH
+      end
+      
       def fullscreen
         @shell.fullScreen()
       end
-
+      
       def fullscreen=(value)
         @shell.setFullScreen(value)
       end
-
+      
       class KeyListener
         def initialize(edit_view_swt)
           @edit_view_swt = edit_view_swt
         end
-
+        
         def key_pressed(key_event)
-        p key_event
+          p key_event
           if key_event.character == Swt::SWT::TAB
-          p :tab_pressedwin
+            p :tab_pressedwin
           elsif key_event.character == Swt::SWT::ESC
-          p :esc_pressedwin
+            p :esc_pressedwin
           end
         end
-
+        
         def verify_key(key_event)
-        p :verkey
+          p :verkey
           if key_event.character == Swt::SWT::TAB
-          p :tab_pressed
-          key_event.doit = false
+            p :tab_pressed
+            key_event.doit = false
           end
         end
-
+        
         def key_released(key_event)
         end
       end
-
+      
       def create_treebook_controller
         treebook = @window.treebook
         controller = ApplicationSWT::Treebook.new(
-          self,
-          treebook)
+        self,
+        treebook)
         treebook.controller = controller
       end
-
+      
       def show
         @shell.open
         @shell.text = window.title
       end
-
+      
       def refresh_menu
         old_menu_bar = shell.menu_bar
         @menu_controller = ApplicationSWT::Menu.new(self, Redcar.app.main_menu(@window), Redcar.app.main_keymap, Swt::SWT::BAR)
         shell.menu_bar = @menu_controller.menu_bar
         old_menu_bar.dispose if old_menu_bar
       end
-
+      
       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_height = @toolbar_controller.height.to_i
-	else
-    @toolbar_controller.hide() if @toolbar_controller
-		@toolbar_height = 0
-	end
-	reset_sash_height
+        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_height = @toolbar_controller.height.to_i
+        else
+          @toolbar_controller.hide() if @toolbar_controller
+          @toolbar_height = 0
+        end
+        reset_sash_height
       end
-
+      
       def set_icon
-        path = File.join(icon_dir, icon_file)
-        icon = Swt::Graphics::Image.new(ApplicationSWT.display, path)
-        shell.image = icon
+        shell.image = Icon.swt_image(icon_file)
       end
-
-      def icon_dir
-        File.join(Redcar.root, %w(plugins application icons))
-      end
-
+      
       def icon_file
         if Redcar::VERSION =~ /dev$/
-          "redcar_icon_beta_dev.png"
+          :redcar_icon_beta_dev
         else
-          "redcar_icon_beta.png"
+          :redcar_icon_beta
         end
       end
-
+      
       def bring_to_front
         @shell.set_minimized(false) # unminimize, just in case
         @shell.redraw
@@ -177,34 +186,34 @@ module Redcar
         @shell.force_active # doesn't do anything, really
         @shell.set_active
       end
-
+      
       def popup_menu(menu)
         menu.controller = ApplicationSWT::Menu.new(self, menu, nil, Swt::SWT::POP_UP)
         menu.controller.show
       end
-
+      
       def popup_menu_with_numbers(menu)
         menu.controller = ApplicationSWT::Menu.new(self, menu, nil, Swt::SWT::POP_UP, :numbers => true)
         menu.controller.show
       end
-
+      
       def speedbar_opened(speedbar)
         speedbar.controller = ApplicationSWT::Speedbar.new(@window, right_composite, speedbar)
       end
-
+      
       def speedbar_closed(speedbar)
         speedbar.controller.close
       end
-
+      
       def title_changed(new_title)
         @shell.text = new_title
       end
-
+      
       def new_notebook(notebook_model)
         notebook_controller = ApplicationSWT::Notebook.new(notebook_model, @notebook_sash)
         reset_notebook_sash_widths
       end
-
+      
       def notebook_removed(notebook_model)
         notebook_controller = notebook_model.controller
         @notebook_handlers[notebook_model].each do |h|
@@ -213,32 +222,32 @@ module Redcar
         notebook_controller.dispose
         reset_notebook_sash_widths
       end
-
+      
       def notebook_orientation_changed(new_orientation)
         orientation = horizontal_vertical(new_orientation)
         @notebook_sash.setOrientation(orientation)
       end
-
+      
       def focussed(_)
         @shell.set_active
       end
-
+      
       def closed(_)
         @shell.close
         @menu_controller.close
         @toolbar_controller.close if @toolbar_controller
       end
-
+      
       def dispose
         @shell.dispose
         @menu_controller.close
         @toolbar_controller.close
       end
-
+      
       attr_reader :right_composite, :left_composite, :tree_composite, :tree_layout, :tree_sash
-
+      
       private
-
+      
       def create_shell
         @shell = Swt::Widgets::Shell.new(ApplicationSWT.display)
         @shell.layout = Swt::Layout::FormLayout.new
@@ -251,10 +260,10 @@ module Redcar
         end
         ApplicationSWT.register_shell(@shell)
       end
-
+      
       def create_sashes(window_model)
         orientation = horizontal_vertical(window_model.notebook_orientation)
-
+        
         @left_composite = Swt::Widgets::Composite.new(@shell, Swt::SWT::NONE)
         @left_composite.layout = Swt::Layout::GridLayout.new(1, false).tap do |l|
           l.verticalSpacing = 0
@@ -262,9 +271,9 @@ module Redcar
           l.horizontalSpacing = 0
           l.marginWidth = 0
         end
-
+        
         @sash = Swt::Widgets::Sash.new(@shell, Swt::SWT::VERTICAL)
-
+        
         @right_composite = Swt::Widgets::Composite.new(@shell, Swt::SWT::NONE)
         @right_composite.layout = Swt::Layout::GridLayout.new(1, false).tap do |l|
           l.verticalSpacing = 0
@@ -272,13 +281,13 @@ module Redcar
           l.horizontalSpacing = 0
           l.marginWidth = 0
         end
-
+        
         @sash.layout_data = Swt::Layout::FormData.new.tap do |d|
           d.left = Swt::Layout::FormAttachment.new(0, 0)
           d.top =  Swt::Layout::FormAttachment.new(0, 5 + TOOLBAR_HEIGHT)
           d.bottom = Swt::Layout::FormAttachment.new(100, 0)
         end
-
+        
         @sash.add_selection_listener do |e|
           sash_rect = @sash.bounds
           shell_rect = @shell.client_area
@@ -293,31 +302,31 @@ module Redcar
             @shell.layout
           end
         end
-
+        
         @left_composite.layout_data = Swt::Layout::FormData.new.tap do |l|
           l.left = Swt::Layout::FormAttachment.new(0, 5)
           l.right = Swt::Layout::FormAttachment.new(@sash, 0)
           l.top = Swt::Layout::FormAttachment.new(0, 5 + TOOLBAR_HEIGHT)
           l.bottom = Swt::Layout::FormAttachment.new(100, -5)
         end
-
+        
         @right_composite.layout_data = Swt::Layout::FormData.new.tap do |d|
           d.left = Swt::Layout::FormAttachment.new(@sash, 0)
           d.right = Swt::Layout::FormAttachment.new(100, -5)
           d.top = Swt::Layout::FormAttachment.new(0, 5 + TOOLBAR_HEIGHT)
           d.bottom = Swt::Layout::FormAttachment.new(100, -5)
         end
-
+        
         @tree_sash = Swt::Custom::SashForm.new(@left_composite, orientation)
         grid_data = Swt::Layout::GridData.new(Swt::Layout::GridData::FILL_BOTH)
         @tree_sash.layout_data = grid_data
-
+        
         @notebook_sash = Swt::Custom::SashForm.new(@right_composite, orientation)
         grid_data = Swt::Layout::GridData.new(Swt::Layout::GridData::FILL_BOTH)
         @notebook_sash.layout_data = grid_data
         @notebook_sash.sash_width = SASH_WIDTH
       end
-
+      
       def horizontal_vertical(symbol)
         case symbol
         when :horizontal
@@ -326,45 +335,48 @@ module Redcar
           Swt::SWT::VERTICAL
         end
       end
-
+      
       def reset_sash_widths
         @treebook_unopened = !@window.treebook.trees.any?
+        width = 0
         if @window.treebook.trees.any?
-          @sash.layout_data.left = Swt::Layout::FormAttachment.new(0, TREEBOOK_WIDTH + SASH_WIDTH)
-        else
-          @sash.layout_data.left = Swt::Layout::FormAttachment.new(0, 0)
+          if @treebook_open_width
+            width = @treebook_open_width
+          else
+            width = default_treebook_width
+          end
         end
-        @shell.layout
+        set_sash_widths(width)
       end
-
+      
       def toggle_sash_widths
-        if not treebook_visible?
+        if treebook_hidden?
           reset_sash_widths
         else
-          @sash.layout_data.left = Swt::Layout::FormAttachment.new(0, 0)
-          @shell.layout
+          @treebook_open_width = treebook_width
+          set_sash_widths(MINIMUM_TREEBOOK_WIDTH)
         end
       end
-
+      
       def set_sash_widths(offset)
         @sash.layout_data.left = Swt::Layout::FormAttachment.new(0, offset)
         @shell.layout
       end
-
+      
       def reset_notebook_sash_widths
         width = (100/@window.notebooks.length).to_i
         widths = [width]*@window.notebooks.length
-      	@notebook_sash.setWeights(widths.to_java(:int))
+        @notebook_sash.setWeights(widths.to_java(:int))
       end
-
+      
       def reset_sash_height
         @sash.layout_data.top =  Swt::Layout::FormAttachment.new(0, @toolbar_height.to_i)
         @left_composite.layout_data.top = Swt::Layout::FormAttachment.new(0, 5 + @toolbar_height.to_i)
         @right_composite.layout_data.top = Swt::Layout::FormAttachment.new(0, 5 + @toolbar_height.to_i)
-	@shell.layout
+        @shell.layout
         @shell.redraw
       end
-
+      
     end
   end
 end