Merge branch 'master' of github.com:trueos/lumina

1 files changed, 8 insertions, 7 deletions

diff --git a/src-qt5/core/lumina-desktop-unified/src-events/LShortcutEvents.h b/src-qt5/core/lumina-desktop-unified/src-events/LShortcutEvents.h
index d1c3b4e0..4560cb1f 100644
--- a/src-qt5/core/lumina-desktop-unified/src-events/LShortcutEvents.h
+++ b/src-qt5/core/lumina-desktop-unified/src-events/LShortcutEvents.h
@@ -22,22 +22,22 @@ public:
 	void stop();
 
 private:
-	QList<int> keylist; //keys currently held down (NOTE: QKeySequence has a max of 4 keys for combinations)
+	QList< Qt::Key > keylist; //keys currently held down
 	WId WIN; //current window being acted on by the keys
 	QTimer *clearTimer; //used to clear the internal keylist every once in a while if no events come in.
 	bool evaluated;
 
 	//Actual check functions
 	void CheckKeySequence(WId win);
-	void CheckMouseSequence(WId win, Lumina::MouseButton, bool release);
+	void CheckMouseSequence(WId win, NativeWindowSystem::MouseButton, bool release);
 	QString keylistToString();
 	void evaluateShortcutAction(QString action);
 
 public slots:
-	void KeyPress(WId window, int key);
-	void KeyRelease(WId window, int key);
-	void MousePress(WId window, Lumina::MouseButton);
-	void MouseRelease(WId window, Lumina::MouseButton);
+	void KeyPress(WId window, Qt::Key key);
+	void KeyRelease(WId window, Qt::Key key);
+	void MousePress(WId window, NativeWindowSystem::MouseButton);
+	void MouseRelease(WId window, NativeWindowSystem::MouseButton);
 	void clearKeys();
 
 signals:
@@ -50,7 +50,7 @@ signals:
 	// Session Options
 	void ChangeWorkspace(int); // +/- 1 from current
 	void LockSession();
-	
+
 	//Active Window Options
 	void ActiveWindowMoveToWorkspace(int); //number of workspace
 	void ActiveWindowTakeToWorkspace(int); //number of workspace
@@ -66,6 +66,7 @@ signals:
 
 	//General Utility Launch
 	void LaunchApplication(QString exec);
+	void LaunchStandardApplication(QString app); //standard app like "terminal", "browser", "email", "settings", etc..
 
 };