alexandria-book-collection-manager 0.6.9 → 0.7.0

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

@@ -26,17 +26,17 @@ module Alexandria
               _("The book '%s' already exists in '%s'. Would you like " \
                 'to replace it?') % [book.title, library.name],
               Gtk::Stock::DIALOG_QUESTION,
-              [[_('_Skip'), Gtk::Dialog::RESPONSE_CANCEL],
-               [_('_Replace'), Gtk::Dialog::RESPONSE_OK]],
+              [[_('_Skip'), :cancel],
+               [_('_Replace'), :ok]],
               _('If you replace the existing book, its contents will ' \
                 'be overwritten.'))
-        self.default_response = Gtk::Dialog::RESPONSE_CANCEL
-        show_all and @response = run
+        self.default_response = Gtk::ResponseType::CANCEL
+        show_all && (@response = run)
         destroy
       end
 
       def replace?
-        @response == Gtk::Dialog::RESPONSE_OK
+        @response == :ok
       end
     end
 
@@ -48,7 +48,7 @@ module Alexandria
         # Deleting a library.
         if books.nil?
           message = _("Are you sure you want to delete '%s'?") % library.name
-          description = if library.is_a?(SmartLibrary) or library.empty?
+          description = if library.is_a?(SmartLibrary) || library.empty?
                           nil
                         else
                           n_('If you continue, %d book will be deleted.',
@@ -68,17 +68,17 @@ module Alexandria
         end
 
         super(parent, message, Gtk::Stock::DIALOG_QUESTION,
-              [[Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL],
-               [Gtk::Stock::DELETE, Gtk::Dialog::RESPONSE_OK]],
+              [[Gtk::Stock::CANCEL, :cancel],
+               [Gtk::Stock::DELETE, :ok]],
               description)
 
-        self.default_response = Gtk::Dialog::RESPONSE_CANCEL
-        show_all and @response = run
+        self.default_response = Gtk::ResponseType::CANCEL
+        show_all && (@response = run)
         destroy
       end
 
       def ok?
-        @response == Gtk::Dialog::RESPONSE_OK
+        @response == :ok
       end
     end
   end

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

@@ -1,5 +1,5 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
-# Copyright (C) 2011 Matijs van Zuijlen
+# Copyright (C) 2011, 2015, 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
@@ -30,18 +30,18 @@ module Alexandria
       def initialize(parent, book)
         super(parent, _("Invalid ISBN '%s'") % book.isbn,
               Gtk::Stock::DIALOG_QUESTION,
-              [[Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL],
-               [_('_Keep'), Gtk::Dialog::RESPONSE_OK]],
+              [[Gtk::Stock::CANCEL, :cancel],
+               [_('_Keep'), :ok]],
               _("The book titled '%s' has an invalid ISBN, but still " \
                 'exists in the providers libraries.  Do you want to ' \
-                'keep the book but change the ISBN or cancel the add?') % book.title)
-        self.default_response = Gtk::Dialog::RESPONSE_OK
-        show_all and @response = run
+                'keep the book but change the ISBN or cancel the addition?') % book.title)
+        self.default_response = Gtk::ResponseType::OK
+        show_all && (@response = run)
         destroy
       end
 
       def keep?
-        @response == Gtk::Dialog::RESPONSE_OK
+        @response == :ok
       end
     end
 
@@ -50,6 +50,7 @@ module Alexandria
       include GetText
       extend GetText
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
+      @@last_criterion_was_not_isbn = false
 
       def initialize(parent, selected_library = nil, &block)
         super('new_book_dialog__builder.glade', widget_names)
@@ -82,7 +83,7 @@ module Alexandria
                                                  @selected_library)
 
         @treeview_results.model = Gtk::ListStore.new(String, String,
-                                                     Gdk::Pixbuf)
+                                                     GdkPixbuf::Pixbuf)
         @treeview_results.selection.mode = Gtk::SELECTION_MULTIPLE
         @treeview_results.selection.signal_connect('changed') do
           @button_add.sensitive = true
@@ -111,12 +112,7 @@ module Alexandria
 
         # Re-select the last selected criterion.
         # TODO let's do this from a Gconf setting instead, maybe?
-        begin
-          @title_radiobutton.active = @@last_criterion_was_not_isbn
-        rescue NameError
-          log.debug { 'initialize @@last_criterion_was_not_isbn as false' }
-          @@last_criterion_was_not_isbn = false
-        end
+        @title_radiobutton.active = @@last_criterion_was_not_isbn
 
         if @@last_criterion_was_not_isbn
           @entry_search.grab_focus
@@ -141,18 +137,18 @@ module Alexandria
         # When item is first toggled to "Search" the entry_search
         # field was unselectable. One used to have to click the dialog
         # title bar to be able to focus it again. Putting the GUI
-        # modifications in an Gtk.idle_add block fixed the problem.
+        # modifications in an GLib::Idle.add block fixed the problem.
 
         is_isbn = item == @isbn_radiobutton
         if is_isbn
-          Gtk.idle_add do
+          GLib::Idle.add do
             @latest_size = @new_book_dialog.size
             @new_book_dialog.resizable = false
             @entry_isbn.grab_focus
             false
           end
         else
-          Gtk.idle_add do
+          GLib::Idle.add do
             @new_book_dialog.resizable = true
             @new_book_dialog.resize(*@latest_size) unless @latest_size.nil?
             @entry_search.grab_focus
@@ -214,13 +210,13 @@ module Alexandria
           end
         end
 
-        Gtk.timeout_add(100) do
+        GLib::Timeout.add(100) do
           if @image_error
             image_error_dialog(@image_error)
           else
             @images.each_pair do |key, value|
               begin
-                loader = Gdk::PixbufLoader.new
+                loader = GdkPixbuf::PixbufLoader.new
                 loader.last_write(value)
                 pixbuf = loader.pixbuf
 
@@ -262,7 +258,7 @@ module Alexandria
                end
 
         # @progressbar.show
-        # progress_pulsing = Gtk.timeout_add(100) do
+        # progress_pulsing = GLib::Timeout.add(100) do
         #  if @destroyed
         #    false
         #  else
@@ -285,7 +281,7 @@ module Alexandria
         @image_thread.kill if @image_thread
 
         notify_start_add_by_isbn
-        Gtk.idle_add do
+        GLib::Idle.add do
           @find_thread = Thread.new do
             log.info { "New @find_thread #{Thread.current}" }
             begin
@@ -303,7 +299,7 @@ module Alexandria
           false
         end
 
-        Gtk.timeout_add(100) do
+        GLib::Timeout.add(100) do
           # This block copies results into the tree view, or shows an
           # error if the search failed.
 
@@ -319,8 +315,8 @@ module Alexandria
                          s = _('%s, by %s') % [book.title,
                                                book.authors.join(', ')]
                          similar_books = @results.find { |book2, _cover2|
-                           book.title == book2.title and
-                             book.authors == book2.authors
+                           (book.title == book2.title) &&
+                             (book.authors == book2.authors)
                          }
                          if similar_books.length > 1
                            s += " (#{book.edition}, #{book.publisher})"
@@ -340,19 +336,19 @@ module Alexandria
                          log.info { "@find_thread (#{@find_thread}) asleep now." }
                          # Not really async now.
                          get_images_async
-                         false # continue == false if you get to here. Stop timeout_add.
+                         false # continue == false if you get to here. Stop timeout.
                        end
                      else
                        # Stop if the book find thread has stopped.
                        @find_thread.alive?
                      end
           # continue == false if @find_error OR if results are returned
-          # timeout_add ends if continue is false!
+          # timeout ends if continue is false!
 
           unless continue
             unless @find_thread.alive? # This happens after find_thread is done
               unless @destroyed
-                # Gtk.timeout_remove(progress_pulsing)
+                # GLib::Source.remove(progress_pulsing)
                 # @progressbar.hide
                 notify_end_add_by_isbn
                 @button_add.sensitive = false
@@ -360,7 +356,7 @@ module Alexandria
             end
           end
 
-          continue # timeout_add loop condition
+          continue # timeout loop condition
         end
       end
 
@@ -378,9 +374,7 @@ module Alexandria
 
       def on_results_button_press_event(_widget, event)
         # double left click
-        if event.event_type == Gdk::Event::BUTTON2_PRESS and
-            event.button == 1
-
+        if (event.event_type == :'2button_press') && (event.button == 1)
           on_add
         end
       end
@@ -397,7 +391,7 @@ module Alexandria
         assert_not_exist(library, @entry_isbn.text)
         @button_add.sensitive = false
         notify_start_add_by_isbn
-        Gtk.idle_add do
+        GLib::Idle.add do
           @find_thread = Thread.new do
             log.info { "New @find_thread #{Thread.current}" }
             begin
@@ -420,11 +414,7 @@ module Alexandria
               else
                 post_addition([], library, is_new)
               end
-            rescue => e
-              unless e.is_a? Alexandria::BookProviders::NoResultsError
-                puts e.message
-                puts e.backtrace.join("\n> ")
-              end
+            rescue Alexandria::BookProviders::NoResultsError => e
               @find_error = e.message
               @button_add.sensitive = true
               notify_end_add_by_isbn
@@ -481,7 +471,7 @@ module Alexandria
         @block.call(books, library, is_new_library)
 
         if @keep_open.active?
-          # TODO reset and clear fields
+          # TODO: reset and clear fields
           if @@last_criterion_was_not_isbn
             @entry_search.select_region(0, -1) # select all, ready to delete
             @treeview_results.model.clear
@@ -536,7 +526,7 @@ module Alexandria
       def notify_start_add_by_isbn
         main_progress_bar = MainApp.instance.appbar.children.first
         main_progress_bar.visible = true
-        @progress_pulsing = Gtk.timeout_add(100) do
+        @progress_pulsing = GLib::Timeout.add(100) do
           if @destroyed
             false
           else
@@ -548,33 +538,31 @@ module Alexandria
 
       def notify_end_add_by_isbn
         MainApp.instance.appbar.children.first.visible = false
-        Gtk.timeout_remove(@progress_pulsing)
+        if @progress_pulsing
+          GLib::Source.remove(@progress_pulsing)
+          @progress_pulsing = nil
+        end
       end
 
       def update(status, provider)
-        Gtk.queue do
-          messages = {
-            searching: _("Searching Provider '%s'..."),
-            error: _("Error while Searching Provider '%s'"),
-            not_found: _("Not Found at Provider '%s'"),
-            found: _("Found at Provider '%s'")
-          }
-          message = messages[status] % provider
-          log.debug { "update message : #{message}" }
-
-          # @parent.appbar.status = message
-          MainApp.instance.appbar.status = message # HACKish
-          # false
-        end
+        messages = {
+          searching: _("Searching Provider '%s'..."),
+          error: _("Error while Searching Provider '%s'"),
+          not_found: _("Not Found at Provider '%s'"),
+          found: _("Found at Provider '%s'")
+        }
+        message = messages[status] % provider
+        log.debug { "update message : #{message}" }
+        MainApp.instance.ui_manager.set_status_label(message)
       end
 
       def on_focus
-        if @isbn_radiobutton.active? and @entry_isbn.text.strip.empty?
+        if @isbn_radiobutton.active? && @entry_isbn.text.strip.empty?
           clipboard = Gtk::Clipboard.get(Gdk::Selection::CLIPBOARD)
           if (text = clipboard.wait_for_text)
-            if Library.valid_isbn?(text) or Library.valid_ean?(text) or
+            if Library.valid_isbn?(text) || Library.valid_ean?(text) ||
                 Library.valid_upc?(text)
-              Gtk.idle_add do
+              GLib::Idle.add do
                 @entry_isbn.text = text
                 @entry_isbn.grab_focus
                 @entry_isbn.select_region(0, -1) # select all...
@@ -592,8 +580,8 @@ module Alexandria
       end
 
       def on_clicked(widget, event)
-        if event.event_type == Gdk::Event::BUTTON_PRESS and
-            event.button == 1
+        if (event.event_type == :button_press) &&
+            (event.button == 1)
 
           radio, target_widget, box2, box3 = case widget
                                              when @eventbox_entry_search

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

@@ -27,7 +27,8 @@ module Alexandria
       def initialize(parent, library, &on_add_cb)
         super(parent, TMP_COVER_FILE)
 
-        @library, @on_add_cb = library, on_add_cb
+        @library = library
+        @on_add_cb = on_add_cb
         FileUtils.rm_f(TMP_COVER_FILE)
 
         cancel_button = Gtk::Button.new(Gtk::Stock::CANCEL)
@@ -76,40 +77,40 @@ module Alexandria
 
       def on_add
         if (title = @entry_title.text.strip).empty?
-          raise AddError.new(_('A title must be provided.'))
+          raise AddError, _('A title must be provided.')
         end
         isbn = nil
         if @entry_isbn.text != ''
           ary = @library.select { |book|
             book.ident == @entry_isbn.text
           }
-          raise AddError.new(_('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?
           isbn = begin
                    Library.canonicalise_isbn(@entry_isbn.text)
                  rescue Alexandria::Library::InvalidISBNError
-                   raise AddError.new(_("Couldn't validate the " \
+                   raise AddError, _("Couldn't validate the " \
                                         'EAN/ISBN you provided.  Make ' \
                                         'sure it is written correcty, ' \
-                                        'and try again.'))
+                                        'and try again.')
                  end
         end
         if (publisher = @entry_publisher.text.strip).empty?
-          raise AddError.new(_('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
+        # TODO: Get rid of this silly requirement
         if (edition = @entry_edition.text.strip).empty?
-          raise AddError.new(_('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.new(_('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 == 0 ? nil : publishing_year,
+                        publishing_year.zero? ? nil : publishing_year,
                         edition)
         book.rating = @current_rating
         book.notes = @textview_notes.buffer.text
@@ -123,7 +124,7 @@ module Alexandria
         book.tags = @entry_tags.text.split
         @library << book
         @library.save(book)
-        if File.exist?(TMP_COVER_FILE) and (!@delete_cover_file)
+        if File.exist?(TMP_COVER_FILE) && !@delete_cover_file
           FileUtils.cp(TMP_COVER_FILE, @library.cover(book))
         end
         @on_add_cb.call(book)

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

@@ -1,5 +1,5 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
-# Copyright (C) 2015 Matijs van Zuijlen
+# Copyright (C) 2015, 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
@@ -22,24 +22,25 @@ module Alexandria
       include GetText
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
 
-      def initialize(parent, &block)
+      def initialize(parent)
         super(parent)
 
-        add_buttons([Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL],
-                    [Gtk::Stock::NEW, Gtk::Dialog::RESPONSE_OK])
+        add_buttons([Gtk::Stock::CANCEL, :cancel],
+                    [Gtk::Stock::NEW, :ok])
 
         self.title = _('New Smart Library')
-        self.default_response = Gtk::Dialog::RESPONSE_CANCEL
+        # FIXME: Should accept just :cancel
+        self.default_response = Gtk::ResponseType::CANCEL
 
         show_all
         insert_new_rule
 
-        while (response = run) != Gtk::Dialog::RESPONSE_CANCEL and
-            response != Gtk::Dialog::RESPONSE_DELETE_EVENT
+        while ((response = run) != :cancel) &&
+            (response != :delete_event)
 
-          if response == Gtk::Dialog::RESPONSE_HELP
+          if response == :help
             Alexandria::UI.display_help(self, 'new-smart-library')
-          elsif response == Gtk::Dialog::RESPONSE_OK
+          elsif response == :ok
             if user_confirms_possible_weirdnesses_before_saving?
               rules = smart_library_rules
               basename = smart_library_base_name(rules) || _('Smart Library')
@@ -49,7 +50,7 @@ module Alexandria
               library = SmartLibrary.new(name,
                                          rules,
                                          predicate_operator_rule)
-              block.call(library)
+              yield(library)
               break
             end
           end
@@ -63,7 +64,7 @@ module Alexandria
       def smart_library_base_name(rules)
         if rules.length == 1
           value = rules.first.value
-          if value.is_a?(String) and !value.strip.empty?
+          if value.is_a?(String) && !value.strip.empty?
             return value
           end
         end