alexandria-book-collection-manager 0.7.5 → 0.7.9

data/lib/alexandria/ui/bad_isbns_dialog.rb

@@ -8,17 +8,16 @@ module Alexandria
   module UI
     # Generalized Dialog for lists of bad isbns. Used for on_import. Can also
     # be used for on_load library conversions.
-    class BadIsbnsDialog < SimpleDelegator
+    class BadIsbnsDialog
       def initialize(parent, message, list)
-        dialog = Gtk::MessageDialog.new(parent: parent,
-                                        flags: :modal,
-                                        type: :warning,
-                                        buttons: :close,
-                                        message: message)
-        super(dialog)
+        @dialog = Gtk::MessageDialog.new(parent: parent,
+                                         flags: :modal,
+                                         type: :warning,
+                                         buttons: :close,
+                                         message: message)
+        the_vbox = @dialog.children.first
 
         isbn_container = Gtk::Box.new :horizontal
-        the_vbox = children.first
         the_vbox.pack_start(isbn_container)
         the_vbox.reorder_child(isbn_container, 3)
         scrolley = Gtk::ScrolledWindow.new
@@ -30,7 +29,12 @@ module Alexandria
         list.each do |li|
           textview.buffer.insert_at_cursor("#{li}\n")
         end
-        show_all
+
+        @dialog.signal_connect("response") { @dialog.destroy }
+      end
+
+      def show
+        @dialog.show_all
       end
     end
   end

data/lib/alexandria/ui/barcode_animation.rb

@@ -96,11 +96,11 @@ module Alexandria
       end
 
       def set_passive
-        if @canvas
-          passive_bg = "#F4F4F4"
-          @canvas.set_property(:background_color, passive_bg)
-          @barcode_bars.each { |rect| rect.set_property(:fill_color, passive_bg) }
-        end
+        @canvas or return
+
+        passive_bg = "#F4F4F4"
+        @canvas.set_property(:background_color, passive_bg)
+        @barcode_bars.each { |rect| rect.set_property(:fill_color, passive_bg) }
       end
 
       def manual_input
@@ -121,7 +121,7 @@ module Alexandria
         until d.empty?
           space_width = d[0].chr.to_i
           bar_width = d[1].chr.to_i
-          d = d[2..-1]
+          d = d[2..]
           @barcode_data << [space_width, bar_width]
         end
       end

data/lib/alexandria/ui/book_properties_dialog.rb

@@ -9,14 +9,13 @@ require "alexandria/ui/error_dialog"
 module Alexandria
   module UI
     class BookPropertiesDialog < BookPropertiesDialogBase
-      include Logging
       include GetText
       extend GetText
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
       def initialize(parent, library, book)
         super(parent, library.cover(book))
-        puts "Initializing Book Properties Dialog..." if $DEBUG
+        log.debug { "Initializing Book Properties Dialog" }
 
         cancel_button = Gtk::Button.new(stock_id: Gtk::Stock::CANCEL)
         cancel_button.signal_connect("clicked") { on_cancel }
@@ -86,7 +85,7 @@ module Alexandria
         if (@checkbutton_redd.active = book.redd?)
           @redd_date.sensitive = true
           if book.redd_when.nil?
-            puts "no redd_when"
+            log.debug { "no redd_when" }
           else
             @redd_date.text = format_date(book.redd_when)
           end

data/lib/alexandria/ui/book_properties_dialog_base.rb

@@ -5,11 +5,14 @@
 # See the file README.md for authorship and licensing information.
 
 require "alexandria/ui/builder_base"
+require "alexandria/ui/calendar_popup"
 require "alexandria/ui/error_dialog"
 
 module Alexandria
   module UI
     class BookPropertiesDialogBase < BuilderBase
+      include CalendarPopup
+      include Logging
       include GetText
       extend GetText
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
@@ -51,7 +54,7 @@ module Alexandria
                                       editable: 1)
         @treeview_authors.append_column(col)
 
-        setup_calendar_widgets
+        setup_date_widgets
         GLib::Timeout.add(150) do
           @setup_finished = true
 
@@ -59,130 +62,31 @@ module Alexandria
         end
       end
 
-      def setup_calendar_widgets
-        @popup_displayed = false
-        @calendar_popup = Gtk::Window.new # Gtk::Window::POPUP)
-        # @calendar_popup.modal = true
-        @calendar_popup.decorated = false
-        @calendar_popup.skip_taskbar_hint = true
-        @calendar_popup.skip_pager_hint = true
-        @calendar_popup.events = [:focus_change_mask]
-
-        @calendar_popup.set_transient_for(@book_properties_dialog)
-        @calendar_popup.set_type_hint :dialog
-        @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|
-          hide_calendar_popup
-          false
-        end
-
-        @calendar = Gtk::Calendar.new
-        @calendar_popup.add(@calendar)
-
-        @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
-          day = date_arr[2]
-          if @calendar_popup_for_entry
-            time = Time.gm(year, month, day)
-            @calendar_popup_for_entry.text = format_date(time)
-          end
-        end
-
-        @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
-          day = date_arr[2]
-          if @calendar_popup_for_entry
-            time = Time.gm(year, month, day)
-            @calendar_popup_for_entry.text = format_date(time)
-          end
-          hide_calendar_popup
-        end
+      def show
+        @book_properties_dialog.show
+      end
 
+      def setup_date_widgets
         @redd_date.signal_connect("icon-press") do |entry, primary, _icon|
-          if primary.nick == "primary"
+          case primary.nick
+          when "primary"
             display_calendar_popup(entry)
-          elsif primary.nick == "secondary"
+          when "secondary"
             clear_date_entry(entry)
           end
         end
 
         @date_loaned_since.signal_connect("icon-press") do |entry, primary, _icon|
-          if primary.nick == "primary"
+          case primary.nick
+          when "primary"
             display_calendar_popup(entry)
-          elsif primary.nick == "secondary"
+          when "secondary"
             clear_date_entry(entry)
             @label_loaning_duration.label = ""
           end
         end
       end
 
-      def clear_date_entry(entry)
-        entry.text = ""
-      end
-
-      def hide_calendar_popup
-        @calendar_popup_for_entry = nil
-
-        @calendar_popup.hide_all
-        @book_properties_dialog.modal = true
-
-        GLib::Timeout.add(150) do
-          # If we set @popup_displayed=false immediately, then a click
-          # event on the primary icon of the Entry simultaneous with
-          # the focus-out-event of the Calendar causes the Calendar to
-          # pop up again milliseconds after being closed.
-          #
-          # This is never what the user intends.
-          #
-          # So we add a small delay before the primary icon's event
-          # handler is told to pop up the calendar in response to
-          # clicks.
-
-          @popup_displayed = false
-          false
-        end
-      end
-
-      def display_calendar_popup(entry)
-        if @popup_displayed
-          hide_calendar_popup
-        else
-          @calendar_popup_for_entry = entry
-          unless entry.text.strip.empty?
-            time = parse_date(entry.text)
-            unless time.nil?
-              @calendar.year = time.year
-              @calendar.month = time.month - 1
-              @calendar.day = time.day
-            end
-          end
-          @book_properties_dialog.modal = false
-          @calendar_popup.move(*get_entry_popup_coords(entry))
-          @calendar_popup.show_all
-          @popup_displayed = true
-        end
-      end
-
-      def get_entry_popup_coords(entry)
-        gdk_win = entry.parent_window
-        x, y = gdk_win.origin
-        alloc = entry.allocation
-        x += alloc.x
-        y += alloc.y
-        y += alloc.height
-        # x = [0, x].max
-        # y = [0, y].max
-        [x, y]
-      end
-
       def widget_names
         [:book_properties_dialog, :button_box, :button_cover,
          :checkbutton_loaned, :checkbutton_own, :checkbutton_redd,
@@ -242,39 +146,32 @@ module Alexandria
       end
 
       def own_toggled
-        @checkbutton_want.inconsistent = if @checkbutton_own.active?
-                                           true
-                                         else
-                                           false
-                                         end
+        @checkbutton_want.inconsistent = @checkbutton_own.active?
       end
 
       def want_toggled; end
 
       @@latest_filechooser_directory = ENV["HOME"]
       def on_change_cover
-        backend = `uname`.chomp == "FreeBSD" ? "neant" : "gnome-vfs"
-        dialog = Gtk::FileChooserDialog.new(_("Select a cover image"),
-                                            @book_properties_dialog,
-                                            Gtk::FileChooser::ACTION_OPEN,
-                                            backend,
-                                            [_("No Cover"), Gtk::ResponseType::REJECT],
-                                            [Gtk::Stock::CANCEL, Gtk::ResponseType::CANCEL],
-                                            [Gtk::Stock::OPEN, Gtk::ResponseType::ACCEPT])
+        dialog = Gtk::FileChooserDialog.new(title: _("Select a cover image"),
+                                            parent: @book_properties_dialog,
+                                            action: :open,
+                                            buttons: [[_("No Cover"), :reject],
+                                                      [Gtk::Stock::CANCEL, :cancel],
+                                                      [Gtk::Stock::OPEN, :accept]])
         dialog.current_folder = @@latest_filechooser_directory
         response = dialog.run
-        if response == Gtk::ResponseType::ACCEPT
+        case response
+        when Gtk::ResponseType::ACCEPT
           begin
             @delete_cover_file = false
             cover = GdkPixbuf::Pixbuf.new(file: dialog.filename)
             # At this stage the file format is recognized.
 
-            if File.exist?(@cover_file)
-              unless @original_cover_file
-                # make a back up, but only of the original
-                @original_cover_file = "#{@cover_file}~"
-                FileUtils.cp(@cover_file, @original_cover_file)
-              end
+            if File.exist?(@cover_file) && !@original_cover_file
+              # make a back up, but only of the original
+              @original_cover_file = "#{@cover_file}~"
+              FileUtils.cp(@cover_file, @original_cover_file)
             end
             if cover.height > COVER_ABSOLUTE_MAXHEIGHT
               FileUtils.cp(dialog.filename, "#{@cover_file}.orig")
@@ -294,7 +191,7 @@ module Alexandria
           rescue RuntimeError => ex
             ErrorDialog.new(@book_properties_dialog, ex.message).display
           end
-        elsif response == Gtk::ResponseType::REJECT
+        when Gtk::ResponseType::REJECT
           ## FileUtils.rm_f(@cover_file) # fixing bug #16707
           @delete_cover_file = true
 
@@ -347,10 +244,11 @@ module Alexandria
       def redd_toggled
         redd_yes = @checkbutton_redd.active?
         @redd_date.sensitive = redd_yes
-        if @setup_finished
-          # don't do this when popping up the dialog for the first time
-          display_calendar_popup(@redd_date) if redd_yes && @redd_date.text.strip.empty?
-        end
+
+        return unless redd_yes && @redd_date.text.strip.empty?
+
+        # don't do this when popping up the dialog for the first time
+        display_calendar_popup(@redd_date) if @setup_finished
       end
 
       private
@@ -363,10 +261,10 @@ module Alexandria
           @image_rating4,
           @image_rating5
         ]
-        raise "out of range" if rating < 0 || rating > images.length
+        raise _("out of range") if rating < 0 || rating > images.length
 
         images[0..rating - 1].each { |x| x.pixbuf = Icons::STAR_SET }
-        images[rating..-1].each { |x| x.pixbuf = Icons::STAR_UNSET }
+        images[rating..].each { |x| x.pixbuf = Icons::STAR_UNSET }
         @current_rating = rating
       end
 

data/lib/alexandria/ui/calendar_popup.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+# This file is part of Alexandria.
+#
+# See the file README.md for authorship and licensing information.
+
+module Alexandria
+  module UI
+    module CalendarPopup
+      def setup_calendar_widgets
+        @calendar_popup = Gtk::Popover.new
+        @calendar_popup.position = :bottom
+
+        @calendar = Gtk::Calendar.new
+        @calendar.show
+        @calendar_popup.add(@calendar)
+
+        @calendar.signal_connect("day-selected") do
+          assign_selected_date
+        end
+
+        @calendar.signal_connect("day-selected-double-click") do
+          assign_selected_date
+          @calendar_popup.hide
+        end
+      end
+
+      def assign_selected_date
+        date_arr = @calendar.date
+        year = date_arr[0]
+        month = date_arr[1] # + 1 # gtk : months 0-indexed, Time.gm : 1-index
+        day = date_arr[2]
+        time = Time.gm(year, month, day)
+        @calendar_popup_for_entry.text = format_date(time)
+      end
+
+      def clear_date_entry(entry)
+        entry.text = ""
+      end
+
+      def display_calendar_popup(entry)
+        setup_calendar_widgets unless defined? @calendar_popup
+
+        @calendar_popup_for_entry = entry
+        unless entry.text.strip.empty?
+          time = parse_date(entry.text)
+          unless time.nil?
+            @calendar.year = time.year
+            @calendar.month = time.month - 1
+            @calendar.day = time.day
+          end
+        end
+        @calendar_popup.set_relative_to(entry)
+        @calendar_popup.popup
+      end
+    end
+  end
+end