GR tweaks to tweak-epub

src/calibre/gui2/actions/tweak_epub.py

@@ -40,8 +40,7 @@ class TweakEpubAction(InterfaceAction):
                     _('No ePub available. First convert the book to ePub.'),
                     show=True)
 
-
+        # Launch modal dialog waiting for user to tweak or cancel
-        # Launch a modal dialog waiting for user to complete or cancel
         dlg = TweakEpub(self.gui, path_to_epub)
         if dlg.exec_() == dlg.Accepted:
             self.update_db(book_id, dlg._output)

src/calibre/gui2/dialogs/tweak_epub.py

@@ -21,8 +21,6 @@ class TweakEpub(QDialog, Ui_Dialog):
     '''
     Display controls for tweaking ePubs
 
-    To do:
-        - need way to kill file browser proc in cleanup()
     '''
 
     def __init__(self, parent, epub):
@@ -30,7 +28,6 @@ class TweakEpub(QDialog, Ui_Dialog):
 
         self._epub = epub
         self._exploded = None
-        #self._file_browser_proc = None
         self._output = None
 
         # Run the dialog setup generated from tweak_epub.ui

src/calibre/gui2/dialogs/tweak_epub.ui

@@ -32,7 +32,7 @@
       <string>&amp;Explode ePub</string>
      </property>
      <property name="icon">
-      <iconset resource="../../../../resources/images.qrc">
+      <iconset>
        <normaloff>:/images/wizard.png</normaloff>:/images/wizard.png</iconset>
      </property>
     </widget>
@@ -49,7 +49,7 @@
       <string>&amp;Rebuild ePub</string>
      </property>
      <property name="icon">
-      <iconset resource="../../../../resources/images.qrc">
+      <iconset>
        <normaloff>:/images/exec.png</normaloff>:/images/exec.png</iconset>
      </property>
     </widget>
@@ -63,7 +63,7 @@
       <string>&amp;Cancel</string>
      </property>
      <property name="icon">
-      <iconset resource="../../../../resources/images.qrc">
+      <iconset>
        <normaloff>:/images/window-close.png</normaloff>:/images/window-close.png</iconset>
      </property>
     </widget>
@@ -71,7 +71,7 @@
    <item row="0" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
-      <string>First, explode the epub. Then edit is contents by right clicking on the individual files and selecting the editor of your choice. When you are done, click rebuild epub and the epub in your calibre library will be updated with the changes you have made.</string>
+      <string>Explode the ePub to display contents in a file browser window. To tweak individual files, right-click, selecting 'Open with...' your editor of choice. When tweaks are complete, close the file browser window. Rebuild the ePub, updating your calibre library.</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>