alexandria-book-collection-manager 0.7.3 → 0.7.4

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

@@ -4,16 +4,17 @@
 #
 # See the file README.md for authorship and licensing information.
 
-require 'tmpdir'
+require "tmpdir"
+require "alexandria/ui/error_dialog"
 
 module Alexandria
   module UI
     class NewBookDialogManual < BookPropertiesDialogBase
       include GetText
       extend GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
-      TMP_COVER_FILE = File.join(Dir.tmpdir, 'tmp_cover')
+      TMP_COVER_FILE = File.join(Dir.tmpdir, "tmp_cover")
       def initialize(parent, library, &on_add_cb)
         super(parent, TMP_COVER_FILE)
 
@@ -22,17 +23,17 @@ module Alexandria
         FileUtils.rm_f(TMP_COVER_FILE)
 
         cancel_button = Gtk::Button.new(stock_id: Gtk::Stock::CANCEL)
-        cancel_button.signal_connect('clicked') { on_cancel }
+        cancel_button.signal_connect("clicked") { on_cancel }
         cancel_button.show
         @button_box << cancel_button
 
         add_button = Gtk::Button.new(stock_id: Gtk::Stock::ADD)
-        add_button.signal_connect('clicked') { on_add }
+        add_button.signal_connect("clicked") { on_add }
         add_button.show
         @button_box << add_button
 
         help_button = Gtk::Button.new(stock_id: Gtk::Stock::HELP)
-        help_button.signal_connect('clicked') { on_help }
+        help_button.signal_connect("clicked") { on_help }
         help_button.show
         @button_box << help_button
         @button_box.set_child_secondary(help_button, true)
@@ -46,7 +47,7 @@ module Alexandria
       def on_title_changed
         title = @entry_title.text.strip
         @book_properties_dialog.title = if title.empty?
-                                          _('Adding a Book')
+                                          _("Adding a Book")
                                         else
                                           _("Adding '%s'") % title
                                         end
@@ -63,34 +64,34 @@ module Alexandria
 
       def on_add
         if (title = @entry_title.text.strip).empty?
-          raise AddError, _('A title must be provided.')
+          raise AddError, _("A title must be provided.")
         end
 
         isbn = nil
-        if @entry_isbn.text != ''
+        if @entry_isbn.text != ""
           isbn = Library.canonicalise_ean(@entry_isbn.text)
           unless isbn
             raise AddError, _("Couldn't validate the EAN/ISBN you provided.  Make " \
-                              'sure it is written correcty, and try again.')
+                              "sure it is written correcty, and try again.")
           end
           ary = @library.select { |book| book.ident == isbn }
-          raise AddError, _('The EAN/ISBN you provided is already used in this library.') unless ary.empty?
+          raise AddError, _("The EAN/ISBN you provided is already used in this library.") unless ary.empty?
         end
         if (publisher = @entry_publisher.text.strip).empty?
-          raise AddError, _('A publisher must be provided.')
+          raise AddError, _("A publisher must be provided.")
         end
 
         publishing_year = @entry_publish_date.text.to_i
         # TODO: Get rid of this silly requirement
         if (edition = @entry_edition.text.strip).empty?
-          raise AddError, _('A binding must be provided.')
+          raise AddError, _("A binding must be provided.")
         end
 
         authors = []
         @treeview_authors.model.each { |_m, _p, i| authors << i[0] }
         if authors.empty?
-          raise AddError, _('At least one author must be ' \
-                               'provided.')
+          raise AddError, _("At least one author must be " \
+                               "provided.")
         end
         book = Book.new(title, authors, isbn, publisher,
                         publishing_year.zero? ? nil : publishing_year,
@@ -112,14 +113,14 @@ module Alexandria
         end
         @on_add_cb.call(book)
         @book_properties_dialog.destroy
-      rescue AddError => e
+      rescue AddError => ex
         ErrorDialog.new(@book_properties_dialog, _("Couldn't add the book"),
-                        e.message).display
+                        ex.message).display
       end
 
       # COPIED from book_properties_dialog_base
       def parse_date(datestring)
-        date_format = '%d/%m/%Y'
+        date_format = "%d/%m/%Y"
         begin
           d = Date.strptime(datestring, date_format)
           Time.gm(d.year, d.month, d.day)
@@ -129,7 +130,7 @@ module Alexandria
       end
 
       def on_help
-        Alexandria::UI.display_help(@preferences_dialog, 'add-book-manually')
+        Alexandria::UI.display_help(@preferences_dialog, "add-book-manually")
       end
     end
   end

data/lib/alexandria/ui/new_provider_dialog.rb

@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+# This file is part of Alexandria.
+#
+# See the file README.md for authorship and licensing information.
+
+require "alexandria/ui/provider_preferences_base_dialog"
+
+module Alexandria
+  module UI
+    class NewProviderDialog < ProviderPreferencesBaseDialog
+      include GetText
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
+
+      def initialize(parent)
+        super(title: _("New Provider"),
+              parent: parent,
+              flags: :modal,
+              buttons: [[Gtk::Stock::CANCEL, Gtk::ResponseType::CANCEL]])
+        @add_button = add_button(Gtk::Stock::ADD,
+                                 Gtk::ResponseType::ACCEPT)
+
+        instances = BookProviders.abstract_classes.map(&:new)
+        @selected_instance = nil
+
+        @table = Gtk::Table.new(2, 2)
+        child.pack_start(@table)
+
+        # Name.
+
+        label_name = Gtk::Label.new(_("_Name:"))
+        label_name.use_underline = true
+        label_name.xalign = 0
+        @table.attach_defaults(label_name, 0, 1, 0, 1)
+
+        entry_name = Gtk::Entry.new
+        entry_name.mandatory = true
+        label_name.mnemonic_widget = entry_name
+        @table.attach_defaults(entry_name, 1, 2, 0, 1)
+
+        # Type.
+
+        label_type = Gtk::Label.new(_("_Type:"))
+        label_type.use_underline = true
+        label_type.xalign = 0
+        @table.attach_defaults(label_type, 0, 1, 1, 2)
+
+        combo_type = Gtk::ComboBoxText.new
+        instances.each do |instance|
+          combo_type.append_text(instance.name)
+        end
+        combo_type.signal_connect("changed") do |cb|
+          @selected_instance = instances[cb.active]
+          fill_table(@table, @selected_instance)
+          sensitize
+          # FIXME: this should be re-written once we have multiple
+          # abstract providers.
+        end
+        combo_type.active = 0
+        label_type.mnemonic_widget = combo_type
+        @table.attach_defaults(combo_type, 1, 2, 1, 2)
+      end
+
+      def acquire
+        show_all
+        if run == Gtk::ResponseType::ACCEPT
+          @selected_instance.reinitialize(entry_name.text)
+          sync_variables
+        else
+          @selected_instance = nil
+        end
+        destroy
+      end
+
+      def instance
+        @selected_instance
+      end
+
+      private
+
+      def sensitize
+        entries = @table.children.select { |x| x.is_a?(Gtk::Entry) }
+        entries.each do |entry|
+          entry.signal_connect("changed") do
+            sensitive = true
+            entries.each do |entry2|
+              if entry2.mandatory?
+                sensitive = !entry2.text.strip.empty?
+                break unless sensitive
+              end
+            end
+            @add_button.sensitive = sensitive
+          end
+        end
+        @add_button.sensitive = false
+      end
+    end
+  end
+end

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

@@ -8,7 +8,7 @@ module Alexandria
   module UI
     class NewSmartLibraryDialog < SmartLibraryPropertiesDialogBase
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
       def initialize(parent)
         super(parent)
@@ -16,7 +16,7 @@ module Alexandria
         add_buttons([Gtk::Stock::CANCEL, :cancel],
                     [Gtk::Stock::NEW, :ok])
 
-        self.title = _('New Smart Library')
+        self.title = _("New Smart Library")
         # FIXME: Should accept just :cancel
         self.default_response = Gtk::ResponseType::CANCEL
       end
@@ -29,11 +29,11 @@ module Alexandria
             (response != Gtk::ResponseType::DELETE_EVENT)
 
           if response == Gtk::ResponseType::HELP
-            Alexandria::UI.display_help(self, 'new-smart-library')
+            Alexandria::UI.display_help(self, "new-smart-library")
           elsif response == Gtk::ResponseType::OK
             if user_confirms_possible_weirdnesses_before_saving?
               rules = smart_library_rules
-              basename = smart_library_base_name(rules) || _('Smart Library')
+              basename = smart_library_base_name(rules) || _("Smart Library")
               name = Library.generate_new_name(
                 LibraryCollection.instance.all_libraries,
                 basename)

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

@@ -4,247 +4,56 @@
 #
 # See the file README.md for authorship and licensing information.
 
-require 'alexandria/ui/builder_base'
-require 'alexandria/scanners/cuecat'
-require 'alexandria/scanners/keyboard'
-
-class Gtk::Entry
-  attr_writer :mandatory
-  def mandatory?
-    @mandatory
-  end
-end
+require "alexandria/scanners/cue_cat"
+require "alexandria/scanners/keyboard"
+require "alexandria/ui/builder_base"
+require "alexandria/ui/provider_preferences_dialog"
+require "alexandria/ui/new_provider_dialog"
 
 module Alexandria
   module UI
-    class ProviderPreferencesBaseDialog < SimpleDelegator
-      def initialize(title:, parent:, flags:, buttons:)
-        dialog = Gtk::Dialog.new(title: title, parent: parent, flags: flags, buttons: buttons)
-        super(dialog)
-
-        self.resizable = false
-        child.border_width = 12
-
-        @controls = []
-      end
-
-      def fill_table(table, provider)
-        i = table.n_rows
-        table.resize(table.n_rows + provider.prefs.length,
-                     table.n_columns)
-        table.border_width = 12
-        table.row_spacings = 6
-        table.column_spacings = 12
-
-        @controls.clear
-
-        provider.prefs.read.each do |variable|
-          if variable.name == 'piggyback'
-            next
-            # ULTRA-HACK!! for bug #13302
-            # not displaying the visual choice, as its usually unnecessary
-            # Either way, this is confusing to the user: FIX
-            #    -   Cathal Mc Ginley 2008-02-18
-          end
-
-          if variable.name == 'enabled'
-            # also don't display Enabled/Disabled
-            next
-          end
-
-          label = Gtk::Label.new('_' + variable.description + ':')
-          label.use_underline = true
-          label.xalign = 0
-          table.attach_defaults(label, 0, 1, i, i + 1)
-
-          if variable.possible_values.nil?
-            entry = Gtk::Entry.new
-            entry.text = variable.value.to_s
-            entry.mandatory = variable.mandatory?
-          else
-            entry = Gtk::ComboBoxText.new
-            variable.possible_values.each do |value|
-              entry.append_text(value.to_s)
-            end
-            index = variable.possible_values.index(variable.value)
-            entry.active = index
-          end
-          label.mnemonic_widget = entry
-
-          @controls << [variable, entry]
-
-          table.attach_defaults(entry, 1, 2, i, i + 1)
-          i += 1
-        end
-        table
-      end
-
-      def sync_variables
-        @controls.each do |variable, entry|
-          variable.new_value = case entry
-                               when Gtk::ComboBox
-                                 variable.possible_values[entry.active]
-                               when Gtk::Entry
-                                 entry.text
-                               end
-        end
-      end
-    end
-
-    class ProviderPreferencesDialog < ProviderPreferencesBaseDialog
-      include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
-
-      def initialize(parent, provider)
-        super(title: _('Preferences for %s') % provider.fullname,
-              parent: parent,
-              flags: :modal,
-              buttons: [[Gtk::Stock::CLOSE, :close]])
-
-        table = Gtk::Table.new(0, 0)
-        fill_table(table, provider)
-        child.pack_start(table)
-
-        signal_connect('destroy') { sync_variables }
-      end
-
-      def acquire
-        show_all
-        run
-        destroy
-      end
-    end
-
-    class NewProviderDialog < ProviderPreferencesBaseDialog
-      include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
-
-      def initialize(parent)
-        super(title: _('New Provider'),
-              parent: parent,
-              flags: :modal,
-              buttons: [[Gtk::Stock::CANCEL, Gtk::ResponseType::CANCEL]])
-        @add_button = add_button(Gtk::Stock::ADD,
-                                 Gtk::ResponseType::ACCEPT)
-
-        instances = BookProviders.abstract_classes.map(&:new)
-        @selected_instance = nil
-
-        @table = Gtk::Table.new(2, 2)
-        child.pack_start(@table)
-
-        # Name.
-
-        label_name = Gtk::Label.new(_('_Name:'))
-        label_name.use_underline = true
-        label_name.xalign = 0
-        @table.attach_defaults(label_name, 0, 1, 0, 1)
-
-        entry_name = Gtk::Entry.new
-        entry_name.mandatory = true
-        label_name.mnemonic_widget = entry_name
-        @table.attach_defaults(entry_name, 1, 2, 0, 1)
-
-        # Type.
-
-        label_type = Gtk::Label.new(_('_Type:'))
-        label_type.use_underline = true
-        label_type.xalign = 0
-        @table.attach_defaults(label_type, 0, 1, 1, 2)
-
-        combo_type = Gtk::ComboBoxText.new
-        instances.each do |instance|
-          combo_type.append_text(instance.name)
-        end
-        combo_type.signal_connect('changed') do |cb|
-          @selected_instance = instances[cb.active]
-          fill_table(@table, @selected_instance)
-          sensitize
-          # FIXME: this should be re-written once we have multiple
-          # abstract providers.
-        end
-        combo_type.active = 0
-        label_type.mnemonic_widget = combo_type
-        @table.attach_defaults(combo_type, 1, 2, 1, 2)
-      end
-
-      def acquire
-        show_all
-        if run == Gtk::ResponseType::ACCEPT
-          @selected_instance.reinitialize(entry_name.text)
-          sync_variables
-        else
-          @selected_instance = nil
-        end
-        destroy
-      end
-
-      def instance
-        @selected_instance
-      end
-
-      private
-
-      def sensitize
-        entries = @table.children.select { |x| x.is_a?(Gtk::Entry) }
-        entries.each do |entry|
-          entry.signal_connect('changed') do
-            sensitive = true
-            entries.each do |entry2|
-              if entry2.mandatory?
-                sensitive = !entry2.text.strip.empty?
-                break unless sensitive
-              end
-            end
-            @add_button.sensitive = sensitive
-          end
-        end
-        @add_button.sensitive = false
-      end
-    end
-
     class PreferencesDialog < BuilderBase
       include Alexandria::Logging
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
       def initialize(parent, &changed_block)
-        super('preferences_dialog__builder.glade', widget_names)
+        super("preferences_dialog__builder.glade", widget_names)
         @preferences_dialog.transient_for = parent
         @changed_block = changed_block
 
         @cols = {
-          @checkbutton_col_authors      => 'col_authors_visible',
-          @checkbutton_col_isbn         => 'col_isbn_visible',
-          @checkbutton_col_publisher    => 'col_publisher_visible',
-          @checkbutton_col_publish_date => 'col_publish_date_visible',
-          @checkbutton_col_edition      => 'col_edition_visible',
-          @checkbutton_col_redd         => 'col_redd_visible',
-          @checkbutton_col_own          => 'col_own_visible',
-          @checkbutton_col_want         => 'col_want_visible',
-          @checkbutton_col_rating       => 'col_rating_visible',
-          @checkbutton_col_tags         => 'col_tags_visible',
-          @checkbutton_col_loaned_to    => 'col_loaned_to_visible'
+          @checkbutton_col_authors      => "col_authors_visible",
+          @checkbutton_col_isbn         => "col_isbn_visible",
+          @checkbutton_col_publisher    => "col_publisher_visible",
+          @checkbutton_col_publish_date => "col_publish_date_visible",
+          @checkbutton_col_edition      => "col_edition_visible",
+          @checkbutton_col_redd         => "col_redd_visible",
+          @checkbutton_col_own          => "col_own_visible",
+          @checkbutton_col_want         => "col_want_visible",
+          @checkbutton_col_rating       => "col_rating_visible",
+          @checkbutton_col_tags         => "col_tags_visible",
+          @checkbutton_col_loaned_to    => "col_loaned_to_visible"
         }
         @cols.each_pair do |checkbutton, pref_name|
           if checkbutton
             checkbutton.active = Preferences.instance.send(pref_name)
           else
-            log.warn {
+            log.warn do
               "no CheckButton for property #{pref_name} " \
-              '(probably conflicting versions of GUI and lib code)'
-            }
+              "(probably conflicting versions of GUI and lib code)"
+            end
           end
         end
 
         model = Gtk::ListStore.new(String, String, TrueClass, Integer)
         @treeview_providers.model = model
         reload_providers
-        model.signal_connect_after('row-changed') { update_priority }
+        model.signal_connect_after("row-changed") { update_priority }
 
         renderer = Gtk::CellRendererToggle.new
         renderer.activatable = true
-        renderer.signal_connect('toggled') do |_rndrr, path|
+        renderer.signal_connect("toggled") do |_rndrr, path|
           tree_path = Gtk::TreePath.new(path)
           @treeview_providers.selection.select_path(tree_path)
           prov = selected_provider
@@ -256,7 +65,7 @@ module Alexandria
         end
 
         # renderer.active = true
-        column = Gtk::TreeViewColumn.new('Enabled', renderer)
+        column = Gtk::TreeViewColumn.new("Enabled", renderer)
         column.set_cell_data_func(renderer) do |_col, rndr, _mod, iter|
           value = iter[2]
           rndr.active = value
@@ -265,7 +74,7 @@ module Alexandria
         @treeview_providers.append_column(column)
 
         renderer = Gtk::CellRendererText.new
-        column = Gtk::TreeViewColumn.new('Providers',
+        column = Gtk::TreeViewColumn.new("Providers",
                                          renderer)
         # :text => 0)
         column.set_cell_data_func(renderer) do |_col, rndr, _mod, iter|
@@ -277,7 +86,7 @@ module Alexandria
           # rndr.active = value
         end
         @treeview_providers.append_column(column)
-        @treeview_providers.selection.signal_connect('changed') \
+        @treeview_providers.selection.signal_connect("changed") \
         { sensitize_providers }
 
         @button_prov_setup.sensitive = false
@@ -318,7 +127,7 @@ module Alexandria
         @scanner_device_type.model = @scanner_device_model
         renderer = Gtk::CellRendererText.new
         @scanner_device_type.pack_start(renderer, true)
-        @scanner_device_type.add_attribute(renderer, 'text', 0)
+        @scanner_device_type.add_attribute(renderer, "text", 0)
 
         Alexandria::Scanners.each_scanner do |scanner|
           iter = @scanner_device_model.append
@@ -335,16 +144,16 @@ module Alexandria
       def setup_enable_disable_popup
         # New Enable/Disable pop-up menu...
         @enable_disable_providers_menu = Gtk::Menu.new
-        @enable_item = Gtk::MenuItem.new(label: _('Disable Provider'))
-        @enable_item.signal_connect('activate') {
+        @enable_item = Gtk::MenuItem.new(label: _("Disable Provider"))
+        @enable_item.signal_connect("activate") do
           prov = selected_provider
           prov.toggle_enabled
           adjust_selected_provider(prov)
-        }
+        end
         @enable_disable_providers_menu.append(@enable_item)
         @enable_disable_providers_menu.show_all
 
-        @treeview_providers.signal_connect('button_press_event') do |widget, event|
+        @treeview_providers.signal_connect("button_press_event") do |widget, event|
           if event_is_right_click(event)
             if (path = widget.get_path_at_pos(event.x, event.y))
               widget.grab_focus
@@ -357,7 +166,7 @@ module Alexandria
               sel = widget.selection.selected
               if sel
                 already_enabled = sel[2]
-                message = already_enabled ? _('Disable Provider') : _('Enable Provider')
+                message = already_enabled ? _("Disable Provider") : _("Enable Provider")
                 @enable_item.label = message
                 GLib::Idle.add do
                   @enable_disable_providers_menu.popup(nil, nil, event.button, event.time)
@@ -365,28 +174,28 @@ module Alexandria
                 end
               end
             else
-              puts 'not on a path'
+              puts "not on a path"
             end
           end
         end
 
         # Popup the menu on Shift-F10
-        @treeview_providers.signal_connect('popup_menu') {
+        @treeview_providers.signal_connect("popup_menu") do
           selected_prov = @treeview_providers.selection.selected
           puts selected_prov.inspect
           if selected_prov
             GLib::Idle.add do
               already_enabled = selected_prov[2]
-              message = already_enabled ? _('Disable Provider') : _('Enable Provider')
+              message = already_enabled ? _("Disable Provider") : _("Enable Provider")
               @enable_item.label = message
 
               @enable_disable_providers_menu.popup(nil, nil, 0, :current_time)
               false
             end
           else
-            puts 'no action'
+            puts "no action"
           end
-        }
+        end
       end
 
       def event_is_right_click(event)
@@ -394,7 +203,7 @@ module Alexandria
       end
 
       def prefs_empty(prefs)
-        prefs.empty? || ((prefs.size == 1) && (prefs.first.name == 'enabled'))
+        prefs.empty? || ((prefs.size == 1) && (prefs.first.name == "enabled"))
       end
 
       def on_provider_setup
@@ -453,17 +262,17 @@ module Alexandria
       def on_provider_remove
         provider = selected_provider
         dialog = AlertDialog.new(@main_app,
-                                 _('Are you sure you want to ' \
-                                   'permanently delete the provider ' \
+                                 _("Are you sure you want to " \
+                                   "permanently delete the provider " \
                                    "'%s'?") % provider.fullname,
                                  Gtk::Stock::DIALOG_QUESTION,
                                  [[Gtk::Stock::CANCEL,
                                    Gtk::ResponseType::CANCEL],
                                   [Gtk::Stock::DELETE,
                                    Gtk::ResponseType::OK]],
-                                 _('If you continue, the provider and ' \
-                                   'all of its preferences will be ' \
-                                   'permanently deleted.'))
+                                 _("If you continue, the provider and " \
+                                   "all of its preferences will be " \
+                                   "permanently deleted."))
         dialog.default_response = Gtk::ResponseType::CANCEL
         dialog.show_all
         if dialog.run == Gtk::ResponseType::OK
@@ -495,7 +304,7 @@ module Alexandria
 
       def on_help
         Alexandria::UI.display_help(@preferences_dialog,
-                                    'alexandria-preferences')
+                                    "alexandria-preferences")
       end
 
       private