alexandria-book-collection-manager 0.6.9 → 0.7.0

data/lib/alexandria/ui/dialogs/book_properties_dialog.rb

@@ -1,4 +1,5 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
+# Copyright (C) 2016 Matijs van Zuijlen
 #
 # Alexandria is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -27,24 +28,24 @@ module Alexandria
         super(parent, library.cover(book))
         puts 'Initializing Book Properties Dialog...' if $DEBUG
 
-        cancel_button = Gtk::Button.new(Gtk::Stock::CANCEL)
+        cancel_button = Gtk::Button.new(stock_id: Gtk::Stock::CANCEL)
         cancel_button.signal_connect('clicked') { on_cancel }
         cancel_button.show
         @button_box << cancel_button
 
-        close_button = Gtk::Button.new(Gtk::Stock::SAVE)
+        close_button = Gtk::Button.new(stock_id: Gtk::Stock::SAVE)
         close_button.signal_connect('clicked') { on_close }
         close_button.show
         @button_box << close_button
 
-        help_button = Gtk::Button.new(Gtk::Stock::HELP)
+        help_button = Gtk::Button.new(stock_id: Gtk::Stock::HELP)
         help_button.signal_connect('clicked') { on_help }
         help_button.show
         @button_box << help_button
         @button_box.set_child_secondary(help_button, true)
 
         @entry_title.text = @book_properties_dialog.title = book.title
-        @entry_isbn.text = (book.isbn or '')
+        @entry_isbn.text = (book.isbn || '')
         @entry_publisher.text = book.publisher
         @entry_publish_date.text = book.publishing_year.to_s
         @entry_publish_date.signal_connect('focus-out-event') do
@@ -53,7 +54,7 @@ module Alexandria
             false
           else
             year = text.to_i
-            if year == 0 or year > (Time.now.year + 10) or year < 10
+            if year.zero? || year > (Time.now.year + 10) || year < 10
               @entry_publish_date.text = ''
               @entry_publish_date.grab_focus
               true
@@ -75,15 +76,16 @@ module Alexandria
         end
 
         buffer = Gtk::TextBuffer.new
-        buffer.text = (book.notes or '')
+        buffer.text = (book.notes || '')
         @textview_notes.buffer = buffer
 
-        @library, @book = library, book
+        @library = library
+        @book = book
         self.cover = Icons.cover(library, book)
-        self.rating = (book.rating or Book::DEFAULT_RATING)
+        self.rating = (book.rating || Book::DEFAULT_RATING)
 
         if (@checkbutton_loaned.active = book.loaned?)
-          @entry_loaned_to.text = (book.loaned_to or '')
+          @entry_loaned_to.text = (book.loaned_to || '')
           self.loaned_since = book.loaned_since
           @date_loaned_since.sensitive = true
         else
@@ -117,7 +119,7 @@ module Alexandria
           @book.isbn = ''
         else
           ary = @library.select { |book| book.ident == @entry_isbn.text }
-          unless ary.empty? or (ary.length == 1 and ary.first == @book)
+          unless ary.empty? || ((ary.length == 1) && (ary.first == @book))
             ErrorDialog.new(@parent,
                             _("Couldn't modify the book"),
                             _('The EAN/ISBN you provided is already ' \
@@ -138,7 +140,7 @@ module Alexandria
         @book.title = @entry_title.text
         @book.publisher = @entry_publisher.text
         year = @entry_publish_date.text.to_i
-        @book.publishing_year = year == 0 ? nil : year
+        @book.publishing_year = year.zero? ? nil : year
         @book.edition = @entry_edition.text
         @book.authors = []
         @treeview_authors.model.each { |_m, _p, i| @book.authors << i[0] }
@@ -164,13 +166,8 @@ module Alexandria
           if redd_date.strip.empty?
             @book.redd_when = nil
           else
-            begin
-              t =  parse_date(redd_date)
-              @book.redd_when = t
-            rescue => err
-              puts err
-              puts err.backtrace
-            end
+            t = parse_date(redd_date)
+            @book.redd_when = t
           end
         else
           @book.redd_when = nil
@@ -179,9 +176,7 @@ module Alexandria
         @book.want = @checkbutton_want.active?
         @book.tags = @entry_tags.text.split(',') # tags are comma separated
 
-        if @delete_cover_file
-          FileUtils.rm_f(@cover_file)
-        end
+        FileUtils.rm_f(@cover_file) if @delete_cover_file
 
         if @original_cover_file
           FileUtils.rm_f(@original_cover_file)

data/lib/alexandria/ui/dialogs/book_properties_dialog_base.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
-# Copyright (C) 2011, 2014 Matijs van Zuijlen
+# Copyright (C) 2011, 2014, 2016 Matijs van Zuijlen
 #
 # Alexandria is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -25,7 +25,7 @@ module Alexandria
       extend GetText
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
 
-      COVER_MAXWIDTH = 140    # pixels
+      COVER_MAXWIDTH = 140 # pixels
 
       COVER_ABSOLUTE_MAXHEIGHT = 250 # pixels, above this we scale down...
 
@@ -33,7 +33,8 @@ module Alexandria
         super('book_properties_dialog__builder.glade', widget_names)
         @setup_finished = false
         @book_properties_dialog.transient_for = parent
-        @parent, @cover_file = parent, cover_file
+        @parent = parent
+        @cover_file = cover_file
         @original_cover_file = nil
         @delete_cover_file = false # fixing bug #16707
 
@@ -46,7 +47,7 @@ module Alexandria
         @entry_tags.complete_tags
 
         @treeview_authors.model = Gtk::ListStore.new(String, TrueClass)
-        @treeview_authors.selection.mode = Gtk::SELECTION_SINGLE
+        @treeview_authors.selection.mode = :single
         renderer = Gtk::CellRendererText.new
         renderer.signal_connect('edited') do |_cell, path_string, new_text|
           path = Gtk::TreePath.new(path_string)
@@ -62,7 +63,7 @@ module Alexandria
         @treeview_authors.append_column(col)
 
         setup_calendar_widgets
-        Gtk.timeout_add(150) do
+        GLib::Timeout.add(150) do
           @setup_finished = true
 
           false
@@ -76,10 +77,10 @@ module Alexandria
         @calendar_popup.decorated = false
         @calendar_popup.skip_taskbar_hint = true
         @calendar_popup.skip_pager_hint = true
-        @calendar_popup.events = [Gdk::Event::FOCUS_CHANGE_MASK]
+        @calendar_popup.events = [:focus_change_mask]
 
         @calendar_popup.set_transient_for(@book_properties_dialog)
-        @calendar_popup.set_type_hint(Gdk::Window::TYPE_HINT_DIALOG)
+        @calendar_popup.set_type_hint :dialog
         @calendar_popup.name = 'calendar-popup'
         @calendar_popup.resizable = false
         # @calendar_popup.border_width = 4
@@ -144,7 +145,7 @@ module Alexandria
         @calendar_popup.hide_all
         @book_properties_dialog.modal = true
 
-        Gtk.timeout_add(150) do
+        GLib::Timeout.add(150) do
           # If we set @popup_displayed=false immediately, then a click
           # event on the primary icon of the Entry simultaneous with
           # the focus-out-event of the Calendar causes the Calendar to
@@ -260,11 +261,11 @@ module Alexandria
       end
 
       def own_toggled
-        if @checkbutton_own.active?
-          @checkbutton_want.inconsistent = true
-        else
-          @checkbutton_want.inconsistent = false
-        end
+        @checkbutton_want.inconsistent = if @checkbutton_own.active?
+                                           true
+                                         else
+                                           false
+                                         end
       end
 
       def want_toggled
@@ -277,15 +278,15 @@ module Alexandria
                                             @book_properties_dialog,
                                             Gtk::FileChooser::ACTION_OPEN,
                                             backend,
-                                            [_('No Cover'), Gtk::Dialog::RESPONSE_REJECT],
-                                            [Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL],
-                                            [Gtk::Stock::OPEN, Gtk::Dialog::RESPONSE_ACCEPT])
+                                            [_('No Cover'), :reject],
+                                            [Gtk::Stock::CANCEL, :cancel],
+                                            [Gtk::Stock::OPEN, :accept])
         dialog.current_folder = @@latest_filechooser_directory
         response = dialog.run
-        if response == Gtk::Dialog::RESPONSE_ACCEPT
+        if response == :accept
           begin
             @delete_cover_file = false
-            cover = Gdk::Pixbuf.new(dialog.filename)
+            cover = GdkPixbuf::Pixbuf.new(file: dialog.filename)
             # At this stage the file format is recognized.
 
             if File.exist?(@cover_file)
@@ -310,7 +311,7 @@ module Alexandria
           rescue RuntimeError => e
             ErrorDialog.new(@book_properties_dialog, e.message)
           end
-        elsif response == Gtk::Dialog::RESPONSE_REJECT
+        elsif response == :reject
           ## FileUtils.rm_f(@cover_file) # fixing bug #16707
           @delete_cover_file = true
 
@@ -319,7 +320,7 @@ module Alexandria
         dialog.destroy
       end
 
-      def on_destroy; end     # no action by default
+      def on_destroy; end # no action by default
 
       def on_loaned
         loaned = @checkbutton_loaned.active?
@@ -336,9 +337,7 @@ module Alexandria
           matches_regex = regex.match(@date_loaned_since.text)
           break if matches_regex
         end
-        unless matches_regex
-          return
-        end
+        return unless matches_regex
         t = parse_date(@date_loaned_since.text)
         if t.nil?
           @label_loaning_duration.label = ''
@@ -378,7 +377,7 @@ module Alexandria
           @image_rating4,
           @image_rating5
         ]
-        raise 'out of range' if rating < 0 or rating > images.length
+        raise 'out of range' if rating < 0 || rating > images.length
         images[0..rating - 1].each { |x| x.pixbuf = Icons::STAR_SET }
         images[rating..-1].each { |x| x.pixbuf = Icons::STAR_UNSET }
         @current_rating = rating

data/lib/alexandria/ui/dialogs/export_dialog.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
-# Copyright (C) 2014 Matijs van Zuijlen
+# Copyright (C) 2014, 2016 Matijs van Zuijlen
 #
 # Alexandria is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -25,17 +25,18 @@ module Alexandria
       def initialize(parent, filename)
         super(parent, _('File already exists'),
               Gtk::Stock::DIALOG_QUESTION,
-              [[Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL],
-               [_('_Replace'), Gtk::Dialog::RESPONSE_OK]],
+              [[Gtk::Stock::CANCEL, :cancel],
+               [_('_Replace'), :ok]],
               _("A file named '%s' already exists.  Do you want " \
                 'to replace it with the one you are generating?') % filename)
-        self.default_response = Gtk::Dialog::RESPONSE_CANCEL
-        show_all and @response = run
+        # FIXME: Should accept just :cancel
+        self.default_response = Gtk::ResponseType::CANCEL
+        show_all && (@response = run)
         destroy
       end
 
       def erase?
-        @response == Gtk::Dialog::RESPONSE_OK
+        @response == :ok
       end
     end
 
@@ -48,83 +49,83 @@ module Alexandria
       THEMES = Alexandria::WebTheme.all
 
       def initialize(parent, library, sort_order)
-        backend = `uname`.chomp == 'FreeBSD' ? 'neant' : 'gnome-vfs'
-        super(_("Export '%s'") % library.name,
-              nil,
-              Gtk::FileChooser::ACTION_SAVE,
-              backend,
-              [Gtk::Stock::HELP, Gtk::Dialog::RESPONSE_HELP],
-              [Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL],
-              [_('_Export'), Gtk::Dialog::RESPONSE_ACCEPT])
+        super(title: _("Export '%s'") % library.name,
+              action: :save,
+              buttons: [[Gtk::Stock::HELP, :help],
+                        [Gtk::Stock::CANCEL, :cancel],
+                        [_('_Export'), :accept]])
 
         self.transient_for = parent
         self.current_name = library.name
         signal_connect('destroy') { hide }
 
-        @parent, @library, @sort_order = parent, library, sort_order
+        @parent = parent
+        @library = library
+        @sort_order = sort_order
 
         preview_image = Gtk::Image.new
 
-        theme_combo = Gtk::ComboBox.new
+        theme_combo = Gtk::ComboBoxText.new
+        theme_combo.valign = :center
+        theme_combo.vexpand = false
         THEMES.each do |theme|
           theme_combo.append_text(theme.name)
         end
         theme_combo.signal_connect('changed') do
           file = THEMES[theme_combo.active].preview_file
-          preview_image.pixbuf = Gdk::Pixbuf.new(file)
+          preview_image.pixbuf = GdkPixbuf::Pixbuf.new(file: file)
         end
         theme_combo.active = 0
-        theme_label = Gtk::Label.new(_('_Theme:'), true)
+        theme_label = Gtk::Label.new(_('_Theme:'), use_underline: true)
         theme_label.xalign = 0
         theme_label.mnemonic_widget = theme_combo
 
-        types_combo = Gtk::ComboBox.new
+        types_combo = Gtk::ComboBoxText.new
+        types_combo.vexpand = false
+        types_combo.valign = :center
         FORMATS.each do |format|
           text = format.name + ' ('
-          if format.ext
-            text += '*.' + format.ext
-          else
-            text += _('directory')
-          end
+          text += if format.ext
+                    '*.' + format.ext
+                  else
+                    _('directory')
+                  end
           text += ')'
           types_combo.append_text(text)
         end
         types_combo.active = 0
         types_combo.signal_connect('changed') do
-          theme_label.visible = theme_combo.visible =
-            preview_image.visible =
-              FORMATS[types_combo.active].needs_preview?
+          visible = FORMATS[types_combo.active].needs_preview?
+          theme_label.visible = theme_combo.visible = preview_image.visible = visible
         end
         types_combo.show
 
-        types_label = Gtk::Label.new(_('Export for_mat:'), true)
+        types_label = Gtk::Label.new(_('Export for_mat:'), use_underline: true)
         types_label.xalign = 0
         types_label.mnemonic_widget = types_combo
         types_label.show
 
-        # Ugly hack to add more rows in the internal Gtk::Table of the
-        # widget, which is needed because we want the export type to be
-        # aligned against the other widgets, and #extra_widget doesn't do
-        # that...
-        internal_table =
-          children[0].children[0].children[0].children[0].children[0]
-        internal_table.resize(4, 3)
-        internal_table.attach(types_label, 0, 1, 2, 3)
-        internal_table.attach(types_combo, 1, 2, 2, 3)
-        internal_table.attach(theme_label, 0, 1, 3, 4)
-        internal_table.attach(theme_combo, 1, 2, 3, 4)
-        internal_table.attach(preview_image, 2, 3, 0, 4)
-
-        while (response = run) != Gtk::Dialog::RESPONSE_CANCEL and
-            response != Gtk::Dialog::RESPONSE_DELETE_EVENT
-
-          if response == Gtk::Dialog::RESPONSE_HELP
+        # TODO: Re-design extra widget layout
+        grid = Gtk::Grid.new
+        grid.column_spacing = 6
+        grid.attach types_label, 0, 0, 1, 1
+        grid.attach types_combo, 1, 0, 1, 1
+        grid.attach theme_label, 0, 1, 1, 1
+        grid.attach theme_combo, 1, 1, 1, 1
+        grid.attach preview_image, 2, 0, 1, 3
+        set_extra_widget grid
+
+        while ((response = run) != :cancel) &&
+            (response != :delete_event)
+
+          if response == :help
             Alexandria::UI.display_help(self, 'exporting')
           else
             begin
               break if on_export(FORMATS[types_combo.active],
                                  THEMES[theme_combo.active])
             rescue => e
+              raise
               ErrorDialog.new(self, _('Export failed'), e.message)
             end
           end

data/lib/alexandria/ui/dialogs/import_dialog.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
-# Copyright (C) 2011 Matijs van Zuijlen
+# Copyright (C) 2011, 2016 Matijs van Zuijlen
 #
 # Alexandria is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -36,17 +36,17 @@ module Alexandria
       def initialize(parent, message)
         super(parent, _('Error while importing'),
               Gtk::Stock::DIALOG_QUESTION,
-              [[Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL],
-               [_('_Continue'), Gtk::Dialog::RESPONSE_OK]],
+              [[Gtk::Stock::CANCEL, :cancel],
+               [_('_Continue'), :ok]],
               message)
         puts "Opened SkipEntryDialog #{inspect}" if $DEBUG
-        self.default_response = Gtk::Dialog::RESPONSE_CANCEL
-        show_all and @response = run
+        self.default_response = Gtk::ResponseType::CANCEL
+        show_all && (@response = run)
         destroy
       end
 
       def continue?
-        @response == Gtk::Dialog::RESPONSE_OK
+        @response == :ok
       end
     end
 
@@ -58,19 +58,19 @@ module Alexandria
 
       FILTERS = Alexandria::ImportFilter.all
 
-      def initialize(parent, &on_accept_cb)
+      def initialize(parent)
         super()
         puts 'ImportDialog opened.' if $DEBUG
         @destroyed = false
         self.title = _('Import a Library')
-        self.action = Gtk::FileChooser::ACTION_OPEN
+        self.action = :open
         self.transient_for = parent
         #            self.deletable = false
         running = false
-        add_button(Gtk::Stock::HELP, Gtk::Dialog::RESPONSE_HELP)
-        add_button(Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL)
+        add_button(Gtk::Stock::HELP, :help)
+        add_button(Gtk::Stock::CANCEL, :cancel)
         import_button = add_button(_('_Import'),
-                                   Gtk::Dialog::RESPONSE_ACCEPT)
+                                   :accept)
         import_button.sensitive = false
 
         signal_connect('destroy') {
@@ -92,29 +92,26 @@ module Alexandria
         end
 
         signal_connect('selection_changed') do
-          import_button.sensitive =
-            filename and File.file?(filename)
+          import_button.sensitive = filename && File.file?(filename)
         end
 
         # before adding the (hidden) progress bar, we must re-set the
         # packing of the button box (currently packed at the end),
         # because the progressbar will be *after* the button box.
-        buttonbox = vbox.children.last
-        options = vbox.query_child_packing(buttonbox)
-        options[-1] = Gtk::PACK_START
-        vbox.set_child_packing(buttonbox, *options)
-        vbox.reorder_child(buttonbox, 1)
+        buttonbox = child.children.last
+        child.set_child_packing(buttonbox, pack_type: :start)
+        child.reorder_child(buttonbox, 1)
 
         pbar = Gtk::ProgressBar.new
         pbar.show_text = true
-        vbox.pack_start(pbar, false)
+        child.pack_start(pbar, expand: false)
 
         on_progress = proc do |fraction|
           begin
             pbar.show unless pbar.visible?
             pbar.fraction = fraction
           rescue
-            # TODO check if destroyed instead...
+            # TODO: check if destroyed instead...
           end
         end
 
@@ -124,11 +121,11 @@ module Alexandria
 
         exec_queue = ExecutionQueue.new
 
-        while !@destroyed and
-            (response = run) != Gtk::Dialog::RESPONSE_CANCEL and
-            response != Gtk::Dialog::RESPONSE_DELETE_EVENT
+        while !@destroyed &&
+            ((response = run) != :cancel) &&
+            (response != :delete_event)
 
-          if response == Gtk::Dialog::RESPONSE_HELP
+          if response == :help
             Alexandria::UI.display_help(self, 'import-library')
             next
           end
@@ -144,12 +141,8 @@ module Alexandria
 
           filter.on_iterate do |n, total|
             unless @destroyed
-              # convert to percents
-              coeff = total / 100.0
-              percent = n / coeff
-              # fraction between 0 and 1
-              fraction = percent / 100
-              puts "#{inspect} Percentage: #{fraction}" if $DEBUG
+              fraction = n * 1.0 / total
+              puts "#{inspect} fraction: #{fraction}" if $DEBUG
               exec_queue.call(on_progress, fraction)
             end
           end
@@ -173,7 +166,7 @@ module Alexandria
             end
           end
 
-          while thread.alive? and !@destroyed
+          while thread.alive? && !@destroyed
             # puts "Thread #{thread} still alive."
             running = true
             exec_queue.iterate
@@ -182,7 +175,7 @@ module Alexandria
 
           unless @destroyed
             if library
-              on_accept_cb.call(library, @bad_isbns, @failed_isbns)
+              yield(library, @bad_isbns, @failed_isbns)
               break
             elsif not_cancelled
               puts "Raising ErrorDialog because not_cancelled is #{not_cancelled}" if $DEBUG
@@ -196,9 +189,7 @@ module Alexandria
             self.sensitive = true
           end
         end
-        unless @destroyed
-          destroy
-        end
+        destroy unless @destroyed
       end
     end
   end