origami 2.0.0 → 2.0.1

data/bin/gui/properties.rb

@@ -45,38 +45,38 @@ module PDFWalker
             def initialize(parent, pdf)
                 super("Document properties", parent, Dialog::MODAL, [Stock::CLOSE, Dialog::RESPONSE_NONE])
 
-                docframe = Frame.new(" File properties ")
-                stat = File.stat(parent.filename)
+                file_frame = create_file_frame(parent)
+                pdf_frame = create_document_frame(pdf)
+
+                vbox.add(file_frame)
+                vbox.add(pdf_frame)
+
+                signal_connect('response') { destroy }
+
+                show_all
+            end
 
-                creation_date = stat.ctime.to_s.encode("utf-8", :invalid => :replace, :undef => :replace)
-                last_modified = stat.mtime.to_s.encode("utf-8", :invalid => :replace, :undef => :replace)
-                md5sum = Digest::MD5.hexdigest(File.binread(parent.filename))
+            private
+
+            def create_file_frame(parent)
+                file_frame = Frame.new(" File properties ")
+                stat = File.stat(parent.filename)
 
                 labels =
                 [
                     [ "Filename:", parent.filename ],
                     [ "File size:", "#{File.size(parent.filename)} bytes" ],
-                    [ "MD5:", md5sum ],
+                    [ "MD5:", Digest::MD5.file(parent.filename).hexdigest ],
                     [ "Read-only:", "#{not stat.writable?}" ],
-                    [ "Creation date:", creation_date ],
-                    [ "Last modified:", last_modified ]
+                    [ "Creation date:", stat.ctime.to_s ],
+                    [ "Last modified:", stat.mtime.to_s ]
                 ]
 
-                doctable = Table.new(labels.size + 1, 3)
-
-                row = 0
-                labels.each do |name, value|
-                    doctable.attach(Label.new(name).set_alignment(1,0), 0, 1, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 4, 4)
-                    doctable.attach(Label.new(value).set_alignment(0,0), 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 4, 4)
-
-                    row = row.succ
-                end
-
-                docframe.border_width = 5
-                docframe.shadow_type = Gtk::SHADOW_IN
-                docframe.add(doctable)
+                create_table(file_frame, labels)
+            end
 
-                pdfframe = Frame.new(" PDF properties ")
+            def create_document_frame(pdf)
+                pdf_frame = Frame.new(" PDF properties ")
 
                 pdf_version = pdf.header.to_f
                 if pdf_version >= 1.0 and pdf_version <= 1.7
@@ -87,40 +87,38 @@ module PDFWalker
 
                 labels =
                 [
-                    [ "Version:", "#{pdf_version} (Acrobat #{acrobat_version})" ],
-                    [ "Number of revisions:", "#{pdf.revisions.size}" ],
+                    [ "Version:",                    "#{pdf_version} (Acrobat #{acrobat_version})" ],
+                    [ "Number of revisions:",        "#{pdf.revisions.size}" ],
                     [ "Number of indirect objects:", "#{pdf.indirect_objects.size}" ],
-                    [ "Number of pages:", "#{pdf.pages.count}" ],
-                    [ "Linearized:", pdf.linearized? ? 'yes' : 'no' ],
-                    [ "Encrypted:", pdf.encrypted? ? 'yes' : 'no' ],
-                    [ "Signed:", pdf.signed? ? 'yes' : 'no' ],
-                    [ "Has usage rights:", pdf.usage_rights? ? 'yes' : 'no' ],
-                    [ "Form:", pdf.form? ? 'yes' : 'no' ],
-                    [ "XFA form:", pdf.xfa_form? ? 'yes' : 'no' ],
-                    [ "Document information:", pdf.document_info? ? 'yes' : 'no' ],
-                    [ "Metadata:", pdf.metadata? ? 'yes' : 'no' ]
+                    [ "Number of pages:",            "#{pdf.pages.count}" ],
+                    [ "Linearized:",           boolean_text(pdf.linearized?) ],
+                    [ "Encrypted:",            boolean_text(pdf.encrypted?) ],
+                    [ "Signed:",               boolean_text(pdf.signed?) ],
+                    [ "Has usage rights:",     boolean_text(pdf.usage_rights?) ],
+                    [ "Form:",                 boolean_text(pdf.form?) ],
+                    [ "XFA form:",             boolean_text(pdf.xfa_form?) ],
+                    [ "Document information:", boolean_text(pdf.document_info?) ],
+                    [ "Metadata:",             boolean_text(pdf.metadata?) ]
                 ]
 
-                pdftable = Table.new(labels.size + 1, 3)
+                create_table(pdf_frame, labels)
+            end
 
-                row = 0
-                labels.each do |name, value|
-                    pdftable.attach(Label.new(name).set_alignment(1,0), 0, 1, row, row + 1, Gtk::FILL,  Gtk::SHRINK, 4, 4)
-                    pdftable.attach(Label.new(value).set_alignment(0,0), 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 4, 4)
+            def create_table(frame, labels)
+                table = Table.new(labels.size + 1, 3)
 
-                    row = row.succ
+                labels.each_with_index do |label, row|
+                    table.attach(Label.new(label[0]).set_alignment(1,0), 0, 1, row, row + 1, Gtk::FILL,  Gtk::SHRINK, 4, 4)
+                    table.attach(Label.new(label[1]).set_alignment(0,0), 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 4, 4)
                 end
 
-                pdfframe.border_width = 5
-                pdfframe.shadow_type = Gtk::SHADOW_IN
-                pdfframe.add(pdftable)
-
-                vbox.add(docframe)
-                vbox.add(pdfframe)
-
-                signal_connect('response') { destroy }
+                frame.border_width = 5
+                frame.shadow_type = Gtk::SHADOW_IN
+                frame.add(table)
+            end
 
-                show_all
+            def boolean_text(value)
+                value ? 'yes' : 'no'
             end
         end
     end

data/bin/gui/signing.rb

@@ -34,21 +34,7 @@ module PDFWalker
             private
 
             def open_private_key_dialog(page)
-                dialog = FileChooserDialog.new("Choose a private RSA key",
-                            @parent,
-                            FileChooser::ACTION_OPEN,
-                            nil,
-                            [Stock::CANCEL, Dialog::RESPONSE_CANCEL],
-                            [Stock::OPEN, Dialog::RESPONSE_ACCEPT])
-
-                filter = FileFilter.new
-                filter.add_pattern("*.key")
-                filter.add_pattern("*.pem")
-                filter.add_pattern("*.der")
-
-                dialog.set_filter(filter)
-
-                if dialog.run == Dialog::RESPONSE_ACCEPT
+                file_chooser_dialog('Choose a private RSA key', '*.key', '*.pem', '*.der') do |dialog|
                     begin
                         @pkey = OpenSSL::PKey::RSA.new(File.binread(dialog.filename))
 
@@ -64,31 +50,15 @@ module PDFWalker
                         @ca = [] # Shall be added to the GUI
                     end
                 end
-
-                dialog.destroy
             end
 
             def open_certificate_dialog(page)
-                dialog = FileChooserDialog.new("Choose a x509 certificate",
-                            @parent,
-                            FileChooser::ACTION_OPEN,
-                            nil,
-                            [Stock::CANCEL, Dialog::RESPONSE_CANCEL],
-                            [Stock::OPEN, Dialog::RESPONSE_ACCEPT])
-                filter = FileFilter.new
-                filter.add_pattern("*.crt")
-                filter.add_pattern("*.cer")
-                filter.add_pattern("*.pem")
-                filter.add_pattern("*.der")
-
-                dialog.set_filter(filter)
-
-                if dialog.run == Dialog::RESPONSE_ACCEPT
+                file_chooser_dialog('Choose a x509 certificate', '*.crt', '*.cer', '*.pem', '*.der') do |dialog|
                     begin
                         @cert = OpenSSL::X509::Certificate.new(File.binread(dialog.filename))
 
                         @certfilename.set_text(dialog.filename)
-                        if @pkey then set_page_complete(page, true) end
+                        set_page_complete(page, true) if @pkey
 
                     rescue
                         @parent.error("Error loading file '#{File.basename(dialog.filename)}'")
@@ -100,43 +70,13 @@ module PDFWalker
                         @ca = [] # Shall be added to the GUI
                     end
                 end
-
-                dialog.destroy
             end
 
             def open_pkcs12_file_dialog(page)
 
-                get_passwd = -> () do
-                    dialog = Dialog.new("Enter passphrase",
-                                @parent,
-                                Dialog::MODAL,
-                                [Stock::OK, Dialog::RESPONSE_OK]
-                    )
-
-                    pwd_entry = Entry.new.set_visibility(false).show
-                    dialog.vbox.pack_start(pwd_entry, true, true, 0)
-
-                    pwd = (dialog.run == Dialog::RESPONSE_OK) ? pwd_entry.text : ""
-
-                    dialog.destroy
-                    return pwd
-                end
-
-                dialog = FileChooserDialog.new("Open PKCS12 container",
-                            @parent,
-                            FileChooser::ACTION_OPEN,
-                            nil,
-                            [Stock::CANCEL, Dialog::RESPONSE_CANCEL],
-                            [Stock::OPEN, Dialog::RESPONSE_ACCEPT])
-                filter = FileFilter.new
-                filter.add_pattern("*.pfx")
-                filter.add_pattern("*.p12")
-
-                dialog.filter = filter
-
-                if dialog.run == Dialog::RESPONSE_ACCEPT
+                file_chooser_dialog('Open PKCS12 container', '*.pfx', '*.p12') do |dialog|
                     begin
-                        p12 = OpenSSL::PKCS12::PKCS12.new(File.binread(dialog.filename), get_passwd)
+                        p12 = OpenSSL::PKCS12::PKCS12.new(File.binread(dialog.filename), method(:prompt_passphrase))
 
                         raise TypeError, "PKCS12 does not contain a RSA key" unless p12.key.is_a?(OpenSSL::PKey::RSA)
                         raise TypeError, "PKCS12 does not contain a x509 certificate" unless p12.certificate.is_a?(OpenSSL::X509::Certificate)
@@ -153,9 +93,71 @@ module PDFWalker
                         @pkey, @cert, @ca = nil, nil, []
                         @p12filename.text = ""
                         set_page_complete(page, false)
-
                     end
                 end
+            end
+
+            def create_keypair_import_page
+                labels =
+                [
+                    [ "Private RSA key:", @pkeyfilename = Entry.new,  pkeychoosebtn = Button.new(Gtk::Stock::OPEN) ],
+                    [ "Public certificate:", @certfilename = Entry.new, certchoosebtn = Button.new(Gtk::Stock::OPEN) ]
+                ]
+
+                row = 0
+                table = Table.new(2, 3)
+                labels.each do |lbl, entry, btn|
+                    entry.editable = entry.sensitive = false
+
+                    table.attach(Label.new(lbl).set_alignment(1,0), 0, 1, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 4, 4)
+                    table.attach(entry, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 4, 4)
+                    table.attach(btn, 2, 3, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 4, 4)
+
+                    row = row.succ
+                end
+
+                pkeychoosebtn.signal_connect('clicked') { open_private_key_dialog(table) }
+                certchoosebtn.signal_connect('clicked') { open_certificate_dialog(table) }
+
+                append_page(table)
+                set_page_title(table, "Import a public/private key pair")
+                set_page_type(table, Assistant::PAGE_CONTENT)
+            end
+
+            def prompt_passphrase
+                dialog = Dialog.new("Enter passphrase",
+                            @parent,
+                            Dialog::MODAL,
+                            [Stock::OK, Dialog::RESPONSE_OK]
+                )
+
+                pwd_entry = Entry.new.set_visibility(false).show
+                dialog.vbox.pack_start(pwd_entry, true, true, 0)
+
+                pwd = pwd_entry.text if dialog.run == Dialog::RESPONSE_OK
+
+                dialog.destroy
+                pwd.to_s
+            end
+
+            def file_chooser_dialog(title, *patterns)
+                dialog = FileChooserDialog.new(title,
+                            @parent,
+                            FileChooser::ACTION_OPEN,
+                            nil,
+                            [Stock::CANCEL, Dialog::RESPONSE_CANCEL],
+                            [Stock::OPEN, Dialog::RESPONSE_ACCEPT])
+
+                filter = FileFilter.new
+                patterns.each do |pattern|
+                    filter.add_pattern(pattern)
+                end
+
+                dialog.set_filter(filter)
+
+                if dialog.run == Dialog::RESPONSE_ACCEPT
+                    yield(dialog)
+                end
 
                 dialog.destroy
             end
@@ -180,33 +182,7 @@ module PDFWalker
                 signal_connect('close') { self.destroy }
 
                 signal_connect('apply') {
-                    rights = []
-
-                    rights << Origami::UsageRights::Rights::DOCUMENT_FULLSAVE if @document_fullsave.active?
-
-                    rights << Origami::UsageRights::Rights::ANNOTS_CREATE if @annots_create.active?
-                    rights << Origami::UsageRights::Rights::ANNOTS_DELETE if @annots_delete.active?
-                    rights << Origami::UsageRights::Rights::ANNOTS_MODIFY if @annots_modify.active?
-                    rights << Origami::UsageRights::Rights::ANNOTS_COPY if @annots_copy.active?
-                    rights << Origami::UsageRights::Rights::ANNOTS_IMPORT if @annots_import.active?
-                    rights << Origami::UsageRights::Rights::ANNOTS_EXPORT if @annots_export.active?
-                    rights << Origami::UsageRights::Rights::ANNOTS_ONLINE if @annots_online.active?
-                    rights << Origami::UsageRights::Rights::ANNOTS_SUMMARYVIEW if @annots_sumview.active?
-
-                    rights << Origami::UsageRights::Rights::FORM_FILLIN if @form_fillin.active?
-                    rights << Origami::UsageRights::Rights::FORM_IMPORT if @form_import.active?
-                    rights << Origami::UsageRights::Rights::FORM_EXPORT if @form_export.active?
-                    rights << Origami::UsageRights::Rights::FORM_SUBMITSTANDALONE if @form_submit.active?
-                    rights << Origami::UsageRights::Rights::FORM_SPAWNTEMPLATE if @form_spawntemplate.active?
-                    rights << Origami::UsageRights::Rights::FORM_BARCODEPLAINTEXT if @form_barcode.active?
-                    rights << Origami::UsageRights::Rights::FORM_ONLINE if @form_online.active?
-
-                    rights << Origami::UsageRights::Rights::SIGNATURE_MODIFY if @signature_modify.active?
-
-                    rights << Origami::UsageRights::Rights::EF_CREATE if @ef_create.active?
-                    rights << Origami::UsageRights::Rights::EF_DELETE if @ef_delete.active?
-                    rights << Origami::UsageRights::Rights::EF_MODIFY if @ef_modify.active?
-                    rights << Origami::UsageRights::Rights::EF_IMPORT if @ef_import.active?
+                    rights = selected_usage_rights
 
                     begin
                         pdf.enable_usage_rights(@cert, @pkey, *rights)
@@ -230,12 +206,43 @@ module PDFWalker
 
             private
 
+            def selected_usage_rights
+                [
+                    [ Origami::UsageRights::Rights::DOCUMENT_FULLSAVE, @document_fullsave ],
+
+                    [ Origami::UsageRights::Rights::ANNOTS_CREATE, @annots_create ],
+                    [ Origami::UsageRights::Rights::ANNOTS_DELETE, @annots_delete ],
+                    [ Origami::UsageRights::Rights::ANNOTS_MODIFY, @annots_modify ],
+                    [ Origami::UsageRights::Rights::ANNOTS_COPY, @annots_copy ],
+                    [ Origami::UsageRights::Rights::ANNOTS_IMPORT, @annots_import ],
+                    [ Origami::UsageRights::Rights::ANNOTS_EXPORT, @annots_export ],
+                    [ Origami::UsageRights::Rights::ANNOTS_ONLINE, @annots_online ],
+                    [ Origami::UsageRights::Rights::ANNOTS_SUMMARYVIEW, @annots_sumview ],
+
+                    [ Origami::UsageRights::Rights::FORM_FILLIN, @form_fillin ],
+                    [ Origami::UsageRights::Rights::FORM_IMPORT, @form_import ],
+                    [ Origami::UsageRights::Rights::FORM_EXPORT, @form_export ],
+                    [ Origami::UsageRights::Rights::FORM_SUBMITSTANDALONE, @form_submit ],
+                    [ Origami::UsageRights::Rights::FORM_SPAWNTEMPLATE, @form_spawntemplate ],
+                    [ Origami::UsageRights::Rights::FORM_BARCODEPLAINTEXT, @form_barcode ],
+                    [ Origami::UsageRights::Rights::FORM_ONLINE, @form_online ],
+
+                    [ Origami::UsageRights::Rights::SIGNATURE_MODIFY, @signature_modify ],
+
+                    [ Origami::UsageRights::Rights::EF_CREATE, @ef_create ],
+                    [ Origami::UsageRights::Rights::EF_DELETE, @ef_delete ],
+                    [ Origami::UsageRights::Rights::EF_MODIFY, @ef_modify ],
+                    [ Origami::UsageRights::Rights::EF_IMPORT, @ef_import ],
+                ].select { |_, button| button.active? }
+                 .map { |right, _| right }
+            end
+
             def create_intro_page
-                intro = <<-INTRO
-You are about to enable Usage Rights for the current PDF document.
-To enable these features, you need to have an Adobe public/private key pair in your possession.
+                intro = <<-INTRO.gsub(/^\s+/, '')
+                    You are about to enable Usage Rights for the current PDF document.
+                    To enable these features, you need to have an Adobe public/private key pair in your possession.
 
-Make sure you have adobe.crt and adobe.key located in the current directory.
+                    Make sure you have adobe.crt and adobe.key located in the current directory.
                 INTRO
 
                 vbox = VBox.new(false, 5)
@@ -251,125 +258,115 @@ Make sure you have adobe.crt and adobe.key located in the current directory.
                 set_page_complete(vbox, true)
             end
 
-            def create_keypair_import_page
-
-                labels =
-                [
-                    [ "Private RSA key:", @pkeyfilename = Entry.new,  pkeychoosebtn = Button.new(Gtk::Stock::OPEN) ],
-                    [ "Public certificate:", @certfilename = Entry.new, certchoosebtn = Button.new(Gtk::Stock::OPEN) ]
-                ]
-
-                row = 0
-                table = Table.new(2, 3)
-                labels.each do |lbl, entry, btn|
-                    entry.editable = entry.sensitive = false
+            def create_rights_frame(name)
+                frame = Frame.new(name)
+                frame.border_width = 5
+                frame.shadow_type = Gtk::SHADOW_IN
 
-                    table.attach(Label.new(lbl).set_alignment(1,0), 0, 1, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 4, 4)
-                    table.attach(entry, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 4, 4)
-                    table.attach(btn, 2, 3, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 4, 4)
-
-                    row = row.succ
-                end
-
-                pkeychoosebtn.signal_connect('clicked') { open_private_key_dialog(table) }
-                certchoosebtn.signal_connect('clicked') { open_certificate_dialog(table) }
-
-                append_page(table)
-                set_page_title(table, "Import a public/private key pair")
-                set_page_type(table, Assistant::PAGE_CONTENT)
+                frame
             end
 
-            def create_rights_selection_page
-                vbox = VBox.new(false, 5)
+            def create_document_rights_frame
+                frame = create_rights_frame(" Document ")
 
-                docframe = Frame.new(" Document ")
-                docframe.border_width = 5
-                docframe.shadow_type = Gtk::SHADOW_IN
+                @document_fullsave = CheckButton.new("Full Save").set_active(true)
 
-                doctable = Table.new(1, 2)
-                doctable.attach(@document_fullsave = CheckButton.new("Full Save").set_active(true), 0, 1, 0, 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 4, 4)
-                docframe.add(doctable)
+                doc_table = Table.new(1, 2)
+                doc_table.attach(@document_fullsave, 0, 1, 0, 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 4, 4)
+                frame.add(doc_table)
+            end
 
-                annotsframe = Frame.new(" Annotations ")
-                annotsframe.border_width = 5
-                annotsframe.shadow_type = Gtk::SHADOW_IN
+            def create_annotations_rights_frame
+                frame = create_rights_frame(" Annotations ")
 
-                annotstable = Table.new(4,2)
+                annots_table = Table.new(4, 2)
                 annots =
                 [
-                    [ @annots_create = CheckButton.new("Create").set_active(true), @annots_import = CheckButton.new("Import").set_active(true) ],
-                    [ @annots_delete = CheckButton.new("Delete").set_active(true), @annots_export = CheckButton.new("Export").set_active(true) ],
-                    [ @annots_modify = CheckButton.new("Modify").set_active(true), @annots_online = CheckButton.new("Online").set_active(true) ],
-                    [ @annots_copy = CheckButton.new("Copy").set_active(true), @annots_sumview = CheckButton.new("Summary View").set_active(true) ]
+                    [ @annots_create = CheckButton.new("Create"), @annots_import = CheckButton.new("Import") ],
+                    [ @annots_delete = CheckButton.new("Delete"), @annots_export = CheckButton.new("Export") ],
+                    [ @annots_modify = CheckButton.new("Modify"), @annots_online = CheckButton.new("Online") ],
+                    [ @annots_copy = CheckButton.new("Copy"), @annots_sumview = CheckButton.new("Summary View") ]
                 ]
 
-                row = 0
-                annots.each do |col1, col2|
-                    annotstable.attach(col1, 0, 1, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 4, 4)
-                    annotstable.attach(col2, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 4, 4)
+                annots.each_with_index do |cols, row|
+                    col1, col2 = cols
 
-                    row = row.succ
+                    col1.active = true
+                    col2.active = true
+
+                    annots_table.attach(col1, 0, 1, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 4, 4)
+                    annots_table.attach(col2, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 4, 4)
                 end
 
-                annotsframe.add(annotstable)
+                frame.add(annots_table)
+            end
 
-                formframe = Frame.new(" Forms ")
-                formframe.border_width = 5
-                formframe.shadow_type = Gtk::SHADOW_IN
+            def create_form_rights_frame
+                frame = create_rights_frame(" Forms ")
 
-                formtable = Table.new(4,2)
+                form_table = Table.new(4, 2)
                 forms =
                 [
-                    [ @form_fillin = CheckButton.new("Fill in").set_active(true), @form_spawntemplate = CheckButton.new("Spawn template").set_active(true) ],
-                    [ @form_import = CheckButton.new("Import").set_active(true), @form_barcode = CheckButton.new("Barcode plaintext").set_active(true) ],
-                    [ @form_export = CheckButton.new("Export").set_active(true), @form_online = CheckButton.new("Online").set_active(true) ],
-                    [ @form_submit = CheckButton.new("Submit stand-alone").set_active(true), nil ]
+                    [ @form_fillin = CheckButton.new("Fill in"), @form_spawntemplate = CheckButton.new("Spawn template") ],
+                    [ @form_import = CheckButton.new("Import"), @form_barcode = CheckButton.new("Barcode plaintext") ],
+                    [ @form_export = CheckButton.new("Export"), @form_online = CheckButton.new("Online") ],
+                    [ @form_submit = CheckButton.new("Submit stand-alone"), nil ]
                 ]
 
-                row = 0
-                forms.each do |col1, col2|
-                    formtable.attach(col1, 0, 1, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 4, 4)
-                    formtable.attach(col2, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 4, 4) unless col2.nil?
+                forms.each_with_index do |cols, row|
+                    col1, col2 = cols
 
-                    row = row.succ
+                    col1.active = true
+                    col2.active = true unless col2.nil?
+
+                    form_table.attach(col1, 0, 1, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 4, 4)
+                    form_table.attach(col2, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 4, 4) unless col2.nil?
                 end
 
-                formframe.add(formtable)
+                frame.add(form_table)
+            end
+
+            def create_signature_rights_frame
+                frame = create_rights_frame(" Signature ")
 
-                signatureframe = Frame.new(" Signature ")
-                signatureframe.border_width = 5
-                signatureframe.shadow_type = Gtk::SHADOW_IN
+                @signature_modify = CheckButton.new("Modify").set_active(true)
 
-                signaturetable = Table.new(1, 2)
-                signaturetable.attach(@signature_modify = CheckButton.new("Modify").set_active(true), 0, 1, 0, 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 4, 4)
-                signatureframe.add(signaturetable)
+                signature_table = Table.new(1, 2)
+                signature_table.attach(@signature_modify, 0, 1, 0, 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 4, 4)
+                frame.add(signature_table)
+            end
 
-                efframe = Frame.new(" Embedded files ")
-                efframe.border_width = 5
-                efframe.shadow_type = Gtk::SHADOW_IN
+            def create_embedded_files_rights_frame
+                frame = create_rights_frame(" Embedded files ")
 
-                eftable = Table.new(2,2)
-                efitems =
+                ef_table = Table.new(2,2)
+                ef_buttons =
                 [
-                    [ @ef_create = CheckButton.new("Create").set_active(true), @ef_modify = CheckButton.new("Modify").set_active(true) ],
-                    [ @ef_delete = CheckButton.new("Delete").set_active(true), @ef_import = CheckButton.new("Import").set_active(true) ]
+                    [ @ef_create = CheckButton.new("Create"), @ef_modify = CheckButton.new("Modify") ],
+                    [ @ef_delete = CheckButton.new("Delete"), @ef_import = CheckButton.new("Import") ]
                 ]
 
-                row = 0
-                efitems.each do |col1, col2|
-                    eftable.attach(col1, 0, 1, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 4, 4)
-                    eftable.attach(col2, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 4, 4)
+                ef_buttons.each_with_index do |cols, row|
+                    col1, col2 = cols
 
-                    row = row.succ
+                    col1.active = true
+                    col2.active = true
+
+                    ef_table.attach(col1, 0, 1, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 4, 4)
+                    ef_table.attach(col2, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 4, 4)
                 end
 
-                efframe.add(eftable)
+                frame.add(ef_table)
+            end
 
-                vbox.add(docframe)
-                vbox.add(annotsframe)
-                vbox.add(formframe)
-                vbox.add(signatureframe)
-                vbox.add(efframe)
+            def create_rights_selection_page
+                vbox = VBox.new(false, 5)
+
+                vbox.add create_document_rights_frame
+                vbox.add create_annotations_rights_frame
+                vbox.add create_form_rights_frame
+                vbox.add create_signature_rights_frame
+                vbox.add create_embedded_files_rights_frame
 
                 append_page(vbox)
                 set_page_title(vbox, "Select Usage Rights to enable")
@@ -461,11 +458,11 @@ Make sure you have adobe.crt and adobe.key located in the current directory.
             private
 
             def create_intro_page
-                intro = <<-INTRO
-You are about to sign the current PDF document.
-Once the document will be signed, no further modification will be allowed.
+                intro = <<-INTRO.gsub(/^\s+/, '')
+                    You are about to sign the current PDF document.
+                    Once the document will be signed, no further modification will be allowed.
 
-The signature process is based on assymetric cryptography, so you will basically need a public/private RSA key pair (between 1024 and 4096 bits).
+                    The signature process is based on assymetric cryptography, so you will basically need a public/private RSA key pair (between 1024 and 4096 bits).
                 INTRO
 
                 vbox = VBox.new(false, 5)
@@ -515,34 +512,6 @@ The signature process is based on assymetric cryptography, so you will basically
                 set_page_type(vbox, Assistant::PAGE_CONTENT)
             end
 
-            def create_keypair_import_page
-
-                labels =
-                [
-                    [ "Private RSA key:", @pkeyfilename = Entry.new,  pkeychoosebtn = Button.new(Gtk::Stock::OPEN) ],
-                    [ "Public certificate:", @certfilename = Entry.new, certchoosebtn = Button.new(Gtk::Stock::OPEN) ]
-                ]
-
-                row = 0
-                table = Table.new(2, 3)
-                labels.each do |lbl, entry, btn|
-                    entry.editable = entry.sensitive = false
-
-                    table.attach(Label.new(lbl).set_alignment(1,0), 0, 1, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 4, 4)
-                    table.attach(entry, 1, 2, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 4, 4)
-                    table.attach(btn, 2, 3, row, row + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 4, 4)
-
-                    row = row.succ
-                end
-
-                pkeychoosebtn.signal_connect('clicked') { open_private_key_dialog(table) }
-                certchoosebtn.signal_connect('clicked') { open_certificate_dialog(table) }
-
-                append_page(table)
-                set_page_title(table, "Import a public/private key pair")
-                set_page_type(table, Assistant::PAGE_CONTENT)
-            end
-
             def create_signature_info_page
                 vbox = VBox.new(false, 5)