StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pr854'

Browse Source
This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-11-25 20:00:27 +01:00
commit 4c379640b8
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main.cpp
View File

@ -66,9 +66,12 @@ int main(int argc, char *argv[])
parser.addHelpOption(); parser.addHelpOption();
parser.addVersionOption(); parser.addVersionOption();
parser.addPositionalArgument("uri", QObject::tr("Tox URI to parse")); parser.addPositionalArgument("uri", QObject::tr("Tox URI to parse"));
parser.addOption(QCommandLineOption("P", QObject::tr("Starts new instance and loads specified profile."), QObject::tr("profile")));
parser.process(a); parser.process(a);
Settings::getInstance(); // Build our Settings singleton as soon as QApplication is ready, not before Settings::getInstance(); // Build our Settings singleton as soon as QApplication is ready, not before
if(parser.isSet("P"))
Settings::getInstance().setCurrentProfile(parser.value("P"));
sodium_init(); // For the auto-updater sodium_init(); // For the auto-updater
@ -110,6 +113,7 @@ int main(int argc, char *argv[])
IPC ipc; IPC ipc;
ipc.registerEventHandler(&toxURIEventHandler); ipc.registerEventHandler(&toxURIEventHandler);
ipc.registerEventHandler(&toxSaveEventHandler); ipc.registerEventHandler(&toxSaveEventHandler);
ipc.registerEventHandler(&toxActivateEventHandler);
if (parser.positionalArguments().size() > 0) if (parser.positionalArguments().size() > 0)
{ {
@ -152,9 +156,16 @@ int main(int argc, char *argv[])
return EXIT_FAILURE; return EXIT_FAILURE;
} }
} }
else if(!ipc.isCurrentOwner() && !parser.isSet("P"))
{
time_t event = ipc.postEvent("$activate");
ipc.waitUntilProcessed(event);
if (!ipc.isCurrentOwner())
return EXIT_SUCCESS;
}
// Run // Run
Widget* w = Widget::getInstance(); Widget* w = Widget::getInstance();
int errorcode = a.exec(); int errorcode = a.exec();
delete w; delete w;

11
src/widget/widget.cpp
View File

@ -51,6 +51,14 @@
#include <QTranslator> #include <QTranslator>
#include <tox/tox.h> #include <tox/tox.h>
void toxActivateEventHandler(const QByteArray& data)
{
if(data != "$activate")
return;
Widget::getInstance()->show();
Widget::getInstance()->activateWindow();
}
Widget *Widget::instance{nullptr}; Widget *Widget::instance{nullptr};
Widget::Widget(QWidget *parent) Widget::Widget(QWidget *parent)
@ -561,7 +569,10 @@ void Widget::onIconClick(QSystemTrayIcon::ActivationReason reason)
switch (reason) { switch (reason) {
case QSystemTrayIcon::Trigger: case QSystemTrayIcon::Trigger:
if(this->isHidden() == true) if(this->isHidden() == true)
{
this->show(); this->show();
this->activateWindow();
}
else else
this->hide(); this->hide();
case QSystemTrayIcon::DoubleClick: case QSystemTrayIcon::DoubleClick:

2
src/widget/widget.h
View File

@ -168,4 +168,6 @@ private:
QTranslator* translator; QTranslator* translator;
}; };
void toxActivateEventHandler(const QByteArray& data);
#endif // WIDGET_H #endif // WIDGET_H