crtxcr/qsrun
1
0
Garpu 0
Kode Masalah 29 Tarik Permintaan 1 Rilis Kegiatan

main: don't ignore config value for single instance mode. allow override using cli param

Telusuri Sumber
This commit is contained in:
Albert S. 2020-10-10 21:53:24 +02:00
orang tua 6813e54e9b
melakukan f424f7632f
1 mengubah file dengan 31 tambahan dan 18 penghapusan
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
main.cpp
Melihat File

@ -31,6 +31,7 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
QString configDirectoryPath;
QDir dir;
bool newInstanceRequested = false;
if(argc >= 2)
{
QCommandLineParser parser;
@ -42,6 +43,8 @@ int main(int argc, char *argv[])
parser.addHelpOption();
parser.process(app.arguments());
configDirectoryPath = parser.value("config");
newInstanceRequested = parser.isSet("new-instance");
if(!configDirectoryPath.isEmpty() && !dir.exists(configDirectoryPath))
{
QMessageBox::warning(nullptr, "Directory not found", configDirectoryPath + " was not found");
@ -70,26 +73,35 @@ int main(int argc, char *argv[])
SettingsProvider settingsProvider{settings};
EntryProvider entryProvider(settingsProvider.userEntriesPaths(), settingsProvider.systemApplicationsEntriesPaths());
QLocalSocket localSocket;
localSocket.connectToServer(settingsProvider.socketPath());
SingleInstanceServer server;
if(localSocket.isOpen() && localSocket.isWritable())
SingleInstanceServer *server = nullptr;
bool singleInstanceMode = !newInstanceRequested && settingsProvider.singleInstanceMode();
if(singleInstanceMode)
{
QDataStream stream(&localSocket);
stream << (int)0x01; // maximize
localSocket.flush();
localSocket.waitForBytesWritten();
localSocket.disconnectFromServer();
return 0;
}
else
{
if(!server.listen(settingsProvider.socketPath()))
QLocalSocket localSocket;
localSocket.connectToServer(settingsProvider.socketPath());
if(localSocket.isOpen() && localSocket.isWritable())
{
QDataStream stream(&localSocket);
stream << (int)0x01; // maximize
localSocket.flush();
localSocket.waitForBytesWritten();
localSocket.disconnectFromServer();
return 0;
}
server = new SingleInstanceServer();
if(!server->listen(settingsProvider.socketPath()))
{
qDebug() << "Failed to listen on socket!";
return 1;
}
Window *w = new Window{entryProvider, settingsProvider};
QObject::connect(&server, &SingleInstanceServer::receivedMaximizationRequest, [&w] {
}
Window *w = new Window{entryProvider, settingsProvider};
if(singleInstanceMode && server != nullptr)
{
QObject::connect(server, &SingleInstanceServer::receivedMaximizationRequest, [&w] {
if(w != nullptr)
{
qInfo() << "maximizing as requested by other instance";
@ -99,9 +111,10 @@ int main(int argc, char *argv[])
w->focusInput();
}
});
w->showMaximized();
w->focusInput();
}
w->showMaximized();
w->focusInput();
return app.exec();
}