fly/flightgear
1
0
Fork 0
Code Activity

Rename flightgear.desktop to org.flightgear.FlightGear.desktop; improve it

Browse source 
This closes ticket #1961
(<https://sourceforge.net/p/flightgear/codetickets/1961/>). To be sure
the file is found, call app->setDesktopFileName() in
src/GUI/QtLauncher.cxx if the Qt version is 5.7 or later.

See <https://sourceforge.net/p/flightgear/mailman/message/35840997/> and
<https://sourceforge.net/p/flightgear/mailman/message/35841007/> for the
small changes to the desktop file contents.
This commit is contained in:
Florent Rougon 2017-05-16 13:51:46 +02:00
parent 2280bd83c7
commit 4b48aca411
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
package/flightgear.desktop → package/org.flightgear.FlightGear.desktop
View file

@ -2,6 +2,7 @@
Version=1.1 Version=1.1
Name=FlightGear Name=FlightGear
GenericName=Flight Simulator GenericName=Flight Simulator
GenericName[fr]=Simulateur de vol
Comment=Practice flight training (airplanes, helicopters...) Comment=Practice flight training (airplanes, helicopters...)
Comment[de]=Fliegen üben (Flugzeuge, Helikopter...) Comment[de]=Fliegen üben (Flugzeuge, Helikopter...)
Comment[fr]=S’entraîner au pilotage (avions, hélicoptères...) Comment[fr]=S’entraîner au pilotage (avions, hélicoptères...)
@ -14,9 +15,9 @@ Icon=flightgear
Terminal=false Terminal=false
Type=Application Type=Application
Categories=Game;Simulation Categories=Game;Simulation
Keywords=aviation;pilot;piloting;aeronautics;simulation;aircraft;airplane;seaplane;sailplane;glider;helicopter;airship;gas balloon;parachute;paraglider;hang-glider;spacecraft;rocket;space shuttle Keywords=aviation;pilot;piloting;simulation;aeronautics;aircraft;airplane;seaplane;sailplane;glider;helicopter;airship;gas balloon;parachute;paraglider;hang-glider;spacecraft;rocket;space shuttle
Keywords[de]=Simulation;Luftfahrzeug;Flugzeug;Wasserflugzeug;Segelflugzeug;Gleiter;Helikopter;Luftschiff;Gasballon;Heißluftballon;Fallschirm;Gleitschirm;Hängegleiter;Raumfahrzeug;Rakete;Space Shuttle Keywords[de]=Simulation;Luftfahrzeug;Flugzeug;Wasserflugzeug;Segelflugzeug;Gleiter;Helikopter;Luftschiff;Gasballon;Heißluftballon;Fallschirm;Gleitschirm;Hängegleiter;Raumfahrzeug;Rakete;Space Shuttle
Keywords[fr]=aviation;vol;pilote;pilotage;simulation;simulateur;aéronautique;aéronef;avion;hydravion;planeur;hélicoptère;ballon dirigeable;montgolfière;parachute;parapente;deltaplane;véhicule spatial;fusée;navette spatiale Keywords[fr]=aviation;pilote;pilotage;simulation;aéronautique;aéronef;avion;hydravion;planeur;hélicoptère;ballon dirigeable;montgolfière;parachute;parapente;deltaplane;véhicule spatial;fusée;navette spatiale
Keywords[it]=simulazione;aeromobile;aereo;idrovolante;aliante;elicottero;dirigibile;mongolfiera;paracadute;parapendio;deltaplano;astronave;razzo;space shuttle Keywords[it]=simulazione;aeromobile;aereo;idrovolante;aliante;elicottero;dirigibile;mongolfiera;paracadute;parapendio;deltaplano;astronave;razzo;space shuttle
Keywords[nl]=simulatie;luchtvaartuig;vliegtuig;watervliegtuig;zweefvliegtuig;helikopter;luchtschip;luchtballon;valscherm;glijscherm;deltavlieger;ruimteschip;raket;ruimteveer Keywords[nl]=simulatie;luchtvaartuig;vliegtuig;watervliegtuig;zweefvliegtuig;helikopter;luchtschip;luchtballon;valscherm;glijscherm;deltavlieger;ruimteschip;raket;ruimteveer
Keywords[pt]=simulação;aeronave;avião;helicóptero;dirigível;balão;paraquedas;parapente;asa-delta;espaçonave;foguete;vaivém espacial Keywords[pt]=simulação;aeronave;avião;helicóptero;dirigível;balão;paraquedas;parapente;asa-delta;espaçonave;foguete;vaivém espacial

7
src/GUI/QtLauncher.cxx
View file

@ -23,6 +23,8 @@
#include <locale.h> #include <locale.h>
// Qt // Qt
#include <QtGlobal>
#include <QString>
#include <QProgressDialog> #include <QProgressDialog>
#include <QDir> #include <QDir>
#include <QFileInfo> #include <QFileInfo>
@ -256,6 +258,11 @@ void initApp(int& argc, char** argv, bool doInitQSettings)
app->setApplicationName("FlightGear"); app->setApplicationName("FlightGear");
app->setOrganizationDomain("flightgear.org"); app->setOrganizationDomain("flightgear.org");
#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
app->setDesktopFileName(
QStringLiteral("org.flightgear.FlightGear.desktop"));
#endif
// reset numeric / collation locales as described at: // reset numeric / collation locales as described at:
// http://doc.qt.io/qt-5/qcoreapplication.html#details // http://doc.qt.io/qt-5/qcoreapplication.html#details
::setlocale(LC_NUMERIC, "C"); ::setlocale(LC_NUMERIC, "C");