From b7913ec9719e77ad0ddc1314e0e6eb6be8af4f04 Mon Sep 17 00:00:00 2001 From: Andres Gomez Date: Sat, 22 Mar 2014 12:46:28 +0200 Subject: [PATCH 1/4] driver: Nokia Maemo/MeeGo devices support PDF --- src/calibre/devices/nokia/driver.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/calibre/devices/nokia/driver.py b/src/calibre/devices/nokia/driver.py index f993817461..1f72e8790f 100644 --- a/src/calibre/devices/nokia/driver.py +++ b/src/calibre/devices/nokia/driver.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- __license__ = 'GPL v3' -__copyright__ = '2009, John Schember ' +__copyright__ = '2009-2014, John Schember and Andres Gomez ' __docformat__ = 'restructuredtext en' ''' @@ -15,12 +15,12 @@ class N770(USBMS): name = 'Nokia 770 Device Interface' gui_name = 'Nokia 770' description = _('Communicate with the Nokia 770 internet tablet.') - author = 'John Schember' + author = 'John Schember and Andres Gomez' supported_platforms = ['windows', 'linux', 'osx'] # Ordered list of supported formats - FORMATS = ['mobi', 'prc', 'epub', 'html', 'zip', 'fb2', 'chm', 'pdb', - 'tcr', 'txt', 'rtf'] + FORMATS = ['mobi', 'prc', 'epub', 'pdf', 'html', 'zip', 'fb2', 'chm', + 'pdb', 'tcr', 'txt', 'rtf'] VENDOR_ID = [0x421] PRODUCT_ID = [0x431] From 2b3b87af71bf0406c2e52a0b6bee16f683d597bb Mon Sep 17 00:00:00 2001 From: Andres Gomez Date: Sat, 22 Mar 2014 13:50:05 +0200 Subject: [PATCH 2/4] driver: Updated the Nokia 770 device information --- src/calibre/devices/nokia/driver.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/devices/nokia/driver.py b/src/calibre/devices/nokia/driver.py index 1f72e8790f..84bd97f28f 100644 --- a/src/calibre/devices/nokia/driver.py +++ b/src/calibre/devices/nokia/driver.py @@ -14,7 +14,7 @@ class N770(USBMS): name = 'Nokia 770 Device Interface' gui_name = 'Nokia 770' - description = _('Communicate with the Nokia 770 internet tablet.') + description = _('Communicate with the Nokia 770 Internet Tablet.') author = 'John Schember and Andres Gomez' supported_platforms = ['windows', 'linux', 'osx'] @@ -29,7 +29,7 @@ class N770(USBMS): VENDOR_NAME = 'NOKIA' WINDOWS_MAIN_MEM = '770' - MAIN_MEMORY_VOLUME_LABEL = 'N770 Main Memory' + MAIN_MEMORY_VOLUME_LABEL = 'Nokia 770 Main Memory' EBOOK_DIR_MAIN = 'My Ebooks' SUPPORTS_SUB_DIRS = True From e37f3c7171acc9c624ef6232fe3755f6c7f6884c Mon Sep 17 00:00:00 2001 From: Andres Gomez Date: Sat, 22 Mar 2014 14:48:57 +0200 Subject: [PATCH 3/4] driver: Added Nokia N800 device support --- src/calibre/devices/nokia/driver.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/calibre/devices/nokia/driver.py b/src/calibre/devices/nokia/driver.py index 84bd97f28f..a5ebf59bfe 100644 --- a/src/calibre/devices/nokia/driver.py +++ b/src/calibre/devices/nokia/driver.py @@ -35,16 +35,16 @@ class N770(USBMS): SUPPORTS_SUB_DIRS = True class N810(N770): - name = 'Nokia 810 Device Interface' - gui_name = 'Nokia 810/900/9' - description = _('Communicate with the Nokia 810/900 internet tablet.') + name = 'Nokia N800/N810/N900/N9 Device Interface' + gui_name = 'Nokia N800/N810/N900/N9' + description = _('Communicate with the Nokia N800/N810/N900/N9 Maemo/MeeGo devices.') - PRODUCT_ID = [0x96, 0x1c7, 0x0518] + PRODUCT_ID = [0x4c3, 0x96, 0x1c7, 0x0518] BCD = [0x316] - WINDOWS_MAIN_MEM = ['N810', 'N900', 'NOKIA_N9'] + WINDOWS_MAIN_MEM = ['N800', 'N810', 'N900', 'NOKIA_N9'] - MAIN_MEMORY_VOLUME_LABEL = 'Nokia Tablet Main Memory' + MAIN_MEMORY_VOLUME_LABEL = 'Nokia Maemo/MeeGo device Main Memory' class E71X(USBMS): From 201909c853b4ebf0a6ff7651cbb21d888f6c8e7a Mon Sep 17 00:00:00 2001 From: Andres Gomez Date: Sat, 22 Mar 2014 14:50:22 +0200 Subject: [PATCH 4/4] driver: Added Nokia N950 device support --- src/calibre/devices/nokia/driver.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/calibre/devices/nokia/driver.py b/src/calibre/devices/nokia/driver.py index a5ebf59bfe..7749f85e26 100644 --- a/src/calibre/devices/nokia/driver.py +++ b/src/calibre/devices/nokia/driver.py @@ -35,14 +35,14 @@ class N770(USBMS): SUPPORTS_SUB_DIRS = True class N810(N770): - name = 'Nokia N800/N810/N900/N9 Device Interface' - gui_name = 'Nokia N800/N810/N900/N9' - description = _('Communicate with the Nokia N800/N810/N900/N9 Maemo/MeeGo devices.') + name = 'Nokia N800/N810/N900/N950/N9 Device Interface' + gui_name = 'Nokia N800/N810/N900/N950/N9' + description = _('Communicate with the Nokia N800/N810/N900/N950/N9 Maemo/MeeGo devices.') - PRODUCT_ID = [0x4c3, 0x96, 0x1c7, 0x0518] + PRODUCT_ID = [0x4c3, 0x96, 0x1c7, 0x3d1, 0x518] BCD = [0x316] - WINDOWS_MAIN_MEM = ['N800', 'N810', 'N900', 'NOKIA_N9'] + WINDOWS_MAIN_MEM = ['N800', 'N810', 'N900', 'NOKIA_N950', 'NOKIA_N9'] MAIN_MEMORY_VOLUME_LABEL = 'Nokia Maemo/MeeGo device Main Memory'