origami 2.0.0 → 2.0.1

data/bin/gui/hexview.rb

@@ -52,29 +52,33 @@ module PDFWalker
             def load(object)
                 return if @current_obj.equal?(object)
 
-                begin
-                    self.clear
+                self.clear
 
-                    case object
-                    when Origami::Stream
-                        begin
-                            @view.set_data(object.data)
-                        rescue Origami::Filter::Error
-                            @view.set_data($!.input_data) if $!.input_data
+                case object
+                when Origami::Stream
+                    load_stream(object)
+                when Origami::String
+                    load_string(object)
+                end
 
-                            @parent.error("#{$!.class}: #{$!.message}") unless object.filters == [ :DCTDecode ]
-                        end
+                @current_obj = object
+            end
 
-                    when Origami::String
-                        @view.set_data(object.value)
-                    end
+            private
 
-                    @current_obj = object
+            def load_stream(object)
+                begin
+                    @view.set_data(object.data)
+                rescue Origami::Filter::Error
+                    @view.set_data($!.input_data) if $!.input_data
 
-                rescue
-                  @parent.error("An error occured while loading this object.\n#{$!} (#{$!.class})")
+                    @parent.error("#{$!.class}: #{$!.message}") unless object.filters == [ :DCTDecode ]
                 end
             end
+
+            def load_string(object)
+                @view.set_data(object.value)
+            end
         end
     end
 end

data/bin/gui/imgview.rb

@@ -31,7 +31,7 @@ module PDFWalker
             set_resizable false
 
             add_events(Gdk::Event::KEY_RELEASE_MASK)
-            signal_connect('key_release_event') { |w, event|
+            signal_connect('key_release_event') { |_, event|
                 destroy if event.keyval == Gdk::Keyval::GDK_Escape
             }
         end

data/bin/gui/menu.rb

@@ -20,32 +20,25 @@
 
 module PDFWalker
 
-    module Popable
+    module PopupMenu
 
         @@menus = Hash.new([])
-        @@menus[:"PDF File"] =
+        @@menus['PDF'] =
         [
             {
                 Name: Stock::SAVE_AS,
                 Sensitive: true,
-                Callback: lambda { |widget, viewer, path|
+                Callback: lambda { |_widget, viewer, _path|
                     viewer.parent.save
                 }
             },
-            {
-                Name: "Serialize",
-                Sensitive: true,
-                Callback: lambda { |widget, viewer, path|
-                    viewer.parent.serialize
-                }
-            },
             {
                 Name: :"---"
             },
             {
                 Name: Stock::PROPERTIES,
                 Sensitive: true,
-                Callback: lambda { |widget, viewer, path|
+                Callback: lambda { |_widget, viewer, _path|
                     viewer.parent.display_file_properties
                 }
             },
@@ -55,29 +48,29 @@ module PDFWalker
             {
                 Name: Stock::CLOSE,
                 Sensitive: true,
-                Callback: lambda { |widget, viewer, path|
+                Callback: lambda { |_widget, viewer, _path|
                     viewer.parent.close
                 }
             }
         ]
 
-        @@menus[:Reference] =
+        @@menus['Reference'] =
         [
             {
                 Name: Stock::JUMP_TO,
                 Sensitive: true,
-                Callback: lambda { |widget, viewer, path|
+                Callback: lambda { |_widget, viewer, path|
                     viewer.row_activated(path, viewer.get_column(viewer.class::TEXTCOL))
                 }
             }
         ]
 
-        @@menus[:Revision] =
+        @@menus['Revision'] =
         [
             {
                 Name: "Save to this revision",
                 Sensitive: true,
-                Callback: lambda { |widget, viewer, path|
+                Callback: lambda { |_widget, viewer, path|
                     revstr = viewer.model.get_value(viewer.model.get_iter(path), viewer.class::TEXTCOL)
                     revstr.slice!(0, "Revision ".size)
 
@@ -102,42 +95,42 @@ module PDFWalker
             }
         ]
 
-        @@menus[:Stream] =
+        @@menus['Stream'] =
         [
             {
                 Name: "Dump encoded stream",
                 Sensitive: true,
-                Callback: lambda { |widget, viewer, path|
-                    stream = viewer.model.get_value(viewer.model.get_iter(path), viewer.class::OBJCOL)
+                Callback: lambda { |_widget, viewer, path|
+                    stream = viewer.object_by_path(path)
 
-                    viewer.parent.save_data("Save stream to file", stream.encoded_data)
+                    viewer.parent.save_data("Save encoded stream to file", stream.encoded_data)
                 }
             },
             {
                 Name: "Dump decoded stream",
                 Sensitive: true,
-                Callback: lambda { |widget, viewer, path|
-                    stream = viewer.model.get_value(viewer.model.get_iter(path), viewer.class::OBJCOL)
+                Callback: lambda { |_widget, viewer, path|
+                    stream = viewer.object_by_path(path)
 
-                    viewer.parent.save_data("Save stream to file", stream.data)
+                    viewer.parent.save_data("Save decoded stream to file", stream.data)
                 }
             }
         ]
 
-        @@menus[:String] =
+        @@menus['String'] =
         [
             {
                 Name: "Dump string",
                 Sensitive: true,
-                Callback: lambda { |widget, viewer, path|
-                    string = viewer.model.get_value(viewer.model.get_iter(path), viewer.class::OBJCOL)
+                Callback: lambda { |_widget, viewer, path|
+                    string = viewer.object_by_path(path)
 
                     viewer.parent.save_data("Save string to file", string.value)
                 }
             }
         ]
 
-        @@menus[:Image] = @@menus[:Stream] +
+        @@menus['Image'] = @@menus['Stream'] +
         [
             {
                 Name: :"---"
@@ -145,8 +138,8 @@ module PDFWalker
             {
                 Name: "View image",
                 Sensitive: true,
-                Callback: lambda { |widget, viewer, path|
-                    stm = viewer.model.get_value(viewer.model.get_iter(path), viewer.class::OBJCOL)
+                Callback: lambda { |_widget, viewer, path|
+                    stm = viewer.object_by_path(path)
                     w,h = stm.Width, stm.Height
 
                     if stm.ColorSpace.nil?
@@ -183,67 +176,50 @@ module PDFWalker
         def popup_menu(obj, event, path)
             menu = Menu.new
 
-            type =
-                if obj.is_a?(Origami::Object)
-                      if obj.is_a?(Origami::Graphics::ImageXObject)
-                          :Image
-                      else
-                          obj.native_type.to_s.split("::").last.to_sym
-                      end
-                else
-                      case obj
-                      when Origami::PDF
-                          :"PDF File"
-                      when Origami::PDF::Revision, Origami::FDF::Revision, Origami::PPKLite::Revision
-                          :Revision
-                      when ::Array
-                          :Body
-                      when Origami::PDF::Header, Origami::FDF::Header, Origami::PPKLite::Header
-                          :Header
-                      when Origami::Trailer
-                          :Trailer
-                      when Origami::XRef::Section
-                          :XRefSection
-                      when Origami::XRef::Subsection
-                          :XRefSubsection
-                      when Origami::XRef, Origami::XRefToCompressedObj
-                          :XRef
-                      else
-                          :Unknown
-                      end
-                end
+            type = popup_menu_key(obj)
 
+            # Create menu title.
             title = obj.is_a?(Origami::Object) ? "Object : " : ""
             title << type.to_s
             menu.append(MenuItem.new(title).set_sensitive(false).modify_text(Gtk::STATE_INSENSITIVE, Gdk::Color.new(255,0,255)))
 
-            if obj.is_a?(Origami::Object)
-                if obj.indirect?
-                    menu.append(MenuItem.new("Number : #{obj.no}; Generation : #{obj.generation}").set_sensitive(false))
-                    menu.append(MenuItem.new("File offset : #{obj.file_offset}").set_sensitive(false))
+            # Object information.
+            create_object_menu(menu, obj) if obj.is_a?(Origami::Object)
 
-                    getxrefs = MenuItem.new("Search references to this object").set_sensitive(true)
-                    getxrefs.signal_connect("activate") do
-                        ref = self.model.get_value(self.model.get_iter(path), self.class::OBJCOL)
-                        self.parent.show_xrefs(ref)
-                    end
+            # Type-specific menu.
+            create_type_menu(menu, type, path)
 
-                    menu.append(getxrefs)
-                elsif not obj.parent.nil?
-                    gotoparent = MenuItem.new("Goto Parent Object").set_sensitive(true)
-                    gotoparent.signal_connect("activate") do
-                        dest = self.model.get_value(self.model.get_iter(path), self.class::OBJCOL).parent
-                        self.goto(dest)
-                    end
+            menu.show_all
+            menu.popup(nil, nil, event.button, event.time)
+        end
+
+        private
+
+        def create_object_menu(menu, object)
+            if object.indirect?
+                menu.append(MenuItem.new("Number : #{object.no}; Generation : #{object.generation}").set_sensitive(false))
+                menu.append(MenuItem.new("File offset : #{object.file_offset}").set_sensitive(false))
+
+                getxrefs = MenuItem.new("Search references to this object").set_sensitive(true)
+                getxrefs.signal_connect("activate") do
+                    self.parent.show_xrefs(object)
+                end
+                menu.append(getxrefs)
 
-                    menu.append(gotoparent)
+            elsif not object.parent.nil?
+                gotoparent = MenuItem.new("Goto Parent Object").set_sensitive(true)
+                gotoparent.signal_connect("activate") do
+                    self.goto(object.parent)
                 end
+                menu.append(gotoparent)
             end
+        end
 
+        def create_type_menu(menu, type, path)
             items = @@menus[type]
             menu.append(SeparatorMenuItem.new) if not items.empty?
 
-            items.each { |item|
+            items.each do |item|
                 if item[:Name] == :"---"
                     entry = SeparatorMenuItem.new
                 else
@@ -258,10 +234,34 @@ module PDFWalker
                 end
 
                 menu.append(entry)
-            }
+            end
+        end
 
-            menu.show_all
-            menu.popup(nil, nil, event.button, event.time)
+        def popup_menu_key(object)
+            if object.is_a?(Origami::Object)
+                popup_menu_object_key(object)
+            else
+                popup_menu_struct_key(object)
+            end
+        end
+
+        def popup_menu_object_key(object)
+            if object.is_a?(Origami::Graphics::ImageXObject)
+                'Image'
+            else
+                object.native_type.to_s.split("::").last
+            end
+        end
+
+        def popup_menu_struct_key(struct)
+            case struct
+            when ::Array
+                'Body'
+            when Origami::XRef, Origami::XRefToCompressedObject
+                'XRef'
+            else
+                struct.class.name.split('::').last
+            end
         end
     end
 
@@ -279,110 +279,90 @@ module PDFWalker
 
             @menu = MenuBar.new
 
-            ####################################################
+            create_file_menu 
+            create_document_menu
+            create_help_menu
+        end
+
+        def create_file_menu
             file_ag = Gtk::AccelGroup.new
             @file_menu = Menu.new.set_accel_group(file_ag).set_accel_path("<PDF Walker>/File")
             add_accel_group(file_ag)
 
-            @file_menu_open = ImageMenuItem.new(Stock::OPEN).set_accel_path("<PDF Walker>/File/Open")
-            @file_menu_recent = MenuItem.new("Last opened")
-            @file_menu_deserialize = MenuItem.new("Deserialize")
-            @file_menu_refresh = ImageMenuItem.new(Stock::REFRESH).set_sensitive(false).set_accel_path("<PDF Walker>/File/Refresh")
-            @file_menu_close = ImageMenuItem.new(Stock::CLOSE).set_sensitive(false).set_accel_path("<PDF Walker>/File/Close")
-            @file_menu_saveas = ImageMenuItem.new(Stock::SAVE_AS).set_sensitive(false)
-            @file_menu_serialize = MenuItem.new("Serialize").set_sensitive(false)
-            @file_menu_exit = ImageMenuItem.new(Stock::QUIT).set_accel_path("<PDF Walker>/File/Quit")
-
-            @export_menu = Menu.new
-            @export_pdf_menu = MenuItem.new("As PDF").set_accel_path("<PDF Walker>/File/Save")
-            @export_graph_menu = MenuItem.new("As GraphViz dot file")
-            @export_graphml_menu = MenuItem.new("As GraphML file")
-
-            @export_pdf_menu.signal_connect('activate') do save end
-            @export_graph_menu.signal_connect('activate') do save_dot end
-            @export_graphml_menu.signal_connect('activate') do save_graphml end
-
-            @export_menu.append(@export_pdf_menu)
-            @export_menu.append(@export_graph_menu)
-            @export_menu.append(@export_graphml_menu)
-
-            @file_menu_saveas.set_submenu(@export_menu)
-
-            @file_menu_open.signal_connect('activate') do open end
-            @file_menu_deserialize.signal_connect('activate') do deserialize end
-            @file_menu_refresh.signal_connect('activate') do open(@filename) end
-            @file_menu_close.signal_connect('activate') do close end
-            @file_menu_serialize.signal_connect('activate') do serialize end
-            @file_menu_exit.signal_connect('activate') do self.destroy end
+            entries = [
+                @file_menu_open = ImageMenuItem.new(Stock::OPEN).set_accel_path("<PDF Walker>/File/Open"),
+                @file_menu_recent = MenuItem.new("Last opened"),
+                @file_menu_refresh = ImageMenuItem.new(Stock::REFRESH).set_sensitive(false).set_accel_path("<PDF Walker>/File/Refresh"),
+                @file_menu_close = ImageMenuItem.new(Stock::CLOSE).set_sensitive(false).set_accel_path("<PDF Walker>/File/Close"),
+                @file_menu_saveas = ImageMenuItem.new(Stock::SAVE_AS).set_sensitive(false).set_accel_path("<PDF Walker>/File/Save"),
+                @file_menu_exit = ImageMenuItem.new(Stock::QUIT).set_accel_path("<PDF Walker>/File/Quit"),
+            ]
+
+            @file_menu_open.signal_connect('activate') { open }
+            @file_menu_refresh.signal_connect('activate') { open(@filename) }
+            @file_menu_close.signal_connect('activate') { close }
+            @file_menu_saveas.signal_connect('activate') { save }
+            @file_menu_exit.signal_connect('activate') { self.destroy }
 
             update_recent_menu
 
-            @file_menu.append(@file_menu_open)
-            @file_menu.append(@file_menu_recent)
-            @file_menu.append(@file_menu_deserialize)
-            @file_menu.append(@file_menu_refresh)
-            @file_menu.append(@file_menu_close)
-            @file_menu.append(@file_menu_saveas)
-            @file_menu.append(@file_menu_serialize)
-            @file_menu.append(@file_menu_exit)
+            entries.each do |entry|
+                @file_menu.append(entry)
+            end
 
             @menu.append(MenuItem.new('_File').set_submenu(@file_menu))
-            ####################################################
+        end
 
+        def create_document_menu
             doc_ag = Gtk::AccelGroup.new
             @document_menu = Menu.new.set_accel_group(doc_ag)
             add_accel_group(doc_ag)
 
-            @document_menu_search = ImageMenuItem.new(Stock::FIND).set_sensitive(false).set_accel_path("<PDF Walker>/Document/Search")
-            @document_menu_gotocatalog = MenuItem.new("Jump to Catalog").set_sensitive(false)
-            @document_menu_gotodocinfo = MenuItem.new("Jump to Document Info").set_sensitive(false)
-            @document_menu_gotometadata = MenuItem.new("Jump to Metadata").set_sensitive(false)
-            @document_menu_gotorev = MenuItem.new("Jump to Revision...").set_sensitive(false)
-            @document_menu_gotopage = MenuItem.new("Jump to Page...").set_sensitive(false)
-            @document_menu_gotofield = MenuItem.new("Jump to Field...").set_sensitive(false)
-            @document_menu_gotoobj = MenuItem.new("Jump to Object...").set_sensitive(false)
-            @document_menu_properties = ImageMenuItem.new(Stock::PROPERTIES).set_sensitive(false)
-            @document_menu_sign = MenuItem.new("Sign the document").set_sensitive(false)
-            @document_menu_ur = MenuItem.new("Enable Usage Rights").set_sensitive(false)
-
-            @document_menu_search.signal_connect('activate') do search end
-            @document_menu_gotocatalog.signal_connect('activate') do goto_catalog end
-            @document_menu_gotodocinfo.signal_connect('activate') do goto_docinfo end
-            @document_menu_gotometadata.signal_connect('activate') do goto_metadata end
-            @document_menu_gotoobj.signal_connect('activate') do goto_object end
-            @document_menu_properties.signal_connect('activate') do display_file_properties end
-            @document_menu_sign.signal_connect('activate') do display_signing_wizard end
-            @document_menu_ur.signal_connect('activate') do display_usage_rights_wizard end
-
-            @document_menu.append(@document_menu_search)
-            @document_menu.append(MenuItem.new)
-            @document_menu.append(@document_menu_gotocatalog)
-            @document_menu.append(@document_menu_gotodocinfo)
-            @document_menu.append(@document_menu_gotometadata)
-            @document_menu.append(@document_menu_gotorev)
-            @document_menu.append(@document_menu_gotopage)
-            @document_menu.append(@document_menu_gotofield)
-            @document_menu.append(@document_menu_gotoobj)
-            @document_menu.append(MenuItem.new)
-            @document_menu.append(@document_menu_sign)
-            @document_menu.append(@document_menu_ur)
-            @document_menu.append(@document_menu_properties)
+            entries = [
+                @document_menu_search = ImageMenuItem.new(Stock::FIND).set_sensitive(false).set_accel_path("<PDF Walker>/Document/Search"),
+                MenuItem.new,
+                @document_menu_gotocatalog = MenuItem.new("Jump to Catalog").set_sensitive(false),
+                @document_menu_gotodocinfo = MenuItem.new("Jump to Document Info").set_sensitive(false),
+                @document_menu_gotometadata = MenuItem.new("Jump to Metadata").set_sensitive(false),
+                @document_menu_gotorev = MenuItem.new("Jump to Revision...").set_sensitive(false),
+                @document_menu_gotopage = MenuItem.new("Jump to Page...").set_sensitive(false),
+                @document_menu_gotofield = MenuItem.new("Jump to Field...").set_sensitive(false),
+                @document_menu_gotoobj = MenuItem.new("Jump to Object...").set_sensitive(false),
+                MenuItem.new,
+                @document_menu_sign = MenuItem.new("Sign the document").set_sensitive(false),
+                @document_menu_ur = MenuItem.new("Enable Usage Rights").set_sensitive(false),
+                @document_menu_properties = ImageMenuItem.new(Stock::PROPERTIES).set_sensitive(false),
+            ]
+
+            @document_menu_search.signal_connect('activate') { search }
+            @document_menu_gotocatalog.signal_connect('activate') { goto_catalog }
+            @document_menu_gotodocinfo.signal_connect('activate') { goto_docinfo }
+            @document_menu_gotometadata.signal_connect('activate') { goto_metadata }
+            @document_menu_gotoobj.signal_connect('activate') { goto_object }
+            @document_menu_properties.signal_connect('activate') { display_file_properties }
+            @document_menu_sign.signal_connect('activate') { display_signing_wizard }
+            @document_menu_ur.signal_connect('activate') { display_usage_rights_wizard }
+
+            entries.each do |entry|
+                @document_menu.append(entry)
+            end
 
             @menu.append(MenuItem.new('_Document').set_submenu(@document_menu))
-            ####################################################
+        end
+
+        def create_help_menu
             @help_menu = Menu.new
-            @help_menu_profile = CheckMenuItem.new("Profiling (Debug purposes only)").set_active(@config.profile?)
-            @help_menu_profile.signal_connect('toggled') do @config.set_profiling(@help_menu_profile.active?) end
 
+            @help_menu_profile = CheckMenuItem.new("Profiling (Debug purposes only)").set_active(@config.profile?)
             @help_menu_about = ImageMenuItem.new(Stock::ABOUT)
 
-            @help_menu_about.signal_connect('activate') do about end
+            @help_menu_profile.signal_connect('toggled') do @config.set_profiling(@help_menu_profile.active?) end
+            @help_menu_about.signal_connect('activate') { about }
 
             @help_menu.append(@help_menu_profile)
             @help_menu.append(@help_menu_about)
 
             @menu.append(MenuItem.new('_Help').set_submenu(@help_menu))
-            ####################################################
         end
 
         def update_recent_menu