alexandria-book-collection-manager 0.7.3 → 0.7.4

data/lib/alexandria/ui/provider_preferences_base_dialog.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+# This file is part of Alexandria.
+#
+# See the file README.md for authorship and licensing information.
+
+class Gtk::Entry
+  attr_writer :mandatory
+  def mandatory?
+    @mandatory
+  end
+end
+
+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
+  end
+end

data/lib/alexandria/ui/provider_preferences_dialog.rb

@@ -0,0 +1,35 @@
+# 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 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
+  end
+end

data/lib/alexandria/ui/{dialogs/misc_dialogs.rb → really_delete_dialog.rb}

@@ -4,34 +4,13 @@
 #
 # See the file README.md for authorship and licensing information.
 
+require "alexandria/ui/alert_dialog"
+
 module Alexandria
   module UI
-    class ConflictWhileCopyingDialog < AlertDialog
-      include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
-
-      def initialize(parent, library, book)
-        super(parent,
-              format(_("The book '%s' already exists in '%s'. Would you like " \
-                'to replace it?'), book.title, library.name),
-              Gtk::Stock::DIALOG_QUESTION,
-              [[_('_Skip'), Gtk::ResponseType::CANCEL],
-               [_('_Replace'), Gtk::ResponseType::OK]],
-              _('If you replace the existing book, its contents will ' \
-                'be overwritten.'))
-        self.default_response = Gtk::ResponseType::CANCEL
-      end
-
-      def replace?
-        show_all && (@response = run)
-        destroy
-        @response == Gtk::ResponseType::OK
-      end
-    end
-
     class ReallyDeleteDialog < AlertDialog
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
       def initialize(parent, library, books = nil)
         # Deleting a library.
@@ -40,8 +19,8 @@ module Alexandria
           description = if library.is_a?(SmartLibrary) || library.empty?
                           nil
                         else
-                          n_('If you continue, %d book will be deleted.',
-                             'If you continue, %d books will be deleted.',
+                          n_("If you continue, %d book will be deleted.",
+                             "If you continue, %d books will be deleted.",
                              library.size) % library.size
                         end
           # Deleting books.
@@ -50,7 +29,7 @@ module Alexandria
                       format(_("Are you sure you want to delete '%s' " \
                         "from '%s'?"), books.first.title, library.name)
                     else
-                      _('Are you sure you want to delete the ' \
+                      _("Are you sure you want to delete the " \
                         "selected books from '%s'?") % library.name
                     end
           description = nil

data/lib/alexandria/ui/{sidepane.rb → sidepane_manager.rb}

@@ -4,6 +4,8 @@
 #
 # See the file README.md for authorship and licensing information.
 
+require "alexandria/ui/error_dialog"
+
 module Alexandria
   module UI
     class SidePaneManager
@@ -29,8 +31,8 @@ module Alexandria
       # if new_text contains disallowed char (/ or initial .), returns a MatchData object
       # otherwise returns nil
       def contains_illegal_character(new_text)
-        new_text.unpack('U*') # attempt to unpack as UTF-8 characters
-        match = /(^\.|\/)/.match(new_text)
+        new_text.unpack("U*") # attempt to unpack as UTF-8 characters
+        match = %r{(^\.|/)}.match(new_text)
         # forbid / character (since Library names become dir names)
         # also no initial . since that hides the Library (hidden file)
         #      forbidding an initial dot also disallows "." and ".."
@@ -49,27 +51,27 @@ module Alexandria
         if cell.text != new_text
           if (match = contains_illegal_character(new_text))
             if match.instance_of? MatchData
-              chars = match[1].gsub(/&/, '&')
+              chars = match[1].gsub(/&/, "&")
               ErrorDialog.new(@main_app, _("Invalid library name '%s'") % new_text,
-                              _('The name provided contains the ' \
-                                'disallowed character <b>%s</b> ') % chars).display
+                              _("The name provided contains the " \
+                                "disallowed character <b>%s</b> ") % chars).display
             else
-              ErrorDialog.new(@main_app, _('Invalid library name'),
-                              _('The name provided contains ' \
-                                'invalid characters.')).display
+              ErrorDialog.new(@main_app, _("Invalid library name"),
+                              _("The name provided contains " \
+                                "invalid characters.")).display
             end
 
           elsif new_text.strip.empty?
-            log.debug { 'Empty text' }
-            ErrorDialog.new(@main_app, _('The library name ' \
-                                         'can not be empty')).display
+            log.debug { "Empty text" }
+            ErrorDialog.new(@main_app, _("The library name " \
+                                         "can not be empty")).display
           elsif library_already_exists new_text
-            log.debug { 'Already exists' }
+            log.debug { "Already exists" }
             ErrorDialog.new(@main_app,
-                            _('The library can not be renamed'),
-                            _('There is already a library named ' \
+                            _("The library can not be renamed"),
+                            _("There is already a library named " \
                               "'%s'.  Please choose a different " \
-                              'name.') % new_text.strip).display
+                              "name.") % new_text.strip).display
           else
             log.debug { "Attempting to apply #{path_string}, #{new_text}" }
             path = Gtk::TreePath.new(path_string)
@@ -93,7 +95,7 @@ module Alexandria
         @libraries.all_smart_libraries.each { |x| @parent.append_library(x) }
 
         renderer = Gtk::CellRendererPixbuf.new
-        column = Gtk::TreeViewColumn.new(_('Library'))
+        column = Gtk::TreeViewColumn.new(_("Library"))
         column.pack_start(renderer, false)
         column.set_cell_data_func(renderer) do |_col, cell, _model, iter|
           # log.debug { "sidepane: cell_data_func #{col}, #{cell}, #{iter}" }
@@ -108,7 +110,7 @@ module Alexandria
           cell.editable = iter[2]
           # log.debug { "exit sidepane: editable #{cell}, #{iter}" }
         end
-        renderer.signal_connect('edited', &method(:on_edited_library))
+        renderer.signal_connect("edited", &method(:on_edited_library))
         @library_listview.append_column(column)
 
         @library_listview.set_row_separator_func do |model, iter|
@@ -116,16 +118,16 @@ module Alexandria
           model.get_value(iter, 3)
         end
 
-        @library_listview.selection.signal_connect('changed') do
-          log.debug { 'changed' }
+        @library_listview.selection.signal_connect("changed") do
+          log.debug { "changed" }
           @parent.refresh_libraries
           @parent.refresh_books
         end
 
         @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' }
+        @library_listview.signal_connect("drag-motion") do |_widget, drag_context, x, y, time, _data|
+          log.debug { "drag-motion" }
 
           path, column, =
             @library_listview.get_path_at_pos(x, y)
@@ -154,8 +156,8 @@ module Alexandria
                           time)
         end
 
-        @library_listview.signal_connect('drag-drop') do |widget, drag_context, _x, _y, time, _data|
-          log.debug { 'drag-drop' }
+        @library_listview.signal_connect("drag-drop") do |widget, drag_context, _x, _y, time, _data|
+          log.debug { "drag-drop" }
 
           widget.drag_get_data(drag_context,
                                drag_context.targets.first,
@@ -163,8 +165,8 @@ module Alexandria
           true
         end
 
-        @library_listview.signal_connect('drag-data-received') do |_, drag_context, x, y, data, _, _|
-          log.debug { 'drag-data-received' }
+        @library_listview.signal_connect("drag-data-received") do |_, drag_context, x, y, data, _, _|
+          log.debug { "drag-data-received" }
 
           success = false
           # FIXME: Ruby-GNOME2 should make comparison work without needing to

data/lib/alexandria/ui/skip_entry_dialog.rb

@@ -0,0 +1,32 @@
+# 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 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
+  end
+end

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

@@ -21,7 +21,7 @@ module Alexandria
   module UI
     class SmartLibraryPropertiesDialog < SmartLibraryPropertiesDialogBase
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
       def initialize(parent, smart_library)
         super(parent)
@@ -41,7 +41,7 @@ module Alexandria
 
         while (response = run) != Gtk::ResponseType::CANCEL
           if response == Gtk::ResponseType::HELP
-            Alexandria::UI.display_help(self, 'edit-smart-library')
+            Alexandria::UI.display_help(self, "edit-smart-library")
           elsif response == Gtk::ResponseType::OK
             if user_confirms_possible_weirdnesses_before_saving?
               smart_library.rules = smart_library_rules

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

@@ -23,12 +23,12 @@ module Alexandria
     class SmartLibraryPropertiesDialogBase < SimpleDelegator
       include Logging
       include GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
       attr_reader :predicate_operator_rule
 
       def initialize(parent)
-        @dialog = Gtk::Dialog.new(title: '',
+        @dialog = Gtk::Dialog.new(title: "",
                                   parent: parent,
                                   flags: :modal,
                                   buttons: [[Gtk::Stock::HELP, :help]])
@@ -75,7 +75,7 @@ module Alexandria
       def has_weirdnesses?
         fill_smart_library_rules_values
         smart_library_rules.each do |rule|
-          return true if rule.value == ''
+          return true if rule.value == ""
         end
         false
       end
@@ -85,14 +85,14 @@ module Alexandria
 
         dialog = AlertDialog.new(
           @dialog,
-          _('Empty or conflictive condition'),
+          _("Empty or conflictive condition"),
           Gtk::Stock::DIALOG_QUESTION,
           [[Gtk::Stock::CANCEL, Gtk::ResponseType::CANCEL],
-           [_('_Save However'), Gtk::ResponseType::YES]],
-          _('This smart library contains one or more conditions ' \
-            'which are empty or conflict with each other. This is ' \
-            'likely to result in never matching a book. Are you ' \
-            'sure you want to save this library?'))
+           [_("_Save However"), Gtk::ResponseType::YES]],
+          _("This smart library contains one or more conditions " \
+            "which are empty or conflict with each other. This is " \
+            "likely to result in never matching a book. Are you " \
+            "sure you want to save this library?"))
         dialog.default_response = Gtk::ResponseType::CANCEL
         dialog.show_all
         confirmed = dialog.run == Gtk::ResponseType::YES
@@ -106,11 +106,11 @@ module Alexandria
         if @rules_box.children.length > 1
           label1 = Gtk::Label.new
           label1.set_alignment(0.0, 0.5)
-          label1.text = _('Match')
+          label1.text = _("Match")
 
           cb = Gtk::ComboBoxText.new
-          [_('all'), _('any')].each { |x| cb.append_text(x) }
-          cb.signal_connect('changed') do
+          [_("all"), _("any")].each { |x| cb.append_text(x) }
+          cb.signal_connect("changed") do
             @predicate_operator_rule = cb.active.zero? ? SmartLibrary::ALL_RULES : SmartLibrary::ANY_RULE
           end
           cb.active =
@@ -118,7 +118,7 @@ module Alexandria
 
           label2 = Gtk::Label.new
           label2.set_alignment(0.0, 0.5)
-          label2.text = _('of the following rules:')
+          label2.text = _("of the following rules:")
 
           @rules_header_box.pack_start(label1, expand: false, fill: false)
           @rules_header_box.pack_start(cb, expand: false, fill: false)
@@ -126,7 +126,7 @@ module Alexandria
         else
           label = Gtk::Label.new
           label.set_alignment(0.0, 0.5)
-          label.text = _('Match the following rule:')
+          label.text = _("Match the following rule:")
           @rules_header_box << label
           @predicate_operator_rule = SmartLibrary::ALL_RULES
         end
@@ -146,29 +146,29 @@ module Alexandria
         date_entry = Gtk::Entry.new
         date_entry.primary_icon_name = Gtk::Stock::EDIT
         date_entry.primary_icon_activatable = true
-        date_entry.signal_connect('icon-press') do |entry, primary, _icon|
-          display_calendar_popup(entry) if primary.nick == 'primary'
+        date_entry.signal_connect("icon-press") do |entry, primary, _icon|
+          display_calendar_popup(entry) if primary.nick == "primary"
         end
 
         # Really hide the time part of the date entry, as the constructor
         # does not seem to do it...
         # ##date_entry.children[2..3].each { |x| date_entry.remove(x) }
         # ##date_entry.spacing = 8
-        entry_label = Gtk::Label.new('')
+        entry_label = Gtk::Label.new("")
 
-        add_button = Gtk::Button.new(label: '')
+        add_button = Gtk::Button.new(label: "")
         add_button.remove(add_button.children.first)
         add_button << Gtk::Image.new(stock: Gtk::Stock::ADD,
                                      size: Gtk::IconSize::BUTTON)
 
-        add_button.signal_connect('clicked') { insert_new_rule }
+        add_button.signal_connect("clicked") { insert_new_rule }
 
-        remove_button = Gtk::Button.new(label: '')
+        remove_button = Gtk::Button.new(label: "")
         remove_button.remove(remove_button.children.first)
         remove_button << Gtk::Image.new(stock: Gtk::Stock::REMOVE,
                                         size: Gtk::IconSize::BUTTON)
 
-        remove_button.signal_connect('clicked') do |_button|
+        remove_button.signal_connect("clicked") do |_button|
           idx = @rules_box.children.index(rule_box)
           raise if idx.nil?
 
@@ -182,7 +182,7 @@ module Alexandria
         operands.each do |operand|
           left_operand_combo.append_text(operand.name)
         end
-        operator_combo.signal_connect('changed') do
+        operator_combo.signal_connect("changed") do
           operand = operands[left_operand_combo.active]
           operations = SmartLibrary::Rule.operations_for_operand(operand)
           operation = operations[operator_combo.active]
@@ -191,7 +191,7 @@ module Alexandria
           right_operand = operation.last
           unless right_operand.nil?
             entry = case right_operand.klass.name
-                    when 'Time'
+                    when "Time"
                       date_entry
                     else
                       value_entry
@@ -215,7 +215,7 @@ module Alexandria
           new_rule.operation = operation.first
           new_rule.value = nil
         end
-        left_operand_combo.signal_connect('changed') do
+        left_operand_combo.signal_connect("changed") do
           operand = operands[left_operand_combo.active]
           operator_combo.freeze_notify do
             operator_combo.remove_all
@@ -312,12 +312,12 @@ module Alexandria
 
         @calendar_popup.set_transient_for(@dialog)
         @calendar_popup.set_type_hint(:dialog)
-        @calendar_popup.name = 'calendar-popup'
+        @calendar_popup.name = "calendar-popup"
         @calendar_popup.resizable = false
         # @calendar_popup.border_width = 4
         # @calendar_popup.app_paintable = true
 
-        @calendar_popup.signal_connect('focus-out-event') do |_popup, _event|
+        @calendar_popup.signal_connect("focus-out-event") do |_popup, _event|
           hide_calendar_popup
           false
         end
@@ -325,7 +325,7 @@ module Alexandria
         @calendar = Gtk::Calendar.new
         @calendar_popup.add(@calendar)
 
-        @calendar.signal_connect('day-selected') do
+        @calendar.signal_connect("day-selected") do
           date_arr = @calendar.date
           year = date_arr[0]
           month = date_arr[1] # + 1 # gtk : months 0-indexed, Time.gm : 1-index
@@ -336,7 +336,7 @@ module Alexandria
           end
         end
 
-        @calendar.signal_connect('day-selected-double-click') do
+        @calendar.signal_connect("day-selected-double-click") do
           date_arr = @calendar.date
           year = date_arr[0]
           month = date_arr[1] # + 1 # gtk : months 0-indexed, Time.gm : 1-index
@@ -405,7 +405,7 @@ module Alexandria
       end
 
       def parse_date(datestring)
-        date_format = '%d/%m/%Y' # or '%m/%d/%Y' for USA and Canada ; or '%Y-%m-%d' for most of Asia
+        date_format = "%d/%m/%Y" # or '%m/%d/%Y' for USA and Canada ; or '%Y-%m-%d' for most of Asia
         ## http://en.wikipedia.org/wiki/Calendar_date#Middle_endian_forms.2C_starting_with_the_month
         begin
           d = Date.strptime(datestring, date_format)
@@ -416,7 +416,7 @@ module Alexandria
       end
 
       def format_date(datetime)
-        datetime.strftime('%d/%m/%Y')
+        datetime.strftime("%d/%m/%Y")
       end
     end
   end