diff --git a/src/calibre/gui2/catalog/catalog_epub_mobi.py b/src/calibre/gui2/catalog/catalog_epub_mobi.py
index 12971528b2..6ecab3c081 100644
--- a/src/calibre/gui2/catalog/catalog_epub_mobi.py
+++ b/src/calibre/gui2/catalog/catalog_epub_mobi.py
@@ -64,5 +64,4 @@ class PluginWidget(QWidget,Ui_Form):
opts_dict[opt[0]] = opt_value.split(',')
opts_dict['output_profile'] = [load_defaults('page_setup')['output_profile']]
-
return opts_dict
diff --git a/src/calibre/gui2/dialogs/catalog.py b/src/calibre/gui2/dialogs/catalog.py
index 880b7b0fd6..e1adbac0b3 100644
--- a/src/calibre/gui2/dialogs/catalog.py
+++ b/src/calibre/gui2/dialogs/catalog.py
@@ -8,7 +8,8 @@ __docformat__ = 'restructuredtext en'
import os, sys
-from PyQt4.Qt import QDialog
+from PyQt4 import QtGui
+from PyQt4.Qt import QDialog, SIGNAL
from calibre.customize.ui import config
from calibre.gui2.dialogs.catalog_ui import Ui_Dialog
@@ -119,9 +120,11 @@ class Catalog(QDialog, Ui_Dialog):
self.sync.setChecked(dynamic.get('catalog_sync_to_device', True))
self.format.currentIndexChanged.connect(self.show_plugin_tab)
+ self.connect(self.buttonBox.button(QtGui.QDialogButtonBox.Apply),
+ SIGNAL("clicked()"),
+ self.apply)
self.show_plugin_tab(None)
-
def show_plugin_tab(self, idx):
cf = unicode(self.format.currentText()).lower()
while self.tabs.count() > 1:
@@ -147,11 +150,20 @@ class Catalog(QDialog, Ui_Dialog):
ans = w.options()
return ans
- def accept(self):
+ def save_catalog_settings(self):
self.catalog_format = unicode(self.format.currentText())
dynamic.set('catalog_preferred_format', self.catalog_format)
self.catalog_title = unicode(self.title.text())
dynamic.set('catalog_last_used_title', self.catalog_title)
self.catalog_sync = bool(self.sync.isChecked())
dynamic.set('catalog_sync_to_device', self.catalog_sync)
- QDialog.accept(self)
+
+ def apply(self):
+ # Store current values without building catalog
+ self.save_catalog_settings()
+ if self.tabs.count() > 1:
+ self.tabs.widget(1).options()
+
+ def accept(self):
+ self.save_catalog_settings()
+ return QDialog.accept(self)
diff --git a/src/calibre/gui2/dialogs/catalog.ui b/src/calibre/gui2/dialogs/catalog.ui
index 3d62f36e85..e1de9407ea 100644
--- a/src/calibre/gui2/dialogs/catalog.ui
+++ b/src/calibre/gui2/dialogs/catalog.ui
@@ -17,110 +17,94 @@
:/images/library.png:/images/library.png
-
-
-
- 430
- 470
- 164
- 32
-
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
-
- 12
- 39
- 579
- 411
-
-
-
- 0
-
-
-
- Catalog options
-
-
- -
-
-
- Catalog &format:
-
-
- format
-
-
-
- -
-
-
- -
-
-
- Catalog &title (existing catalog with the same title will be replaced):
-
-
- true
-
-
- title
-
-
-
- -
-
-
- -
-
-
- &Send catalog to device automatically
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 299
-
-
-
-
-
-
-
-
-
-
- 12
- 12
- 301
- 17
-
-
-
-
- 75
- true
-
-
-
- Generate catalog for {0} books
-
-
+
+ -
+
+
+
+ 75
+ true
+
+
+
+ Generate catalog for {0} books
+
+
+
+ -
+
+
+ 0
+
+
+
+ Catalog options
+
+
+
-
+
+
+ Catalog &format:
+
+
+ format
+
+
+
+ -
+
+
+ -
+
+
+ Catalog &title (existing catalog with the same title will be replaced):
+
+
+ true
+
+
+ title
+
+
+
+ -
+
+
+ -
+
+
+ &Send catalog to device automatically
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 299
+
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
+
diff --git a/src/calibre/library/catalog.py b/src/calibre/library/catalog.py
index ded5ac97a8..76f572df95 100644
--- a/src/calibre/library/catalog.py
+++ b/src/calibre/library/catalog.py
@@ -1226,7 +1226,7 @@ class EPUB_MOBI(CatalogPlugin):
emTag = Tag(soup, "em")
emTag.insert(0, aTag)
if ttc < len(title['tags']):
- emTag.insert(1, NavigableString(', '))
+ emTag.insert(1, NavigableString(' · '))
tagsTag.insert(ttc, emTag)
ttc += 1