mirror of
https://github.com/zint/zint
synced 2024-11-16 20:57:25 +13:00
frontend: batch: for @ use + instead of * on Windows as * not allowed
in filenames GUI: sequence: similarly for * use + instead of * on Windows
This commit is contained in:
@ -119,9 +119,9 @@
|
||||
<widget class="QLabel" name="lblSeqFormat">
|
||||
<property name="toolTip">
|
||||
<string>Format sequence using special characters<table cellspacing="3">
|
||||
<tr><td>#</td><td>Number or space</td></tr>
|
||||
<tr><td>$</td><td>Number or '0'</td></tr>
|
||||
<tr><td>*</td><td>Number or '*'</td></tr>
|
||||
<tr><td>#</td><td>Number or space</td></tr>
|
||||
<tr><td>*</td><td>Number or '*' ('+' on Windows)</td></tr>
|
||||
<tr><td>Other</td><td>Insert literally</td></tr>
|
||||
</table></string>
|
||||
</property>
|
||||
@ -137,9 +137,9 @@
|
||||
<widget class="QLineEdit" name="linSeqFormat">
|
||||
<property name="toolTip">
|
||||
<string>Format sequence using special characters<table cellspacing="3">
|
||||
<tr><td>#</td><td>Number or space</td></tr>
|
||||
<tr><td>$</td><td>Number or '0'</td></tr>
|
||||
<tr><td>*</td><td>Number or '*'</td></tr>
|
||||
<tr><td>#</td><td>Number or space</td></tr>
|
||||
<tr><td>*</td><td>Number or '*' ('+' on Windows)</td></tr>
|
||||
<tr><td>Other</td><td>Insert literally</td></tr>
|
||||
</table></string>
|
||||
</property>
|
||||
|
@ -120,7 +120,11 @@ QString SequenceWindow::apply_format(const QString& raw_number)
|
||||
adjusted += raw_number[inpos - 1];
|
||||
inpos--;
|
||||
} else {
|
||||
#ifndef _WIN32
|
||||
adjusted += '*';
|
||||
#else
|
||||
adjusted += '+';
|
||||
#endif
|
||||
}
|
||||
break;
|
||||
default:
|
||||
@ -129,7 +133,7 @@ QString SequenceWindow::apply_format(const QString& raw_number)
|
||||
}
|
||||
}
|
||||
|
||||
for(i = format_len; i > 0; i--) {
|
||||
for (i = format_len; i > 0; i--) {
|
||||
reversed += adjusted[i - 1];
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user