From 361a841062b56a6ca60ea788fed2af37416030a2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 6 Aug 2007 13:08:12 +0000
Subject: [PATCH] minor bug fixes.

---
 src/libprs500/__init__.py      |  2 +-
 src/libprs500/gui2/__init__.py | 29 ++++++++++++++++-------------
 src/libprs500/gui2/main.py     |  3 +--
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/libprs500/__init__.py b/src/libprs500/__init__.py
index 52b9c4779d..ff833a66b7 100644
--- a/src/libprs500/__init__.py
+++ b/src/libprs500/__init__.py
@@ -13,7 +13,7 @@
 ##    with this program; if not, write to the Free Software Foundation, Inc.,
 ##    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 ''' E-book management software'''
-__version__   = "0.3.89"
+__version__   = "0.3.90"
 __docformat__ = "epytext"
 __author__    = "Kovid Goyal <kovid@kovidgoyal.net>"
 __appname__   = 'libprs500'
diff --git a/src/libprs500/gui2/__init__.py b/src/libprs500/gui2/__init__.py
index 27805dc194..f78ea4319d 100644
--- a/src/libprs500/gui2/__init__.py
+++ b/src/libprs500/gui2/__init__.py
@@ -22,7 +22,7 @@ from libprs500 import __author__
 NONE = QVariant() #: Null value to return from the data function of item models
 
 BOOK_EXTENSIONS = ['lrf', 'lrx', 'rar', 'zip', 'rtf', 'lit', 'txt', 'htm', 
-                   'html', 'xhtml', 'epub',]
+                   'html', 'xhtml', 'epub', 'pdf']
 
 def extension(path):
     return os.path.splitext(path)[1][1:].lower()
@@ -89,7 +89,7 @@ class FileIconProvider(QFileIconProvider):
         self.icons = {}
         for key in self.__class__.ICONS.keys():
             self.icons[key] = ':/images/mimetypes/'+self.__class__.ICONS[key]+'.svg'
-        for i in ('dir', 'default'):
+        for i in ('dir', 'default', 'zero'):
             self.icons[i] = QIcon(self.icons[i])
     
     def key_from_ext(self, ext):
@@ -144,7 +144,7 @@ def file_icon_provider():
     global _file_icon_provider
     return _file_icon_provider
         
-class FileDialog(QFileDialog):
+class FileDialog(QObject):
     def __init__(self, title='Choose Files', 
                        filters=[],
                        add_all_files_filter=True, 
@@ -153,14 +153,15 @@ class FileDialog(QFileDialog):
                        name = '',
                        mode = QFileDialog.ExistingFiles,
                        ):
+        QObject.__init__(self)
         initialize_file_icon_provider()
-        QFileDialog.__init__(self, parent)        
-        self.setIconProvider(_file_icon_provider)
-        self.setModal(modal)
+        self.fd = QFileDialog(parent)        
+        self.fd.setIconProvider(_file_icon_provider)
+        self.fd.setModal(modal)
         settings = QSettings()
         state = settings.value(name, QVariant()).toByteArray()
-        if not self.restoreState(state):
-            self.setDirectory(os.path.expanduser('~'))
+        if not self.fd.restoreState(state):
+            self.fd.setDirectory(os.path.expanduser('~'))
         self.dialog_name = name
         ftext = ''
         if filters:
@@ -170,16 +171,18 @@ class FileDialog(QFileDialog):
                 ftext += '%s (%s);;'%(text, ' '.join(extensions)) 
         if add_all_files_filter or not ftext:
             ftext += 'All files (*)'
-        self.setFilter(ftext)
-        self.setWindowTitle(title)
-        QObject.connect(self, SIGNAL('accepted()'), self.save_dir)
+        self.fd.setFilter(ftext)
+        self.fd.setWindowTitle(title)
+        QObject.connect(self.fd, SIGNAL('accepted()'), self.save_dir)
+        self.exec_ = self.fd.exec_
+        self.show = self.fd.show
     
     def get_files(self):        
-        return tuple(os.path.abspath(qstring_to_unicode(i)) for i in self.selectedFiles())
+        return tuple(os.path.abspath(qstring_to_unicode(i)) for i in self.fd.selectedFiles())
     
     def save_dir(self):
          settings = QSettings()
-         settings.setValue(self.dialog_name, QVariant(self.saveState()))
+         settings.setValue(self.dialog_name, QVariant(self.fd.saveState()))
         
 
 def choose_files(window, name, title,  
diff --git a/src/libprs500/gui2/main.py b/src/libprs500/gui2/main.py
index 3d1c376086..6d4e68e998 100644
--- a/src/libprs500/gui2/main.py
+++ b/src/libprs500/gui2/main.py
@@ -438,8 +438,7 @@ class Main(QObject, Ui_MainWindow):
     
     def wrap_traceback(self, tb):
         tb = unicode(tb, 'utf8', 'replace')
-        if iswindows or isosx:
-            tb = '\n'.join(self.tb_wrapper.wrap(tb))
+        tb = '\n'.join(self.tb_wrapper.wrap(tb))
         return tb
     
     def device_job_exception(self, id, description, exception, formatted_traceback):