alexandria-book-collection-manager 0.7.3 → 0.7.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/dependabot.yml +9 -0
- data/.github/workflows/ruby.yml +77 -0
- data/.gitignore +4 -1
- data/.rubocop.yml +86 -36
- data/.rubocop_todo.yml +58 -161
- data/.simplecov +5 -2
- data/CHANGELOG.md +56 -2
- data/Gemfile +4 -3
- data/INSTALL.md +23 -11
- data/README.md +52 -41
- data/Rakefile +78 -75
- data/alexandria-book-collection-manager.gemspec +50 -44
- data/bin/alexandria +12 -22
- data/doc/FAQ +1 -2
- data/doc/dependency_decisions.yml +27 -8
- data/lib/alexandria.rb +25 -23
- data/lib/alexandria/about.rb +50 -50
- data/lib/alexandria/book_providers.rb +86 -91
- data/lib/alexandria/book_providers/adlibris.rb +37 -74
- data/lib/alexandria/book_providers/amazon_aws.rb +94 -100
- data/lib/alexandria/book_providers/amazon_ecs_util.rb +289 -324
- data/lib/alexandria/book_providers/barnes_and_noble.rb +42 -42
- data/lib/alexandria/book_providers/douban.rb +25 -41
- data/lib/alexandria/book_providers/proxis.rb +34 -29
- data/lib/alexandria/book_providers/pseudomarc.rb +77 -85
- data/lib/alexandria/book_providers/siciliano.rb +60 -64
- data/lib/alexandria/book_providers/thalia_provider.rb +161 -0
- data/lib/alexandria/book_providers/web.rb +5 -5
- data/lib/alexandria/book_providers/worldcat.rb +66 -95
- data/lib/alexandria/book_providers/z3950.rb +153 -169
- data/lib/alexandria/config.rb +1 -1
- data/lib/alexandria/console.rb +3 -3
- data/lib/alexandria/default_preferences.rb +37 -0
- data/lib/alexandria/execution_queue.rb +13 -12
- data/lib/alexandria/export_format.rb +8 -8
- data/lib/alexandria/export_library.rb +128 -127
- data/lib/alexandria/import_library.rb +102 -126
- data/lib/alexandria/import_library_csv.rb +41 -41
- data/lib/alexandria/library_collection.rb +6 -5
- data/lib/alexandria/library_sort_order.rb +4 -2
- data/lib/alexandria/library_store.rb +39 -28
- data/lib/alexandria/logging.rb +10 -14
- data/lib/alexandria/models/book.rb +5 -4
- data/lib/alexandria/models/library.rb +63 -53
- data/lib/alexandria/net.rb +5 -6
- data/lib/alexandria/preferences.rb +66 -63
- data/lib/alexandria/scanners.rb +2 -2
- data/lib/alexandria/scanners/{cuecat.rb → cue_cat.rb} +17 -17
- data/lib/alexandria/scanners/keyboard.rb +8 -8
- data/lib/alexandria/smart_library.rb +110 -112
- data/lib/alexandria/ui.rb +15 -15
- data/lib/alexandria/ui/{dialogs/about_dialog.rb → about_dialog.rb} +2 -2
- data/lib/alexandria/ui/{dialogs/acquire_dialog.rb → acquire_dialog.rb} +108 -109
- data/lib/alexandria/ui/alert_dialog.rb +66 -0
- data/lib/alexandria/ui/{dialogs/bad_isbns_dialog.rb → bad_isbns_dialog.rb} +13 -9
- data/lib/alexandria/ui/{dialogs/barcode_animation.rb → barcode_animation.rb} +16 -15
- data/lib/alexandria/ui/{dialogs/book_properties_dialog.rb → book_properties_dialog.rb} +25 -38
- data/lib/alexandria/ui/{dialogs/book_properties_dialog_base.rb → book_properties_dialog_base.rb} +64 -157
- data/lib/alexandria/ui/builder_base.rb +1 -1
- data/lib/alexandria/ui/calendar_popup.rb +58 -0
- data/lib/alexandria/ui/callbacks.rb +187 -155
- data/lib/alexandria/ui/completion_models.rb +8 -22
- data/lib/alexandria/ui/confirm_erase_dialog.rb +33 -0
- data/lib/alexandria/ui/conflict_while_copying_dialog.rb +34 -0
- data/lib/alexandria/ui/dndable.rb +7 -7
- data/lib/alexandria/ui/error_dialog.rb +25 -0
- data/lib/alexandria/ui/{dialogs/export_dialog.rb → export_dialog.rb} +37 -58
- data/lib/alexandria/ui/icons.rb +38 -43
- data/lib/alexandria/ui/iconview.rb +12 -10
- data/lib/alexandria/ui/iconview_tooltips.rb +41 -54
- data/lib/alexandria/ui/import_dialog.rb +157 -0
- data/lib/alexandria/ui/init.rb +30 -41
- data/lib/alexandria/ui/{dialogs/keep_bad_isbn_dialog.rb → keep_bad_isbn_dialog.rb} +9 -6
- data/lib/alexandria/ui/libraries_combo.rb +15 -14
- data/lib/alexandria/ui/listview.rb +69 -67
- data/lib/alexandria/ui/main_app.rb +24 -26
- data/lib/alexandria/ui/misc_dialogs.rb +10 -0
- data/lib/alexandria/ui/multi_drag_treeview.rb +8 -9
- data/lib/alexandria/ui/{dialogs/new_book_dialog.rb → new_book_dialog.rb} +113 -114
- data/lib/alexandria/ui/{dialogs/new_book_dialog_manual.rb → new_book_dialog_manual.rb} +22 -19
- data/lib/alexandria/ui/new_provider_dialog.rb +100 -0
- data/lib/alexandria/ui/new_smart_library_dialog.rb +74 -0
- data/lib/alexandria/ui/preferences_dialog.rb +313 -0
- data/lib/alexandria/ui/provider_preferences_base_dialog.rb +95 -0
- data/lib/alexandria/ui/provider_preferences_dialog.rb +35 -0
- data/lib/alexandria/ui/{dialogs/misc_dialogs.rb → really_delete_dialog.rb} +7 -28
- data/lib/alexandria/ui/{sidepane.rb → sidepane_manager.rb} +53 -48
- data/lib/alexandria/ui/skip_entry_dialog.rb +33 -0
- data/lib/alexandria/ui/smart_library_properties_dialog.rb +60 -0
- data/lib/alexandria/ui/smart_library_properties_dialog_base.rb +242 -0
- data/lib/alexandria/ui/smart_library_rule_box.rb +119 -0
- data/lib/alexandria/ui/sound.rb +11 -13
- data/lib/alexandria/ui/ui_manager.rb +216 -200
- data/lib/alexandria/version.rb +4 -19
- data/lib/alexandria/web_themes.rb +21 -21
- data/po/Makefile +2 -2
- data/po/cs.po +992 -875
- data/po/cy.po +961 -874
- data/po/de.po +990 -865
- data/po/el.po +989 -865
- data/po/es.po +985 -861
- data/po/fr.po +987 -867
- data/po/ga.po +908 -820
- data/po/gl.po +980 -860
- data/po/it.po +986 -864
- data/po/ja.po +969 -849
- data/po/mk.po +984 -860
- data/po/nb.po +979 -859
- data/po/nl.po +983 -860
- data/po/pl.po +1018 -971
- data/po/pt.po +988 -857
- data/po/pt_BR.po +983 -863
- data/po/ru.po +994 -871
- data/po/sk.po +989 -867
- data/po/sv.po +976 -856
- data/po/uk.po +972 -858
- data/po/zh_TW.po +974 -854
- data/schemas/alexandria.schemas +24 -2
- data/share/alexandria/glade/acquire_dialog__builder.glade +1 -1
- data/share/alexandria/glade/book_properties_dialog__builder.glade +1 -1
- data/share/alexandria/glade/main_app__builder.glade +6 -21
- data/share/alexandria/glade/new_book_dialog__builder.glade +1 -1
- data/share/alexandria/glade/preferences_dialog__builder.glade +1 -1
- data/share/gnome/help/alexandria/C/introduction.xml +0 -4
- data/share/gnome/help/alexandria/C/searching.xml +1 -1
- data/share/gnome/help/alexandria/C/smart-libraries.xml +2 -2
- data/share/gnome/help/alexandria/C/working-with-libraries.xml +1 -1
- data/share/gnome/help/alexandria/fr/alexandria.xml +1 -1
- data/share/gnome/help/alexandria/ja/introduction.xml +0 -4
- data/share/gnome/help/alexandria/ja/smart-libraries.xml +1 -1
- data/spec/alexandria/book_providers/thalia_provider_spec.rb +119 -0
- data/spec/alexandria/book_providers/world_cat_provider_spec.rb +160 -0
- data/spec/alexandria/book_providers_spec.rb +62 -156
- data/spec/alexandria/book_spec.rb +12 -10
- data/spec/alexandria/console_spec.rb +6 -11
- data/spec/alexandria/export_library_spec.rb +47 -58
- data/spec/alexandria/library_spec.rb +121 -109
- data/spec/alexandria/library_store_spec.rb +8 -8
- data/spec/alexandria/preferences_spec.rb +44 -17
- data/spec/alexandria/scanners/cue_cat_spec.rb +52 -0
- data/spec/alexandria/smart_library_spec.rb +15 -15
- data/spec/alexandria/ui/about_dialog_spec.rb +14 -0
- data/spec/alexandria/ui/acquire_dialog_spec.rb +14 -0
- data/spec/alexandria/ui/alert_dialog_spec.rb +16 -0
- data/spec/alexandria/ui/bad_isbns_dialog_spec.rb +14 -0
- data/spec/alexandria/ui/book_properties_dialog_spec.rb +59 -0
- data/spec/alexandria/ui/confirm_erase_dialog_spec.rb +14 -0
- data/spec/alexandria/ui/conflict_while_copying_dialog_spec.rb +16 -0
- data/spec/alexandria/ui/error_dialog_spec.rb +14 -0
- data/spec/alexandria/ui/export_dialog_spec.rb +36 -0
- data/spec/alexandria/ui/icons_spec.rb +26 -0
- data/spec/alexandria/ui/iconview_spec.rb +7 -21
- data/spec/alexandria/ui/import_dialog_spec.rb +46 -0
- data/spec/alexandria/ui/keep_bad_isbn_dialog_spec.rb +17 -0
- data/spec/alexandria/ui/main_app_spec.rb +7 -34
- data/spec/alexandria/ui/new_book_dialog_manual_spec.rb +51 -0
- data/spec/alexandria/ui/{dialogs/new_book_dialog_spec.rb → new_book_dialog_spec.rb} +4 -4
- data/spec/alexandria/ui/new_provider_dialog_spec.rb +30 -0
- data/spec/alexandria/ui/new_smart_library_dialog_spec.rb +39 -0
- data/spec/alexandria/ui/preferences_dialog_spec.rb +14 -0
- data/spec/alexandria/ui/provider_preferences_dialog_spec.rb +34 -0
- data/spec/alexandria/ui/really_delete_dialog_spec.rb +16 -0
- data/spec/alexandria/ui/sidepane_manager_spec.rb +15 -0
- data/spec/alexandria/ui/skip_entry_dialog_spec.rb +14 -0
- data/spec/alexandria/ui/smart_library_properties_dialog_spec.rb +49 -0
- data/spec/alexandria/ui/sound_spec.rb +2 -2
- data/spec/alexandria/ui/ui_manager_spec.rb +44 -20
- data/spec/end_to_end/basic_run_spec.rb +21 -38
- data/spec/fixtures/cover.jpg +0 -0
- data/spec/spec_helper.rb +54 -10
- data/tasks/setup.rb +2 -2
- data/tasks/spec.rake +11 -11
- data/util/rake/fileinstall.rb +38 -35
- data/util/rake/gettextgenerate.rb +7 -7
- data/util/rake/omfgenerate.rb +7 -7
- metadata +158 -45
- data/dogtail/basic_run_test.py +0 -9
- data/lib/alexandria/book_providers/renaud.rb +0 -155
- data/lib/alexandria/book_providers/thalia.rb +0 -198
- data/lib/alexandria/ui/dialogs/alert_dialog.rb +0 -63
- data/lib/alexandria/ui/dialogs/import_dialog.rb +0 -176
- data/lib/alexandria/ui/dialogs/new_smart_library_dialog.rb +0 -62
- data/lib/alexandria/ui/dialogs/preferences_dialog.rb +0 -563
- data/lib/alexandria/ui/dialogs/smart_library_properties_dialog.rb +0 -61
- data/lib/alexandria/ui/dialogs/smart_library_properties_dialog_base.rb +0 -423
- data/spec/alexandria/scanners/cuecat_spec.rb +0 -67
- data/spec/alexandria/ui/dialogs_spec.rb +0 -162
- data/spec/alexandria/ui/sidepane_spec.rb +0 -29
- data/spec/alexandria/ui/ui_utilities_spec.rb +0 -62
- data/spec/alexandria/utilities_spec.rb +0 -52
- data/tasks/dogtail.rake +0 -6
@@ -0,0 +1,95 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
# This file is part of Alexandria.
|
4
|
+
#
|
5
|
+
# See the file README.md for authorship and licensing information.
|
6
|
+
|
7
|
+
class Gtk::Entry
|
8
|
+
attr_writer :mandatory
|
9
|
+
|
10
|
+
def mandatory?
|
11
|
+
@mandatory
|
12
|
+
end
|
13
|
+
end
|
14
|
+
|
15
|
+
module Alexandria
|
16
|
+
module UI
|
17
|
+
class ProviderPreferencesBaseDialog
|
18
|
+
attr_reader :dialog
|
19
|
+
|
20
|
+
def initialize(title:, parent:, flags:, buttons:)
|
21
|
+
@dialog = Gtk::Dialog.new(title: title, parent: parent, flags: flags,
|
22
|
+
buttons: buttons)
|
23
|
+
|
24
|
+
@dialog.resizable = false
|
25
|
+
@dialog.child.border_width = 12
|
26
|
+
|
27
|
+
@controls = []
|
28
|
+
end
|
29
|
+
|
30
|
+
private
|
31
|
+
|
32
|
+
def fill_table(table, provider)
|
33
|
+
i = table.n_rows
|
34
|
+
table.resize(table.n_rows + provider.prefs.length,
|
35
|
+
table.n_columns)
|
36
|
+
table.border_width = 12
|
37
|
+
table.row_spacings = 6
|
38
|
+
table.column_spacings = 12
|
39
|
+
|
40
|
+
@controls.clear
|
41
|
+
|
42
|
+
provider.prefs.read.each do |variable|
|
43
|
+
if variable.name == "piggyback"
|
44
|
+
next
|
45
|
+
# ULTRA-HACK!! for bug #13302
|
46
|
+
# not displaying the visual choice, as its usually unnecessary
|
47
|
+
# Either way, this is confusing to the user: FIX
|
48
|
+
# - Cathal Mc Ginley 2008-02-18
|
49
|
+
end
|
50
|
+
|
51
|
+
if variable.name == "enabled"
|
52
|
+
# also don't display Enabled/Disabled
|
53
|
+
next
|
54
|
+
end
|
55
|
+
|
56
|
+
label = Gtk::Label.new("_" + variable.description + ":")
|
57
|
+
label.use_underline = true
|
58
|
+
label.xalign = 0
|
59
|
+
table.attach_defaults(label, 0, 1, i, i + 1)
|
60
|
+
|
61
|
+
if variable.possible_values.nil?
|
62
|
+
entry = Gtk::Entry.new
|
63
|
+
entry.text = variable.value.to_s
|
64
|
+
entry.mandatory = variable.mandatory?
|
65
|
+
else
|
66
|
+
entry = Gtk::ComboBoxText.new
|
67
|
+
variable.possible_values.each do |value|
|
68
|
+
entry.append_text(value.to_s)
|
69
|
+
end
|
70
|
+
index = variable.possible_values.index(variable.value)
|
71
|
+
entry.active = index
|
72
|
+
end
|
73
|
+
label.mnemonic_widget = entry
|
74
|
+
|
75
|
+
@controls << [variable, entry]
|
76
|
+
|
77
|
+
table.attach_defaults(entry, 1, 2, i, i + 1)
|
78
|
+
i += 1
|
79
|
+
end
|
80
|
+
table
|
81
|
+
end
|
82
|
+
|
83
|
+
def sync_variables
|
84
|
+
@controls.each do |variable, entry|
|
85
|
+
variable.new_value = case entry
|
86
|
+
when Gtk::ComboBox
|
87
|
+
variable.possible_values[entry.active]
|
88
|
+
when Gtk::Entry
|
89
|
+
entry.text
|
90
|
+
end
|
91
|
+
end
|
92
|
+
end
|
93
|
+
end
|
94
|
+
end
|
95
|
+
end
|
@@ -0,0 +1,35 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
# This file is part of Alexandria.
|
4
|
+
#
|
5
|
+
# See the file README.md for authorship and licensing information.
|
6
|
+
|
7
|
+
require "alexandria/ui/provider_preferences_base_dialog"
|
8
|
+
|
9
|
+
module Alexandria
|
10
|
+
module UI
|
11
|
+
class ProviderPreferencesDialog < ProviderPreferencesBaseDialog
|
12
|
+
include GetText
|
13
|
+
GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
|
14
|
+
|
15
|
+
def initialize(parent, provider)
|
16
|
+
super(title: _("Preferences for %s") % provider.fullname,
|
17
|
+
parent: parent,
|
18
|
+
flags: :modal,
|
19
|
+
buttons: [[Gtk::Stock::CLOSE, :close]])
|
20
|
+
|
21
|
+
table = Gtk::Table.new(0, 0)
|
22
|
+
fill_table(table, provider)
|
23
|
+
dialog.child.pack_start(table)
|
24
|
+
|
25
|
+
dialog.signal_connect("destroy") { sync_variables }
|
26
|
+
end
|
27
|
+
|
28
|
+
def acquire
|
29
|
+
dialog.show_all
|
30
|
+
dialog.run
|
31
|
+
dialog.destroy
|
32
|
+
end
|
33
|
+
end
|
34
|
+
end
|
35
|
+
end
|
@@ -4,34 +4,13 @@
|
|
4
4
|
#
|
5
5
|
# See the file README.md for authorship and licensing information.
|
6
6
|
|
7
|
+
require "alexandria/ui/alert_dialog"
|
8
|
+
|
7
9
|
module Alexandria
|
8
10
|
module UI
|
9
|
-
class ConflictWhileCopyingDialog < AlertDialog
|
10
|
-
include GetText
|
11
|
-
GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
|
12
|
-
|
13
|
-
def initialize(parent, library, book)
|
14
|
-
super(parent,
|
15
|
-
format(_("The book '%s' already exists in '%s'. Would you like " \
|
16
|
-
'to replace it?'), book.title, library.name),
|
17
|
-
Gtk::Stock::DIALOG_QUESTION,
|
18
|
-
[[_('_Skip'), Gtk::ResponseType::CANCEL],
|
19
|
-
[_('_Replace'), Gtk::ResponseType::OK]],
|
20
|
-
_('If you replace the existing book, its contents will ' \
|
21
|
-
'be overwritten.'))
|
22
|
-
self.default_response = Gtk::ResponseType::CANCEL
|
23
|
-
end
|
24
|
-
|
25
|
-
def replace?
|
26
|
-
show_all && (@response = run)
|
27
|
-
destroy
|
28
|
-
@response == Gtk::ResponseType::OK
|
29
|
-
end
|
30
|
-
end
|
31
|
-
|
32
11
|
class ReallyDeleteDialog < AlertDialog
|
33
12
|
include GetText
|
34
|
-
GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset:
|
13
|
+
GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
|
35
14
|
|
36
15
|
def initialize(parent, library, books = nil)
|
37
16
|
# Deleting a library.
|
@@ -40,8 +19,8 @@ module Alexandria
|
|
40
19
|
description = if library.is_a?(SmartLibrary) || library.empty?
|
41
20
|
nil
|
42
21
|
else
|
43
|
-
n_(
|
44
|
-
|
22
|
+
n_("If you continue, %d book will be deleted.",
|
23
|
+
"If you continue, %d books will be deleted.",
|
45
24
|
library.size) % library.size
|
46
25
|
end
|
47
26
|
# Deleting books.
|
@@ -50,7 +29,7 @@ module Alexandria
|
|
50
29
|
format(_("Are you sure you want to delete '%s' " \
|
51
30
|
"from '%s'?"), books.first.title, library.name)
|
52
31
|
else
|
53
|
-
_(
|
32
|
+
_("Are you sure you want to delete the " \
|
54
33
|
"selected books from '%s'?") % library.name
|
55
34
|
end
|
56
35
|
description = nil
|
@@ -61,7 +40,7 @@ module Alexandria
|
|
61
40
|
[Gtk::Stock::DELETE, Gtk::ResponseType::OK]],
|
62
41
|
description)
|
63
42
|
|
64
|
-
|
43
|
+
dialog.default_response = Gtk::ResponseType::CANCEL
|
65
44
|
end
|
66
45
|
|
67
46
|
def ok?
|
@@ -4,12 +4,15 @@
|
|
4
4
|
#
|
5
5
|
# See the file README.md for authorship and licensing information.
|
6
6
|
|
7
|
+
require "alexandria/ui/error_dialog"
|
8
|
+
|
7
9
|
module Alexandria
|
8
10
|
module UI
|
9
|
-
class
|
11
|
+
class SidepaneManager
|
10
12
|
include Logging
|
11
13
|
include GetText
|
12
14
|
attr_accessor :library_listview
|
15
|
+
|
13
16
|
def initialize(library_listview, parent)
|
14
17
|
@library_listview = library_listview
|
15
18
|
@parent = parent
|
@@ -29,13 +32,12 @@ module Alexandria
|
|
29
32
|
# if new_text contains disallowed char (/ or initial .), returns a MatchData object
|
30
33
|
# otherwise returns nil
|
31
34
|
def contains_illegal_character(new_text)
|
32
|
-
new_text.unpack(
|
33
|
-
match = /(^\.|\/)/.match(new_text)
|
35
|
+
new_text.unpack("U*") # attempt to unpack as UTF-8 characters
|
34
36
|
# forbid / character (since Library names become dir names)
|
35
37
|
# also no initial . since that hides the Library (hidden file)
|
36
38
|
# forbidding an initial dot also disallows "." and ".."
|
37
39
|
# which are of course pre-existing directories.
|
38
|
-
match
|
40
|
+
%r{(^\.|/)}.match(new_text)
|
39
41
|
rescue StandardError => ex
|
40
42
|
log.warn { "New library name not valid UTF-8: #{ex.message}" }
|
41
43
|
true
|
@@ -44,42 +46,40 @@ module Alexandria
|
|
44
46
|
|
45
47
|
def on_edited_library(cell, path_string, new_text)
|
46
48
|
log.debug { "edited library name #{new_text}" }
|
47
|
-
|
48
|
-
|
49
|
-
if
|
50
|
-
if
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
'disallowed character <b>%s</b> ') % chars).display
|
56
|
-
else
|
57
|
-
ErrorDialog.new(@main_app, _('Invalid library name'),
|
58
|
-
_('The name provided contains ' \
|
59
|
-
'invalid characters.')).display
|
60
|
-
end
|
61
|
-
|
62
|
-
elsif new_text.strip.empty?
|
63
|
-
log.debug { 'Empty text' }
|
64
|
-
ErrorDialog.new(@main_app, _('The library name ' \
|
65
|
-
'can not be empty')).display
|
66
|
-
elsif library_already_exists new_text
|
67
|
-
log.debug { 'Already exists' }
|
68
|
-
ErrorDialog.new(@main_app,
|
69
|
-
_('The library can not be renamed'),
|
70
|
-
_('There is already a library named ' \
|
71
|
-
"'%s'. Please choose a different " \
|
72
|
-
'name.') % new_text.strip).display
|
49
|
+
return if cell.text == new_text
|
50
|
+
|
51
|
+
if (match = contains_illegal_character(new_text))
|
52
|
+
if match.instance_of? MatchData
|
53
|
+
chars = match[1].gsub(/&/, "&")
|
54
|
+
ErrorDialog.new(@main_app, _("Invalid library name '%s'") % new_text,
|
55
|
+
_("The name provided contains the " \
|
56
|
+
"disallowed character <b>%s</b>") % chars).display
|
73
57
|
else
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
library_name = new_text.strip
|
78
|
-
log.info { "library name is #{library_name}" }
|
79
|
-
iter[1] = @parent.selected_library.name = library_name
|
80
|
-
@parent.setup_move_actions
|
81
|
-
@parent.refresh_libraries
|
58
|
+
ErrorDialog.new(@main_app, _("Invalid library name"),
|
59
|
+
_("The name provided contains " \
|
60
|
+
"invalid characters.")).display
|
82
61
|
end
|
62
|
+
|
63
|
+
elsif new_text.strip.empty?
|
64
|
+
log.debug { "Empty text" }
|
65
|
+
ErrorDialog.new(@main_app, _("The library name " \
|
66
|
+
"can not be empty")).display
|
67
|
+
elsif library_already_exists new_text
|
68
|
+
log.debug { "Already exists" }
|
69
|
+
ErrorDialog.new(@main_app,
|
70
|
+
_("The library can not be renamed"),
|
71
|
+
_("There is already a library named " \
|
72
|
+
"'%s'. Please choose a different " \
|
73
|
+
"name.") % new_text.strip).display
|
74
|
+
else
|
75
|
+
log.debug { "Attempting to apply #{path_string}, #{new_text}" }
|
76
|
+
path = Gtk::TreePath.new(path_string)
|
77
|
+
iter = @library_listview.model.get_iter(path)
|
78
|
+
library_name = new_text.strip
|
79
|
+
log.info { "library name is #{library_name}" }
|
80
|
+
iter[1] = @parent.selected_library.name = library_name
|
81
|
+
@parent.setup_move_actions
|
82
|
+
@parent.refresh_libraries
|
83
83
|
end
|
84
84
|
end
|
85
85
|
|
@@ -93,7 +93,7 @@ module Alexandria
|
|
93
93
|
@libraries.all_smart_libraries.each { |x| @parent.append_library(x) }
|
94
94
|
|
95
95
|
renderer = Gtk::CellRendererPixbuf.new
|
96
|
-
column = Gtk::TreeViewColumn.new(_(
|
96
|
+
column = Gtk::TreeViewColumn.new(_("Library"))
|
97
97
|
column.pack_start(renderer, false)
|
98
98
|
column.set_cell_data_func(renderer) do |_col, cell, _model, iter|
|
99
99
|
# log.debug { "sidepane: cell_data_func #{col}, #{cell}, #{iter}" }
|
@@ -108,7 +108,9 @@ module Alexandria
|
|
108
108
|
cell.editable = iter[2]
|
109
109
|
# log.debug { "exit sidepane: editable #{cell}, #{iter}" }
|
110
110
|
end
|
111
|
-
renderer.signal_connect(
|
111
|
+
renderer.signal_connect("edited") do |cell, path_string, new_text|
|
112
|
+
on_edited_library(cell, path_string, new_text)
|
113
|
+
end
|
112
114
|
@library_listview.append_column(column)
|
113
115
|
|
114
116
|
@library_listview.set_row_separator_func do |model, iter|
|
@@ -116,16 +118,17 @@ module Alexandria
|
|
116
118
|
model.get_value(iter, 3)
|
117
119
|
end
|
118
120
|
|
119
|
-
@library_listview.selection.signal_connect(
|
120
|
-
log.debug {
|
121
|
+
@library_listview.selection.signal_connect("changed") do
|
122
|
+
log.debug { "changed" }
|
121
123
|
@parent.refresh_libraries
|
122
124
|
@parent.refresh_books
|
123
125
|
end
|
124
126
|
|
125
127
|
@library_listview.enable_model_drag_dest(BOOKS_TARGET_TABLE, :move)
|
126
128
|
|
127
|
-
@library_listview
|
128
|
-
|
129
|
+
@library_listview
|
130
|
+
.signal_connect("drag-motion") do |_widget, drag_context, x, y, time, _data|
|
131
|
+
log.debug { "drag-motion" }
|
129
132
|
|
130
133
|
path, column, =
|
131
134
|
@library_listview.get_path_at_pos(x, y)
|
@@ -154,8 +157,9 @@ module Alexandria
|
|
154
157
|
time)
|
155
158
|
end
|
156
159
|
|
157
|
-
@library_listview
|
158
|
-
|
160
|
+
@library_listview
|
161
|
+
.signal_connect("drag-drop") do |widget, drag_context, _x, _y, time, _data|
|
162
|
+
log.debug { "drag-drop" }
|
159
163
|
|
160
164
|
widget.drag_get_data(drag_context,
|
161
165
|
drag_context.targets.first,
|
@@ -163,8 +167,9 @@ module Alexandria
|
|
163
167
|
true
|
164
168
|
end
|
165
169
|
|
166
|
-
@library_listview
|
167
|
-
|
170
|
+
@library_listview
|
171
|
+
.signal_connect("drag-data-received") do |_, drag_context, x, y, data, _, _|
|
172
|
+
log.debug { "drag-data-received" }
|
168
173
|
|
169
174
|
success = false
|
170
175
|
# FIXME: Ruby-GNOME2 should make comparison work without needing to
|
@@ -0,0 +1,33 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
# This file is part of Alexandria.
|
4
|
+
#
|
5
|
+
# See the file README.md for authorship and licensing information.
|
6
|
+
|
7
|
+
require "alexandria/ui/alert_dialog"
|
8
|
+
|
9
|
+
module Alexandria
|
10
|
+
module UI
|
11
|
+
class SkipEntryDialog < AlertDialog
|
12
|
+
include GetText
|
13
|
+
include Logging
|
14
|
+
GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
|
15
|
+
|
16
|
+
def initialize(parent, message)
|
17
|
+
super(parent, _("Error while importing"),
|
18
|
+
Gtk::Stock::DIALOG_QUESTION,
|
19
|
+
[[Gtk::Stock::CANCEL, Gtk::ResponseType::CANCEL],
|
20
|
+
[_("_Continue"), Gtk::ResponseType::OK]],
|
21
|
+
message)
|
22
|
+
log.debug { "Opened SkipEntryDialog #{inspect}" }
|
23
|
+
dialog.default_response = Gtk::ResponseType::CANCEL
|
24
|
+
end
|
25
|
+
|
26
|
+
def continue?
|
27
|
+
show_all && (@response = run)
|
28
|
+
destroy
|
29
|
+
@response == Gtk::ResponseType::OK
|
30
|
+
end
|
31
|
+
end
|
32
|
+
end
|
33
|
+
end
|
@@ -0,0 +1,60 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
# This file is part of Alexandria.
|
4
|
+
#
|
5
|
+
# See the file README.md for authorship and licensing information.
|
6
|
+
|
7
|
+
module Alexandria
|
8
|
+
module UI
|
9
|
+
class SmartLibraryPropertiesDialog < SmartLibraryPropertiesDialogBase
|
10
|
+
include GetText
|
11
|
+
GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
|
12
|
+
|
13
|
+
def initialize(parent, smart_library)
|
14
|
+
super(parent)
|
15
|
+
|
16
|
+
@smart_library = smart_library
|
17
|
+
|
18
|
+
dialog.add_buttons([Gtk::Stock::CANCEL, :cancel],
|
19
|
+
[Gtk::Stock::SAVE, :ok])
|
20
|
+
|
21
|
+
dialog.title = _("Properties for '%s'") % @smart_library.name
|
22
|
+
# FIXME: Should accept just :cancel
|
23
|
+
dialog.default_response = Gtk::ResponseType::CANCEL
|
24
|
+
@smart_library.rules.each { |x| insert_new_rule(x) }
|
25
|
+
update_rules_header_box(@smart_library.predicate_operator_rule)
|
26
|
+
end
|
27
|
+
|
28
|
+
def acquire
|
29
|
+
dialog.show_all
|
30
|
+
|
31
|
+
while (response = dialog.run) != Gtk::ResponseType::CANCEL
|
32
|
+
case response
|
33
|
+
when Gtk::ResponseType::HELP
|
34
|
+
handle_help_response
|
35
|
+
when Gtk::ResponseType::OK
|
36
|
+
break if handle_ok_response
|
37
|
+
end
|
38
|
+
end
|
39
|
+
|
40
|
+
dialog.destroy
|
41
|
+
end
|
42
|
+
|
43
|
+
private
|
44
|
+
|
45
|
+
def handle_ok_response
|
46
|
+
user_confirms_possible_weirdnesses_before_saving? or return
|
47
|
+
|
48
|
+
@smart_library.rules = smart_library_rules
|
49
|
+
@smart_library.predicate_operator_rule =
|
50
|
+
predicate_operator_rule
|
51
|
+
@smart_library.save
|
52
|
+
true
|
53
|
+
end
|
54
|
+
|
55
|
+
def handle_help_response
|
56
|
+
Alexandria::UI.display_help(self, "edit-smart-library")
|
57
|
+
end
|
58
|
+
end
|
59
|
+
end
|
60
|
+
end
|