mirrors/zint
2
0
Fork 0
mirror of https://github.com/zint/zint synced 2024-11-16 20:57:25 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

GUI: undo Windows * -> + change as formatting data, not filenames, doh

Browse Source
This commit is contained in:
gitlost 2022-07-05 01:35:24 +01:00
parent 8525597b81
commit 9870fc6a61
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/manual.pmd
View File

@ -342,10 +342,10 @@ format of the automatically generated sequence where characters have the
meanings as given below: meanings as given below:
| Character | Effect | | Character | Effect |
|:-------------------|:---------------------------------------------------| |:-------------------|:------------------------|
|`$` | Insert leading zeroes | |`$` | Insert leading zeroes |
|`#` | Insert leading spaces | |`#` | Insert leading spaces |
|`*` | Insert leading asterisks (or plus signs on Windows)| |`*` | Insert leading asterisks|
|Any other character | Interpreted literally | |Any other character | Interpreted literally |
Table: {#tbl:sequence_format_characters tag=": Sequence Format Characters"} Table: {#tbl:sequence_format_characters tag=": Sequence Format Characters"}

4
docs/manual.txt
View File

@ -502,10 +502,10 @@ format of the automatically generated sequence where characters have the
meanings as given below: meanings as given below:
Character Effect Character Effect
--------------------- ----------------------------------------------------- --------------------- --------------------------
$ Insert leading zeroes $ Insert leading zeroes
# Insert leading spaces # Insert leading spaces
* Insert leading asterisks (or plus signs on Windows) * Insert leading asterisks
Any other character Interpreted literally Any other character Interpreted literally
: Table : Sequence Format Characters: : Table : Sequence Format Characters:

4
frontend_qt/extSequence.ui
View File

@ -121,7 +121,7 @@
<string>Format sequence using special characters&lt;table cellspacing=&quot;3&quot;&gt; <string>Format sequence using special characters&lt;table cellspacing=&quot;3&quot;&gt;
&lt;tr&gt;&lt;td&gt;$&lt;/td&gt;&lt;td&gt;Number or '0'&lt;/td&gt;&lt;/tr&gt; &lt;tr&gt;&lt;td&gt;$&lt;/td&gt;&lt;td&gt;Number or '0'&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;td&gt;#&lt;/td&gt;&lt;td&gt;Number or space&lt;/td&gt;&lt;/tr&gt; &lt;tr&gt;&lt;td&gt;#&lt;/td&gt;&lt;td&gt;Number or space&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;td&gt;*&lt;/td&gt;&lt;td&gt;Number or '*' ('+' on Windows)&lt;/td&gt;&lt;/tr&gt; &lt;tr&gt;&lt;td&gt;*&lt;/td&gt;&lt;td&gt;Number or '*'&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;td&gt;Other&lt;/td&gt;&lt;td&gt;Insert literally&lt;/td&gt;&lt;/tr&gt; &lt;tr&gt;&lt;td&gt;Other&lt;/td&gt;&lt;td&gt;Insert literally&lt;/td&gt;&lt;/tr&gt;
&lt;/table&gt;</string> &lt;/table&gt;</string>
</property> </property>
@ -139,7 +139,7 @@
<string>Format sequence using special characters&lt;table cellspacing=&quot;3&quot;&gt; <string>Format sequence using special characters&lt;table cellspacing=&quot;3&quot;&gt;
&lt;tr&gt;&lt;td&gt;$&lt;/td&gt;&lt;td&gt;Number or '0'&lt;/td&gt;&lt;/tr&gt; &lt;tr&gt;&lt;td&gt;$&lt;/td&gt;&lt;td&gt;Number or '0'&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;td&gt;#&lt;/td&gt;&lt;td&gt;Number or space&lt;/td&gt;&lt;/tr&gt; &lt;tr&gt;&lt;td&gt;#&lt;/td&gt;&lt;td&gt;Number or space&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;td&gt;*&lt;/td&gt;&lt;td&gt;Number or '*' ('+' on Windows)&lt;/td&gt;&lt;/tr&gt; &lt;tr&gt;&lt;td&gt;*&lt;/td&gt;&lt;td&gt;Number or '*'&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;td&gt;Other&lt;/td&gt;&lt;td&gt;Insert literally&lt;/td&gt;&lt;/tr&gt; &lt;tr&gt;&lt;td&gt;Other&lt;/td&gt;&lt;td&gt;Insert literally&lt;/td&gt;&lt;/tr&gt;
&lt;/table&gt;</string> &lt;/table&gt;</string>
</property> </property>

4
frontend_qt/sequencewindow.cpp
View File

@ -120,11 +120,7 @@ QString SequenceWindow::apply_format(const QString& raw_number)
adjusted += raw_number[inpos - 1]; adjusted += raw_number[inpos - 1];
inpos--; inpos--;
} else { } else {
#ifndef _WIN32
adjusted += '*'; adjusted += '*';
#else
adjusted += '+';
#endif
} }
break; break;
default: default: