From 336dfaac4a9396a4d39caf55489a9f2f6bf12f08 Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Sun, 7 Jun 2009 07:57:52 -0400
Subject: [PATCH 1/2] Possible fix for PRS-505/700 SD card showing incorrectly.

---
 src/calibre/gui2/widgets.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/calibre/gui2/widgets.py b/src/calibre/gui2/widgets.py
index 372c717c14..c56939f726 100644
--- a/src/calibre/gui2/widgets.py
+++ b/src/calibre/gui2/widgets.py
@@ -216,9 +216,6 @@ class LocationModel(QAbstractListModel):
         cpa, cpb = cp
         self.free[1] = fs[1] if fs[1] is not None and cpa is not None else -1
         self.free[2] = fs[2] if fs[2] is not None and cpb is not None else -1
-        if self.free[1] < 0 and self.free[2] >= 0:
-            self.free[1] = self.free[2]
-            self.free[2] = -1
         self.reset()
 
     def location_changed(self, row):

From 37658f07c680ead4e83013d0e766f38ba6f2415e Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Sun, 7 Jun 2009 10:17:51 -0400
Subject: [PATCH 2/2] Transparency effect for eject button.

---
 src/calibre/gui2/widgets.py | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/widgets.py b/src/calibre/gui2/widgets.py
index c56939f726..e15ca1ad7c 100644
--- a/src/calibre/gui2/widgets.py
+++ b/src/calibre/gui2/widgets.py
@@ -278,10 +278,29 @@ class LocationView(QListView):
 
 class EjectButton(QAbstractButton):
 
+    def __init__(self, parent):
+        QAbstractButton.__init__(self, parent)
+        self.mouse_over = False
+
+    def enterEvent(self, event):
+        self.mouse_over = True
+
+    def leaveEvent(self, event):
+        self.mouse_over = False
+
     def paintEvent(self, event):
         painter = QPainter(self)
-        painter.setClipRect(event.rect());
-        painter.drawPixmap(0, 0, QPixmap(':/images/eject').scaledToHeight(event.rect().height(), Qt.SmoothTransformation))
+        painter.setClipRect(event.rect())
+        image = QPixmap(':/images/eject').scaledToHeight(event.rect().height(),
+            Qt.SmoothTransformation)
+
+        if not self.mouse_over:
+            alpha_mask = QPixmap(image.width(), image.height())
+            color = QColor(128, 128, 128)
+            alpha_mask.fill(color)
+            image.setAlphaChannel(alpha_mask)
+
+        painter.drawPixmap(0, 0, image)
 
 
 class DetailView(QDialog, Ui_Dialog):