aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2016-10-11 08:38:54 -0400
committerKen Moore <ken@ixsystems.com>2016-10-11 08:38:54 -0400
commit5516ffe1cc233d66a86c024130520e027b15ab6d (patch)
tree9eca9063f5c243adda87f74872880accbf282e70
parentFix a bug in LFileInfo, and update lumina-fileinfo to show the size of the im... (diff)
downloadlumina-5516ffe1cc233d66a86c024130520e027b15ab6d.tar.gz
lumina-5516ffe1cc233d66a86c024130520e027b15ab6d.tar.bz2
lumina-5516ffe1cc233d66a86c024130520e027b15ab6d.zip
Make lumina-screenshot single-instanced, and adjust the .desktop entry to *always* open a new window.
-rw-r--r--src-qt5/desktop-utils/lumina-screenshot/lumina-screenshot.desktop2
-rw-r--r--src-qt5/desktop-utils/lumina-screenshot/lumina-screenshot.pro2
-rw-r--r--src-qt5/desktop-utils/lumina-screenshot/main.cpp5
3 files changed, 5 insertions, 4 deletions
diff --git a/src-qt5/desktop-utils/lumina-screenshot/lumina-screenshot.desktop b/src-qt5/desktop-utils/lumina-screenshot/lumina-screenshot.desktop
index b1c386fc..c4678265 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/lumina-screenshot.desktop
+++ b/src-qt5/desktop-utils/lumina-screenshot/lumina-screenshot.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Exec=lumina-screenshot
+Exec=lumina-screenshot -new-instance
Icon=camera-web
Terminal=false
Type=Application
diff --git a/src-qt5/desktop-utils/lumina-screenshot/lumina-screenshot.pro b/src-qt5/desktop-utils/lumina-screenshot/lumina-screenshot.pro
index 6f47f61f..a85b234c 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/lumina-screenshot.pro
+++ b/src-qt5/desktop-utils/lumina-screenshot/lumina-screenshot.pro
@@ -1,6 +1,6 @@
include("$${PWD}/../../OS-detect.pri")
-QT += core gui
+QT += core gui network
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras
diff --git a/src-qt5/desktop-utils/lumina-screenshot/main.cpp b/src-qt5/desktop-utils/lumina-screenshot/main.cpp
index aee374b0..27e1f2ff 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/main.cpp
+++ b/src-qt5/desktop-utils/lumina-screenshot/main.cpp
@@ -7,14 +7,15 @@
#include <LuminaOS.h>
#include <LuminaThemes.h>
#include <LuminaUtils.h>
+#include <LuminaSingleApplication.h>
int main(int argc, char ** argv)
{
LTHEME::LoadCustomEnvSettings();
- QApplication a(argc, argv);
+ LSingleApplication a(argc, argv, "l-screenshot");
LuminaThemeEngine theme(&a);
a.setApplicationName("Take Screenshot");
- LUtils::LoadTranslation(&a, "l-screenshot");
+ //LUtils::LoadTranslation(&a, "l-screenshot");
MainUI w;
QObject::connect(&theme,SIGNAL(updateIcons()), &w, SLOT(setupIcons()) );
bgstack15