benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master_nc' into feature/RND-547-flameshot-popup-on-windows-after-start-in-tray

Browse Source 
# Conflicts:
#	translations/Internationalization_ca.ts
#	translations/Internationalization_de_DE.ts
#	translations/Internationalization_es.ts
#	translations/Internationalization_fr.ts
#	translations/Internationalization_hu.ts
#	translations/Internationalization_ja.ts
#	translations/Internationalization_ka.ts
#	translations/Internationalization_nl.ts
#	translations/Internationalization_pl.ts
#	translations/Internationalization_pt_br.ts
#	translations/Internationalization_ru.ts
#	translations/Internationalization_sk.ts
#	translations/Internationalization_sr.ts
#	translations/Internationalization_tr.ts
#	translations/Internationalization_uk.ts
#	translations/Internationalization_zh_CN.ts
#	translations/Internationalization_zh_TW.ts
This commit is contained in:
Yuriy Puchkov
2020-08-17 22:40:54 +03:00
parent fc694a0ecb 0ab981b13a
commit e548672272
18 changed files with 570 additions and 647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/third-party/singleapplication/singleapplication.cpp vendored
View File

@@ -32,6 +32,8 @@
#include <QtCore/QDataStream>
#include <QtNetwork/QLocalServer>
#include <QtNetwork/QLocalSocket>
#include <QMessageBox>
#include <QTimer>
#ifdef Q_OS_UNIX
#include <signal.h>
@@ -415,6 +417,26 @@ SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSeconda
d->connectToPrimary( timeout, SingleApplicationPrivate::NewInstance );
delete d;
// show message box with inforation that Flameshot is already launched
QMessageBox msgBox;
msgBox.setText(QObject::tr("Hi, I'm already running!\nYou can find me in the system tray."));
int cnt = 3;
QTimer cntDown;
QObject::connect(
&cntDown,
&QTimer::timeout,
[&msgBox,&cnt, &cntDown]()->void{
if(--cnt < 0){
cntDown.stop();
msgBox.close();
} else {
msgBox.setWindowTitle(QString("Flameshot (%1)").arg(cnt + 1));
}
});
cntDown.start(1000);
msgBox.exec();
::exit( EXIT_SUCCESS );
}