From 852ec5a0c9f38b896bd4b5c2bb293126b35c3aea Mon Sep 17 00:00:00 2001
From: Bill Kendrick
Date: Fri, 5 Feb 2021 18:05:25 -0800
Subject: [PATCH] Noting that colorsrows can only be between 1 & 3
---
docs/en/OPTIONS.txt | 3 ++-
docs/en/README.txt | 4 ++--
docs/en/html/OPTIONS.html | 2 +-
docs/en/html/README.html | 4 ++--
docs/es_ES.UTF-8/OPTIONS.txt | 3 ++-
docs/es_ES.UTF-8/README.txt | 4 ++--
docs/es_ES.UTF-8/html/OPTIONS.html | 2 +-
docs/es_ES.UTF-8/html/README.html | 4 ++--
docs/fr_FR.UTF-8/OPTIONS.txt | 3 ++-
docs/fr_FR.UTF-8/README.txt | 4 ++--
docs/fr_FR.UTF-8/html/OPTIONS.html | 2 +-
docs/fr_FR.UTF-8/html/README.html | 4 ++--
docs/gl_ES.UTF-8/OPTIONS.txt | 3 ++-
docs/gl_ES.UTF-8/README.txt | 4 ++--
docs/gl_ES.UTF-8/html/OPTIONS.html | 2 +-
docs/gl_ES.UTF-8/html/README.html | 4 ++--
src/manpage/tuxpaint.1 | 4 ++--
src/tuxpaint-completion.bash | 3 ++-
18 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/docs/en/OPTIONS.txt b/docs/en/OPTIONS.txt
index 3651fa258..cbd300cb6 100644
--- a/docs/en/OPTIONS.txt
+++ b/docs/en/OPTIONS.txt
@@ -718,7 +718,8 @@ Windows Users
How many rows of color palette buttons to show; useful when
using a large color palette (see "colorfile", above), and/or for
- use with coarse input devices (like eyegaze trackers).
+ use with coarse input devices (like eyegaze trackers). "ROWS"
+ may be between "1" (the default) and "3".
lang=LANGUAGE
diff --git a/docs/en/README.txt b/docs/en/README.txt
index eeb21b43a..ba88036bb 100644
--- a/docs/en/README.txt
+++ b/docs/en/README.txt
@@ -874,7 +874,7 @@ Using the import script, "tuxpaint-import"
Example:
$ tuxpaint-import grandma.jpg
- grandma.jpg -> /home/username/.tuxpaint/saved/20210205175230.png
+ grandma.jpg -> /home/username/.tuxpaint/saved/20210205180425.png
jpegtopnm: WRITING A PPM FILE
The first line ("tuxpaint-import grandma.jpg") is the command to run.
@@ -916,7 +916,7 @@ Importing Pictures Manually
* mm = Minute (two digits, "00"-"59")
* ss = Seconds (two digits, "00"-"59")
- Example: "20210205175230.png", for 5 February 2021 at 17:52:30.
+ Example: "20210205180425.png", for 5 February 2021 at 18:04:25.
Place this PNG file in your Tux Paint "saved" directory/folder. (See
above.)
diff --git a/docs/en/html/OPTIONS.html b/docs/en/html/OPTIONS.html
index fac59fdb2..c3ac5d76c 100644
--- a/docs/en/html/OPTIONS.html
+++ b/docs/en/html/OPTIONS.html
@@ -959,7 +959,7 @@
- How many rows of color palette buttons to show; useful when using a large color palette (see "colorfile", above), and/or for use with coarse input devices (like eyegaze trackers).
+ How many rows of color palette buttons to show; useful when using a large color palette (see "colorfile", above), and/or for use with coarse input devices (like eyegaze trackers). "ROWS" may be between "1" (the default) and "3".
diff --git a/docs/en/html/README.html b/docs/en/html/README.html
index 0516f7560..41156a32c 100644
--- a/docs/en/html/README.html
+++ b/docs/en/html/README.html
@@ -1303,7 +1303,7 @@
$ tuxpaint-import grandma.jpg
grandma.jpg ->
- /home/username/.tuxpaint/saved/20210205175230.png
+ /home/username/.tuxpaint/saved/20210205180425.png
jpegtopnm: WRITING A PPM FILE
@@ -1351,7 +1351,7 @@
- Example: "20210205175230.png", for 5 February 2021 at 17:52:30.
+ Example: "20210205180425.png", for 5 February 2021 at 18:04:25.
Place this PNG file in your Tux Paint "saved" directory/folder. (See above.)
diff --git a/docs/es_ES.UTF-8/OPTIONS.txt b/docs/es_ES.UTF-8/OPTIONS.txt
index 6c8edab1c..88adb04c4 100644
--- a/docs/es_ES.UTF-8/OPTIONS.txt
+++ b/docs/es_ES.UTF-8/OPTIONS.txt
@@ -718,7 +718,8 @@ Windows Users
How many rows of color palette buttons to show; useful when
using a large color palette (see "colorfile", above), and/or for
- use with coarse input devices (like eyegaze trackers).
+ use with coarse input devices (like eyegaze trackers). "ROWS"
+ may be between "1" (the default) and "3".
lang=LANGUAGE
diff --git a/docs/es_ES.UTF-8/README.txt b/docs/es_ES.UTF-8/README.txt
index 9a9fc3253..d522e0bff 100644
--- a/docs/es_ES.UTF-8/README.txt
+++ b/docs/es_ES.UTF-8/README.txt
@@ -874,7 +874,7 @@ Using the import script, "tuxpaint-import"
Example:
$ tuxpaint-import grandma.jpg
- grandma.jpg -> /home/username/.tuxpaint/saved/20210205160922.png
+ grandma.jpg -> /home/username/.tuxpaint/saved/20210205180425.png
jpegtopnm: WRITING A PPM FILE
The first line ("tuxpaint-import grandma.jpg") is the command to run.
@@ -916,7 +916,7 @@ Importing Pictures Manually
* mm = Minute (two digits, "00"-"59")
* ss = Seconds (two digits, "00"-"59")
- Example: "20210205160922.png", for 5 febrero 2021 at 16:09:22.
+ Example: "20210205180425.png", for 5 febrero 2021 at 18:04:25.
Place this PNG file in your Tux Paint "saved" directory/folder. (See
above.)
diff --git a/docs/es_ES.UTF-8/html/OPTIONS.html b/docs/es_ES.UTF-8/html/OPTIONS.html
index e08719740..7e8384485 100644
--- a/docs/es_ES.UTF-8/html/OPTIONS.html
+++ b/docs/es_ES.UTF-8/html/OPTIONS.html
@@ -959,7 +959,7 @@
- How many rows of color palette buttons to show; useful when using a large color palette (see "colorfile", above), and/or for use with coarse input devices (like eyegaze trackers).
+ How many rows of color palette buttons to show; useful when using a large color palette (see "colorfile", above), and/or for use with coarse input devices (like eyegaze trackers). "ROWS" may be between "1" (the default) and "3".
diff --git a/docs/es_ES.UTF-8/html/README.html b/docs/es_ES.UTF-8/html/README.html
index e10a5a8c8..7dec8e7f1 100644
--- a/docs/es_ES.UTF-8/html/README.html
+++ b/docs/es_ES.UTF-8/html/README.html
@@ -1303,7 +1303,7 @@
$ tuxpaint-import grandma.jpg
grandma.jpg ->
- /home/username/.tuxpaint/saved/20210205160922.png
+ /home/username/.tuxpaint/saved/20210205180425.png
jpegtopnm: WRITING A PPM FILE
@@ -1351,7 +1351,7 @@
- Example: "20210205160922.png", for 5 febrero 2021 at 16:09:22.
+ Example: "20210205180425.png", for 5 febrero 2021 at 18:04:25.
Place this PNG file in your Tux Paint "saved" directory/folder. (See above.)
diff --git a/docs/fr_FR.UTF-8/OPTIONS.txt b/docs/fr_FR.UTF-8/OPTIONS.txt
index 42a78d4cd..1e8856779 100644
--- a/docs/fr_FR.UTF-8/OPTIONS.txt
+++ b/docs/fr_FR.UTF-8/OPTIONS.txt
@@ -718,7 +718,8 @@ Windows Users
How many rows of color palette buttons to show; useful when
using a large color palette (see "colorfile", above), and/or for
- use with coarse input devices (like eyegaze trackers).
+ use with coarse input devices (like eyegaze trackers). "ROWS"
+ may be between "1" (the default) and "3".
lang=LANGUAGE
diff --git a/docs/fr_FR.UTF-8/README.txt b/docs/fr_FR.UTF-8/README.txt
index 87b8087e2..d7e7aa0bf 100644
--- a/docs/fr_FR.UTF-8/README.txt
+++ b/docs/fr_FR.UTF-8/README.txt
@@ -874,7 +874,7 @@ Using the import script, "tuxpaint-import"
Example:
$ tuxpaint-import grandma.jpg
- grandma.jpg -> /home/username/.tuxpaint/saved/20210205160922.png
+ grandma.jpg -> /home/username/.tuxpaint/saved/20210205180425.png
jpegtopnm: WRITING A PPM FILE
The first line ("tuxpaint-import grandma.jpg") is the command to run.
@@ -916,7 +916,7 @@ Importing Pictures Manually
* mm = Minute (two digits, "00"-"59")
* ss = Seconds (two digits, "00"-"59")
- Example: "20210205160922.png", for 5 février 2021 at 16:09:22.
+ Example: "20210205180425.png", for 5 février 2021 at 18:04:25.
Place this PNG file in your Tux Paint "saved" directory/folder. (See
above.)
diff --git a/docs/fr_FR.UTF-8/html/OPTIONS.html b/docs/fr_FR.UTF-8/html/OPTIONS.html
index 89cded610..6449cbf32 100644
--- a/docs/fr_FR.UTF-8/html/OPTIONS.html
+++ b/docs/fr_FR.UTF-8/html/OPTIONS.html
@@ -959,7 +959,7 @@
- How many rows of color palette buttons to show; useful when using a large color palette (see "colorfile", above), and/or for use with coarse input devices (like eyegaze trackers).
+ How many rows of color palette buttons to show; useful when using a large color palette (see "colorfile", above), and/or for use with coarse input devices (like eyegaze trackers). "ROWS" may be between "1" (the default) and "3".
diff --git a/docs/fr_FR.UTF-8/html/README.html b/docs/fr_FR.UTF-8/html/README.html
index 26e418978..4fef999fc 100644
--- a/docs/fr_FR.UTF-8/html/README.html
+++ b/docs/fr_FR.UTF-8/html/README.html
@@ -1303,7 +1303,7 @@
$ tuxpaint-import grandma.jpg
grandma.jpg ->
- /home/username/.tuxpaint/saved/20210205160922.png
+ /home/username/.tuxpaint/saved/20210205180425.png
jpegtopnm: WRITING A PPM FILE
@@ -1351,7 +1351,7 @@
- Example: "20210205160922.png", for 5 février 2021 at 16:09:22.
+ Example: "20210205180425.png", for 5 février 2021 at 18:04:25.
Place this PNG file in your Tux Paint "saved" directory/folder. (See above.)
diff --git a/docs/gl_ES.UTF-8/OPTIONS.txt b/docs/gl_ES.UTF-8/OPTIONS.txt
index 3026c1ef0..42ee131ba 100644
--- a/docs/gl_ES.UTF-8/OPTIONS.txt
+++ b/docs/gl_ES.UTF-8/OPTIONS.txt
@@ -740,7 +740,8 @@ Usuarios de Windows
How many rows of color palette buttons to show; useful when
using a large color palette (see "colorfile", above), and/or for
- use with coarse input devices (like eyegaze trackers).
+ use with coarse input devices (like eyegaze trackers). "ROWS"
+ may be between "1" (the default) and "3".
lang=IDIOMA
diff --git a/docs/gl_ES.UTF-8/README.txt b/docs/gl_ES.UTF-8/README.txt
index d3e9d2379..f0d3f15af 100644
--- a/docs/gl_ES.UTF-8/README.txt
+++ b/docs/gl_ES.UTF-8/README.txt
@@ -874,7 +874,7 @@ Using the import script, "tuxpaint-import"
Exemplo:
$ tuxpaint-import grandma.jpg
- grandma.jpg -> /home/username/.tuxpaint/saved/20210205160922.png
+ grandma.jpg -> /home/username/.tuxpaint/saved/20210205180425.png
jpegtopnm: WRITING A PPM FILE
The first line ("tuxpaint-import grandma.jpg") is the command to run.
@@ -916,7 +916,7 @@ Importing Pictures Manually
* mm = Minute (two digits, "00"-"59")
* ss = Seconds (two digits, "00"-"59")
- Example: "20210205160922.png", for 5 Febreiro 2021 at 16:09:22.
+ Example: "20210205180425.png", for 5 Febreiro 2021 at 18:04:25.
Place this PNG file in your Tux Paint "saved" directory/folder. (See
above.)
diff --git a/docs/gl_ES.UTF-8/html/OPTIONS.html b/docs/gl_ES.UTF-8/html/OPTIONS.html
index 5d7baad6b..714b81f99 100644
--- a/docs/gl_ES.UTF-8/html/OPTIONS.html
+++ b/docs/gl_ES.UTF-8/html/OPTIONS.html
@@ -959,7 +959,7 @@
- How many rows of color palette buttons to show; useful when using a large color palette (see "colorfile", above), and/or for use with coarse input devices (like eyegaze trackers).
+ How many rows of color palette buttons to show; useful when using a large color palette (see "colorfile", above), and/or for use with coarse input devices (like eyegaze trackers). "ROWS" may be between "1" (the default) and "3".
diff --git a/docs/gl_ES.UTF-8/html/README.html b/docs/gl_ES.UTF-8/html/README.html
index e42ded38f..c3fd92260 100644
--- a/docs/gl_ES.UTF-8/html/README.html
+++ b/docs/gl_ES.UTF-8/html/README.html
@@ -1303,7 +1303,7 @@
$ tuxpaint-import grandma.jpg
grandma.jpg ->
- /home/username/.tuxpaint/saved/20210205160922.png
+ /home/username/.tuxpaint/saved/20210205180425.png
jpegtopnm: WRITING A PPM FILE
@@ -1351,7 +1351,7 @@
- Example: "20210205160922.png", for 5 Febreiro 2021 at 16:09:22.
+ Example: "20210205180425.png", for 5 Febreiro 2021 at 18:04:25.
Place this PNG file in your Tux Paint "saved" directory/folder. (See above.)
diff --git a/src/manpage/tuxpaint.1 b/src/manpage/tuxpaint.1
index 638557abc..6e476b36c 100644
--- a/src/manpage/tuxpaint.1
+++ b/src/manpage/tuxpaint.1
@@ -71,7 +71,7 @@ tuxpaint -- "Tux Paint", a drawing program for young children.
.br
[\-\-mirrorstamps]
.br
-[\-\-colorsrows=ROWS]
+[\-\-colorsrows=\fIROWS\fP]
.br
[\-\-mouse-accessibility]
.br
@@ -456,7 +456,7 @@ options displayed when using the \fINew\fP tool to start a new picture.
.B \-\-colorsrows=\fIrows\fP
How many rows of color palette buttons to show; useful when using
a large color palette, and/or for use with coarse input devices
-(like eyegaze trackers).
+(like eyegaze trackers). It can be between 1 (default) and 3.
.TP 8
.B \-\-mirrorstamps \-\-dontmirrorstamps
diff --git a/src/tuxpaint-completion.bash b/src/tuxpaint-completion.bash
index 5766ce806..dbe102704 100644
--- a/src/tuxpaint-completion.bash
+++ b/src/tuxpaint-completion.bash
@@ -48,7 +48,8 @@ _tuxpaint()
--outlines --nooutlines \
--stamps --nostamps \
--newcolorsfirst --newcolorslast \
- --colorsrows= \
+ --colorsrows=1 --colorsrows=2 \
+ --colorsrows=3 \
--sysfonts --nosysfonts \
--nostampcontrols --stampcontrols \
--nomagiccontrols --magiccontrols \