From 4892defbec800d17100908743d33f084ed1570c8 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 24 Dec 2012 09:44:47 +0530
Subject: [PATCH] When adding empty books, allow setting of the series for the
 new boks. Also select the newly added book records after adding.

---
 src/calibre/gui2/actions/add.py            | 17 +++++++++---
 src/calibre/gui2/dialogs/add_empty_book.py | 30 +++++++++++++++++++++-
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/src/calibre/gui2/actions/add.py b/src/calibre/gui2/actions/add.py
index 4f3e9fc066..e18f5fe77c 100644
--- a/src/calibre/gui2/actions/add.py
+++ b/src/calibre/gui2/actions/add.py
@@ -151,7 +151,7 @@ class AddAction(InterfaceAction):
         Add an empty book item to the library. This does not import any formats
         from a book file.
         '''
-        author = None
+        author = series = None
         index = self.gui.library_view.currentIndex()
         if index.isValid():
             raw = index.model().db.authors(index.row())
@@ -159,16 +159,27 @@ class AddAction(InterfaceAction):
                 authors = [a.strip().replace('|', ',') for a in raw.split(',')]
                 if authors:
                     author = authors[0]
-        dlg = AddEmptyBookDialog(self.gui, self.gui.library_view.model().db, author)
+            series = index.model().db.series(index.row())
+        dlg = AddEmptyBookDialog(self.gui, self.gui.library_view.model().db,
+                                 author, series)
         if dlg.exec_() == dlg.Accepted:
             num = dlg.qty_to_add
+            series = dlg.selected_series
+            db = self.gui.library_view.model().db
+            ids = []
             for x in xrange(num):
                 mi = MetaInformation(_('Unknown'), dlg.selected_authors)
-                self.gui.library_view.model().db.import_book(mi, [])
+                if series:
+                    mi.series = series
+                    mi.series_index = db.get_next_series_num_for(series)
+                ids.append(db.import_book(mi, []))
             self.gui.library_view.model().books_added(num)
             if hasattr(self.gui, 'db_images'):
                 self.gui.db_images.reset()
             self.gui.tags_view.recount()
+            if ids:
+                ids.reverse()
+                self.gui.library_view.select_rows(ids)
 
     def add_isbns(self, books, add_tags=[]):
         self.isbn_books = list(books)
diff --git a/src/calibre/gui2/dialogs/add_empty_book.py b/src/calibre/gui2/dialogs/add_empty_book.py
index 98992f85bb..185a3699e7 100644
--- a/src/calibre/gui2/dialogs/add_empty_book.py
+++ b/src/calibre/gui2/dialogs/add_empty_book.py
@@ -12,7 +12,7 @@ from calibre.utils.config import tweaks
 
 class AddEmptyBookDialog(QDialog):
 
-    def __init__(self, parent, db, author):
+    def __init__(self, parent, db, author, series=None):
         QDialog.__init__(self, parent)
         self.db = db
 
@@ -45,6 +45,22 @@ class AddEmptyBookDialog(QDialog):
         self.clear_button.clicked.connect(self.reset_author)
         self._layout.addWidget(self.clear_button, 3, 1, 1, 1)
 
+        self.series_label = QLabel(_('Set the series of the new books to:'))
+        self._layout.addWidget(self.series_label, 4, 0, 1, 2)
+
+        self.series_combo = EditWithComplete(self)
+        self.authors_combo.setSizeAdjustPolicy(
+                self.authors_combo.AdjustToMinimumContentsLengthWithIcon)
+        self.series_combo.setEditable(True)
+        self._layout.addWidget(self.series_combo, 5, 0, 1, 1)
+        self.initialize_series(db, series)
+
+        self.sclear_button = QToolButton(self)
+        self.sclear_button.setIcon(QIcon(I('trash.png')))
+        self.sclear_button.setToolTip(_('Reset series'))
+        self.sclear_button.clicked.connect(self.reset_series)
+        self._layout.addWidget(self.sclear_button, 5, 1, 1, 1)
+
         button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
         button_box.accepted.connect(self.accept)
         button_box.rejected.connect(self.reject)
@@ -54,6 +70,9 @@ class AddEmptyBookDialog(QDialog):
     def reset_author(self, *args):
         self.authors_combo.setEditText(_('Unknown'))
 
+    def reset_series(self):
+        self.series_combo.setEditText('')
+
     def initialize_authors(self, db, author):
         au = author
         if not au:
@@ -65,6 +84,11 @@ class AddEmptyBookDialog(QDialog):
         self.authors_combo.set_add_separator(tweaks['authors_completer_append_separator'])
         self.authors_combo.update_items_cache(db.all_author_names())
 
+    def initialize_series(self, db, series):
+        self.series_combo.show_initial_value(series or '')
+        self.series_combo.update_items_cache(db.all_series_names())
+        self.series_combo.set_separator(None)
+
     @property
     def qty_to_add(self):
         return self.qty_spinbox.value()
@@ -73,6 +97,10 @@ class AddEmptyBookDialog(QDialog):
     def selected_authors(self):
         return string_to_authors(unicode(self.authors_combo.text()))
 
+    @property
+    def selected_series(self):
+        return unicode(self.series_combo.text())
+
 if __name__ == '__main__':
     app = QApplication([])
     d = AddEmptyBookDialog()