mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-14 02:54:46 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add support for minimize and start to tray.

Browse Source
This commit is contained in:
Felix Kauselmann
2018-05-26 16:20:24 +02:00
committed by Luis Ángel San Martín
parent 23c597d444
commit e587f59ddb
9 changed files with 103 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
YACReaderLibrary/main.cpp
View File

@ -20,6 +20,9 @@
#include "yacreader_libraries.h"
#include "exit_check.h"
#include "opengl_checker.h"
#ifdef Q_OS_MACOS
#include "trayhandler.h"
#endif
#include "QsLog.h"
#include "QsLogDest.h"
@ -127,9 +130,12 @@ int main(int argc, char **argv)
app.setApplicationVersion(VERSION);
app.setAttribute(Qt::AA_UseHighDpiPixmaps);
if (QIcon::hasThemeIcon("YACReaderLibrary")) {
app.setWindowIcon(QIcon::fromTheme("YACReaderLibrary"));
}
// Set window icon according to Freedesktop icon specification
// This is mostly relevant for Linux and other Unix systems
if (QIcon::hasThemeIcon("YACReaderLibrary")) {
app.setWindowIcon(QIcon::fromTheme("YACReaderLibrary"));
}
// TODO: We might want to add a fallback icon here.
QString destLog = YACReader::getSettingsPath() + "/yacreaderlibrary.log";
QDir().mkpath(YACReader::getSettingsPath());
@ -210,18 +216,18 @@ int main(int argc, char **argv)
}
#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
settings->beginGroup("libraryConfig");
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");
s = new Startup();
s = new Startup();
if (settings->value(SERVER_ON, true).toBool()) {
s->start();
}
#endif
QLOG_INFO() << "YACReaderLibrary attempting to start";
QLOG_INFO() << "YACReaderLibrary attempting to start";
logSystemAndConfig();
logSystemAndConfig();
if (YACReaderLocalServer::isRunning()) //s<>lo se permite una instancia de YACReaderLibrary
{
@ -235,24 +241,24 @@ int main(int argc, char **argv)
auto mw = new LibraryWindow();
mw->connect(localServer, SIGNAL(comicUpdated(quint64, const ComicDB &)), mw, SLOT(updateComicsView(quint64, const ComicDB &)), Qt::QueuedConnection);
mw->connect(localServer,SIGNAL(comicUpdated(quint64, const ComicDB &)),mw,SLOT(updateComicsView(quint64, const ComicDB &)), Qt::QueuedConnection);
//connections to localServer
//connections to localServer
mw->show();
mw->show();
int ret = app.exec();
int ret = app.exec();
QLOG_INFO() << "YACReaderLibrary closed with exit code :" << ret;
YACReader::exitCheck(ret);
//shutdown
s->stop();
delete s;
localServer->close();
delete localServer;
delete mw;
//shutdown
s->stop();
delete s;
localServer->close();
delete localServer;
delete mw;
QsLogging::Logger::destroyInstance();