VimMate 0.6.4 → 0.6.5

data/CHANGELOG

@@ -1,5 +1,16 @@
 = Changelog
 
+=== Version 0.6.5
+- VimMate would crash when VTE was not present when using shortcut keys
+- Changed some shortcut keys:
+  - CTRL+SHIFT+S: Set focus to current terminal (shell)
+  - CTRL+SHIFT+T: Create a new terminal
+  - CTRL+SHIFT+E: Set focus to search file list
+- # 13210: A new option is now available to hide the status of the files. This helps
+  when using ellipsis since it leaves more space for the file names. The new
+  option is :files_show_status and it's set to true by default. Thanks to
+  Stephen Walker who sent me a patch for this.
+
 === Version 0.6.4
 - VimMate now has shortcut keys to control it's various parts. Here is the
   list of the shortcut keys that where added:

data/README

@@ -187,14 +187,14 @@ There are a lot of other nice script out there so check
 
 = Keyboard shortcuts
 Here is a list of the various shortcut keys:
-- CTRL+SHIFT+T: Set focus to current terminal
-- CTRL+SHIFT+N: Create a new terminal
+- CTRL+SHIFT+S: Set focus to current terminal (shell)
+- CTRL+SHIFT+T: Create a new terminal
 - CTRL+SHIFT+W: Close current terminal
 - CTRL+PAGEDOWN: Next terminal
 - CTRL+PAGEDOWN: Previous terminal
 - CTRL+SHIFT+L: Set focus to file filter
 - CTRL+SHIFT+F: Set focus to file list
-- CTRL+SHIFT+S: Set focus to search file list
+- CTRL+SHIFT+E: Set focus to search file list
 - CTRL+SHIFT+V: Set focus to Vim
 Thanks to Florian Frank who sent me a patch for the first 5 shortcuts. The
 other shortcuts where also added thanks to this patch by Florian Frank. (Note

data/TODO

@@ -1,7 +1,10 @@
 = TODO
 List of things to do:
 - Find a better way to hide the file list and use the same way to hide
-  the terminals.
+  the terminals. Patches for this are welcome!
+- Configurable shortcut keys: allow users to change the shortcut keys
+  with .vimmaterc. Need to find a way to specify the modifier (shift, ctrl)
+  and the key. Probably something like "CONTROL_MASK SHIFT_MASK GDK_S".
 
 = Ideas
 - New from file copy

data/bin/vimmate

@@ -92,8 +92,10 @@ fork do
   end
 
   main.files_window = files if files
-  main.vim_window = vim if files
-  main.terminals_window = terminals if terminals
+  main.vim_window = vim if vim
+  if not terminals.nil? and not terminals.is_a?(VimMate::DummyWindow)
+    main.terminals_window = terminals
+  end
 
   # Set the signals for the file list
   files.add_open_signal do |path, kind|

data/lib/vimmatelib/config.rb

@@ -52,6 +52,7 @@ module VimMate
       :files_search_separator_position => 400,
       :files_warn_too_many_files => 300,
       :files_warn_too_many_files_each_step => true,
+      :files_show_status => true,
       :terminals_enabled => true,
       :terminals_height => 50,
       :terminals_font => "10",

data/lib/vimmatelib/files_window.rb

@@ -161,12 +161,14 @@ module VimMate
       column.set_attributes(text_cell_renderer, :text => NAME)
       
       # Status
-      text_cell_renderer2 = Gtk::CellRendererText.new
-      if Config[:files_use_ellipsis]
-        text_cell_renderer2.ellipsize = Pango::Layout::EllipsizeMode::END
+      if Config[:files_show_status]
+        text_cell_renderer2 = Gtk::CellRendererText.new
+        if Config[:files_use_ellipsis]
+          text_cell_renderer2.ellipsize = Pango::Layout::EllipsizeMode::END
+        end
+        column.pack_start(text_cell_renderer2, true)
+        column.set_attributes(text_cell_renderer2, :text => STATUS)
       end
-      column.pack_start(text_cell_renderer2, true)
-      column.set_attributes(text_cell_renderer2, :text => STATUS)
       
       @gtk_tree_view.append_column(column)
       
@@ -395,7 +397,7 @@ module VimMate
           @gtk_tree_store.each do |model,path,iter|
             if iter[PATH] == file.path
               iter[ICON] = file.icon
-              iter[STATUS] = file.status_text
+              iter[STATUS] = file.status_text if Config[:files_show_status]
               break
             end
           end
@@ -417,7 +419,7 @@ module VimMate
       new_row[NAME] = file.name
       new_row[PATH] = file.path
       new_row[ICON] = file.icon
-      new_row[STATUS] = file.status_text
+      new_row[STATUS] = file.status_text if Config[:files_show_status]
       if file.instance_of? ListedDirectory
         new_row[SORT] = "1-#{file.path}-1"
         new_row[TYPE] = TYPE_DIRECTORY

data/lib/vimmatelib/main_window.rb

@@ -47,12 +47,12 @@ module VimMate
         if event.state & Gdk::Window::ModifierType::CONTROL_MASK != 0
           if event.state & Gdk::Window::ModifierType::SHIFT_MASK != 0
             case event.keyval
-            # CTRL+SHIFT+T: Set focus to terminal
-            when Gdk::Keyval::GDK_T
+            # CTRL+SHIFT+S: Set focus to terminal (shell)
+            when Gdk::Keyval::GDK_S
               terminals_window.focus_terminal if terminals_window
               next true
-            # CTRL+SHIFT+N: New terminal
-            when Gdk::Keyval::GDK_N
+            # CTRL+SHIFT+T: New terminal
+            when Gdk::Keyval::GDK_T
               terminals_window.add_new_terminal if terminals_window
               next true
             # CTRL+SHIFT+W: Close terminal
@@ -68,7 +68,7 @@ module VimMate
               files_window.focus_file_list if files_window
               next true
             # CTRL+SHIFT+S: Set focus to search file list
-            when Gdk::Keyval::GDK_S
+            when Gdk::Keyval::GDK_E
               files_window.focus_file_search if files_window
               next true
             # CTRL+SHIFT+V: Set focus to Vim

data/lib/vimmatelib/version.rb

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

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: VimMate
 version: !ruby/object:Gem::Version 
-  version: 0.6.4
-date: 2007-09-05 00:00:00 -04:00
+  version: 0.6.5
+date: 2007-09-29 00:00:00 -04:00
 summary: VimMate is a graphical add-on to Vim with IDE-like features.
 require_paths: 
 - lib