alexandria-book-collection-manager 0.6.9 → 0.7.0

data/lib/alexandria/ui/sidepane.rb

@@ -1,6 +1,6 @@
 # Copyright (C) 2008 Joseph Method
 # Copyright (C) 2008,2009 Cathal Mc Ginley
-# Copyright (C) 2011,2014,2015 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
@@ -35,7 +35,7 @@ module Alexandria
         x = (@libraries.all_libraries + Library.deleted_libraries).find do |library|
           library.name == new_text.strip
         end
-        x and x.name != @parent.selected_library.name
+        x && (x.name != @parent.selected_library.name)
       end
 
       # if new_text is invalid utf-8, returns true
@@ -97,7 +97,7 @@ module Alexandria
       end
 
       def setup_sidepane
-        @library_listview.model = Gtk::ListStore.new(Gdk::Pixbuf,
+        @library_listview.model = Gtk::ListStore.new(GdkPixbuf::Pixbuf,
                                                      String,
                                                      TrueClass,
                                                      TrueClass)
@@ -113,7 +113,7 @@ module Alexandria
           cell.pixbuf = iter[0]
         end
         renderer = Gtk::CellRendererText.new
-        renderer.ellipsize = Pango::ELLIPSIZE_END if Pango.ellipsizable?
+        renderer.ellipsize = Pango::ELLIPSIZE_END
         column.pack_start(renderer, true)
         column.set_cell_data_func(renderer) do |_col, cell, _model, iter|
           # log.debug { "sidepane: editable #{cell}, #{iter} #{iter[1]}: #{iter[2]}" }
@@ -124,9 +124,9 @@ module Alexandria
         renderer.signal_connect('edited', &method(:on_edited_library))
         @library_listview.append_column(column)
 
-        @library_listview.set_row_separator_func do |_model, iter|
+        @library_listview.set_row_separator_func do |model, iter|
           # log.debug { "library_listview row_separator #{iter}" }
-          iter[3]
+          model.get_value(iter, 3)
         end
 
         @library_listview.selection.signal_connect('changed') do
@@ -135,9 +135,7 @@ module Alexandria
           @parent.refresh_books
         end
 
-        @library_listview.enable_model_drag_dest(
-          BOOKS_TARGET_TABLE,
-          Gdk::DragContext::ACTION_MOVE)
+        @library_listview.enable_model_drag_dest(BOOKS_TARGET_TABLE, :move)
 
         @library_listview.signal_connect('drag-motion') do |_widget, drag_context, x, y, time, _data|
           log.debug { 'drag-motion' }
@@ -151,7 +149,7 @@ module Alexandria
               path = nil
             else
               iter = @library_listview.model.get_iter(path)
-              if iter[3]  # separator?
+              if iter[3] # separator?
                 path = nil
               else
                 library = @libraries.all_libraries.find do |lib|
@@ -162,22 +160,19 @@ module Alexandria
             end
           end
 
-          @library_listview.set_drag_dest_row(
-            path,
-            Gtk::TreeView::DROP_INTO_OR_AFTER)
+          @library_listview.set_drag_dest_row(path, :into_or_after)
 
-          drag_context.drag_status(
-            !path.nil? ? drag_context.suggested_action : 0,
-            time)
+          Gdk.drag_status(drag_context,
+                          !path.nil? ? drag_context.suggested_action : 0,
+                          time)
         end
 
         @library_listview.signal_connect('drag-drop') do |widget, drag_context, _x, _y, time, _data|
           log.debug { 'drag-drop' }
 
-          Gtk::Drag.get_data(widget,
-                             drag_context,
-                             drag_context.targets.first,
-                             time)
+          widget.drag_get_data(drag_context,
+                               drag_context.targets.first,
+                               time)
           true
         end
 
@@ -185,11 +180,13 @@ module Alexandria
           log.debug { 'drag-data-received' }
 
           success = false
-          if selection_data.type == Gdk::Selection::TYPE_STRING
-            path, =
+          # FIXME: Ruby-GNOME2 should make comparison work without needing to
+          # call #name.
+          if selection_data.data_type.name == Gdk::Selection::TYPE_STRING.name
+            success, path =
               @library_listview.get_dest_row_at_pos(x, y)
 
-            if path
+            if success
               iter = @library_listview.model.get_iter(path)
               library = @libraries.all_libraries.find do |lib|
                 lib.name == iter[1]
@@ -199,9 +196,10 @@ module Alexandria
             end
           end
           begin
-            Gtk::Drag.finish(drag_context, success, false, 0) # ,time)
+            drag_context.finish(success: success, delete: false)
           rescue => ex
-            log.error { "Gtk::Drag.finish failed: #{ex}" }
+            log.error { "drag_context.finish failed: #{ex}" }
+            raise
           end
         end
       end

data/lib/alexandria/ui/sound.rb

@@ -31,14 +31,17 @@ module Alexandria
         @ogg_vorbis_pipeline = Gst::Pipeline.new
         set_up_pipeline
         @playing = false
-        set_up_glib_loop
+        set_up_bus_watch
       end
 
       def play(effect)
         file = File.join(@sounds_dir, "#{effect}.ogg")
         unless @playing
+          puts "Not playing. Starting #{effect}." if $DEBUG
           @filesrc.location = file
           start_playback
+        else
+          puts "Already playing #{effect}." if $DEBUG
         end
       end
 
@@ -57,50 +60,38 @@ module Alexandria
         # have multiple src pads (for audio/video muxed streams)
 
         demuxer.signal_connect('pad-added') do |_parser, ogg_src_pad|
-          vorbis_sink_pad = decoder.get_pad('sink')
+          vorbis_sink_pad = decoder.sinkpads.first
           ogg_src_pad.link(vorbis_sink_pad)
         end
 
         decoder >> converter >> audiosink
       end
 
-      def set_up_glib_loop
-        unless @loop
-          @loop = GLib::MainLoop.new(nil, false)
-
-          @bus = @ogg_vorbis_pipeline.bus
-          @bus.add_watch do |_bus, message|
-            case message.type
-            when Gst::Message::EOS
-              @playing = false
-              @loop.quit
-            when Gst::Message::ERROR
-              if $DEBUG
-                puts 'ERROR loop.quit'
-                p message.parse
-              end
-              @playing = false
-              @loop.quit
+      def set_up_bus_watch
+        @bus = @ogg_vorbis_pipeline.bus
+        @bus.add_watch do |_bus, message|
+          case message.type
+          when Gst::MessageType::EOS
+            stop_playback
+          when Gst::MessageType::ERROR
+            if $DEBUG
+              puts 'ERROR loop.quit'
+              p message.parse
             end
-            true
+            stop_playback
           end
+          true
         end
       end
 
       def start_playback
         @playing = true
         @ogg_vorbis_pipeline.play
-        begin
-          @loop.run
-        rescue Interrupt
-        ensure
-          @ogg_vorbis_pipeline.stop
-          @playing = false
-        end
       end
 
       def stop_playback
         @ogg_vorbis_pipeline.stop
+        @playing = false
       end
     end
   end

data/lib/alexandria/ui/ui_manager.rb

@@ -1,6 +1,6 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2008 Joseph Method
-# 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
@@ -38,7 +38,7 @@ module Alexandria
       MAX_RATING_STARS = 5
 
       def initialize(parent)
-        super('main_app__builder.glade',  widget_names)
+        super('main_app__builder.glade', widget_names)
         @parent = parent
 
         @library_separator_iter = nil
@@ -60,7 +60,6 @@ module Alexandria
         setup_accel_group
         setup_popups
         setup_window_events
-        setup_dialog_hooks
         setup_books_iconview_sorting
         on_books_selection_changed
         restore_preferences
@@ -89,8 +88,8 @@ module Alexandria
       end
 
       def setup_dependents
-        @listview_model = Gtk::TreeModelSort.new(@filtered_model)
-        @iconview_model = Gtk::TreeModelSort.new(@filtered_model)
+        @listview_model = Gtk::TreeModelSort.new(model: @filtered_model)
+        @iconview_model = Gtk::TreeModelSort.new(model: @filtered_model)
         @listview_manager = ListViewManager.new @listview, self
         @iconview_manager = IconViewManager.new @iconview, self
         @sidepane_manager = SidePaneManager.new @library_listview, self
@@ -115,29 +114,29 @@ module Alexandria
         add_main_toolbar_items
         @toolbar = @uimanager.get_widget('/MainToolbar')
         @toolbar.show_arrow = true
-        @toolbar.insert(-1, Gtk::SeparatorToolItem.new)
+        @toolbar.insert(Gtk::SeparatorToolItem.new, -1)
         setup_toolbar_combobox
         setup_toolbar_filter_entry
-        @toolbar.insert(-1, Gtk::SeparatorToolItem.new)
+        @toolbar.insert(Gtk::SeparatorToolItem.new, -1)
         setup_toolbar_viewas
         @toolbar.show_all
         @actiongroup['Undo'].sensitive = @actiongroup['Redo'].sensitive = false
         UndoManager.instance.add_observer(self)
-        @vbox1.add(@toolbar,  position: 1, expand: false, fill: false)
+        @vbox1.add(@toolbar, position: 1, expand: false, fill: false)
       end
 
       def add_main_toolbar_items
         mid = @uimanager.new_merge_id
         @uimanager.add_ui(mid, 'ui/', 'MainToolbar', 'MainToolbar',
-                          Gtk::UIManager::TOOLBAR, false)
+                          :toolbar, false)
         @uimanager.add_ui(mid, 'ui/MainToolbar/', 'New', 'New',
-                          Gtk::UIManager::TOOLITEM, false)
+                          :toolitem, false)
         @uimanager.add_ui(mid, 'ui/MainToolbar/', 'AddBook', 'AddBook',
-                          Gtk::UIManager::TOOLITEM, false)
+                          :toolitem, false)
         # @uimanager.add_ui(mid, "ui/MainToolbar/", "sep", "sep",
-        #                  Gtk::UIManager::SEPARATOR, false)
+        #                  :separator, false)
         # @uimanager.add_ui(mid, "ui/MainToolbar/", "Refresh", "Refresh",
-        #                  Gtk::UIManager::TOOLITEM, false)
+        #                  :toolitem, false)
       end
 
       def setup_toolbar_filter_entry
@@ -146,19 +145,16 @@ module Alexandria
         @toolitem = Gtk::ToolItem.new
         @toolitem.expand = true
         @toolitem.border_width = 5
-        @tooltips.set_tip(@filter_entry,
-                          _('Type here the search criterion'), nil)
+        @filter_entry.set_tooltip_text _('Type here the search criterion')
         @toolitem << @filter_entry
-        @toolbar.insert(-1, @toolitem)
+        @toolbar.insert(@toolitem, -1)
       end
 
       def setup_toolbar_combobox
-        @tooltips = Gtk::Tooltips.new
-
-        cb = Gtk::ComboBox.new
-        cb.set_row_separator_func do |_model, iter|
+        cb = Gtk::ComboBoxText.new
+        cb.set_row_separator_func do |model, iter|
           # log.debug { "row_separator" }
-          iter[0] == '-'
+          model.get_value(iter, 0) == '-'
         end
         [_('Match everything'),
          '-',
@@ -167,8 +163,7 @@ module Alexandria
          _('ISBN contains'),
          _('Publisher contains'),
          _('Notes contain'),
-         _('Tags contain')
-        ].each do |item|
+         _('Tags contain')].each do |item|
           cb.append_text(item)
         end
         cb.active = 0
@@ -181,12 +176,12 @@ module Alexandria
         @toolitem = Gtk::ToolItem.new
         @toolitem.border_width = 5
         @toolitem << eb
-        @toolbar.insert(-1, @toolitem)
-        @tooltips.set_tip(eb, _('Change the search type'), nil)
+        @toolbar.insert(@toolitem, -1)
+        eb.set_tooltip_text _('Change the search type')
       end
 
       def setup_toolbar_viewas
-        @toolbar_view_as = Gtk::ComboBox.new
+        @toolbar_view_as = Gtk::ComboBoxText.new
         @toolbar_view_as.append_text(_('View as Icons'))
         @toolbar_view_as.append_text(_('View as List'))
         @toolbar_view_as.active = 0
@@ -200,8 +195,8 @@ module Alexandria
         @toolitem = Gtk::ToolItem.new
         @toolitem.border_width = 5
         @toolitem << eb
-        @toolbar.insert(-1, @toolitem)
-        @tooltips.set_tip(eb, _('Choose how to show books'), nil)
+        @toolbar.insert(@toolitem, -1)
+        eb.set_tooltip_text _('Choose how to show books')
       end
 
       def setup_book_providers
@@ -214,7 +209,7 @@ module Alexandria
            'ui/NoBookPopup/OnlineInformation/'].each do |path|
              log.debug { "Adding #{name} to #{path}" }
              @uimanager.add_ui(mid, path, name, name,
-                               Gtk::UIManager::MENUITEM, false)
+                               :menuitem, false)
            end
         end
       end
@@ -234,19 +229,7 @@ module Alexandria
 
       def setup_menus
         @menubar = @uimanager.get_widget('/MainMenubar')
-        @vbox1.add(@menubar,  position: 0, expand: false, fill: false)
-      end
-
-      def setup_dialog_hooks
-        log.debug { 'setup_dialog_hooks' }
-        Gtk::AboutDialog.set_url_hook do |_about, link|
-          log.debug { 'set_url_hook' }
-          open_web_browser(link)
-        end
-        Gtk::AboutDialog.set_email_hook do |_about, link|
-          log.debug { 'set_email_hook' }
-          open_email_client('mailto:' + link)
-        end
+        @vbox1.add(@menubar, position: 0, expand: false, fill: false)
       end
 
       def setup_popups
@@ -269,8 +252,8 @@ module Alexandria
         # The active model.
 
         list = [
-          Gdk::Pixbuf,    # COVER_LIST
-          Gdk::Pixbuf,    # COVER_ICON
+          GdkPixbuf::Pixbuf,    # COVER_LIST
+          GdkPixbuf::Pixbuf,    # COVER_ICON
           String,         # TITLE
           String,         # TITLE_REDUCED
           String,         # AUTHORS
@@ -301,12 +284,12 @@ module Alexandria
           else
             data = case @filter_books_mode
                    when 0 then
-                     (iter[Columns::TITLE] or '') +
-                       (iter[Columns::AUTHORS] or '') +
-                       (iter[Columns::ISBN] or '') +
-                       (iter[Columns::PUBLISHER] or '') +
-                       (iter[Columns::NOTES] or '') +
-                       (iter[Columns::TAGS] or '')
+                     (iter[Columns::TITLE] || '') +
+                       (iter[Columns::AUTHORS] || '') +
+                       (iter[Columns::ISBN] || '') +
+                       (iter[Columns::PUBLISHER] || '') +
+                       (iter[Columns::NOTES] || '') +
+                       (iter[Columns::TAGS] || '')
                    when 2 then iter[Columns::TITLE]
                    when 3 then iter[Columns::AUTHORS]
                    when 4 then iter[Columns::ISBN]
@@ -314,7 +297,7 @@ module Alexandria
                    when 6 then iter[Columns::NOTES]
                    when 7 then iter[Columns::TAGS]
                    end
-            !data.nil? and data.downcase.include?(filter.downcase)
+            !data.nil? && data.downcase.include?(filter.downcase)
           end
         end
 
@@ -344,7 +327,7 @@ module Alexandria
               sensitize_library selected_library
 
               if widget.is_a?(Gtk::TreeView)
-                Gtk.idle_add do
+                GLib::Idle.add do
                   # cur_path, focus_col = widget.cursor
 
                   widget.focus = true
@@ -377,13 +360,13 @@ module Alexandria
           if library_already_selected
             sensitize_library selected_library
 
-            Gtk.idle_add do
+            GLib::Idle.add do
               menu.popup(nil, nil, event.button, event.time)
               # @clicking_on_sidepane = false
               false
             end
           else
-            Gtk.idle_add do
+            GLib::Idle.add do
               menu.popup(nil, nil, event.button, event.time)
               # @clicking_on_sidepane = false
 
@@ -410,7 +393,7 @@ module Alexandria
       end
 
       def event_is_right_click(event)
-        event.event_type == Gdk::Event::BUTTON_PRESS and event.button == 3
+        (event.event_type == :button_press) && (event.button == 3)
       end
 
       def on_books_button_press_event(widget, event)
@@ -430,7 +413,7 @@ module Alexandria
             widget.unselect_all
           end
 
-          menu = (selected_books.empty?) ? @nobook_popup : @book_popup
+          menu = selected_books.empty? ? @nobook_popup : @book_popup
           menu.popup(nil, nil, event.button, event.time)
         end
       end
@@ -447,7 +430,7 @@ module Alexandria
                "Library '%s' selected, %d unrated books",
                library.length) % [library.name,
                                   library.length]
-          elsif n_unrated == 0
+          elsif n_unrated.zero?
             n_("Library '%s' selected, %d book",
                "Library '%s' selected, %d books",
                library.length) % [library.name,
@@ -487,7 +470,7 @@ module Alexandria
         # selection = @library_listview.selection.selected ? @library_listview.selection.selected.has_focus? : false
 
         # Focus is the wrong idiom here.
-        unless @clicking_on_sidepane or (@main_app.focus == @library_listview)
+        unless @clicking_on_sidepane || (@main_app.focus == @library_listview)
           # unless @main_app.focus == @library_listview
 
           log.debug { "Currently focused widget: #{@main_app.focus.inspect}" }
@@ -521,7 +504,7 @@ module Alexandria
             BookProviders.each do |provider|
               has_no_url = true
               begin
-                has_no_url = (b.isbn.nil? or b.isbn.strip.empty? or provider.url(b).nil?)
+                has_no_url = (b.isbn.nil? || b.isbn.strip.empty? || provider.url(b).nil?)
               rescue => ex
                 log.warn { "Error determining URL from #{provider.name}; #{ex.message}" }
               end
@@ -536,16 +519,16 @@ module Alexandria
         @clicking_on_sidepane = false
       end
 
-      def on_switch_page
+      def on_switch_page(_notebook, _page, page_num)
         log.debug { 'on_switch_page' }
-        @actiongroup['ArrangeIcons'].sensitive = @notebook.page == 0
+        @actiongroup['ArrangeIcons'].sensitive = page_num.zero?
         on_books_selection_changed
       end
 
       def on_focus(widget, _event_focus)
-        if @clicking_on_sidepane or widget == @library_listview
+        if @clicking_on_sidepane || (widget == @library_listview)
           log.debug { 'on_focus: @library_listview' }
-          Gtk.idle_add do
+          GLib::Idle.add do
             %w(OnlineInformation SelectAll DeselectAll).each do |action|
               @actiongroup[action].sensitive = false
             end
@@ -559,7 +542,7 @@ module Alexandria
       end
 
       def determine_delete_option
-        sensitive = (@libraries.all_regular_libraries.length > 1 or selected_library.is_a?(SmartLibrary))
+        sensitive = (@libraries.all_regular_libraries.length > 1 || selected_library.is_a?(SmartLibrary))
         sensitive
       end
 
@@ -572,15 +555,10 @@ module Alexandria
         select_this_book = proc do |bk, view|
           @filtered_model.refilter
           iter = iter_from_book bk
-          unless iter
-            next
-          end
+          next unless iter
           path = iter.path
-          unless view.model
-            next
-          end
-          path = view.model.convert_path_to_child_path(path)
-          path = @filtered_model.convert_path_to_child_path(path)
+          next unless view.model
+          path = view_path_to_model_path(view, path)
           log.debug { "Path for #{bk.ident} is #{path}" }
           selection = view.respond_to?(:selection) ? @listview.selection : @iconview
           selection.unselect_all
@@ -606,9 +584,7 @@ module Alexandria
           @actiongroup['Redo'].sensitive = caller.can_redo?
         elsif caller.is_a?(Library)
           unless caller.updating?
-            Gtk.queue do
-              handle_update_caller_library ary
-            end
+            handle_update_caller_library ary
           end
         else
           raise 'unrecognized update event'
@@ -625,9 +601,7 @@ module Alexandria
             append_book(book)
           when Library::BOOK_UPDATED
             iter = iter_from_ident(book.saved_ident)
-            if iter
-              fill_iter_with_book(iter, book)
-            end
+            fill_iter_with_book(iter, book) if iter
           when Library::BOOK_REMOVED
             @model.remove(iter_from_book(book))
           end
@@ -646,41 +620,7 @@ module Alexandria
           log.warn('Attempt to open browser with nil url')
           return
         end
-        if (cmd = Preferences.instance.www_browser)
-          launch_command = cmd
-          if cmd.downcase.index('%u')
-            launch_command = cmd.gsub(/%U/i, "\"" + url + "\"")
-          else
-            launch_command = cmd + " \"" + url + "\""
-          end
-          Thread.new { system(launch_command) }
-        else
-          ErrorDialog.new(@main_app,
-                          _('Unable to launch the web browser'),
-                          _('Check out that a web browser is ' \
-                            'configured as default (Desktop ' \
-                            'Preferences -> Advanced -> Preferred ' \
-                            'Applications) and try again.'))
-        end
-      end
-
-      def open_email_client(url)
-        if (cmd = Preferences.instance.email_client)
-          launch_command = cmd
-          if cmd.downcase.index('%u')
-            launch_command = cmd.gsub(/%u/i, "\"" + url + "\"")
-          else
-            launch_command = cmd + " \"" + url + "\""
-          end
-          Thread.new { system(launch_command) }
-        else
-          ErrorDialog.new(@main_app,
-                          _('Unable to launch the mail reader'),
-                          _('Check out that a mail reader is ' \
-                            'configured as default (Desktop ' \
-                            'Preferences -> Advanced -> Preferred ' \
-                            'Applications) and try again.'))
-        end
+        Gtk.show_uri url
       end
 
       def detach_old_libraries
@@ -719,7 +659,7 @@ module Alexandria
         # entries.\n" )
 
         @libraries.ruined_books.each { |bi|
-          new_message += "\n#{bi[1] or bi[1].inspect}"
+          new_message += "\n#{bi[1] || bi[1].inspect}"
         }
         recovery_dialog = Gtk::MessageDialog.new(@main_app, Gtk::Dialog::MODAL,
                                                  Gtk::MessageDialog::WARNING,
@@ -727,17 +667,17 @@ module Alexandria
                                                  new_message).show
         recovery_dialog.signal_connect('response') do |_dialog, response_type|
           recovery_dialog.destroy
-          if response_type == Gtk::Dialog::RESPONSE_OK
+          if response_type == :ok
             # progress indicator...
             @progressbar.fraction = 0
-            @appbar.children.first.visible = true   # show the progress bar
+            @appbar.children.first.visible = true # show the progress bar
 
             total_book_count = @libraries.ruined_books.size
             fraction_per_book = 1.0 / total_book_count
             prog_percentage = 0
 
             @libraries.ruined_books.reverse!
-            Gtk.idle_add do
+            GLib::Idle.add do
               ruined_book = @libraries.ruined_books.pop
               if ruined_book
                 book, isbn, library = ruined_book
@@ -746,7 +686,7 @@ module Alexandria
                   book = book_rslt[0]
                   cover_uri = book_rslt[1]
 
-                  # TODO if the book was saved okay, make sure the old
+                  # TODO: if the book was saved okay, make sure the old
                   # empty yaml file doesn't stick around esp if doing
                   # isbn-10 --> isbn-13 conversion...
                   if isbn.size == 10
@@ -818,18 +758,18 @@ module Alexandria
         iter[Columns::PUBLISHER] = book.publisher
         iter[Columns::PUBLISH_DATE] = book.publishing_year.to_s
         iter[Columns::EDITION] = book.edition
-        iter[Columns::NOTES] = (book.notes or '')
-        iter[Columns::LOANED_TO] = (book.loaned_to or '')
-        rating = (book.rating or Book::DEFAULT_RATING)
+        iter[Columns::NOTES] = (book.notes || '')
+        iter[Columns::LOANED_TO] = (book.loaned_to || '')
+        rating = (book.rating || Book::DEFAULT_RATING)
         iter[Columns::RATING] = MAX_RATING_STARS - rating # ascending order is the default
         iter[Columns::OWN] = book.own?
         iter[Columns::REDD] = book.redd?
         iter[Columns::WANT] = book.want?
-        if book.tags
-          iter[Columns::TAGS] = book.tags.join(',')
-        else
-          iter[Columns::TAGS] = ''
-        end
+        iter[Columns::TAGS] = if book.tags
+                                book.tags.join(',')
+                              else
+                                ''
+                              end
 
         icon = Icons.cover(selected_library, book)
         log.debug { "Setting icon #{icon} for book #{book.title}" }
@@ -916,45 +856,38 @@ module Alexandria
         @iconview.freeze
         @listview.freeze # NEW / bdewey
         @progressbar.fraction = 0
-        @appbar.children.first.visible = true   # show the progress bar
+        @appbar.children.first.visible = true # show the progress bar
         set_status_label(_("Loading '%s'...") % library.name)
         total = library.length
         log.debug { "library #{library.name} length #{library.length}" }
         n = 0
 
-        Gtk.idle_add do
+        GLib::Idle.add do
           block_return = true
           book = library[n]
           if book
-            Gtk.queue do
-              begin
-                append_book(book)
-              rescue => ex
-                trace = ex.backtrace.join("\n > ")
-                log.error { "append_books failed #{ex.message} #{trace}" }
-              end
-              # convert to percents
-              coeff = total / 100.0
-              percent = n / coeff
-              fraction = percent / 100
-              log.debug { "#index #{n} percent #{percent} fraction #{fraction}" }
-              @progressbar.fraction = fraction
-              n += 1
+            begin
+              append_book(book)
+            rescue => ex
+              trace = ex.backtrace.join("\n > ")
+              log.error { "append_books failed #{ex.message} #{trace}" }
             end
+            fraction = n * 1.0 / total
+            log.debug { "#index #{n} fraction #{fraction}" }
+            @progressbar.fraction = fraction
+            n += 1
           else
-            Gtk.queue do
-              @iconview.unfreeze
-              @listview.unfreeze # NEW / bdewey
-              @filtered_model.refilter
-              @listview.columns_autosize
-              @progressbar.fraction = 1
-              # Hide the progress bar.
-              @appbar.children.first.visible = false
-              # Refresh the status bar.
-              on_books_selection_changed
-              @library_listview.set_sensitive(true)
-              block_return = false
-            end
+            @iconview.unfreeze
+            @listview.unfreeze # NEW / bdewey
+            @filtered_model.refilter
+            @listview.columns_autosize
+            @progressbar.fraction = 1
+            # Hide the progress bar.
+            @appbar.children.first.visible = false
+            # Refresh the status bar.
+            on_books_selection_changed
+            @library_listview.set_sensitive(true)
+            block_return = false
           end
 
           block_return
@@ -989,57 +922,44 @@ module Alexandria
       end
 
       def iter_from_ident(ident)
-        log.debug { "#{ident}" }
+        log.debug { ident.to_s }
         iter = @model.iter_first
         ok = true
         while ok
-          if iter[Columns::IDENT] == ident
-            return iter
-          end
+          return iter if iter[Columns::IDENT] == ident
           ok = iter.next!
         end
         nil
       end
 
       def iter_from_book(book)
-        log.debug { "#{book}" }
+        log.debug { book.to_s }
         iter_from_ident(book.ident)
       end
 
       def collate_selected_books(page)
-        a = []
+        result = []
         library = selected_library
-        view = page == 0 ? @iconview : @listview
-        selection = page == 0 ? @iconview : @listview.selection
-
-        selection.selected_each do |_the_view, path|
-          # don't use the_view which is passed in by this block
-          # as it doesn't consider the filtering for some reason
-          # see bug #24568
-          unless view.model
-            next
+
+        if page.zero?
+          result = @iconview.selected_items.map do |path|
+            path = view_path_to_model_path(@iconview, path)
+            book_from_iter(library, @model.get_iter(path))
           end
-          path = view.model.convert_path_to_child_path(path)
-          if path
-            path = @filtered_model.convert_path_to_child_path(path)
-            # FIX this sometimes returns a nil path for iconview...
-            if path
-              iter = @model.get_iter(path)
-              if iter
-                a << book_from_iter(library, iter)
-              end
-            end
-            # This used to cause a crash when manually adding the first
-            # book to a Library displayed in an Iconview
-            # TODO find root cause of this
+        else
+          selection = @listview.selection
+          rows, _model = selection.selected_rows
+          result = rows.map do |path|
+            path = view_path_to_model_path(@listview, path)
+            book_from_iter(library, @model.get_iter(path))
           end
         end
-        a
+
+        result
       end
 
       def selected_books
-        a = collate_selected_books(@notebook.page)
-        selected = a.select { |x| !x.nil? }
+        selected = collate_selected_books(@notebook.page).compact
         log.debug { "Selected books = #{selected.inspect}" }
         selected
       end
@@ -1054,9 +974,7 @@ module Alexandria
         # Disable the selected library in the move libraries actions.
         @libraries.all_regular_libraries.each do |i_library|
           action = @actiongroup[i_library.action_name]
-          if action
-            action.sensitive = i_library != library
-          end
+          action.sensitive = i_library != library if action
         end
         sensitize_library library
       end
@@ -1064,7 +982,7 @@ module Alexandria
       def sensitize_library(library)
         smart = library.is_a?(SmartLibrary)
         log.debug { "sensitize_library: smartlibrary = #{smart}" }
-        Gtk.idle_add do
+        GLib::Idle.add do
           @actiongroup['AddBook'].sensitive = !smart
           @actiongroup['AddBookManual'].sensitive = !smart
           @actiongroup['Properties'].sensitive = smart
@@ -1132,7 +1050,7 @@ module Alexandria
         @prefs.selected_library = selected_library.name
         cols_width = {}
         @listview.columns.each do |c|
-          cols_width[c.title] = [c.widget.size_request.first, c.width].max
+          cols_width[c.title] = c.width
         end
         @prefs.cols_width = '{' + cols_width.to_a.map do |t, v|
           '"' + t + '": ' + v.to_s
@@ -1149,7 +1067,7 @@ module Alexandria
 
       def move_selected_books_to_library(library)
         books = selected_books.select do |book|
-          !library.include?(book) or
+          !library.include?(book) ||
             ConflictWhileCopyingDialog.new(@main_app,
                                            library,
                                            book).replace?
@@ -1159,7 +1077,7 @@ module Alexandria
 
       def setup_move_actions
         @actiongroup.actions.each do |action|
-          next unless /^MoveIn/.match(action.name)
+          next unless /^MoveIn/ =~ action.name
           @actiongroup.remove_action(action)
         end
         actions = []
@@ -1178,7 +1096,7 @@ module Alexandria
           ['ui/MainMenubar/EditMenu/Move/',
            'ui/BookPopup/Move/'].each do |path|
             @uimanager.add_ui(@move_mid, path, name, name,
-                              Gtk::UIManager::MENUITEM, false)
+                              :menuitem, false)
           end
         end
       end
@@ -1196,11 +1114,8 @@ module Alexandria
       def library_sort_order
         # added by Cathal Mc Ginley, 23 Oct 2007
         log.debug { "library_sort_order #{@notebook.page}: #{@iconview.model.inspect} #{@listview.model.inspect}" }
-        sorted_on = current_view.model.sort_column_id
-        if sorted_on
-          sort_column = sorted_on[0]
-          sort_order = sorted_on[1]
-
+        result, sort_column, sort_order = current_view.model.sort_column_id
+        if result
           column_ids_to_attributes = { 2 => :title,
                                        4 => :authors,
                                        5 => :isbn,
@@ -1212,8 +1127,8 @@ module Alexandria
                                        14 => :want,
                                        9 => :rating }
 
-          sort_attribute = column_ids_to_attributes[sort_column]
-          ascending = (sort_order == Gtk::SORT_ASCENDING)
+          sort_attribute = column_ids_to_attributes.fetch sort_column
+          ascending = (sort_order == :ascending)
           LibrarySortOrder.new(sort_attribute, ascending)
         else
           LibrarySortOrder::Unsorted.new
@@ -1260,7 +1175,7 @@ module Alexandria
       end
 
       def remove_library_separator
-        if !@library_separator_iter.nil? and @libraries.all_smart_libraries.empty?
+        if !@library_separator_iter.nil? && @libraries.all_smart_libraries.empty?
           @library_listview.model.remove(@library_separator_iter)
           @library_separator_iter = nil
         end
@@ -1291,14 +1206,21 @@ module Alexandria
       ICONS_SORTS = [
         Columns::TITLE, Columns::AUTHORS, Columns::ISBN,
         Columns::PUBLISHER, Columns::EDITION, Columns::RATING, Columns::REDD, Columns::OWN, Columns::WANT
-      ]
+      ].freeze
 
       def setup_books_iconview_sorting
-        sort_order = @prefs.reverse_icons ? Gtk::SORT_DESCENDING : Gtk::SORT_ASCENDING
+        sort_order = @prefs.reverse_icons ? :descending : :ascending
         mode = ICONS_SORTS[@prefs.arrange_icons_mode]
         @iconview_model.set_sort_column_id(mode, sort_order)
         @filtered_model.refilter # force redraw
       end
+
+      private
+
+      def view_path_to_model_path(view, path)
+        path = view.model.convert_path_to_child_path(path)
+        @filtered_model.convert_path_to_child_path(path) if path
+      end
     end
   end
 end