alexandria-book-collection-manager 0.6.9 → 0.7.0

data/lib/alexandria/ui/dndable.rb

@@ -1,5 +1,6 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2008 Joseph Method
+# Copyright (C) 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
@@ -18,10 +19,10 @@
 
 module Alexandria
   module UI
-    BOOKS_TARGET_TABLE = [['ALEXANDRIA_BOOKS', Gtk::Drag::TARGET_SAME_APP, 0]]
+    BOOKS_TARGET_TABLE = [Gtk::TargetEntry.new('ALEXANDRIA_BOOKS', :same_app, 0)].freeze
 
     module DragAndDropable
-      BADGE_MARKUP = "<span weight=\"heavy\" foreground=\"white\">%d</span>"
+      BADGE_MARKUP = '<span weight="heavy" foreground="white">%d</span>'.freeze
 
       def setup_view_source_dnd(view)
         # better be Loggable!
@@ -71,9 +72,9 @@ module Alexandria
           end
         end
 
-        view.enable_model_drag_source(Gdk::Window::BUTTON1_MASK,
+        view.enable_model_drag_source(:button1_mask,
                                       Alexandria::UI::BOOKS_TARGET_TABLE,
-                                      Gdk::DragContext::ACTION_MOVE)
+                                      :move)
       end
     end
   end

data/lib/alexandria/ui/icons.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
-# Copyright (C) 2014 Matijs van Zuijlen
+# Copyright (C) 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
@@ -16,18 +16,18 @@
 # write to the Free Software Foundation, Inc., 51 Franklin Street,
 # Fifth Floor, Boston, MA 02110-1301 USA.
 
-class Gdk::Pixbuf
+class GdkPixbuf::Pixbuf
   def tag(tag_pixbuf)
     # Computes some tweaks.
     tweak_x = tag_pixbuf.width / 3
     tweak_y = tag_pixbuf.height / 3
 
     # Creates the destination pixbuf.
-    new_pixbuf = Gdk::Pixbuf.new(Gdk::Pixbuf::COLORSPACE_RGB,
-                                 true,
-                                 8,
-                                 width + tweak_x,
-                                 height + tweak_y)
+    new_pixbuf = GdkPixbuf::Pixbuf.new(colorspace: :rgb,
+                                       has_alpha: true,
+                                       bits_per_sample: 8,
+                                       width: width + tweak_x,
+                                       height: height + tweak_y)
 
     # Fills with blank.
     new_pixbuf.fill!(0)
@@ -41,12 +41,12 @@ class Gdk::Pixbuf
     # Copies the tag pixbuf there (north-est).
     tag_pixbuf_x = width - (tweak_x * 2)
     new_pixbuf.composite!(tag_pixbuf,
-                          0, 0,
-                          tag_pixbuf.width + tag_pixbuf_x,
-                          tag_pixbuf.height,
-                          tag_pixbuf_x, 0,
-                          1, 1,
-                          Gdk::Pixbuf::INTERP_HYPER, 255)
+                          dest_x: 0, dest_y: 0,
+                          dest_width: tag_pixbuf.width + tag_pixbuf_x,
+                          dest_height: tag_pixbuf.height,
+                          offset_x: tag_pixbuf_x, offset_y: 0,
+                          scale_x: 1, scale_y: 1,
+                          interpolation_type: :hyper, overall_alpha: 255)
     new_pixbuf
   end
 end
@@ -63,11 +63,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 file =~ /\.png$/ # 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')
-          const_set(name, Gdk::Pixbuf.new(File.join(ICONS_DIR, file)))
+          const_set(name, GdkPixbuf::Pixbuf.new(file: File.join(ICONS_DIR, file)))
         end
       end
 
@@ -76,20 +76,20 @@ module Alexandria
           return BOOK_ICON if library.nil?
           filename = library.cover(book)
           if File.exist?(filename)
-            return Gdk::Pixbuf.new(filename)
+            return GdkPixbuf::Pixbuf.new(file: filename)
           end
         rescue => err
           # report load error; FIX should go to a Logger...
           puts err.message
           puts err.backtrace.join("\n> ")
-          puts "Failed to load Gdk::Pixbuf, please ensure that from #{filename} is a valid image file"
+          puts "Failed to load GdkPixbuf::Pixbuf, please ensure that from #{filename} is a valid image file"
         end
         BOOK_ICON
       end
 
       def self.blank?(filename)
-        pixbuf = Gdk::Pixbuf.new(filename)
-        pixbuf.width == 1 and pixbuf.height == 1
+        pixbuf = GdkPixbuf::Pixbuf.new(file: filename)
+        (pixbuf.width == 1) && (pixbuf.height == 1)
       rescue => err
         puts err.message
         puts err.backtrace.join("\n> ")

data/lib/alexandria/ui/iconview.rb

@@ -1,5 +1,6 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2008 Joseph Method
+# Copyright (C) 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
@@ -45,29 +46,23 @@ module Alexandria
         log.info { "setup_books_iconview #{@iconview_model.inspect}" }
         @iconview.model = @iconview_model
         log.info { "now @iconview.model = #{@iconview.model.inspect}" }
-        @iconview.selection_mode = Gtk::SELECTION_MULTIPLE
+        @iconview.selection_mode = :multiple
         @iconview.text_column = Columns::TITLE_REDUCED
         @iconview.pixbuf_column = Columns::COVER_ICON
-        @iconview.orientation = Gtk::ORIENTATION_VERTICAL
+        @iconview.item_orientation = :vertical
         @iconview.row_spacing = 4
         @iconview.column_spacing = 16
         @iconview.item_width = ICON_WIDTH + 16
 
         @iconview.signal_connect('selection-changed') do
           log.debug { 'selection-changed' }
-          @tooltips.hide_tooltip
           @parent.on_books_selection_changed
         end
 
         @iconview.signal_connect('item-activated') do
           log.debug { 'item-activated' }
-          # Dirty hack to avoid the beginning of a drag within this
-          # handler.
-          @tooltips.hide_tooltip
-          Gtk.timeout_add(100) do
-            @actiongroup['Properties'].activate
-            false
-          end
+          @actiongroup['Properties'].activate
+          false
         end
 
         # DND support for Gtk::IconView is shipped since GTK+ 2.8.0.
@@ -79,12 +74,12 @@ 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
         mode = ICONS_SORTS[@prefs.arrange_icons_mode]
         @iconview_model.set_sort_column_id(mode,
                                            @prefs.reverse_icons ? Gtk::SORT_DESCENDING : Gtk::SORT_ASCENDING)
-        @filtered_model.refilter    # force redraw
+        @filtered_model.refilter # force redraw
       end
     end
   end

data/lib/alexandria/ui/iconview_tooltips.rb

@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2007 kksou
 # Copyright (C) 2008,2009 Cathal Mc Ginley
-# Copyright (C) 2011, 2014 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
@@ -33,134 +33,47 @@ class IconViewTooltips
   include Alexandria::Logging
 
   def initialize(view)
-    @tooltip_window = Gtk::Window.new(Gtk::Window::POPUP)
-    @tooltip_window.name = 'gtk-tooltips'
-    @tooltip_window.resizable = false
-    @tooltip_window.border_width = 4
-    @tooltip_window.app_paintable = true
-
-    @tooltip_window.signal_connect('expose_event') { |window, event|
-      on_expose(window, event)
-    }
-
-    @tooltip_window.signal_connect('leave_notify_event') { |vw, event|
-      on_leave(vw, event)
-    }
-
-    @label = Gtk::Label.new('')
-    @label.wrap = true
-    @label.set_alignment(0.5, 0.5)
-    @label.use_markup = true
-    @label.show
-
-    @tooltip_window.add(@label)
     set_view(view)
   end
 
   def set_view(view)
-    view.signal_connect('motion_notify_event') { |vw, event|
-      on_motion(vw, event)
-    }
-    view.signal_connect('leave_notify_event') { |vw, event|
-      on_leave(vw, event)
-    }
-  end
-
-  def on_expose(window, _event)
-    # this paints a nice outline around the label
-    size = window.size_request
-    window.style.paint_flat_box(window.window,
-                                Gtk::STATE_NORMAL,
-                                Gtk::SHADOW_OUT,
-                                nil,
-                                @tooltip_window,
-                                'tooltip',
-                                0, 0, size[0], size[1])
-    # must return nil so the label contents get drawn correctly
-    nil
+    view.has_tooltip = true
+    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)
+
+        title = iter[2] # HACK: hardcoded, should use column names...
+        authors = iter[4]
+        publisher = iter[6]
+        year = iter[7]
+        tooltip.set_markup label_for_book(title, authors, publisher, year)
+      end
+    end
   end
 
   def label_for_book(title, authors, publisher, year)
     # This is much too complex... but it works for now!
     html = ''
-    if title.size > 0
+    unless title.empty?
       html += "<b>#{CGI.escapeHTML(title)}</b>"
-      if authors.size > 0
-        html += "\n"
-      end
+      html += "\n" unless authors.empty?
     end
-    if authors.size > 0
+    unless authors.empty?
       html += "<i>#{CGI.escapeHTML(authors)}</i>"
     end
-    if (title.size > 0) or (authors.size > 0)
-      html += "\n"
-    end
+    html += "\n" if !title.empty? || !authors.empty?
 
     html += '<small>'
-    if publisher and publisher.size > 0
-      html += "#{CGI.escapeHTML(publisher)}"
+    if publisher && !publisher.empty?
+      html += CGI.escapeHTML(publisher).to_s
     end
 
-    if year and year.size > 0
-      if publisher and publisher.size > 0
-        html += ' '
-      end
+    if year && !year.empty?
+      html += ' ' if publisher && !publisher.empty?
       html += "(#{year})"
     end
 
     html + '</small>'
   end
-
-  def on_motion(view, event)
-    tree_path = view.get_path(event.x, event.y)
-    # TODO translate path a few times, for sorting & filtering...
-    # hmmm, actually seems to work. Report a bug if you can spot a failure
-    if tree_path
-      iter = view.model.get_iter(tree_path)
-      if @latest_iter.nil?
-        @latest_iter = iter
-
-        @tooltip_timeout_id = Gtk.timeout_add(250) do
-          if @latest_iter == iter
-
-            title = iter[2] # HACK hardcoded, should use column names...
-            authors = iter[4]
-            publisher = iter[6]
-            year = iter[7]
-            @label.markup = label_for_book(title, authors, publisher, year)
-            ## "<b>#{title}</b>\n<i>#{authors}</i>\n<small>#{publisher} <i>(#{year})</i></small>"
-            size = @tooltip_window.size_request
-            @tooltip_window.move(event.x_root - size[0],
-                                 event.y_root + 12)
-            @tooltip_window.show
-            # don't run again
-            false
-          else
-            @tooltip_timeout_id = nil
-          end
-        end
-
-      elsif @latest_iter != iter
-        hide_tooltip
-      end
-
-    else
-      hide_tooltip
-    end
-  end
-
-  def hide_tooltip
-    unless @tooltip_window.nil?
-      @tooltip_window.hide
-      if @tooltip_timeout_id
-        Gtk.timeout_remove(@tooltip_timeout_id)
-        @tooltip_timeout_id = nil
-      end
-      @latest_iter = nil
-    end
-  end
-
-  def on_leave(_view, _event)
-    @tooltip_window.hide
-  end
 end

data/lib/alexandria/ui/init.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
@@ -21,11 +21,11 @@ class CellRendererToggle < Gtk::CellRendererToggle
   attr_accessor :text
   type_register
   install_property(GLib::Param::String.new(
-    'text',
-    'text',
-    'Some damn value',
-    '',
-    GLib::Param::READABLE | GLib::Param::WRITABLE))
+                     'text',
+                     'text',
+                     'Some damn value',
+                     '',
+                     GLib::Param::READABLE | GLib::Param::WRITABLE))
 end
 
 class Gtk::ActionGroup
@@ -68,19 +68,11 @@ class Alexandria::BookProviders::AbstractProvider
   end
 end
 
-module Pango
-  def self.ellipsizable?
-    @ellipsizable ||= Pango.constants.include?('ELLIPSIZE_END')
-  end
-end
-
 module Alexandria
   module UI
     def self.display_help(parent = nil, section = nil)
       section_index = ''
-      if section
-        section_index = "##{section}"
-      end
+      section_index = "##{section}" if section
       exec("gnome-help ghelp:alexandria#{section_index}") if fork.nil?
     rescue
       log.error(self) { 'Unable to load help browser' }

data/lib/alexandria/ui/libraries_combo.rb

@@ -1,4 +1,5 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
+# Copyright (C) 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
@@ -16,60 +17,65 @@
 # Fifth Floor, Boston, MA 02110-1301 USA.
 
 # Ideally this would be a subclass of GtkComboBox, but...
-class Gtk::ComboBox
-  include GetText
-  extend GetText
-  GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
 
-  def populate_with_libraries(libraries, selected_library)
-    libraries_names = libraries.map(&:name)
-    if selected_library
-      libraries_names.delete selected_library.name
-      libraries_names.unshift selected_library.name
-    end
-    clear
-    set_row_separator_func do |_model, iter|
-      iter[1] == '-'
-    end
-    self.model = Gtk::ListStore.new(Gdk::Pixbuf, String, TrueClass)
-    libraries_names.each do |library_name|
+module Alexandria
+  module ComboBoxOverrides
+    include GetText
+    extend GetText
+    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
+
+    def populate_with_libraries(libraries, selected_library)
+      libraries_names = libraries.map(&:name)
+      if selected_library
+        libraries_names.delete selected_library.name
+        libraries_names.unshift selected_library.name
+      end
+      clear
+      set_row_separator_func do |model, iter|
+        model.get_value(iter, 1) == '-'
+      end
+      self.model = Gtk::ListStore.new(GdkPixbuf::Pixbuf, String, TrueClass)
+      libraries_names.each do |library_name|
+        iter = model.append
+        iter[0] = Alexandria::UI::Icons::LIBRARY_SMALL
+        iter[1] = library_name
+        iter[2] = false
+      end
+      model.append[1] = '-'
       iter = model.append
       iter[0] = Alexandria::UI::Icons::LIBRARY_SMALL
-      iter[1] = library_name
-      iter[2] = false
+      iter[1] = _('New Library')
+      iter[2] = true
+      renderer = Gtk::CellRendererPixbuf.new
+      pack_start(renderer, false)
+      set_attributes(renderer, pixbuf: 0)
+      renderer = Gtk::CellRendererText.new
+      pack_start(renderer, true)
+      set_attributes(renderer, text: 1)
+      self.active = 0
+      # self.sensitive = libraries.length > 1
+      # This prohibits us from adding a "New Library" from this combo
+      # when we only have a single library
     end
-    model.append[1] = '-'
-    iter = model.append
-    iter[0] = Alexandria::UI::Icons::LIBRARY_SMALL
-    iter[1] = _('New Library')
-    iter[2] = true
-    renderer = Gtk::CellRendererPixbuf.new
-    pack_start(renderer, false)
-    set_attributes(renderer, pixbuf: 0)
-    renderer = Gtk::CellRendererText.new
-    pack_start(renderer, true)
-    set_attributes(renderer, text: 1)
-    self.active = 0
-    # self.sensitive = libraries.length > 1
-    # This prohibits us from adding a "New Library" from this combo
-    # when we only have a single library
-  end
 
-  def selection_from_libraries(libraries)
-    iter = active_iter
-    is_new = false
-    library = nil
-    if iter[2]
-      name = Alexandria::Library.generate_new_name(libraries)
-      library = Alexandria::Library.load(name)
-      libraries << library
-      is_new = true
-    else
-      library = libraries.find do |x|
-        x.name == active_iter[1]
+    def selection_from_libraries(libraries)
+      iter = active_iter
+      is_new = false
+      library = nil
+      if iter[2]
+        name = Alexandria::Library.generate_new_name(libraries)
+        library = Alexandria::Library.load(name)
+        libraries << library
+        is_new = true
+      else
+        library = libraries.find do |x|
+          x.name == active_iter[1]
+        end
       end
+      raise unless library
+      [library, is_new]
     end
-    raise unless library
-    [library, is_new]
   end
 end
+
+Gtk::ComboBox.prepend Alexandria::ComboBoxOverrides