fxri 0.2.0 → 0.3.0

data/fxri

@@ -44,11 +44,12 @@ require 'lib/FoxTextFormatter'
 require 'lib/fxirb'
 
 # Responsible for application initialization
-class Main_Window < FXMainWindow
+class FXri < FXHorizontalFrame
 	
 	# Initializes the XDCC-application.
-	def initialize(app)
-		super(app, $cfg.app.name, nil, nil, DECOR_ALL, 0, 0, $cfg.app.width, $cfg.app.height)
+	def initialize(p, opts=0, x=0 ,y=0 ,w=0 ,h=0 , pl=DEFAULT_SPACING, pr=DEFAULT_SPACING, pt=DEFAULT_SPACING, pb=DEFAULT_SPACING, hs=DEFAULT_SPACING, vs=DEFAULT_SPACING)
+		super(p, opts, x ,y ,w ,h , pl, pr, pt, pb, hs, vs)
+    @isLoaded = false
 		set_default_font
 		# load icons
 		icon_loader = Icon_Loader.new(FXApp::instance)
@@ -76,11 +77,18 @@ class Main_Window < FXMainWindow
 	# Automatically called when the Fox application is created
 	def create
 		super
-		show(PLACEMENT_SCREEN)
+		show
 		# load items
-		load_items
-		@search_engine.update_search_status_text
-	end
+    Thread.new do
+      # delayed loading, this speeds up freeride's startup.
+      sleep 1 if $cfg.delayed_loading
+      @gui.search_field.enabled = false
+      load_items
+      @isLoaded = true
+      @gui.search_field.enabled = true
+      @gui.search_field.text = ""
+    end
+  end
 	
 	def create_data
 		@data.displayer = FoxDisplayer.new(@gui.text)
@@ -110,19 +118,28 @@ class Main_Window < FXMainWindow
 	# build gui
 	def build(parent)
 		FXSplitter.new(parent, SPLITTER_TRACKING|LAYOUT_FILL_X|LAYOUT_FILL_Y) do |base|
-			FXVerticalFrame.new(base, LAYOUT_FILL_X|LAYOUT_FILL_Y, 0,0,$cfg.packet_list_width,0, DEFAULT_SPACING, 0) do |search_frame|
+			FXVerticalFrame.new(base, LAYOUT_FILL_X|LAYOUT_FILL_Y, 0,0,$cfg.packet_list_width,0, 0,0,0,0,0,0) do |search_frame|
 
 				@gui.search_field = FXTextField.new(search_frame, 1, nil, 0, TEXTFIELD_NORMAL|LAYOUT_FILL_X|FRAME_SUNKEN)
-				Empty_Text_Field_Handler.new(@gui.search_field, $cfg.text.search_field)
 				@gui.search_field.connect(SEL_CHANGED) do |*args|
 					on_search
 				end
 				
 
 				FXVerticalFrame.new(search_frame, FRAME_SUNKEN|LAYOUT_FILL_X|LAYOUT_FILL_Y, 0,0,0,0, 0,0,0,0,0,0) do |list_frame|
-					@gui.packet_list = Packet_List.new(@data, list_frame, nil, 0, HSCROLLER_NEVER|VSCROLLER_ALWAYS|TREELIST_BROWSESELECT|LAYOUT_FILL_X|LAYOUT_FILL_Y) do |packet_list|
+					@gui.packet_list = Packet_List.new(@data, list_frame, nil, 0, 
+						ICONLIST_DETAILED|
+						ICONLIST_COLUMNS|
+						#ICONLIST_MINI_ICONS|
+						HSCROLLER_NEVER|
+						VSCROLLER_ALWAYS|
+						ICONLIST_BROWSESELECT|
+						LAYOUT_FILL_X|
+						LAYOUT_FILL_Y) do |packet_list|
 						packet_list.add_header($cfg.text.method_name, $cfg.packet_list_width) { |x| make_sortable(x) }
 					end
+					
+					@gui.packet_list.setHeaderSize(0, 1000)
 				end
 				
 				@gui.search_label = FXLabel.new(search_frame, "", nil, LAYOUT_FILL_X|LABEL_NORMAL|JUSTIFY_RIGHT, 0,0,0,0, 0,0,0,0)
@@ -133,22 +150,19 @@ class Main_Window < FXMainWindow
 				end
 			end
 			
-			
-			FXSplitter.new(base, SPLITTER_TRACKING|LAYOUT_FILL_X|LAYOUT_FILL_Y|SPLITTER_VERTICAL) do |split|
-				FXHorizontalFrame.new(split, FRAME_SUNKEN|LAYOUT_FILL_X|LAYOUT_FILL_Y, 0,0,0,0, 0,0,0,0,0,0) do |right|
-					@gui.text = FXText.new(right, nil, 0, TEXT_READONLY|TEXT_WORDWRAP|LAYOUT_FILL_X|LAYOUT_FILL_Y)
-				end
-				
-				FXHorizontalFrame.new(split, FRAME_SUNKEN|LAYOUT_FILL_X|LAYOUT_FILL_Y, 0,0,0,0, 0,0,0,0,0,0) do |irb_frame|
-					@irb_frame = irb_frame
-					@gui.irb = FXIrb.init(irb_frame, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y|TEXT_WORDWRAP|TEXT_SHOWACTIVE)
-					@gui.irb.setFont(@font) if @font
-				end
-				split.setSplit(0, $cfg.irb_height)
-			end
+			split = FXSplitter.new(base, SPLITTER_TRACKING|LAYOUT_FILL_X|LAYOUT_FILL_Y|SPLITTER_VERTICAL) if $cfg.launch_irb
+      right = FXHorizontalFrame.new(($cfg.launch_irb ? split : base), FRAME_SUNKEN|LAYOUT_FILL_X|LAYOUT_FILL_Y, 0,0,0,0, 0,0,0,0,0,0)
+      @gui.text = FXText.new(right, nil, 0, TEXT_READONLY|TEXT_WORDWRAP|LAYOUT_FILL_X|LAYOUT_FILL_Y)
+	    if $cfg.launch_irb
+	      irb_frame = FXHorizontalFrame.new(split, FRAME_SUNKEN|LAYOUT_FILL_X|LAYOUT_FILL_Y, 0,0,0,0, 0,0,0,0,0,0)
+	      @irb_frame = irb_frame
+	      @gui.irb = FXIrb.init(irb_frame, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y|TEXT_WORDWRAP|TEXT_SHOWACTIVE)
+	      @gui.irb.setFont(@font) if @font
+	      split.setSplit(0, $cfg.irb_height)
+	    end
 			font = load_font($cfg.ri_font)
 			@gui.text.font = font if font
-			font.create
+			font.create 
 			@gui.text_width = font.fontWidth
 			
 			@gui.text.connect(SEL_CONFIGURE) do 
@@ -231,27 +245,35 @@ class Main_Window < FXMainWindow
 	
 	# loads all ri items
 	def load_items
-		@data.ri_manager.all_names.each do |name|
-			icon = case name.type
-				when NameDescriptor::CLASS
-					$cfg.icons.klass
-				when NameDescriptor::INSTANCE_METHOD
-					$cfg.icons.instance_method
-				when NameDescriptor::CLASS_METHOD
-					$cfg.icons.class_method
-				end
-			item = Packet_Item.new(@gui.packet_list, icon, name.to_s)
-			item.data = name
-			@data.items.push item
-		end
-		# quick hack to sort in right order :-)
-		@gui.packet_list.on_cmd_header(0)
-		@gui.packet_list.on_cmd_header(0)
-		@gui.packet_list.update_header_width
-		recalc
+      @gui.search_field.text = "loading..."
+    @data.ri_manager.all_names.each do |name|
+      icon = case name.type
+        when NameDescriptor::CLASS
+          $cfg.icons.klass
+        when NameDescriptor::INSTANCE_METHOD
+          $cfg.icons.instance_method
+        when NameDescriptor::CLASS_METHOD
+          $cfg.icons.class_method
+        end
+      item = Packet_Item.new(@gui.packet_list, icon, name.to_s)
+      @search_engine.update_search_status_text
+      item.data = name
+      @data.items.push item
+    end
+      @gui.search_field.text = "sorting..."
+    @gui.packet_list.on_cmd_header(0)
+    @gui.packet_list.update_header_width
+    recalc
+	end
+
+	def go_search(string)
+	  @gui.search_field.text = string
+	  on_search
 	end
 	
 	def on_search
+    # do nothing if not fully loaded
+    return if !@isLoaded
 		@search_engine.on_search
 	end
 	
@@ -275,18 +297,24 @@ class Main_Window < FXMainWindow
 	# This creates a sortable representation. First class, then class methods, then instance.
 	def make_sortable(x)
 		[ x.downcase.gsub("::", " 1 ").gsub("#", " 2 "),
-		x.downcase,
-		x]
+		  x.downcase,
+		  x]
 	end
 	
 end
 
-Thread.abort_on_exception= true
+if __FILE__ == $0
+  Thread.abort_on_exception= true
 
-# move to directory of this file, so that icons can load correctly.
-Dir.chdir(File.dirname(File.expand_path(__FILE__)))
+  # move to directory of this file, so that icons can load correctly.
+  Dir.chdir(File.dirname(File.expand_path(__FILE__)))
 
-$app = FXApp.new($cfg.app.name, $cfg.app.name)
-$main_window = Main_Window.new($app)
-$app.create
-$app.run
+  application = FXApp.new($cfg.app.name, $cfg.app.name)
+  application.threadsEnabled = true
+  #application.init(ARGV)
+  window =  FXMainWindow.new(application, $cfg.app.name, nil, nil, DECOR_ALL, 0, 0, $cfg.app.width, $cfg.app.height)
+  FXri.new(window,FRAME_NONE|LAYOUT_FILL_X|LAYOUT_FILL_Y,0,0,0,0,0,0,0,0,0,0)
+  application.create
+  window.show(PLACEMENT_SCREEN)
+  application.run
+end

data/fxri.gemspec

@@ -1,24 +1,24 @@
-#!/bin/env ruby
-require 'rubygems'
-
-spec = Gem::Specification.new do |s|
-	s.name = "fxri"
-	s.add_dependency('fxruby', '>= 1.2.0')
-	s.version = "0.2.0"
-	s.date = "2005-02-20"
-	s.summary = "Graphical interface to the RI documentation, with search engine."
-	s.require_paths = ["lib"]
-	s.email = "martin.ankerl@gmail.com"
-	s.homepage = "http://fxri.rubyforge.org/"
-	s.rubyforge_project = "fxri"
-	s.description = "FxRi is an FXRuby interface to the RI documentation, with a search engine that allows for search-on-typing."
-	s.has_rdoc = false
-	s.files = Dir.glob("**/*")
-	s.bindir = "."
-	s.executables = ["fxri"]
-end
-
-if __FILE__ == $0
-	Gem.manage_gems
-	Gem::Builder.new(spec).build
-end
+#!/bin/env ruby
+require 'rubygems'
+
+spec = Gem::Specification.new do |s|
+	s.name = "fxri"
+	s.add_dependency('fxruby', '>= 1.2.0')
+	s.version = "0.3.0"
+	s.date = "2005-04-16"
+	s.summary = "Graphical interface to the RI documentation, with search engine."
+	s.require_paths = ["lib"]
+	s.email = "martin.ankerl@gmail.com"
+	s.homepage = "http://fxri.rubyforge.org/"
+	s.rubyforge_project = "fxri"
+	s.description = "FxRi is an FXRuby interface to the RI documentation, with a search engine that allows for search-on-typing."
+	s.has_rdoc = false
+	s.files = Dir.glob("**/*")
+	s.bindir = "."
+	s.executables = ["fxri"]
+end
+
+if __FILE__ == $0
+	Gem.manage_gems
+	Gem::Builder.new(spec).build
+end

data/lib/Globals.rb

@@ -4,6 +4,8 @@ $cfg = Recursive_Open_Struct.new
 
 $cfg.app.name = "fxri - Instant Ruby Enlightenment"
 
+$cfg.delayed_loading = false
+
 # uses the first font that is available
 $cfg.app.font.name = ["Bitstream Vera Sans", "Verdana", "Trebuchet MS", "Tahoma", "Arial"]
 $cfg.ri_font = ["Bitstream Vera Sans Mono", "Courier New", "Courier"]
@@ -20,6 +22,7 @@ $cfg.status_line_update_interval = 0.1
 $cfg.list.opts = ICONLIST_SINGLESELECT|ICONLIST_DETAILED|LAYOUT_FILL_X|LAYOUT_FILL_Y|ICONLIST_AUTOSIZE
 
 # icons, are automatically loaded from Icon_Loader.
+$cfg.icons_path = File.join("lib","icons")
 $cfg.icons.klass = "class.png"
 $cfg.icons.class_method = "module.png"
 $cfg.icons.instance_method = "method.png"
@@ -29,6 +32,8 @@ $cfg.text.search = "%d / %d entries"
 $cfg.text.search_field = "What do you want to know?"
 $cfg.text.method_name = "name"
 
+# IRB
+$cfg.launch_irb = true
 
 $cfg.text.help = %|This is <b>fxri</b>, a graphical interface to the <em>Ruby</em> documentation. Fxri comes with a search engine with quite a few features. Here are several examples:
 '<em>Array</em>': Lists all classes with the name <em>Array</em>. Note that upcase words are treated case sensitive, lowercase words insensitive.

data/lib/Packet_List.rb

@@ -18,7 +18,7 @@ class Packet_List < FXIconList
 		end
 		
 		@header_item_index = 0
-		@reversed = false
+		@reversed = true
 		@conversions = Array.new
 		@items = Set.new
 		super(*args)
@@ -53,7 +53,7 @@ class Packet_List < FXIconList
 			if @header_item_index == header_item_index
 				@reversed = !@reversed
 			else
-				@reversed = false
+				@reversed = true
 			end
 			@header_item_index = header_item_index
 			header.setArrowDir(@header_item_index, @reversed)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.6
 specification_version: 1
 name: fxri
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2005-02-20
+  version: 0.3.0
+date: 2005-04-16
 summary: "Graphical interface to the RI documentation, with search engine."
 require_paths: 
   - lib
@@ -27,24 +27,24 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 authors: []
 files: 
+  - lib
   - fxri
   - fxri.gemspec
-  - lib
-  - lib/Empty_Text_Field_Handler.rb
   - lib/FoxDisplayer.rb
-  - lib/FoxTextFormatter.rb
-  - lib/fxirb.rb
-  - lib/Globals.rb
   - lib/icons
-  - lib/Icon_Loader.rb
-  - lib/Packet_Item.rb
-  - lib/Packet_List.rb
   - lib/Recursive_Open_Struct.rb
   - lib/RiManager.rb
+  - lib/Globals.rb
+  - lib/fxirb.rb
+  - lib/Packet_Item.rb
   - lib/Search_Engine.rb
-  - lib/icons/class.png
-  - lib/icons/method.png
+  - lib/Empty_Text_Field_Handler.rb
+  - lib/FoxTextFormatter.rb
+  - lib/Packet_List.rb
+  - lib/Icon_Loader.rb
   - lib/icons/module.png
+  - lib/icons/method.png
+  - lib/icons/class.png
 test_files: []
 rdoc_options: []
 extra_rdoc_files: []