Merge pull request #1465 from larspalo/newLargerLabels

Added new larger label images
GrandOrgue · Apr 8, 2023 · 2917ef1 · 2917ef1
2 parents 67d8ddf + 479b813
commit 2917ef1
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 2 deletions.
diff --git a/help/grandorgue.xml b/help/grandorgue.xml
@@ -8865,8 +8865,8 @@ group label font of the panel.
           <term>DispImageNum</term>
           <listitem>
             <para>
-	      (integer 0 - 12, default: 1) Builtin bitmap set to use. 0 means
-	      that the lable does not have a background image.
+	      (integer 0 - 15, default: 1) Builtin bitmap set to use. 0 means
+	      that the label does not have a background image.
 	    </para>
           </listitem>
         </varlistentry>

diff --git a/src/grandorgue/GOBitmapCache.cpp b/src/grandorgue/GOBitmapCache.cpp
@@ -74,6 +74,9 @@
   LABEL(10)                                                                    \
   LABEL(11)                                                                    \
   LABEL(12)                                                                    \
+  LABEL(13)                                                                    \
+  LABEL(14)                                                                    \
+  LABEL(15)                                                                    \
   ENCLOSURE(A)                                                                 \
   ENCLOSURE(B)                                                                 \
   ENCLOSURE(C)                                                                 \

diff --git a/src/images/CMakeLists.txt b/src/images/CMakeLists.txt
@@ -130,6 +130,9 @@ CONVERTIMAGE(IMAGE_LIST label09.png)
 CONVERTIMAGE(IMAGE_LIST label10.png)
 CONVERTIMAGE(IMAGE_LIST label11.png)
 CONVERTIMAGE(IMAGE_LIST label12.png)
+CONVERTIMAGE(IMAGE_LIST label13.png)
+CONVERTIMAGE(IMAGE_LIST label14.png)
+CONVERTIMAGE(IMAGE_LIST label15.png)
 CONVERTIMAGE(IMAGE_LIST EnclosureA00.png)
 CONVERTIMAGE(IMAGE_LIST EnclosureA01.png)
 CONVERTIMAGE(IMAGE_LIST EnclosureA02.png)

diff --git a/src/images/label13.png b/src/images/label13.png
diff --git a/src/images/label14.png b/src/images/label14.png
diff --git a/src/images/label15.png b/src/images/label15.png