alexandria-book-collection-manager 0.6.9 → 0.7.0

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

@@ -1,5 +1,5 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
-# 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
@@ -32,9 +32,8 @@ module Alexandria
       def initialize(*args)
         super(*args)
 
-        self.has_separator = false
         self.resizable = false
-        vbox.border_width = 12
+        child.border_width = 12
 
         @controls = []
       end
@@ -73,7 +72,7 @@ module Alexandria
             entry.text = variable.value.to_s
             entry.mandatory = variable.mandatory?
           else
-            entry = Gtk::ComboBox.new
+            entry = Gtk::ComboBoxText.new
             variable.possible_values.each do |value|
               entry.append_text(value.to_s)
             end
@@ -107,17 +106,14 @@ module Alexandria
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
 
       def initialize(parent, provider)
-        super(_('Preferences for %s') % provider.fullname,
-              parent,
-              Gtk::Dialog::MODAL,
-              [Gtk::Stock::CLOSE, Gtk::Dialog::RESPONSE_CLOSE])
-        self.has_separator = false
-        self.resizable = false
-        vbox.border_width = 12
+        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)
-        vbox.pack_start(table)
+        child.pack_start(table)
 
         signal_connect('destroy') { sync_variables }
 
@@ -135,9 +131,9 @@ module Alexandria
         super(_('New Provider'),
               parent,
               Gtk::Dialog::MODAL,
-              [Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL])
+              [Gtk::Stock::CANCEL, :cancel])
         @add_button = add_button(Gtk::Stock::ADD,
-                                 Gtk::Dialog::RESPONSE_ACCEPT)
+                                 :accept)
 
         instances = BookProviders.abstract_classes.map(&:new)
         @selected_instance = nil
@@ -172,7 +168,7 @@ module Alexandria
           @selected_instance = instances[cb.active]
           fill_table(@table, @selected_instance)
           sensitize
-          # FIXME this should be re-written once we have multiple
+          # FIXME: this should be re-written once we have multiple
           # abstract providers.
         end
         combo_type.active = 0
@@ -180,7 +176,7 @@ module Alexandria
         @table.attach_defaults(combo_type, 1, 2, 1, 2)
 
         show_all
-        if run == Gtk::Dialog::RESPONSE_ACCEPT
+        if run == :accept
           @selected_instance.reinitialize(entry_name.text)
           sync_variables
         else
@@ -291,8 +287,7 @@ module Alexandria
         { sensitize_providers }
 
         @button_prov_setup.sensitive = false
-        @button_prov_up.sensitive =  @button_prov_down.sensitive =
-          BookProviders.length > 1
+        @button_prov_up.sensitive = @button_prov_down.sensitive = BookProviders.length > 1
 
         @buttonbox_prov.set_child_secondary(@button_prov_add, true)
         @buttonbox_prov.set_child_secondary(@button_prov_remove, true)
@@ -337,7 +332,7 @@ module Alexandria
           iter = @scanner_device_model.append
           iter[0] = scanner.display_name
           iter[1] = scanner.name
-          if (chosen_scanner_name == scanner.name)
+          if chosen_scanner_name == scanner.name
             @scanner_device_type.active = index
           end
           index += 1
@@ -350,7 +345,7 @@ 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(_('Disable Provider'))
+        @enable_item = Gtk::MenuItem.new(label: _('Disable Provider'))
         @enable_item.signal_connect('activate') {
           prov = selected_provider
           prov.toggle_enabled
@@ -363,7 +358,8 @@ module Alexandria
           if event_is_right_click(event)
             if (path = widget.get_path_at_pos(event.x, event.y))
               widget.grab_focus
-              obj, path = widget.selection, path.first
+              obj = widget.selection
+              path = path.first
               unless obj.path_is_selected?(path)
                 widget.unselect_all
                 obj.select_path(path)
@@ -373,7 +369,7 @@ module Alexandria
                 already_enabled = sel[2]
                 message = already_enabled ? _('Disable Provider') : _('Enable Provider')
                 @enable_item.label = message
-                Gtk.idle_add do
+                GLib::Idle.add do
                   @enable_disable_providers_menu.popup(nil, nil, event.button, event.time)
                   false
                 end
@@ -389,12 +385,12 @@ module Alexandria
           selected_prov = @treeview_providers.selection.selected
           puts selected_prov.inspect
           if selected_prov
-            Gtk.idle_add do
+            GLib::Idle.add do
               already_enabled = selected_prov[2]
               message = already_enabled ? _('Disable Provider') : _('Enable Provider')
               @enable_item.label = message
 
-              @enable_disable_providers_menu.popup(nil, nil, 0, Gdk::Event::CURRENT_TIME)
+              @enable_disable_providers_menu.popup(nil, nil, 0, :current_time)
               false
             end
           else
@@ -404,11 +400,11 @@ module Alexandria
       end
 
       def event_is_right_click(event)
-        event.event_type == Gdk::Event::BUTTON_PRESS and event.button == 3
+        (event.event_type == :button_press) && (event.button == 3)
       end
 
       def prefs_empty(prefs)
-        prefs.empty? or (prefs.size == 1 and prefs.first.name == 'enabled')
+        prefs.empty? || ((prefs.size == 1) && (prefs.first.name == 'enabled'))
       end
 
       def on_provider_setup
@@ -474,15 +470,15 @@ module Alexandria
                                    "'%s'?") % provider.fullname,
                                  Gtk::Stock::DIALOG_QUESTION,
                                  [[Gtk::Stock::CANCEL,
-                                   Gtk::Dialog::RESPONSE_CANCEL],
+                                   :cancel],
                                   [Gtk::Stock::DELETE,
-                                   Gtk::Dialog::RESPONSE_OK]],
+                                   :ok]],
                                  _('If you continue, the provider and ' \
                                    'all of its preferences will be ' \
                                    'permanently deleted.'))
-        dialog.default_response = Gtk::Dialog::RESPONSE_CANCEL
+        dialog.default_response = Gtk::ResponseType::CANCEL
         dialog.show_all
-        if dialog.run == Gtk::Dialog::RESPONSE_OK
+        if dialog.run == :ok
           provider.remove
           BookProviders.update_priority
           reload_providers
@@ -500,9 +496,7 @@ module Alexandria
 
       def on_providers_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_provider_setup
         end
       end
@@ -524,11 +518,11 @@ module Alexandria
         model.clear
         BookProviders.each_with_index do |x, index|
           iter = model.append
-          if x.enabled
-            iter[0] = x.fullname
-          else
-            iter[0] = "<i>#{x.fullname}</i>"
-          end
+          iter[0] = if x.enabled
+                      x.fullname
+                    else
+                      "<i>#{x.fullname}</i>"
+                    end
           iter[1] = x.name
           iter[2] = x.enabled
           iter[3] = index
@@ -544,11 +538,11 @@ module Alexandria
 
       def adjust_selected_provider(prov)
         iter = @treeview_providers.selection.selected
-        if prov.enabled
-          iter[0] = prov.fullname
-        else
-          iter[0] = "<i>#{prov.fullname}</i>"
-        end
+        iter[0] = if prov.enabled
+                    prov.fullname
+                  else
+                    "<i>#{prov.fullname}</i>"
+                  end
         iter[2] = prov.enabled
       end
 

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

@@ -21,29 +21,30 @@ module Alexandria
       include GetText
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
 
-      def initialize(parent, smart_library, &block)
+      def initialize(parent, smart_library)
         super(parent)
 
-        add_buttons([Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL],
-                    [Gtk::Stock::SAVE, Gtk::Dialog::RESPONSE_OK])
+        add_buttons([Gtk::Stock::CANCEL, :cancel],
+                    [Gtk::Stock::SAVE, :ok])
 
         self.title = _("Properties for '%s'") % smart_library.name
-        self.default_response = Gtk::Dialog::RESPONSE_CANCEL
+        # FIXME: Should accept just :cancel
+        self.default_response = Gtk::ResponseType::CANCEL
 
         show_all
         smart_library.rules.each { |x| insert_new_rule(x) }
         update_rules_header_box(smart_library.predicate_operator_rule)
 
-        while (response = run) != Gtk::Dialog::RESPONSE_CANCEL
-          if response == Gtk::Dialog::RESPONSE_HELP
+        while (response = run) != :cancel
+          if response == :help
             Alexandria::UI.display_help(self, 'edit-smart-library')
-          elsif response == Gtk::Dialog::RESPONSE_OK
+          elsif response == :ok
             if user_confirms_possible_weirdnesses_before_saving?
               smart_library.rules = smart_library_rules
               smart_library.predicate_operator_rule =
                 predicate_operator_rule
               smart_library.save
-              block.call(smart_library)
+              yield(smart_library)
               break
             end
           end

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

@@ -1,5 +1,5 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
-# 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
@@ -26,37 +26,38 @@ module Alexandria
       attr_reader :predicate_operator_rule
 
       def initialize(parent)
-        super('', parent, Gtk::Dialog::MODAL,
-              [Gtk::Stock::HELP, Gtk::Dialog::RESPONSE_HELP])
+        super(title: '',
+              parent: parent,
+              flags: :modal,
+              buttons: [[Gtk::Stock::HELP, :help]])
 
-        self.window_position = Gtk::Window::POS_CENTER
-        self.has_separator = false
+        self.window_position = :center
         self.resizable = true
         self.border_width = 4
-        vbox.border_width = 12
+        child.border_width = 12
 
-        main_box = Gtk::VBox.new
+        main_box = Gtk::Box.new :vertical
         main_box.border_width = 4
         main_box.spacing = 8
 
-        vbox << main_box
+        child << main_box
 
         @smart_library_rules = []
 
-        @rules_header_box = Gtk::HBox.new
+        @rules_header_box = Gtk::Box.new :horizontal
         @rules_header_box.spacing = 2
 
-        @rules_box = Gtk::VBox.new
+        @rules_box = Gtk::Box.new :vertical
         @rules_box.spacing = 8
         @rules_box.border_width = 8
 
         scrollview = Gtk::ScrolledWindow.new
-        scrollview.hscrollbar_policy = Gtk::POLICY_NEVER
-        scrollview.vscrollbar_policy = Gtk::POLICY_AUTOMATIC
+        scrollview.hscrollbar_policy = :never
+        scrollview.vscrollbar_policy = :automatic
         scrollview.set_size_request(-1, 125)
         scrollview.add_with_viewport(@rules_box)
 
-        main_box.pack_start(@rules_header_box, false, false, 0)
+        main_box.pack_start(@rules_header_box, expand: false, fill: false)
         main_box << scrollview
         setup_calendar_widgets
       end
@@ -82,15 +83,15 @@ module Alexandria
           self,
           _('Empty or conflictive condition'),
           Gtk::Stock::DIALOG_QUESTION,
-          [[Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL],
-           [_('_Save However'), Gtk::Dialog::RESPONSE_YES]],
+          [[Gtk::Stock::CANCEL, :cancel],
+           [_('_Save However'), :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::Dialog::RESPONSE_CANCEL
+        dialog.default_response = Gtk::ResponseType::CANCEL
         dialog.show_all
-        confirmed = dialog.run == Gtk::Dialog::RESPONSE_YES
+        confirmed = dialog.run == :yes
         dialog.destroy
         confirmed
       end
@@ -103,10 +104,10 @@ module Alexandria
           label1.set_alignment(0.0, 0.5)
           label1.text = _('Match')
 
-          cb = Gtk::ComboBox.new
+          cb = Gtk::ComboBoxText.new
           [_('all'), _('any')].each { |x| cb.append_text(x) }
           cb.signal_connect('changed') do
-            @predicate_operator_rule = cb.active == 0 ? SmartLibrary::ALL_RULES : SmartLibrary::ANY_RULE
+            @predicate_operator_rule = cb.active.zero? ? SmartLibrary::ALL_RULES : SmartLibrary::ANY_RULE
           end
           cb.active =
             predicate_operator_rule == SmartLibrary::ALL_RULES ? 0 : 1
@@ -115,9 +116,9 @@ module Alexandria
           label2.set_alignment(0.0, 0.5)
           label2.text = _('of the following rules:')
 
-          @rules_header_box.pack_start(label1, false, false, 0)
-          @rules_header_box.pack_start(cb, false, false, 0)
-          @rules_header_box.pack_start(label2, false, false, 0)
+          @rules_header_box.pack_start(label1, expand: false, fill: false)
+          @rules_header_box.pack_start(cb, expand: false, fill: false)
+          @rules_header_box.pack_start(label2, expand: false, fill: false)
         else
           label = Gtk::Label.new
           label.set_alignment(0.0, 0.5)
@@ -130,15 +131,11 @@ module Alexandria
       end
 
       def insert_new_rule(rule = nil)
-        rule_box = Gtk::HBox.new
+        rule_box = Gtk::Box.new :horizontal
         rule_box.spacing = 8
 
-        left_operand_combo = Gtk::ComboBox.new
-        operator_combo = Gtk::ComboBox.new
-        operator_model = Gtk::ListStore.new(String)
-        # we can't just pass the model to the combo constructor,
-        # it doesn't seem to work properly
-        operator_combo.model = operator_model
+        left_operand_combo = Gtk::ComboBoxText.new
+        operator_combo = Gtk::ComboBoxText.new
 
         value_entry = Gtk::Entry.new
 
@@ -157,17 +154,17 @@ module Alexandria
         # ##date_entry.spacing = 8
         entry_label = Gtk::Label.new('')
 
-        add_button = Gtk::Button.new('')
+        add_button = Gtk::Button.new(label: '')
         add_button.remove(add_button.children.first)
-        add_button << Gtk::Image.new(Gtk::Stock::ADD,
-                                     Gtk::IconSize::BUTTON)
+        add_button << Gtk::Image.new(stock: Gtk::Stock::ADD,
+                                     size: Gtk::IconSize::BUTTON)
 
         add_button.signal_connect('clicked') { insert_new_rule }
 
-        remove_button = Gtk::Button.new('')
+        remove_button = Gtk::Button.new(label: '')
         remove_button.remove(remove_button.children.first)
-        remove_button << Gtk::Image.new(Gtk::Stock::REMOVE,
-                                        Gtk::IconSize::BUTTON)
+        remove_button << Gtk::Image.new(stock: Gtk::Stock::REMOVE,
+                                        size: Gtk::IconSize::BUTTON)
 
         remove_button.signal_connect('clicked') do |_button|
           idx = @rules_box.children.index(rule_box)
@@ -187,8 +184,7 @@ module Alexandria
           operations = SmartLibrary::Rule.operations_for_operand(operand)
           operation = operations[operator_combo.active]
 
-          value_entry.visible = date_entry.visible =
-            entry_label.visible = false
+          value_entry.visible = date_entry.visible = entry_label.visible = false
           right_operand = operation.last
           unless right_operand.nil?
             entry = case right_operand.klass.name
@@ -219,30 +215,28 @@ module Alexandria
         left_operand_combo.signal_connect('changed') do
           operand = operands[left_operand_combo.active]
           operator_combo.freeze_notify do
-            operator_combo.model.clear
+            operator_combo.remove_all
             operations = SmartLibrary::Rule.operations_for_operand(operand)
             operations.each do |operation|
               operator = operation.first
-              iter = operator_combo.model.append
-              iter[0] = operator.name
+              operator_combo.append_text(operator.name)
             end
             operator_combo.active = 0
           end
         end
 
-        rule_box.pack_start(left_operand_combo, false, false, 0)
-        rule_box.pack_start(operator_combo, false, false, 0)
+        rule_box.pack_start(left_operand_combo, expand: false, fill: false)
+        rule_box.pack_start(operator_combo, expand: false, fill: false)
         rule_box.pack_start(value_entry)
         rule_box.pack_start(date_entry)
-        rule_box.pack_start(entry_label, false, false, 0)
-        rule_box.pack_end(remove_button, false, false, 0)
-        rule_box.pack_end(add_button, false, false, 0)
+        rule_box.pack_start(entry_label, expand: false, fill: false)
+        rule_box.pack_end(remove_button, expand: false, fill: false)
+        rule_box.pack_end(add_button, expand: false, fill: false)
 
         rule_box.show_all
-        value_entry.visible = date_entry.visible = entry_label.visible =
-          false
+        value_entry.visible = date_entry.visible = entry_label.visible = false
 
-        @rules_box.pack_start(rule_box, false, true, 0)
+        @rules_box.pack_start(rule_box, expand: false, fill: true)
 
         if rule
           operand_idx = operands.index(rule.operand)
@@ -250,7 +244,7 @@ module Alexandria
             SmartLibrary::Rule.operations_for_operand(rule.operand)
           operation_idx = operations.map(&:first).index(rule.operation)
 
-          if !operand_idx.nil? and !operation_idx.nil?
+          if !operand_idx.nil? && !operation_idx.nil?
             left_operand_combo.active = operand_idx
             operator_combo.active = operation_idx
             unless rule.value.nil?
@@ -266,7 +260,7 @@ module Alexandria
           left_operand_combo.active = 0
         end
 
-        @rules_box.check_resize     # force a layout
+        @rules_box.check_resize # force a layout
         update_rules_header_box
         sensitize_remove_rule_buttons
       end
@@ -313,10 +307,10 @@ module Alexandria
         @calendar_popup.decorated = false
         @calendar_popup.skip_taskbar_hint = true
         @calendar_popup.skip_pager_hint = true
-        @calendar_popup.events = [Gdk::Event::FOCUS_CHANGE_MASK]
+        @calendar_popup.events = [:focus_change_mask]
 
         @calendar_popup.set_transient_for(self)
-        @calendar_popup.set_type_hint(Gdk::Window::TYPE_HINT_DIALOG)
+        @calendar_popup.set_type_hint(:dialog)
         @calendar_popup.name = 'calendar-popup'
         @calendar_popup.resizable = false
         # @calendar_popup.border_width = 4
@@ -360,7 +354,7 @@ module Alexandria
         @calendar_popup.hide_all
         self.modal = true
 
-        Gtk.timeout_add(150) do
+        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