Preparation for flatpack support (#255)

- Updates to project and desktop metadata in preparation for flatpak packaging
- These updates are independent of flatpack
- This commit unmingles the actual flatpack packaging from #255

CMakeLists.txt

@@ -17,6 +17,7 @@ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/"
 set (ORGANIZATION_NAME "glabels.org")
 set (ORGANIZATION_DOMAIN "glabels.org")
 set (APPLICATION_NAME "glabels-qt")
+set (DESKTOP_FILE_NAME "org.glabels.glabels-qt")
 
 set (WEBSITE  "glabels.org")
 set (BUG_WEBSITE  "https://github.com/j-evins/glabels-qt/issues")

data/CMakeLists.txt

@@ -1,7 +1,7 @@
 #=======================================
 # Install
 #=======================================
-install (FILES glabels-qt.desktop           DESTINATION share/applications)
+install (FILES org.glabels.glabels-qt.desktop      DESTINATION share/applications)
-install (FILES x-glabels-document.mime.xml  DESTINATION share/mime/packages)
+install (FILES org.glabels.glabels-qt.mime.xml     DESTINATION share/mime/packages)
-install (FILES glabels-qt.appdata.xml       DESTINATION share/appdata)
+install (FILES org.glabels.glabels-qt.metainfo.xml DESTINATION share/metainfo)
 

data/glabels-qt.appdata.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
-  <id>glabels-qt.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-3.0+</project_license>
-  <name>gLabels</name>
-  <summary>Create labels, business cards and media covers</summary>
-  <description>
-    <p>gLabels is a program for creating labels and business cards. It is
-    designed to work with various laser/ink-jet peel-off label and business
-    card sheets that you'll find at most office supply stores.</p>
-    <p>gLabels can be used to design address labels, name tags, price tags,
-    cd/dvd labels, or just about anything else that is organized in a regular
-    pattern on a sheet of paper. Labels (or cards) can contain text, images,
-    lines, shapes, and barcodes. gLabels also includes a document-merge feature
-    which lets you print a unique label for each record from an external data
-    source, such as a CSV file.</p>
-  </description>
-  <!--
-  <screenshots>
-    <screenshot width="881" type="default" height="640">
-      <image>http://glabels.org/screenshots/400-screenshot-main.png</image>
-    </screenshot>
-    </screenshots>
-  -->
-  <url type="homepage">http://glabels.org/</url>
-  <url type="bugtracker">https://github.com/j-evins/glabels-qt/issues</url>
-  <update_contact>evins_at_snaught.com</update_contact>
-</component>

data/glabels-qt.desktop

@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=gLabels Label Designer 4
-Comment=Create labels, business cards and media covers
-Keywords=label;card;print;office;barcode;
-Exec=glabels-qt %F
-Icon=glabels
-Terminal=false
-Type=Application
-Categories=Office;
-StartupNotify=true
-MimeType=application/x-glabels;

data/org.glabels.glabels-qt.desktop

@@ -0,0 +1,19 @@
+[Desktop Entry]
+Name=gLabels Label Designer 4
+Comment=Create labels and business cards
+Comment[de]=Entwurf von Etiketten und Visitenkarten
+Comment[es]=Crear etiquetas y tarjetas de visita
+Comment[fr]=Créer des étiquettes et des cartes de visite
+Comment[it]=Crea etichette e biglietti da visita
+Comment[pl]=Twórz etykiety i wizytówki
+Comment[pt]=Crie etiquetas e cartões de visita
+Comment[pt_BR]=Crie etiquetas e cartões de visita
+Comment[uk]=Створюйте етикетки та візитки
+Keywords=label;card;print;office;barcode;
+Exec=glabels-qt %F
+Icon=glabels
+Terminal=false
+Type=Application
+Categories=Office;
+StartupNotify=true
+MimeType=application/x-glabels;

data/org.glabels.glabels-qt.metainfo.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>org.glabels.glabels-qt</id>
+  <developer id="io.github.j-evins">
+    <name>Jaye Evins</name>
+  </developer>
+  <launchable type="desktop-id">org.glabels.glabels-qt.desktop</launchable>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-3.0+</project_license>
+  <name>gLabels</name>
+  <summary>Create labels and business cards</summary>
+  <summary xml:lang="de">Entwurf von Etiketten und Visitenkarten</summary>
+  <summary xml:lang="es">Crear etiquetas y tarjetas de visita</summary>
+  <summary xml:lang="fr">Créer des étiquettes et des cartes de visite</summary>
+  <summary xml:lang="it">Crea etichette e biglietti da visita</summary>
+  <summary xml:lang="pl">Twórz etykiety i wizytówki</summary>
+  <summary xml:lang="pt">Crie etiquetas e cartões de visita</summary>
+  <summary xml:lang="pt_BR">Crie etiquetas e cartões de visita</summary>
+  <summary xml:lang="uk">Створюйте етикетки та візитки</summary>
+  <description>
+    <p>gLabels is a program for creating labels, business cards and media covers.
+    It is designed to work with various laser/ink-jet peel-off label and business
+    card sheets that you'll find at most office supply stores.</p>
+    <p>gLabels can be used to design address labels, name tags, price tags,
+    cd/dvd labels, or just about anything else that is organized in a regular
+    pattern on a sheet of paper. Labels (or cards) can contain text, images,
+    lines, shapes, and barcodes. gLabels also includes a document-merge feature
+    which lets you print a unique label for each record from an external data
+    source, such as a CSV file.</p>
+  </description>
+  <categories>
+    <category>Office</category>
+  </categories>
+  <keywords>
+    <keyword>label</keyword>
+    <keyword>card</keyword>
+    <keyword>print</keyword>
+    <keyword>office</keyword>
+    <keyword>barcode</keyword>
+    <keyword translate="no">qt</keyword>
+  </keywords>
+  <url type="homepage">https://glabels.org/</url>
+  <url type="bugtracker">https://github.com/j-evins/glabels-qt/issues</url>
+  <url type="vcs-browser">https://github.com/j-evins/glabels-qt</url>
+  <update_contact>evins_at_snaught.com</update_contact>
+  <content_rating type="oars-1.1" />
+  <branding>
+    <color type="primary" scheme_preference="light">#bbdb69</color>
+    <color type="primary" scheme_preference="dark">#4e9a06</color>
+  </branding>
+  <translation type="qt">glabels-qt/translations/glabels</translation>
+  <!--
+  <screenshots>
+    <screenshot type="default">
+      <image>https://glabels.org/screenshots/400-screenshot-main.png</image>
+      <caption>...</caption>
+    </screenshot>
+  </screenshots>
+  <releases>
+    <release version="4.0.0" date="2025-12-01">
+      <url type="details">https://example.org/changelog.html#version_4.0.0</url>
+      <description>
+        <p>Release description</p>
+          <ul>
+            <li>List of changes</li>
+            <li>List of changes</li>
+          </ul>
+      </description>
+    </release>
+  </releases>
+  -->
+</component>

data/org.glabels.glabels-qt.mime.xml

@@ -3,7 +3,7 @@
    <mime-type type="application/x-glabels">
      <comment>gLabels Project File</comment>
      <sub-class-of type="application/xml"/>
-     <generic-icon name="x-glabels-project"/>
+     <icon name="x-glabels-project"/>
      <glob pattern="*.glabels"/>
    </mime-type>
 </mime-info>

glabels/main.cpp

@@ -46,6 +46,7 @@ int main( int argc, char **argv )
 	QCoreApplication::setOrganizationDomain( glabels::model::Version::ORGANIZATION_DOMAIN );
 	QCoreApplication::setApplicationName( glabels::model::Version::APPLICATION_NAME );
 	QCoreApplication::setApplicationVersion( glabels::model::Version::LONG_STRING );
+	QApplication::setDesktopFileName( glabels::model::Version::DESKTOP_FILE_NAME );
 
 	QIcon::setThemeName( "glabels-flat" );
 

model/Version.h.in

@@ -35,8 +35,9 @@ namespace glabels
 			const QString ORGANIZATION_NAME   = "@ORGANIZATION_NAME@";
 			const QString ORGANIZATION_DOMAIN = "@ORGANIZATION_DOMAIN@";
 			const QString APPLICATION_NAME    = "@APPLICATION_NAME@";
+			const QString DESKTOP_FILE_NAME    = "@DESKTOP_FILE_NAME@";
 
-			const QString WEBSITE = "http://@WEBSITE@";
+			const QString WEBSITE = "https://@WEBSITE@";
 			const QString BUG_WEBSITE = "@BUG_WEBSITE@";
 
 			const int     MAJOR   = @glabels-qt_VERSION_MAJOR@;