crtxcr/qsrun
1
0
Fork 0
Code Issues 29 Pull Requests 1 Releases Activity

SettingsProvider/main: Read single instance socket path from config

Browse Source
This commit is contained in:
Albert S.
2020-10-10 21:10:53 +02:00
parent 3fbbc7d653
commit 6813e54e9b
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main.cpp
View File

@@ -69,9 +69,9 @@ int main(int argc, char *argv[])
SettingsProvider settingsProvider{settings}; SettingsProvider settingsProvider{settings};
EntryProvider entryProvider(settingsProvider.userEntriesPaths(), settingsProvider.systemApplicationsEntriesPaths()); EntryProvider entryProvider(settingsProvider.userEntriesPaths(), settingsProvider.systemApplicationsEntriesPaths());
// TODO if setting single instance mode
QLocalSocket localSocket; QLocalSocket localSocket;
localSocket.connectToServer("/tmp/qsrun.socket"); localSocket.connectToServer(settingsProvider.socketPath());
SingleInstanceServer server; SingleInstanceServer server;
if(localSocket.isOpen() && localSocket.isWritable()) if(localSocket.isOpen() && localSocket.isWritable())
{ {
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
} }
else else
{ {
if(!server.listen("/tmp/qsrun.socket")) if(!server.listen(settingsProvider.socketPath()))
{ {
qDebug() << "Failed to listen on socket!"; qDebug() << "Failed to listen on socket!";
} }

5
settingsprovider.cpp
View File

@@ -33,3 +33,8 @@ QString SettingsProvider::getTerminalCommand() const
{ {
return settings->value("terminal", "/usr/bin/x-terminal-emulator -e %c").toString(); return settings->value("terminal", "/usr/bin/x-terminal-emulator -e %c").toString();
} }
QString SettingsProvider::socketPath() const
{
return settings->value("singleInstanceSocket", "/tmp/qsrun").toString();
}

1
settingsprovider.h
View File

@@ -16,6 +16,7 @@ class SettingsProvider
virtual int getMaxCols() const; virtual int getMaxCols() const;
virtual bool singleInstanceMode() const; virtual bool singleInstanceMode() const;
QString getTerminalCommand() const; QString getTerminalCommand() const;
QString socketPath() const;
}; };
#endif // SETTINGSPROVIDER_H #endif // SETTINGSPROVIDER_H