Merge pull request #29 from rupor-github/profiles

New default profiles for GUI version

fb2mobi-gui.config

@@ -1,32 +1,32 @@
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-  <currentProfile>default</currentProfile>
+  <currentProfile>KindleNew</currentProfile>
   <currentFormat>mobi</currentFormat>
   <embedFontFamily/>
-  <hyphens>No</hyphens>
+  <hyphens>profile</hyphens>
   <outputFolder/>
-  <lastUsedTargetPath>C:\Users\dnkorpushov\Desktop\dest</lastUsedTargetPath>
-  <lastUsedPath>C:\Users\dnkorpushov\Google Диск\Библиотека\Довлатов, Сергей</lastUsedPath>
+  <lastUsedTargetPath>C:\Users\dnkorpushov\Desktop</lastUsedTargetPath>
+  <lastUsedPath/>
   <writeLog>True</writeLog>
-  <clearLogAfterExit>True</clearLogAfterExit>
+  <clearLogAfterExit>False</clearLogAfterExit>
   <logLevel>DEBUG</logLevel>
   <kindlePath/>
-  <kindleSyncCovers>True</kindleSyncCovers>
+  <kindleSyncCovers>False</kindleSyncCovers>
   <kindleDocsSubfolder/>
   <GoogleMail/>
   <GooglePassword/>
   <KindleMail/>
   <bookInfoVisible>True</bookInfoVisible>
-  <bookInfoSplitterState>712, 261</bookInfoSplitterState>
+  <bookInfoSplitterState>508, 406</bookInfoSplitterState>
   <columns>
-    <c0>356</c0>
-    <c1>281</c1>
-    <c2>73</c2>
+    <c0>100</c0>
+    <c1>100</c1>
+    <c2>306</c2>
   </columns>
   <geometry>
-    <x>243</x>
-    <y>238</y>
-    <width>996</width>
-    <height>558</height>
+    <x>483</x>
+    <y>209</y>
+    <width>937</width>
+    <height>562</height>
   </geometry>
 </settings>

fb2mobi-gui.py

@@ -743,7 +743,7 @@ def generateFontCSS(self):
                '.table th', '.table td', '.annotation', 'body']
 
 
-        css_string = modules.default_css.default_css
+        css_string = modules.default_css.gui_default_css
         css = cssutils.parseString(css_string)
 
         font_regular = ''

fb2mobi.config

@@ -28,6 +28,77 @@
   <!--defaultProfile>chapters</defaultProfile-->
 
   <profiles>
+
+        <profile description="Kindle PW, Voyage, Oasis" name="KindleNew">
+            <openBookFromCover>False</openBookFromCover>
+            <kindleRemovePersonalLabel>False</kindleRemovePersonalLabel>
+            <removePngTransparency>True</removePngTransparency>
+            <generateAPNX>False</generateAPNX>
+
+            <hyphens>False</hyphens>
+            <hyphensReplaceNBSP>True</hyphensReplaceNBSP>
+
+            <css parse="True">profiles/kindle.css</css>
+            <xslt>profiles/dash_spaces.xsl</xslt>
+
+            <generateOPFGuide>True</generateOPFGuide>
+
+            <dropcaps>None</dropcaps>
+
+            <chapterOnNewPage>True</chapterOnNewPage>
+
+            <authorFormat>#l #f #m</authorFormat>
+            <bookTitleFormat>{(#abbrseries{ #padnumber}) }#title</bookTitleFormat>
+
+            <annotationTitle>Аннотация</annotationTitle>
+            <generateAnnotationPage>True</generateAnnotationPage>
+
+            <tocBeforeBody>False</tocBeforeBody>
+            <tocTitle>Содержание</tocTitle>
+            <tocType>Kindle</tocType>
+            <generateTOCPage>True</generateTOCPage>
+
+            <notesMode>float</notesMode>
+            <notesBodies>notes,Примечания</notesBodies>
+
+      <vignettes/>
+    </profile>    
+
+    <profile description="Kindle 4, 5, Touch" name="KindleOld">
+            <openBookFromCover>False</openBookFromCover>
+            <kindleRemovePersonalLabel>False</kindleRemovePersonalLabel>
+            <removePngTransparency>True</removePngTransparency>
+            <generateAPNX>False</generateAPNX>
+
+            <hyphens>True</hyphens>
+            <hyphensReplaceNBSP>True</hyphensReplaceNBSP>
+
+            <css parse="True">profiles/kindle.css</css>
+            <xslt>profiles/dash_spaces.xsl</xslt>
+
+            <generateOPFGuide>True</generateOPFGuide>
+
+            <dropcaps>None</dropcaps>
+
+            <chapterOnNewPage>True</chapterOnNewPage>
+
+            <authorFormat>#l #f #m</authorFormat>
+            <bookTitleFormat>{(#abbrseries{ #padnumber}) }#title</bookTitleFormat>
+
+            <annotationTitle>Аннотация</annotationTitle>
+            <generateAnnotationPage>True</generateAnnotationPage>
+
+            <tocBeforeBody>False</tocBeforeBody>
+            <tocTitle>Содержание</tocTitle>
+            <tocType>Kindle</tocType>
+            <generateTOCPage>True</generateTOCPage>
+
+            <notesMode>default</notesMode>
+            <notesBodies>notes,Примечания</notesBodies>
+
+      <vignettes/>
+    </profile>   
+
     <profile description="Default profile" name="default">
 
       <openBookFromCover>False</openBookFromCover>