From 44d917fda5c5e694574e5be54e30bb3db598f665 Mon Sep 17 00:00:00 2001 From: GRiker Date: Fri, 25 Mar 2011 04:18:58 -0700 Subject: [PATCH 1/3] Removed device driver label customization, no longer needed with EXTRA_CUSTOMIZATION --- src/calibre/devices/apple/driver.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py index 1305c4114a..9e477e14a2 100644 --- a/src/calibre/devices/apple/driver.py +++ b/src/calibre/devices/apple/driver.py @@ -586,10 +586,6 @@ class ITUNES(DriverBase): # Turn off the Save template cw.opt_save_template.setVisible(False) cw.label.setVisible(False) - # Repurpose the metadata checkbox - cw.opt_read_metadata.setText(_("Use Series as Category in iTunes/iBooks")) - # Repurpose the use_subdirs checkbox - cw.opt_use_subdirs.setText(_("Cache covers from iTunes/iBooks")) return cw def delete_books(self, paths, end_session=True): From 01c1e94a70c29d0d6f2febd42e9aa74237e8787e Mon Sep 17 00:00:00 2001 From: GRiker Date: Fri, 25 Mar 2011 04:24:52 -0700 Subject: [PATCH 2/3] Reformatted message in 'Connect to iTunes' dialog --- src/calibre/devices/apple/driver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py index 9e477e14a2..2850abe7d6 100644 --- a/src/calibre/devices/apple/driver.py +++ b/src/calibre/devices/apple/driver.py @@ -746,7 +746,7 @@ class ITUNES(DriverBase): if not self.settings().extra_customization[self.SKIP_CONNECT_TO_ITUNES_DIALOG]: raise OpenFeedback('

' + _('Click the "Connect/Share" button and choose' ' "Connect to iTunes" to send books from your calibre library' - ' to your Apple iDevice.

For more information, see' + ' to your Apple iDevice.

For more information, see ' '' 'Calibre + Apple iDevices FAQ.

' 'After following the Quick Start steps outlined in the FAQ, ' From fd3a469a4c412381baf0970dff22437dc9d1d20f Mon Sep 17 00:00:00 2001 From: GRiker Date: Fri, 25 Mar 2011 04:30:50 -0700 Subject: [PATCH 3/3] Added diagnostic to DEBUG output indicating advanced user mode --- src/calibre/devices/apple/driver.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py index 2850abe7d6..7a2b25b2e8 100644 --- a/src/calibre/devices/apple/driver.py +++ b/src/calibre/devices/apple/driver.py @@ -752,6 +752,9 @@ class ITUNES(DriverBase): 'After following the Quick Start steps outlined in the FAQ, ' 'restart calibre.')) + if DEBUG: + self.log.info(" advanced user mode, directly connecting to iDevice") + # Confirm/create thumbs archive if not os.path.exists(self.cache_dir): if DEBUG: