Don't allow editing of config category names. Fix import.

src/calibre/gui2/dialogs/config.py

@@ -18,7 +18,7 @@ from calibre.utils.config import prefs
 from calibre.gui2.widgets import FilenamePattern
 from calibre.gui2.library import BooksModel
 from calibre.ebooks import BOOK_EXTENSIONS
-from calibre.ebooks.epub.iterator import is_supported
+from calibre.ebooks.oeb.iterator import is_supported
 from calibre.library import server_config
 from calibre.customize.ui import initialized_plugins, is_disabled, enable_plugin, \
                                  disable_plugin, customize_plugin, \

src/calibre/gui2/dialogs/config.ui

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0" >
  <author>Kovid Goyal</author>
  <class>Dialog</class>
@@ -24,7 +23,7 @@
      <item>
       <widget class="QListView" name="category_view" >
        <property name="sizePolicy" >
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
+        <sizepolicy vsizetype="Expanding" hsizetype="MinimumExpanding" >
          <horstretch>1</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -35,6 +34,9 @@
          <bold>true</bold>
         </font>
        </property>
+       <property name="editTriggers" >
+        <set>QAbstractItemView::NoEditTriggers</set>
+       </property>
        <property name="tabKeyNavigation" >
         <bool>true</bool>
        </property>
@@ -67,7 +69,7 @@
      <item>
       <widget class="QStackedWidget" name="stackedWidget" >
        <property name="sizePolicy" >
-        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+        <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
          <horstretch>100</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -563,7 +565,7 @@
            <item>
             <widget class="QLineEdit" name="email_from" >
              <property name="toolTip" >
-              <string>&lt;p&gt;This is what will be present in the From: field of emails sent by calibre.&lt;br&gt; Set it to your email address</string>
+              <string>&lt;p>This is what will be present in the From: field of emails sent by calibre.&lt;br> Set it to your email address</string>
              </property>
             </widget>
            </item>
@@ -640,7 +642,7 @@
          <item row="3" column="0" >
           <widget class="QGroupBox" name="groupBox_5" >
            <property name="toolTip" >
-            <string>&lt;p&gt;A mail server is useful if the service you are sending mail to only accepts email from well know mail services.</string>
+            <string>&lt;p>A mail server is useful if the service you are sending mail to only accepts email from well know mail services.</string>
            </property>
            <property name="title" >
             <string>Mail &amp;Server</string>
@@ -649,7 +651,7 @@
             <item row="0" column="0" colspan="4" >
              <widget class="QLabel" name="label_16" >
               <property name="text" >
-               <string>calibre can &lt;b&gt;optionally&lt;/b&gt; use a server to send mail</string>
+               <string>calibre can &lt;b>optionally&lt;/b> use a server to send mail</string>
               </property>
               <property name="wordWrap" >
                <bool>true</bool>