VimMate 0.6.2 → 0.6.3

data/CHANGELOG

@@ -1,5 +1,15 @@
 = Changelog
 
+=== Version 0.6.3
+- # 13212: VimMate could not be resized properly.
+- # 7399, partially. A new warning has been added when too many files are
+  loaded by VimMate. The warning asks the user if he wants to continue. The
+  default number of files is 300 and can be changed by setting the option
+  :files_warn_too_many_files to an other number. The warning is popped every
+  multiple of this settings, which means at 300, 600, 900... This can be
+  changed by setting the option :files_warn_too_many_files_each_step to
+  false.
+
 === Version 0.6.2
 - # 7028: It's now possible to install VimMate using the provided setup.rb
   or with Ruby Gems.

data/README

@@ -40,8 +40,8 @@ To install:
   Try running <tt>ruby --version</tt> in a terminal.
 - Install the Ruby bindings to GTK and GNOME (for the VTE terminal). See
   {Ruby-GNOME2 website}[http://ruby-gnome2.sourceforge.jp/]. Only
-  Ruby-GNOME2 version 0.15 has been tested. You don't need VTE: if it's
-  not installed, VimMate will not have terminals but will run anyway.
+  Ruby-GNOME2 version 0.15 and 0.16 has been tested. You don't need VTE: if
+  it's not installed, VimMate will not have terminals but will run anyway.
 - If you want to use the Subversion integration feature, you must install
   the subversion bindings for Ruby. Check if it's available for your OS
   or get the sources from
@@ -184,7 +184,8 @@ There are a lot of other nice script out there so check
 
 = Limitations
 - VimMate cannot handle well a directory tree with thousands of files,
-  although it has no problems with hundreds of files.
+  although it has no problems with hundreds of files although it can take
+  some time to start.
 - Vim loads after VimMate is started. If you close VimMate or open a file
   before Vim starts and is connected to VimMate, this can lead to weird
   things. You should wait for Vim before you start playing with VimMate.

data/bin/vimmate

@@ -109,12 +109,14 @@ fork do
 
   # When there are no files, add the current directory to the file list.
   # If files are specified on the command line, use them
-  if ARGV.empty?
-    files.add_path(File.expand_path('.'))
-    files.expand_first_row
-  else
-    ARGV.each do |file|
-      files.add_path(File.expand_path(file))
+  files.initial_add do
+    if ARGV.empty?
+      files.add_path(File.expand_path('.'))
+      files.expand_first_row
+    else
+      ARGV.each do |file|
+        files.add_path(File.expand_path(file))
+      end
     end
   end
 

data/lib/vimmatelib/config.rb

@@ -50,6 +50,8 @@ module VimMate
       :files_use_search => true,
       :files_search_ignore_case => true,
       :files_search_separator_position => 400,
+      :files_warn_too_many_files => 300,
+      :files_warn_too_many_files_each_step => true,
       :terminals_enabled => true,
       :terminals_height => 50,
       :terminals_font => "10",

data/lib/vimmatelib/files.rb

@@ -179,6 +179,9 @@ module VimMate
       @refresh_signal = Set.new
       @signal_method = method(:signal)
       @exclude_file_list = exclude_file_list
+      @too_many_files_signal = Set.new
+      @warn_too_many_files = false
+      @warn_files_count = 0
     end
 
     # Yield each files and directory at the root of the tree
@@ -200,6 +203,19 @@ module VimMate
       self
     end
 
+    # Indicates that the initial file adding is going on. Used to warn if
+    # there are too many files
+    def initial_add
+      begin
+        @warn_files_count = 0
+        @warn_too_many_files = true
+        yield
+      ensure
+        @warn_files_count = 0
+        @warn_too_many_files = false
+      end
+    end
+
     # Refresh the files from the tree. Inexistent files are removed and
     # new files are added
     def refresh
@@ -217,10 +233,29 @@ module VimMate
       @refresh_signal << block
     end
 
+    # Add a block that will be called when too many files are added.
+    # The block takes 1 argument, the number of files that where added.
+    def add_too_many_files_signal(&block)
+      @too_many_files_signal << block
+    end
+
     private
 
     # Signal that a file has been added or removed.
     def signal(method, file)
+      if @warn_too_many_files
+        @warn_files_count += 1
+        warn = if Config[:files_warn_too_many_files_each_step]
+                 (@warn_files_count % Config[:files_warn_too_many_files]) == 0
+               else
+                 @warn_files_count == Config[:files_warn_too_many_files]
+               end
+        if warn
+          @too_many_files_signal.each do |block|
+            block.call(@warn_files_count)
+          end
+        end
+      end
       @refresh_signal.each do |block|
         block.call(method, file)
       end

data/lib/vimmatelib/files_window.rb

@@ -240,12 +240,7 @@ module VimMate
 
       gtk_window.border_width = 5
 
-      # Launch a timer to refresh the file list
       @file_tree_mutex = Mutex.new
-      Gtk.timeout_add(Config[:files_refresh_interval] * 1000) do 
-        do_refresh
-        true
-      end
     end
 
     # Recursively add a path at the root of the tree
@@ -311,6 +306,17 @@ module VimMate
       @expander_signal << block
     end
 
+    # Indicates that the initial file adding is going on. The timer to refresh
+    # the list is started after the initial add.
+    def initial_add(&block)
+      @file_tree.initial_add(&block)
+      # Launch a timer to refresh the file list
+      Gtk.timeout_add(Config[:files_refresh_interval] * 1000) do 
+        do_refresh
+        true
+      end
+    end
+    
     private
 
     # Lunch the refresh of the tree
@@ -324,6 +330,21 @@ module VimMate
     def initialize_file_tree(exclude_file_list)
       @file_tree = ListedTree.new(exclude_file_list)
 
+      @file_tree.add_too_many_files_signal do |nbfiles|
+        dialog = Gtk::MessageDialog.new(nil,
+                                        Gtk::MessageDialog::Flags::MODAL,
+                                        Gtk::MessageDialog::Type::QUESTION,
+                                        Gtk::MessageDialog::ButtonsType::YES_NO,
+                                        "A large number of files will be processed (more than #{nbfiles}). This could take a long time. Continue anyway ?")
+        dialog.set_icon_list(Icons.window_icons)
+        if dialog.run == Gtk::Dialog::RESPONSE_NO
+          puts "\n\nToo many files. The user chose to stop loading. Exiting now.\n\n"
+          exit
+        end
+        dialog.hide
+        dialog.destroy
+      end
+
       # Register to receive a signal when a file is added or removed
       @file_tree.add_refresh_signal do |method, file|
         case method

data/lib/vimmatelib/terminals_window.rb

@@ -55,7 +55,7 @@ module VimMate
           @gtk_notebook.page = page_num
         end
       end
-      @gtk_notebook.set_size_request(-1, Config[:terminals_height])
+      @gtk_notebook.set_size_request(0, Config[:terminals_height])
     end
 
     # The "window" for this object

data/lib/vimmatelib/version.rb

@@ -24,6 +24,6 @@ SOFTWARE.
 module VimMate
 
   # VimMate's version
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.4
 specification_version: 1
 name: VimMate
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
-date: 2006-12-20 00:00:00 -05:00
+  version: 0.6.3
+date: 2007-08-20 00:00:00 -04:00
 summary: VimMate is a graphical add-on to Vim with IDE-like features.
 require_paths: 
 - lib
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Guillaume Benny
 files: