From 9870fc6a61c7cb58ea4958578c904b998515ba98 Mon Sep 17 00:00:00 2001 From: gitlost Date: Tue, 5 Jul 2022 01:35:24 +0100 Subject: [PATCH] GUI: undo Windows * -> + change as formatting data, not filenames, doh --- docs/manual.pmd | 12 ++++++------ docs/manual.txt | 4 ++-- frontend_qt/extSequence.ui | 4 ++-- frontend_qt/sequencewindow.cpp | 4 ---- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/docs/manual.pmd b/docs/manual.pmd index 6b7212ca..72408fe0 100644 --- a/docs/manual.pmd +++ b/docs/manual.pmd @@ -341,12 +341,12 @@ each line of text in the right hand panel. The format field determines the format of the automatically generated sequence where characters have the meanings as given below: -| Character | Effect | -|:-------------------|:---------------------------------------------------| -|`$` | Insert leading zeroes | -|`#` | Insert leading spaces | -|`*` | Insert leading asterisks (or plus signs on Windows)| -|Any other character | Interpreted literally | +| Character | Effect | +|:-------------------|:------------------------| +|`$` | Insert leading zeroes | +|`#` | Insert leading spaces | +|`*` | Insert leading asterisks| +|Any other character | Interpreted literally | Table: {#tbl:sequence_format_characters tag=": Sequence Format Characters"} diff --git a/docs/manual.txt b/docs/manual.txt index 7ebae415..5a512551 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -502,10 +502,10 @@ format of the automatically generated sequence where characters have the meanings as given below: Character Effect - --------------------- ----------------------------------------------------- + --------------------- -------------------------- $ Insert leading zeroes # Insert leading spaces - * Insert leading asterisks (or plus signs on Windows) + * Insert leading asterisks Any other character Interpreted literally : Table : Sequence Format Characters: diff --git a/frontend_qt/extSequence.ui b/frontend_qt/extSequence.ui index a608abfc..4b8154cb 100644 --- a/frontend_qt/extSequence.ui +++ b/frontend_qt/extSequence.ui @@ -121,7 +121,7 @@ Format sequence using special characters<table cellspacing="3"> <tr><td>$</td><td>Number or '0'</td></tr> <tr><td>#</td><td>Number or space</td></tr> -<tr><td>*</td><td>Number or '*' ('+' on Windows)</td></tr> +<tr><td>*</td><td>Number or '*'</td></tr> <tr><td>Other</td><td>Insert literally</td></tr> </table> @@ -139,7 +139,7 @@ Format sequence using special characters<table cellspacing="3"> <tr><td>$</td><td>Number or '0'</td></tr> <tr><td>#</td><td>Number or space</td></tr> -<tr><td>*</td><td>Number or '*' ('+' on Windows)</td></tr> +<tr><td>*</td><td>Number or '*'</td></tr> <tr><td>Other</td><td>Insert literally</td></tr> </table> diff --git a/frontend_qt/sequencewindow.cpp b/frontend_qt/sequencewindow.cpp index 1e22fe46..0af217bd 100644 --- a/frontend_qt/sequencewindow.cpp +++ b/frontend_qt/sequencewindow.cpp @@ -120,11 +120,7 @@ QString SequenceWindow::apply_format(const QString& raw_number) adjusted += raw_number[inpos - 1]; inpos--; } else { -#ifndef _WIN32 adjusted += '*'; -#else - adjusted += '+'; -#endif } break; default: