rcv 0.0.4 → 0.0.5

data/Manifest.txt

@@ -7,6 +7,5 @@ bin/rcv
 lib/rcv.rb
 lib/rcv/config.rb
 lib/rcv/reader.rb
-lib/rcv/version.rb
 test/test_helper.rb
 test/test_rcv.rb

data/README.txt

@@ -13,8 +13,8 @@ Ruby's
 
 == Usage:
 
-rcv zipfile
-rcv
+$ rcv zipfile
+$ rcv
 
 == Shortcut key:
 
@@ -23,6 +23,7 @@ right : Next Image
 left  : Prev Image
 s     : Save bookmark
 b     : Load bookmark
+l     : Bookmark List
 
 Copyright (c) 2008 Kazuki Uchida <gioext at gmail.com>
 

data/bin/rcv

@@ -30,18 +30,24 @@ module RCV
       show_all
     end
 
-    def read(file)
+    def read(file, b = false)
       @filename = file
-      if file
+      if file && File.exist?(@filename)
         @reader = RCV::Reader.new(file)
         @reader.read
+        if b
+          state = RCV::Config.bookmark @filename
+          if state && @reader
+            @reader.state = state
+          end
+        end
         print @reader.next_image
       end
     end
 
-    def close
-      @reader.close if @reader
-    end
+#     def close
+#       @reader.close if @reader
+#     end
 
     def on_key_press_event(sender, e)
       case e.keyval
@@ -55,6 +61,8 @@ module RCV
         on_press_s
       when Gdk::Keyval::GDK_b
         on_press_b
+      when Gdk::Keyval::GDK_l
+        on_press_l
       end
     end
 
@@ -67,13 +75,17 @@ module RCV
     end
 
     def on_press_o
-      dialog = Gtk::FileChooserDialog.new("Open File",
-                                          self,
-                                          Gtk::FileChooser::ACTION_OPEN,
-                                          nil,
-                                          [Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL],
-                                          [Gtk::Stock::OPEN, Gtk::Dialog::RESPONSE_ACCEPT])
+      dialog = Gtk::FileChooserDialog.new(
+                 "Open File",
+                 self,
+                 Gtk::FileChooser::ACTION_OPEN,
+                 nil,
+                 [Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL],
+                 [Gtk::Stock::OPEN, Gtk::Dialog::RESPONSE_ACCEPT])
       dialog.current_folder = ENV["HOME"] || "./"
+      filter = Gtk::FileFilter.new
+      filter.add_pattern("*.zip")
+      dialog.add_filter(filter)
       if dialog.run == Gtk::Dialog::RESPONSE_ACCEPT
         read dialog.filename
       end
@@ -92,21 +104,9 @@ module RCV
       end
     end
 
-    # ubuntu bug? PixbufLoader(jpg file)
-    def get_pixbuf(stream)
-      if stream
-        # @buf = Gdk::Pixbuf.new(temp)
-        loader = Gdk::PixbufLoader.new
-        loader.last_write(stream)
-        @buf = loader.pixbuf
-      end
-    end
-
-    def print stream
-      if stream
-        get_pixbuf stream
-        @drawing_area.signal_emit("expose_event", nil)
-      end
+    def on_press_l
+      w = BookmarkWindow.new { |path| read path, true }
+      w.show_all
     end
 
     def on_drawing_area_expose(sender, e)
@@ -137,6 +137,70 @@ module RCV
       context.paint
       GC.start
     end
+
+    # ubuntu7.10 bug? PixbufLoader(jpg file)
+    def print stream
+      return unless stream
+      loader = Gdk::PixbufLoader.new
+      loader.last_write(stream)
+      @buf = loader.pixbuf
+      @drawing_area.signal_emit("expose_event", nil)
+    end
+  end
+
+  class BookmarkWindow < Gtk::Window
+    def initialize(&block)
+      super("Bookmark")
+      @openblock = block
+      @view = Gtk::TreeView.new
+      @view.model = Gtk::ListStore.new(String)
+      renderer = Gtk::CellRendererText.new
+      @view.append_column(Gtk::TreeViewColumn.new("Title", renderer, :text => 0))
+
+      hbox = Gtk::HBox.new(false, 5)
+      button_open = Gtk::Button.new(Gtk::Stock::APPLY)
+      button_open.signal_connect("clicked") { |w, e| on_button_open_click }
+      button_del = Gtk::Button.new(Gtk::Stock::DELETE)
+      button_del.signal_connect("clicked") { |w, e| on_button_del_click }
+      hbox.pack_start(button_open, false, true, 0)
+      hbox.pack_start(button_del, false, true, 0)
+
+      vbox = Gtk::VBox.new(false, 5)
+      scrolled_window = Gtk::ScrolledWindow.new
+      scrolled_window.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC)
+      vbox.pack_start(scrolled_window.add(@view))
+      vbox.pack_start(hbox, false, true, 0)
+
+      add vbox
+      set_default_size(480, 320)
+      set_modal true
+      signal_connect("destroy") { destroy }
+      set_bookmark RCV::Config.bookmarks
+    end
+
+    def on_button_open_click
+      if @view.selection.selected
+        @path = @view.selection.selected[0]
+        @openblock.call @path
+        destroy
+      end
+    end
+    attr_reader :path
+
+    def on_button_del_click
+      return unless @view.selection.selected
+      bm = RCV::Config.delete_bookmark(@view.selection.selected[0])
+      set_bookmark bm
+    end
+
+    def set_bookmark(bm)
+      return unless bm
+      @view.model.clear
+      bm.each do |k, v|
+        row = @view.model.append
+        row[0] = k
+      end
+    end
   end
 end
 
@@ -150,8 +214,9 @@ end
 
 begin
   ui = RCV::GtkWindow.new
-  ui.read ARGV[0]
+  ui.read File.expand_path(ARGV[0]) if ARGV[0]
   Gtk.main
 rescue
-  ui.close
+  puts $@
+  #ui.close
 end

data/lib/rcv.rb

@@ -7,7 +7,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module RCV
-  VERSION = [0, 0, 4]
+  VERSION = [0, 0, 5]
 
   def self.version
     VERSION.join(".")

data/lib/rcv/config.rb

@@ -10,26 +10,35 @@ module RCV
     class << self
       def bookmark=(hash)
         FileUtils.mkpath(CONF_DIR) unless File.exist?(CONF_DIR)
-        bm = bookmark_all
+        bm = bookmarks
         hash.update(bm) { |k, v| v } if bm
-        open(BOOKMARK_PATH, "w") do |f|
-          f.write hash.to_yaml
-        end
+        write_bookmark hash
       end
 
       def bookmark(key = nil)
-        bm = bookmark_all
+        bm = bookmarks
         bm[key] if bm && bm.key?(key)
       end
 
+      def delete_bookmark(key)
+        hash = bookmarks.reject { |k, v| k == key }
+        write_bookmark hash
+        hash
+      end
+
       def clear_bookmark
         File.open(BOOKMARK_PATH, "w").close
       end
 
-      private
-      def bookmark_all
+      def bookmarks
         YAML.load(File.read(BOOKMARK_PATH)) if File.exist?(BOOKMARK_PATH)
       end
+
+      def write_bookmark(hash)
+        open(BOOKMARK_PATH, "w") do |f|
+          f.write hash.to_yaml
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rcv
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Kazuki Uchida
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-26 00:00:00 +09:00
+date: 2008-04-27 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -35,7 +35,6 @@ files:
 - lib/rcv.rb
 - lib/rcv/config.rb
 - lib/rcv/reader.rb
-- lib/rcv/version.rb
 - test/test_helper.rb
 - test/test_rcv.rb
 has_rdoc: true

data/lib/rcv/version.rb

@@ -1,9 +0,0 @@
-module Rcv #:nodoc:
-  module VERSION #:nodoc:
-    MAJOR = 0
-    MINOR = 0
-    TINY  = 1
-
-    STRING = [MAJOR, MINOR, TINY].join('.')
-  end
-end