Skip to content

Commit c9e4253

Browse files
committed
-updates keyboardshortcut help
-help related files created on Windows always use \n line ending
1 parent 1638d99 commit c9e4253

File tree

4 files changed

+9
-2
lines changed

4 files changed

+9
-2
lines changed
188 Bytes
Binary file not shown.

doc/help_dialogs/Output_html/keyboardshortcuts_help.html

+6
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,12 @@
367367
<td>Copy table</td>
368368
<td>&#160;</td>
369369
</tr>
370+
<tr>
371+
<td>Click on Energy / CO2 result area</td>
372+
<td>Roast Properties Energy tab</td>
373+
<td>Toggle &#39;per kg green coffee&#39; result for Batch or Roast</td>
374+
<td>&#160;</td>
375+
</tr>
370376
<tr>
371377
<td>OPTION click &#39;Copy Table&#39; Button [Mac]<br>ALT click &#39;Copy Table&#39; Button [Win]</td>
372378
<td>Various</td>

doc/help_dialogs/Script/xlsx_to_artisan_help.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ def writepyFile(filename_in:str, filename_out:str) -> None:
272272
outstr = buildpyCode(filename_in)
273273

274274
# write outstr (py code) to the specified filename
275-
with open(filename_out,'w', encoding='utf-8') as file_object:
275+
with open(filename_out, 'w', encoding='utf-8', newline='\n') as file_object:
276276
file_object.write(outstr)
277277
sleep(0.01) #allow the previous write to settle, resolves appveyor file read fail
278278

@@ -286,7 +286,7 @@ def writehtmlFile(_fname_in:str, filename_out:str, filename_htm:str) -> None:
286286
htmstr = var.content() + '\n'
287287

288288
# write htmlstr (html) to the specified filename
289-
with open(filename_htm,'w', encoding='utf-8') as file_object:
289+
with open(filename_htm, 'w', encoding='utf-8', newline='\n') as file_object:
290290
file_object.write(htmstr)
291291

292292
if __name__ == '__main__':

src/help/keyboardshortcuts_help.py

+1
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ def content() -> str:
9494
tbl_AddlShortcuts.add_row([QApplication.translate('HelpDlg','Enter'),QApplication.translate('HelpDlg','Roast Properties Roast Tab\nVolume Calculator Unit, Green Unit Weight or Roasted Unit Weight field'),QApplication.translate('HelpDlg','Overwrite with current scale weight (same action as &#39;unit&#39;, &#39;in&#39;, &#39;out&#39; buttons)'),QApplication.translate('HelpDlg','Requires a connected scale')])
9595
tbl_AddlShortcuts.add_row([QApplication.translate('HelpDlg','Enter'),QApplication.translate('HelpDlg','Roast Properties Roast tab\nGreen Weight or Roasted Weight field'),QApplication.translate('HelpDlg','Overwrite with current scale weight'),QApplication.translate('HelpDlg','Requires a connected scale')])
9696
tbl_AddlShortcuts.add_row([QApplication.translate('HelpDlg','⌘+C [Mac]\nCTRL+C [Win]'),QApplication.translate('HelpDlg','Roast Properties Data tab'),QApplication.translate('HelpDlg','Copy table'),'&#160;'])
97+
tbl_AddlShortcuts.add_row([QApplication.translate('HelpDlg','Click on Energy / CO2 result area'),QApplication.translate('HelpDlg','Roast Properties Energy tab'),QApplication.translate('HelpDlg','Toggle &#39;per kg green coffee&#39; result for Batch or Roast'),'&#160;'])
9798
tbl_AddlShortcuts.add_row([QApplication.translate('HelpDlg','OPTION click &#39;Copy Table&#39; Button [Mac]\nALT click &#39;Copy Table&#39; Button [Win]'),QApplication.translate('HelpDlg','Various'),QApplication.translate('HelpDlg','For various tables this copies the table in tabular form'),'&#160;'])
9899
tbl_AddlShortcuts.add_row([QApplication.translate('HelpDlg','Click on Home Icon\nWhile recording only'),QApplication.translate('HelpDlg','Navigation Toolbar'),QApplication.translate('HelpDlg','Toggle Zoom Follow (automatic panning)'),QApplication.translate('HelpDlg','Zoom action while recording sets Follow ON')])
99100
tbl_AddlShortcuts.add_row([QApplication.translate('HelpDlg','Hold Shift+Option [Mac]\nHold Shift+Alt [Win]'),QApplication.translate('HelpDlg','When starting Artisan'),QApplication.translate('HelpDlg','Skip Settings Load'),'&#160;'])

0 commit comments

Comments
 (0)