From aba0f116165719f96a247a22510d4af09344177c Mon Sep 17 00:00:00 2001 From: p0358 Date: Wed, 17 Dec 2025 15:56:00 -0500 Subject: [PATCH] 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 | 1 + data/CMakeLists.txt | 6 +- data/glabels-qt.appdata.xml | 29 -------- data/glabels-qt.desktop | 11 --- data/org.glabels.glabels-qt.desktop | 19 +++++ data/org.glabels.glabels-qt.metainfo.xml | 72 +++++++++++++++++++ ...me.xml => org.glabels.glabels-qt.mime.xml} | 2 +- glabels/main.cpp | 1 + model/Version.h.in | 3 +- 9 files changed, 99 insertions(+), 45 deletions(-) delete mode 100644 data/glabels-qt.appdata.xml delete mode 100644 data/glabels-qt.desktop create mode 100644 data/org.glabels.glabels-qt.desktop create mode 100644 data/org.glabels.glabels-qt.metainfo.xml rename data/{x-glabels-document.mime.xml => org.glabels.glabels-qt.mime.xml} (87%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c94951..c87f4d1 100644 --- a/CMakeLists.txt +++ b/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") diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 0eb584e..70485ae 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -1,7 +1,7 @@ #======================================= # Install #======================================= -install (FILES glabels-qt.desktop DESTINATION share/applications) -install (FILES x-glabels-document.mime.xml DESTINATION share/mime/packages) -install (FILES glabels-qt.appdata.xml DESTINATION share/appdata) +install (FILES org.glabels.glabels-qt.desktop DESTINATION share/applications) +install (FILES org.glabels.glabels-qt.mime.xml DESTINATION share/mime/packages) +install (FILES org.glabels.glabels-qt.metainfo.xml DESTINATION share/metainfo) diff --git a/data/glabels-qt.appdata.xml b/data/glabels-qt.appdata.xml deleted file mode 100644 index be047c5..0000000 --- a/data/glabels-qt.appdata.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - glabels-qt.desktop - CC0-1.0 - GPL-3.0+ - gLabels - Create labels, business cards and media covers - -

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.

-

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.

- - - http://glabels.org/ - https://github.com/j-evins/glabels-qt/issues - evins_at_snaught.com - diff --git a/data/glabels-qt.desktop b/data/glabels-qt.desktop deleted file mode 100644 index dad65b3..0000000 --- a/data/glabels-qt.desktop +++ /dev/null @@ -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; diff --git a/data/org.glabels.glabels-qt.desktop b/data/org.glabels.glabels-qt.desktop new file mode 100644 index 0000000..3f4e21d --- /dev/null +++ b/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; diff --git a/data/org.glabels.glabels-qt.metainfo.xml b/data/org.glabels.glabels-qt.metainfo.xml new file mode 100644 index 0000000..04fe92b --- /dev/null +++ b/data/org.glabels.glabels-qt.metainfo.xml @@ -0,0 +1,72 @@ + + + org.glabels.glabels-qt + + Jaye Evins + + org.glabels.glabels-qt.desktop + CC0-1.0 + GPL-3.0+ + gLabels + Create labels and business cards + Entwurf von Etiketten und Visitenkarten + Crear etiquetas y tarjetas de visita + Créer des étiquettes et des cartes de visite + Crea etichette e biglietti da visita + Twórz etykiety i wizytówki + Crie etiquetas e cartões de visita + Crie etiquetas e cartões de visita + Створюйте етикетки та візитки + +

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.

+

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.

+ + + Office + + + label + card + print + office + barcode + qt + + https://glabels.org/ + https://github.com/j-evins/glabels-qt/issues + https://github.com/j-evins/glabels-qt + evins_at_snaught.com + + + #bbdb69 + #4e9a06 + + glabels-qt/translations/glabels + + diff --git a/data/x-glabels-document.mime.xml b/data/org.glabels.glabels-qt.mime.xml similarity index 87% rename from data/x-glabels-document.mime.xml rename to data/org.glabels.glabels-qt.mime.xml index 51c5e40..b8f12a8 100644 --- a/data/x-glabels-document.mime.xml +++ b/data/org.glabels.glabels-qt.mime.xml @@ -3,7 +3,7 @@ gLabels Project File - + diff --git a/glabels/main.cpp b/glabels/main.cpp index 630bd68..f25cafc 100644 --- a/glabels/main.cpp +++ b/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" ); diff --git a/model/Version.h.in b/model/Version.h.in index 0578b86..12f0833 100644 --- a/model/Version.h.in +++ b/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@;