Merge from trunk

Changelog.yaml

@@ -4,6 +4,63 @@
 # for important features/bug fixes.
 # Also, each release can have new and improved recipes.
 
+- version: 0.7.17
+  date: 2010-09-03
+
+  new features:
+    - title: "Content server: Show custom column data in the book listing"
+
+    - title: "Add preference to automatically set a tag when adding books (Preferences->General)"
+
+    - title: "Add a tweak to create compound search terms. Show error message in tooltip when user inputs an invalid search query."
+
+    - title: "Managing multiple libraries: Allow renaming/deleting libraries from the Choose library menu"
+
+    - title: "Searching on series index is now possible. See the User Manual for details."
+
+  bug fixes:
+    - title: "Fix regression in 0.7.16 that broke conversion of HTML files with preprocess turned on"
+
+    - title: "MOBI Output: When converting an input document that specifies an inline TOC in the <guide> but not in the <spine>, add it correctly. Fixes #6661 (Conversion to MOBI fails to create TOC)"
+      tickets: [6661]
+
+    - title: "JetBook driver: Only use JetBook naming scheme for txt, pdf and fb2 files."
+      tickets: [6638]
+
+    - title: "Copy to library action now respects merge preferences"
+      tickets: [6641]
+
+    - title: "Fix bug in email sending when using an SSL connection"
+
+    - title: "Kobo driver: Fix bug that prevented metadata caching from working correctly"
+      tickets: [6015]
+
+    - title: "Fix regression in 0.7.16 that caused calibre to forget its preferences on each restart for new installs on linux"
+
+    - title: "News downloads: Cut off long downloaded from URLs"
+      tickets: [6649]
+
+  new recipes:
+    - title: "HOY"
+      author: Fco Javier Nieto
+
+    - title: "Milenio"
+      author: bmsleight
+
+    - title: "Winnipeg Free Press"
+      author: buyo
+
+    - title: "Field and stream blog, West Hawaii Today, Marietta Daily Journal"
+      author: Tony Stegall
+
+    - title: "Europa Sur"
+      author: "Darko Miletic"
+
+
+  improved recipes:
+    - La Jornada
+    - Slate
+
 - version: 0.7.16
   date: 2010-08-27
 

src/calibre/constants.py

@@ -2,7 +2,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = 'calibre'
-__version__   = '0.7.16'
+__version__   = '0.7.17'
 __author__    = "Kovid Goyal <kovid@kovidgoyal.net>"
 
 import re

src/calibre/gui2/preferences/behavior.py

@@ -18,6 +18,7 @@ from calibre.customize.ui import available_output_formats, all_input_formats
 from calibre.utils.search_query_parser import saved_searches
 from calibre.ebooks import BOOK_EXTENSIONS
 from calibre.ebooks.oeb.iterator import is_supported
+from calibre.constants import iswindows
 
 class ConfigWidget(ConfigWidgetBase, Ui_Form):
 
@@ -57,6 +58,9 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
             signal = getattr(self.opt_internally_viewed_formats, 'item'+signal)
             signal.connect(self.internally_viewed_formats_changed)
 
+        self.settings['worker_process_priority'].gui_obj.setVisible(iswindows)
+        self.priority_label.setVisible(iswindows)
+
 
     def initialize(self):
         ConfigWidgetBase.initialize(self)
@@ -70,7 +74,8 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
 
     def commit(self):
         input_map = prefs['input_format_order']
-        input_cols = [unicode(self.input_order.item(i).data(Qt.UserRole).toString()) for i in range(self.input_order.count())]
+        input_cols = [unicode(self.opt_input_order.item(i).data(Qt.UserRole).toString()) for
+                i in range(self.opt_input_order.count())]
         if input_map != input_cols:
             prefs['input_format_order'] = input_cols
         fmts = self.current_internally_viewed_formats

src/calibre/library/server/mobile.py

@@ -156,7 +156,7 @@ def build_index(books, num, search, sort, order, start, total, url_base, CKEYS):
 class MobileServer(object):
     'A view optimized for browsers in mobile devices'
 
-    MOBILE_UA = re.compile('(?i)(?:iPhone|Opera Mini|NetFront|webOS|Mobile|Android|imode|DoCoMo|Minimo|Blackberry|MIDP|Symbian|HD2)')
+    MOBILE_UA = re.compile('(?i)(?:iPhone|Opera Mini|NetFront|webOS|Mobile|Android|imode|DoCoMo|Minimo|Blackberry|MIDP|Symbian|HD2|Kindle)')
 
     def add_routes(self, connect):
         connect('mobile', '/mobile', self.mobile)

src/calibre/manual/faq.rst

@@ -223,7 +223,7 @@ the server has IP address 63.45.128.5, in the browser, you would type::
 
     http://63.45.128.5:8080
 
-Some devices, like the Kindle, do not allow you to access port 8080 (the default port on which the content
+Some devices, like the Kindle (1/2/DX), do not allow you to access port 8080 (the default port on which the content
 server runs. In that case, change the port in the |app| Preferences to 80. (On some operating systems,
 you may not be able to run the server on a port number less than 1024 because of security settings. In
 this case the simplest solution is to adjust your router to forward requests on port 80 to port 8080).