alexandria-book-collection-manager 0.7.3 → 0.7.4

data/lib/alexandria/ui/dndable.rb

@@ -21,15 +21,15 @@
 
 module Alexandria
   module UI
-    BOOKS_TARGET_TABLE = [Gtk::TargetEntry.new('ALEXANDRIA_BOOKS', :same_app, 0)].freeze
+    BOOKS_TARGET_TABLE = [Gtk::TargetEntry.new("ALEXANDRIA_BOOKS", :same_app, 0)].freeze
 
     module DragAndDropable
       BADGE_MARKUP = '<span weight="heavy" foreground="white">%d</span>'
 
       def setup_view_source_dnd(view)
         # better be Loggable!
-        log.info { format('setup_view_source_dnd for %s', view) }
-        view.signal_connect_after('drag-begin') do |_widget, drag_context|
+        log.info { format("setup_view_source_dnd for %s", view) }
+        view.signal_connect_after("drag-begin") do |_widget, drag_context|
           n_books = @parent.selected_books.length
           if n_books > 1
             # Render generic book icon.
@@ -45,8 +45,8 @@ module Alexandria
 
             # Draw a red ellipse where the badge number should be.
             red_gc = Gdk::GC.new(pixmap)
-            red_gc.rgb_fg_color = Gdk::Color.parse('red')
-            red_gc.rgb_bg_color = Gdk::Color.parse('red')
+            red_gc.rgb_fg_color = Gdk::Color.parse("red")
+            red_gc.rgb_bg_color = Gdk::Color.parse("red")
             pixmap.draw_arc(red_gc,
                             true,
                             x - 5, y - 2,
@@ -66,11 +66,11 @@ module Alexandria
           end
         end
 
-        view.signal_connect('drag-data-get') do |_widget, _drag_context, selection_data, _info, _time|
+        view.signal_connect("drag-data-get") do |_widget, _drag_context, selection_data, _info, _time|
           idents = @parent.selected_books.map(&:ident)
           unless idents.empty?
             selection_data.set(Gdk::Selection::TYPE_STRING,
-                               idents.join(','))
+                               idents.join(","))
           end
         end
 

data/lib/alexandria/ui/error_dialog.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+# This file is part of Alexandria.
+#
+# See the file README.md for authorship and licensing information.
+
+require "alexandria/ui/alert_dialog"
+
+module Alexandria
+  module UI
+    class ErrorDialog < AlertDialog
+      def initialize(parent, title, message = nil)
+        super(parent, title, Gtk::Stock::DIALOG_ERROR,
+              [[Gtk::Stock::OK, :ok]], message)
+        # FIXME: Should accept just :ok
+        self.default_response = Gtk::ResponseType::OK
+      end
+
+      def display
+        show_all && run
+        destroy
+      end
+    end
+  end
+end

data/lib/alexandria/ui/{dialogs/export_dialog.rb → export_dialog.rb}

@@ -4,36 +4,16 @@
 #
 # See the file README.md for authorship and licensing information.
 
-require 'alexandria/export_format'
+require "alexandria/export_format"
+require "alexandria/ui/confirm_erase_dialog"
+require "alexandria/ui/error_dialog"
 
 module Alexandria
   module UI
-    class ConfirmEraseDialog < AlertDialog
-      include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
-
-      def initialize(parent, filename)
-        super(parent, _('File already exists'),
-              Gtk::Stock::DIALOG_QUESTION,
-              [[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)
-        # FIXME: Should accept just :cancel
-        self.default_response = Gtk::ResponseType::CANCEL
-      end
-
-      def erase?
-        show_all && (@response = run)
-        destroy
-        @response == Gtk::ResponseType::OK
-      end
-    end
-
     class ExportDialog < SimpleDelegator
       include GetText
       extend GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
       FORMATS = Alexandria::ExportFormat.all
       THEMES = Alexandria::WebTheme.all
@@ -44,11 +24,11 @@ module Alexandria
                                                     action: :save,
                                                     buttons: [[Gtk::Stock::HELP, :help],
                                                               [Gtk::Stock::CANCEL, :cancel],
-                                                              [_('_Export'), :accept]])
+                                                              [_("_Export"), :accept]])
         super(@export_dialog)
 
         self.current_name = library.name
-        signal_connect('destroy') { hide }
+        signal_connect("destroy") { hide }
 
         @parent = parent
         @library = library
@@ -62,12 +42,12 @@ module Alexandria
         THEMES.each do |theme|
           @theme_combo.append_text(theme.name)
         end
-        @theme_combo.signal_connect('changed') do
+        @theme_combo.signal_connect("changed") do
           file = THEMES[@theme_combo.active].preview_file
           preview_image.pixbuf = GdkPixbuf::Pixbuf.new(file: file)
         end
         @theme_combo.active = 0
-        theme_label = Gtk::Label.new(_('_Theme:'), use_underline: true)
+        theme_label = Gtk::Label.new(_("_Theme:"), use_underline: true)
         theme_label.xalign = 0
         theme_label.mnemonic_widget = @theme_combo
 
@@ -75,23 +55,23 @@ module Alexandria
         @types_combo.vexpand = false
         @types_combo.valign = :center
         FORMATS.each do |format|
-          text = format.name + ' ('
+          text = format.name + " ("
           text += if format.ext
-                    '*.' + format.ext
+                    "*." + format.ext
                   else
-                    _('directory')
+                    _("directory")
                   end
-          text += ')'
+          text += ")"
           @types_combo.append_text(text)
         end
         @types_combo.active = 0
-        @types_combo.signal_connect('changed') do
+        @types_combo.signal_connect("changed") do
           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:'), use_underline: 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
@@ -112,13 +92,13 @@ module Alexandria
             (response != Gtk::ResponseType::DELETE_EVENT)
 
           if response == Gtk::ResponseType::HELP
-            Alexandria::UI.display_help(self, 'exporting')
+            Alexandria::UI.display_help(self, "exporting")
           else
             begin
               break if on_export(FORMATS[@types_combo.active],
                                  THEMES[@theme_combo.active])
-            rescue StandardError => e
-              ErrorDialog.new(@export_dialog, _('Export failed'), e.message).display
+            rescue StandardError => ex
+              ErrorDialog.new(@export_dialog, _("Export failed"), ex.message).display
             end
           end
         end
@@ -132,7 +112,7 @@ module Alexandria
 
         filename = self.filename
         if format.ext
-          filename += '.' + format.ext if File.extname(filename).empty?
+          filename += "." + format.ext if File.extname(filename).empty?
           if File.exist?(filename)
             dialog = ConfirmEraseDialog.new(@export_dialog, filename)
             return unless dialog.erase?
@@ -144,10 +124,10 @@ module Alexandria
           if File.exist?(filename)
             unless File.directory?(filename)
               msg = _("The target, named '%s', is a regular " \
-                      'file.  A directory is needed for this ' \
-                      'operation.  Please select a directory and ' \
-                      'try again.') % filename
-              ErrorDialog.new(@export_dialog, _('Not a directory'), msg).display
+                      "file.  A directory is needed for this " \
+                      "operation.  Please select a directory and " \
+                      "try again.") % filename
+              ErrorDialog.new(@export_dialog, _("Not a directory"), msg).display
               return
             end
           else

data/lib/alexandria/ui/icons.rb

@@ -44,7 +44,7 @@ module Alexandria
     module Icons
       include Logging
 
-      ICONS_DIR = File.join(Alexandria::Config::DATA_DIR, 'icons')
+      ICONS_DIR = File.join(Alexandria::Config::DATA_DIR, "icons")
       def self.init
         load_icon_images
       end
@@ -53,11 +53,11 @@ module Alexandria
       # Alexandria::UI::Icons namespace, e.g., Icons::STAR_SET
       def self.load_icon_images
         Dir.entries(ICONS_DIR).each do |file|
-          next unless file =~ /\.png$/ # skip non '.png' files
+          next unless /\.png$/.match?(file) # skip non '.png' files
 
           # Don't use upcase and use tr instead
           # For example in Turkish the upper case of 'i' is still 'i'.
-          name = File.basename(file, '.png').tr('a-z', 'A-Z')
+          name = File.basename(file, ".png").tr("a-z", "A-Z")
           const_set(name, GdkPixbuf::Pixbuf.new(file: File.join(ICONS_DIR, file)))
         end
       end
@@ -79,9 +79,9 @@ module Alexandria
       def self.blank?(filename)
         pixbuf = GdkPixbuf::Pixbuf.new(file: filename)
         (pixbuf.width == 1) && (pixbuf.height == 1)
-      rescue StandardError => err
-        puts err.message
-        puts err.backtrace.join("\n> ")
+      rescue StandardError => ex
+        puts ex.message
+        puts ex.backtrace.join("\n> ")
         true
       end
     end

data/lib/alexandria/ui/iconview.rb

@@ -19,8 +19,8 @@
 # write to the Free Software Foundation, Inc., 51 Franklin Street,
 # Fifth Floor, Boston, MA 02110-1301 USA.
 
-require 'alexandria/ui/columns'
-require 'alexandria/ui/iconview_tooltips'
+require "alexandria/ui/columns"
+require "alexandria/ui/iconview_tooltips"
 
 module Alexandria
   module UI
@@ -51,14 +51,14 @@ module Alexandria
         @iconview.column_spacing = 16
         @iconview.item_width = ICON_WIDTH + 16
 
-        @iconview.signal_connect('selection-changed') do
-          log.debug { 'selection-changed' }
+        @iconview.signal_connect("selection-changed") do
+          log.debug { "selection-changed" }
           @parent.on_books_selection_changed
         end
 
-        @iconview.signal_connect('item-activated') do
-          log.debug { 'item-activated' }
-          @actiongroup['Properties'].activate
+        @iconview.signal_connect("item-activated") do
+          log.debug { "item-activated" }
+          @actiongroup["Properties"].activate
           false
         end
 

data/lib/alexandria/ui/iconview_tooltips.rb

@@ -29,7 +29,7 @@
 #
 # Ported to ruby-gtk2 (and modified for IconView) by Cathal Mc Ginley
 
-require 'cgi'
+require "cgi"
 
 class IconViewTooltips
   include Alexandria::Logging
@@ -40,7 +40,7 @@ class IconViewTooltips
 
   def set_view(view)
     view.has_tooltip = true
-    view.signal_connect('query-tooltip') do |_widget, x, y, _keyboard_mode, tooltip|
+    view.signal_connect("query-tooltip") do |_widget, x, y, _keyboard_mode, tooltip|
       tree_path = view.get_path_at_pos(x, y)
       if tree_path
         iter = view.model.get_iter(tree_path)
@@ -56,7 +56,7 @@ class IconViewTooltips
 
   def label_for_book(title, authors, publisher, year)
     # This is much too complex... but it works for now!
-    html = ''
+    html = ""
     unless title.empty?
       html += "<b>#{CGI.escapeHTML(title)}</b>"
       html += "\n" unless authors.empty?
@@ -64,14 +64,14 @@ class IconViewTooltips
     html += "<i>#{CGI.escapeHTML(authors)}</i>" unless authors.empty?
     html += "\n" if !title.empty? || !authors.empty?
 
-    html += '<small>'
+    html += "<small>"
     html += CGI.escapeHTML(publisher).to_s if publisher && !publisher.empty?
 
     if year && !year.empty?
-      html += ' ' if publisher && !publisher.empty?
+      html += " " if publisher && !publisher.empty?
       html += "(#{year})"
     end
 
-    html + '</small>'
+    html + "</small>"
   end
 end

data/lib/alexandria/ui/{dialogs/import_dialog.rb → import_dialog.rb}

@@ -4,6 +4,9 @@
 #
 # See the file README.md for authorship and licensing information.
 
+require "alexandria/ui/error_dialog"
+require "alexandria/ui/skip_entry_dialog"
+
 class Alexandria::ImportFilter
   def to_filefilter
     filefilter = Gtk::FileFilter.new
@@ -15,49 +18,28 @@ end
 
 module Alexandria
   module UI
-    class SkipEntryDialog < AlertDialog
-      include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
-
-      def initialize(parent, message)
-        super(parent, _('Error while importing'),
-              Gtk::Stock::DIALOG_QUESTION,
-              [[Gtk::Stock::CANCEL, Gtk::ResponseType::CANCEL],
-               [_('_Continue'), Gtk::ResponseType::OK]],
-              message)
-        puts "Opened SkipEntryDialog #{inspect}" if $DEBUG
-        self.default_response = Gtk::ResponseType::CANCEL
-      end
-
-      def continue?
-        show_all && (@response = run)
-        destroy
-        @response == Gtk::ResponseType::OK
-      end
-    end
-
     class ImportDialog < SimpleDelegator
       include GetText
       include Logging
 
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
       FILTERS = Alexandria::ImportFilter.all
 
       def initialize(parent)
-        title = _('Import a Library')
+        title = _("Import a Library")
         dialog = Gtk::FileChooserDialog.new title: title, parent: parent, action: :open
         super(dialog)
-        puts 'ImportDialog opened.' if $DEBUG
+        puts "ImportDialog opened." if $DEBUG
         @destroyed = false
         @running = false
         add_button(Gtk::Stock::HELP, Gtk::ResponseType::HELP)
         add_button(Gtk::Stock::CANCEL, Gtk::ResponseType::CANCEL)
-        import_button = add_button(_('_Import'),
+        import_button = add_button(_("_Import"),
                                    Gtk::ResponseType::ACCEPT)
         import_button.sensitive = false
 
-        signal_connect('destroy') do
+        signal_connect("destroy") do
           if @running
             @destroyed = true
           else
@@ -73,7 +55,7 @@ module Alexandria
           filters[filefilter] = filter
         end
 
-        signal_connect('selection_changed') do
+        signal_connect("selection_changed") do
           import_button.sensitive = filename && File.file?(filename)
         end
 
@@ -106,10 +88,10 @@ module Alexandria
             response != Gtk::ResponseType::DELETE_EVENT
 
           if response == Gtk::ResponseType::HELP
-            Alexandria::UI.display_help(self, 'import-library')
+            Alexandria::UI.display_help(self, "import-library")
             next
           end
-          file = File.basename(filename, '.*')
+          file = File.basename(filename, ".*")
           base = GLib.locale_to_utf8(file)
           new_library_name = Library.generate_new_name(
             LibraryCollection.instance.all_libraries,
@@ -161,9 +143,9 @@ module Alexandria
               puts "Raising ErrorDialog because not_cancelled is #{not_cancelled}" if $DEBUG
               ErrorDialog.new(self,
                               _("Couldn't import the library"),
-                              _('The format of the file you ' \
-                                'provided is unknown.  Please ' \
-                                'retry with another file.')).display
+                              _("The format of the file you " \
+                                "provided is unknown.  Please " \
+                                "retry with another file.")).display
             end
             pbar.hide
             self.sensitive = true

data/lib/alexandria/ui/init.rb

@@ -1,32 +1,19 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2004-2006 Laurent Sansonetti
-# Copyright (C) 2008 Joseph Method
-# Copyright (C) 2011, 2016 Matijs van Zuijlen
+# This file is part of Alexandria.
 #
-# Alexandria is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# Alexandria is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with Alexandria; see the file COPYING.  If not,
-# write to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# See the file README.md for authorship and licensing information.
+
+require "alexandria/ui/error_dialog"
 
 class CellRendererToggle < Gtk::CellRendererToggle
   attr_accessor :text
   type_register
   install_property(GLib::Param::String.new(
-                     'text',
-                     'text',
-                     'Some damn value',
-                     '',
+                     "text",
+                     "text",
+                     "Some damn value",
+                     "",
                      GLib::Param::READABLE | GLib::Param::WRITABLE))
 end
 
@@ -60,28 +47,28 @@ end
 
 class Alexandria::Library
   def action_name
-    'MoveIn' + name.gsub(/\s/, '')
+    "MoveIn" + name.gsub(/\s/, "")
   end
 end
 
 class Alexandria::BookProviders::AbstractProvider
   def action_name
-    'At' + name
+    "At" + name
   end
 end
 
 module Alexandria
   module UI
     def self.display_help(parent, section = nil)
-      section_index = ''
+      section_index = ""
       section_index = "##{section}" if section
       exec("gnome-help ghelp:alexandria#{section_index}") if fork.nil?
     rescue StandardError
-      log.error(self) { 'Unable to load help browser' }
-      ErrorDialog.new(parent, _('Unable to launch the help browser'),
-                      _('Could not display help for Alexandria. ' \
-                        'There was an error launching the system ' \
-                        'help browser.')).display
+      log.error(self) { "Unable to load help browser" }
+      ErrorDialog.new(parent, _("Unable to launch the help browser"),
+                      _("Could not display help for Alexandria. " \
+                        "There was an error launching the system " \
+                        "help browser.")).display
     end
   end
 end