From 9e1b7d135ef97b231e037882e562248ae8eb5903 Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Sat, 31 Jan 2009 08:40:35 -0500
Subject: [PATCH 1/2] Allow for recipies to be navigated via keyboard.

---
 src/calibre/gui2/dialogs/recipelistview.py | 16 ++++++++++++++++
 src/calibre/gui2/dialogs/scheduler.py      |  6 ++----
 src/calibre/gui2/dialogs/scheduler.ui      |  9 ++++++++-
 3 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 src/calibre/gui2/dialogs/recipelistview.py

diff --git a/src/calibre/gui2/dialogs/recipelistview.py b/src/calibre/gui2/dialogs/recipelistview.py
new file mode 100644
index 0000000000..963079307d
--- /dev/null
+++ b/src/calibre/gui2/dialogs/recipelistview.py
@@ -0,0 +1,16 @@
+__license__   = 'GPL v3'
+__copyright__ = '2009, John Schember john@nachtimwald.com'
+'''
+List View for showing recipies. Allows for keyboad events when selecting new
+items.
+'''
+
+from PyQt4.Qt import QListView, SIGNAL
+            
+class RecipeListView(QListView):
+    def __init__(self, *args):
+        QListView.__init__(self, *args)
+        
+    def selectionChanged(self, selected, deselected):
+        self.emit(SIGNAL('itemChanged(QModelIndex)'), selected.indexes()[0])
+
diff --git a/src/calibre/gui2/dialogs/scheduler.py b/src/calibre/gui2/dialogs/scheduler.py
index d15adebb8b..62dd79ac9b 100644
--- a/src/calibre/gui2/dialogs/scheduler.py
+++ b/src/calibre/gui2/dialogs/scheduler.py
@@ -241,8 +241,7 @@ class SchedulerDialog(QDialog, Ui_Dialog):
         self._model = RecipeModel(db)
         self.current_recipe = None
         self.recipes.setModel(self._model)
-        self.connect(self.recipes, SIGNAL('activated(QModelIndex)'), self.show_recipe)
-        self.connect(self.recipes, SIGNAL('clicked(QModelIndex)'), self.show_recipe)
+        self.connect(self.recipes, SIGNAL('itemChanged(QModelIndex)'), self.show_recipe)
         self.connect(self.username, SIGNAL('textEdited(QString)'), self.set_account_info)
         self.connect(self.password, SIGNAL('textEdited(QString)'), self.set_account_info)
         self.connect(self.schedule, SIGNAL('stateChanged(int)'), self.do_schedule)
@@ -359,7 +358,6 @@ class SchedulerDialog(QDialog, Ui_Dialog):
         else:
             self.last_downloaded.setText(_('Last downloaded: never'))
             
-            
 class Scheduler(QObject):
     
     INTERVAL = 1 # minutes
@@ -515,4 +513,4 @@ def main(args=sys.argv):
     return 0
 
 if __name__ == '__main__':
-    sys.exit(main())
\ No newline at end of file
+    sys.exit(main())
diff --git a/src/calibre/gui2/dialogs/scheduler.ui b/src/calibre/gui2/dialogs/scheduler.ui
index b10e777d7d..79ea04977e 100644
--- a/src/calibre/gui2/dialogs/scheduler.ui
+++ b/src/calibre/gui2/dialogs/scheduler.ui
@@ -24,7 +24,7 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout" >
       <item>
-       <widget class="QListView" name="recipes" >
+       <widget class="RecipeListView" name="recipes" >
         <property name="alternatingRowColors" >
          <bool>true</bool>
         </property>
@@ -321,6 +321,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>RecipeListView</class>
+   <extends>QListView</extends>
+   <header>recipelistview.h</header>
+  </customwidget>
+ </customwidgets>
  <resources>
   <include location="../images.qrc" />
  </resources>

From 0e04f13a0cac363c4d420f479dcd112a04f4623e Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Sat, 31 Jan 2009 09:28:23 -0500
Subject: [PATCH 2/2] FDI find device via lun not parition

---
 src/calibre/devices/usbms/device.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py
index aba41c78cb..a33d041b2a 100644
--- a/src/calibre/devices/usbms/device.py
+++ b/src/calibre/devices/usbms/device.py
@@ -40,7 +40,7 @@ class Device(_Device):
           <match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.vendor_id" int="%(vendor_id)s">
               <match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.product_id" int="%(product_id)s">
                 %(BCD_start)s
-                  <match key="volume.is_partition" bool="false">
+                  <match key="@info.parent:storage.lun" int="0">
                           <merge key="volume.label" type="string">%(main_memory)s</merge>
                           <merge key="%(app)s.mainvolume" type="string">%(deviceclass)s</merge>
                   </match>
@@ -54,7 +54,7 @@ class Device(_Device):
           <match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.vendor_id" int="%(vendor_id)s">
               <match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.product_id" int="%(product_id)s">
                 %(BCD_start)s
-                  <match key="volume.is_partition" bool="true">
+                  <match key="@info.parent:storage.lun" int="1">
                           <merge key="volume.label" type="string">%(storage_card)s</merge>
                           <merge key="%(app)s.cardvolume" type="string">%(deviceclass)s</merge>
                   </match>