From 7491a8d20ebf7fa0fb6c9d65a50301124ff9cf68 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 18 May 2010 11:13:27 -0600
Subject: [PATCH] Fix text alignment in device views and only save valid states

---
 src/calibre/gui2/library/models.py | 6 ++++++
 src/calibre/gui2/library/views.py  | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 802e23e90c..bd8fb20741 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -1011,6 +1011,12 @@ class DeviceBooksModel(BooksModel): # {{{
         elif role == Qt.DecorationRole and cname == 'inlibrary':
             if self.db[self.map[row]].in_library:
                 return QVariant(self.bool_yes_icon)
+        elif role == Qt.TextAlignmentRole:
+            cname = self.column_map[index.column()]
+            ans = Qt.AlignVCenter | ALIGNMENT_MAP[self.alignment_map.get(cname,
+                'left')]
+            return QVariant(ans)
+
 
         return NONE
 
diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index ad0e82110c..e5c6ffd5f7 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -44,6 +44,7 @@ class BooksView(QTableView): # {{{
         self.selectionModel().currentRowChanged.connect(self._model.current_changed)
 
         # {{{ Column Header setup
+        self.was_restored = False
         self.column_header = self.horizontalHeader()
         self.column_header.setMovable(True)
         self.column_header.sectionMoved.connect(self.save_state)
@@ -198,7 +199,7 @@ class BooksView(QTableView): # {{{
 
     def save_state(self):
         # Only save if we have been initialized (set_database called)
-        if len(self.column_map) > 0:
+        if len(self.column_map) > 0 and self.was_restored:
             state = self.get_state()
             name = unicode(self.objectName())
             if name:
@@ -287,6 +288,7 @@ class BooksView(QTableView): # {{{
             old_state['sort_history'] = tweaks['sort_columns_at_startup']
 
         self.apply_state(old_state)
+        self.was_restored = True
 
     # }}}