mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-18 13:04:28 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set application icons for X11 based systems

Browse Source
This commit is contained in:
Felix Kauselmann
2018-01-03 20:20:51 +01:00
parent 8f886661c6
commit 184cd43257
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
YACReader/main.cpp
View File

@ -85,12 +85,15 @@ int main(int argc, char * argv[])
app.setApplicationName("YACReader"); app.setApplicationName("YACReader");
app.setOrganizationName("YACReader"); app.setOrganizationName("YACReader");
app.setAttribute(Qt::AA_UseHighDpiPixmaps); app.setAttribute(Qt::AA_UseHighDpiPixmaps);
//simple command line parser if (QIcon::hasThemeIcon("YACReader")) {
app.setWindowIcon(QIcon::fromTheme("YACReader"));
}
//simple command line parser
//will be replaced by QCommandLineParser in the future //will be replaced by QCommandLineParser in the future
QStringList optlist; QStringList optlist;
QStringList arglist; QStringList arglist;
if (argc > 1) if (argc > 1)
{ {
//extract options and arguments //extract options and arguments
@ -118,7 +121,7 @@ int main(int argc, char * argv[])
} }
} }
} }
QString destLog = YACReader::getSettingsPath()+"/yacreader.log"; QString destLog = YACReader::getSettingsPath()+"/yacreader.log";
QDir().mkpath(YACReader::getSettingsPath()); QDir().mkpath(YACReader::getSettingsPath());
@ -133,11 +136,11 @@ int main(int argc, char * argv[])
QTranslator translator; QTranslator translator;
QString sufix = QLocale::system().name(); QString sufix = QLocale::system().name();
#if defined Q_OS_UNIX && !defined Q_OS_MAC #if defined Q_OS_UNIX && !defined Q_OS_MAC
translator.load(QString(DATADIR)+"/yacreader/languages/yacreader_"+sufix); translator.load(QString(DATADIR)+"/yacreader/languages/yacreader_"+sufix);
#else #else
translator.load(QCoreApplication::applicationDirPath()+"/languages/yacreader_"+sufix); translator.load(QCoreApplication::applicationDirPath()+"/languages/yacreader_"+sufix);
#endif #endif
app.installTranslator(&translator); app.installTranslator(&translator);
MainWindowViewer * mwv = new MainWindowViewer(); MainWindowViewer * mwv = new MainWindowViewer();
@ -145,7 +148,7 @@ int main(int argc, char * argv[])
//if we have a valid request, open it - if not, load normally //if we have a valid request, open it - if not, load normally
if (argc > 1) if (argc > 1)
{ {
if (!optlist.filter("--comicId=").isEmpty() && !optlist.filter("--libraryId=").isEmpty()) if (!optlist.filter("--comicId=").isEmpty() && !optlist.filter("--libraryId=").isEmpty())
{ {
if (arglist.count()>1) if (arglist.count()>1)
{ {
@ -168,7 +171,7 @@ int main(int argc, char * argv[])
delete mwv; delete mwv;
//Configuration::getConfiguration().save(); //Configuration::getConfiguration().save();
YACReader::exitCheck(ret); YACReader::exitCheck(ret);
#ifdef Q_OS_MAC #ifdef Q_OS_MAC

9
YACReaderLibrary/main.cpp
View File

@ -158,6 +158,9 @@ int main( int argc, char ** argv )
app.setApplicationVersion(VERSION); app.setApplicationVersion(VERSION);
app.setAttribute(Qt::AA_UseHighDpiPixmaps); app.setAttribute(Qt::AA_UseHighDpiPixmaps);
if (QIcon::hasThemeIcon("YACReaderLibrary")) {
app.setWindowIcon(QIcon::fromTheme("YACReaderLibrary"));
}
QString destLog = YACReader::getSettingsPath()+"/yacreaderlibrary.log"; QString destLog = YACReader::getSettingsPath()+"/yacreaderlibrary.log";
QDir().mkpath(YACReader::getSettingsPath()); QDir().mkpath(YACReader::getSettingsPath());
@ -179,11 +182,11 @@ int main( int argc, char ** argv )
translator.load(QCoreApplication::applicationDirPath()+"/languages/yacreaderlibrary_"+sufix); translator.load(QCoreApplication::applicationDirPath()+"/languages/yacreaderlibrary_"+sufix);
#endif #endif
app.installTranslator(&translator); app.installTranslator(&translator);
QTranslator viewerTranslator; QTranslator viewerTranslator;
#if defined Q_OS_UNIX && !defined Q_OS_MAC #if defined Q_OS_UNIX && !defined Q_OS_MAC
viewerTranslator.load(QString(DATADIR)+"/yacreader/languages/yacreader_"+sufix); viewerTranslator.load(QString(DATADIR)+"/yacreader/languages/yacreader_"+sufix);
#else #else
viewerTranslator.load(QCoreApplication::applicationDirPath()+"/languages/yacreader_"+sufix); viewerTranslator.load(QCoreApplication::applicationDirPath()+"/languages/yacreader_"+sufix);
#endif #endif
app.installTranslator(&viewerTranslator); app.installTranslator(&viewerTranslator);
@ -193,7 +196,7 @@ int main( int argc, char ** argv )
#ifdef SERVER_RELEASE #ifdef SERVER_RELEASE
QSettings * settings = new QSettings(YACReader::getSettingsPath()+"/YACReaderLibrary.ini",QSettings::IniFormat); //TODO unificar la creaci<63>n del fichero de config con el servidor QSettings * settings = new QSettings(YACReader::getSettingsPath()+"/YACReaderLibrary.ini",QSettings::IniFormat); //TODO unificar la creaci<63>n del fichero de config con el servidor
settings->beginGroup("libraryConfig"); settings->beginGroup("libraryConfig");
s = new Startup(); s = new Startup();
if(settings->value(SERVER_ON,true).toBool()) if(settings->value(SERVER_ON,true).toBool())