diff --git a/comictaggerlib/settingswindow.py b/comictaggerlib/settingswindow.py index 1e35ca6..30ab344 100644 --- a/comictaggerlib/settingswindow.py +++ b/comictaggerlib/settingswindow.py @@ -77,8 +77,8 @@ old_template_tooltip = """ new_template_tooltip = """ 
The template for the new filename. Uses python format strings https://docs.python.org/3/library/string.html#format-string-syntax
 Accepts the following variables:
-{isEmpty}       (boolean)
-{tagOrigin}     (string)
+{is_empty}       (boolean)
+{tag_origin}     (string)
 {series}        (string)
 {issue}     (string)
 {title}     (string)
@@ -86,42 +86,42 @@ Accepts the following variables:
 {month}     (integer)
 {year}      (integer)
 {day}       (integer)
-{issueCount}    (integer)
+{issue_count}    (integer)
 {volume}        (integer)
 {genre}     (string)
 {language}      (string)
 {comments}      (string)
-{volumeCount}   (integer)
-{criticalRating}    (string)
+{volume_count}   (integer)
+{critical_rating}    (string)
 {country}       (string)
-{alternateSeries}   (string)
-{alternateNumber}   (string)
-{alternateCount}    (integer)
+{alternate_series}   (string)
+{alternate_number}   (string)
+{alternate_count}    (integer)
 {imprint}       (string)
 {notes}     (string)
-{webLink}       (string)
+{web_link}       (string)
 {format}        (string)
 {manga}     (string)
-{blackAndWhite} (boolean)
-{pageCount}     (integer)
-{maturityRating}    (string)
-{storyArc}      (string)
-{seriesGroup}   (string)
-{scanInfo}      (string)
+{black_and_white} (boolean)
+{page_count}     (integer)
+{maturity_rating}    (string)
+{story_arc}      (string)
+{series_group}   (string)
+{scan_info}      (string)
 {characters}    (string)
 {teams}     (string)
 {locations}     (string)
-{credits}       (list of dict({'role': 'str', 'person': 'str', 'primary': boolean}))
+{credits}       (list of dict({'role': string, 'person': string, 'primary': boolean}))
 {tags}      (list of str)
-{pages}     (list of dict({'Image': 'str(int)', 'Type': 'str'}))
+{pages}     (list of dict({'Image': string(int), 'Type': string}))
 
 CoMet-only items:
 {price}     (float)
-{isVersionOf}   (string)
+{is_version_of}   (string)
 {rights}        (string)
 {identifier}    (string)
-{lastMark}  (string)
-{coverImage}    (string)
+{last_mark}  (string)
+{cover_image}    (string)
 
 Examples:
 
diff --git a/comictaggerlib/ui/TemplateHelp.ui b/comictaggerlib/ui/TemplateHelp.ui
index 0a692f1..ca1e8f9 100644
--- a/comictaggerlib/ui/TemplateHelp.ui
+++ b/comictaggerlib/ui/TemplateHelp.ui
@@ -27,65 +27,87 @@
     2
    
    
-    
+    
      
       true
      
      
       <html>
-	<head/>
+	<head>
+     <style>
+table {
+  font-family: arial, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+td, th {
+  border: 1px solid #dddddd;
+  text-align: left;
+  padding: 8px;
+}
+
+tr:nth-child(even) {
+  background-color: #dddddd;
+}
+</style>
+     </head>
 	<body>
-		<h1 style="text-align: center">Template help</h1>
+		<h1 style="text-align: center">Template help</h1>
 		<p>The template uses Python format strings, in the simplest use it replaces the field (e.g. {issue}) with the value for that particular comic (e.g. 1) for advanced formatting please reference the
 
-			<a href="https://docs.python.org/3/library/string.html#format-string-syntax">Python 3 documentation</a></p>
-		<pre>Accepts the following variables:
-{isEmpty}		(boolean)
-{tagOrigin}		(string)
-{series}		(string)
-{issue}		(string)
-{title}		(string)
-{publisher}		(string)
-{month}		(integer)
-{year}		(integer)
-{day}		(integer)
-{issueCount}	(integer)
-{volume}		(integer)
-{genre}		(string)
-{language}		(string)
-{comments}		(string)
-{volumeCount}	(integer)
-{criticalRating}	(string)
-{country}		(string)
-{alternateSeries}	(string)
-{alternateNumber}	(string)
-{alternateCount}	(integer)
-{imprint}		(string)
-{notes}		(string)
-{webLink}		(string)
-{format}		(string)
-{manga}		(string)
-{blackAndWhite}	(boolean)
-{pageCount}		(integer)
-{maturityRating}	(string)
-{storyArc}		(string)
-{seriesGroup}	(string)
-{scanInfo}		(string)
-{characters}	(string)
-{teams}		(string)
-{locations}		(string)
-{credits}		(list of dict({'role': 'str', 'person': 'str', 'primary': boolean}))
-{tags}		(list of str)
-{pages}		(list of dict({'Image': 'str(int)', 'Type': 'str'}))
-
-CoMet-only items:
-{price}		(float)
-{isVersionOf}	(string)
-{rights}		(string)
-{identifier}	(string)
-{lastMark}	(string)
-{coverImage}	(string)
-
+			<a href="https://docs.python.org/3/library/string.html#format-string-syntax">Python 3 documentation</a></p>
+		Accepts the following variables:
+<table>
+     <tr>
+          <th>Tag name</th>
+          <th>Type</th>
+     </tr>
+     <tr><td>{is_empty}</td><td>boolean</td></tr>
+     <tr><td>{tag_origin}</td><td>string</td></tr>
+     <tr><td>{series}</td><td>string</td></tr>
+     <tr><td>{issue}</td><td>string</td></tr>
+     <tr><td>{title}</td><td>string</td></tr>
+     <tr><td>{publisher}</td><td>string</td></tr>
+     <tr><td>{month}</td><td>integer</td></tr>
+     <tr><td>{year}</td><td>integer</td></tr>
+     <tr><td>{day}</td><td>integer</td></tr>
+     <tr><td>{issue_count}</td><td>integer</td></tr>
+     <tr><td>{volume}</td><td>integer</td></tr>
+     <tr><td>{genre}</td><td>string</td></tr>
+     <tr><td>{language}</td><td>string</td></tr>
+     <tr><td>{comments}</td><td>string</td></tr>
+     <tr><td>{volume_count}</td><td>integer</td></tr>
+     <tr><td>{critical_rating}</td><td>string</td></tr>
+     <tr><td>{country}</td><td>string</td></tr>
+     <tr><td>{alternate_series}</td><td>string</td></tr>
+     <tr><td>{alternate_number}</td><td>string</td></tr>
+     <tr><td>{alternate_count}</td><td>integer</td></tr>
+     <tr><td>{imprint}</td><td>string</td></tr>
+     <tr><td>{notes}</td><td>string</td></tr>
+     <tr><td>{web_link}</td><td>string</td></tr>
+     <tr><td>{format}</td><td>string</td></tr>
+     <tr><td>{manga}</td><td>string</td></tr>
+     <tr><td>{black_and_white}</td><td>boolean</td></tr>
+     <tr><td>{page_count}</td><td>integer</td></tr>
+     <tr><td>{maturity_rating}</td><td>string</td></tr>
+     <tr><td>{story_arc}</td><td>string</td></tr>
+     <tr><td>{series_group}</td><td>string</td></tr>
+     <tr><td>{scan_info}</td><td>string</td></tr>
+     <tr><td>{characters}</td><td>string</td></tr>
+     <tr><td>{teams}</td><td>string</td></tr>
+     <tr><td>{locations}</td><td>string</td></tr>
+     <tr><td>{credits}</td><td>list of dict({'role': string, 'person': string, 'primary': boolean})</td></tr>
+     <tr><td>{tags}</td><td>list of str</td></tr>
+     <tr><td>{pages}</td><td>list of dict({'Image': string(int), 'Type': string})</td></tr>
+     <tr><td>{price}</td><td>float</td></tr>
+     <tr><td>{is_version_of}</td><td>string</td></tr>
+     <tr><td>{rights}</td><td>string</td></tr>
+     <tr><td>{identifier}</td><td>string</td></tr>
+     <tr><td>{last_mark}</td><td>string</td></tr>
+     <tr><td>{cover_image}</td><td>string</td></tr>
+</table>
+<pre>
 Examples:
 
 {series} {issue} ({year})
@@ -96,7 +118,9 @@ Spider-Geddon #1 - New Players; Check In
 
 </pre>
 	</body>
-</html>
+</html>
+     
+      Qt::TextBrowserInteraction
      
      
       true