hyperiond desktop integration (#453)

* add deployment

* add correct api key

* fix cmake lists and add heroku app name

* Update .gitmodules

sync modules with upstream

* add possibility to start hyperiond as systray app

* cleanup

* - new command line options: --desktop --service to set desired mode (systray icon / console only)
- auto detect x server - if avail run in gui mode
- on osx always run in gui mode
- use existing icon from webconfig, instead of own icon
- add ability to no gice a config file name. If config not given, default config file will be set (home dir, or hyperiond dir, depending on writable state)

* fix warnings and compile error

* use own icon for systray purpose

* use new logo

* - set application properties
- fix force service mode
This commit is contained in:
redPanther
2017-08-01 17:29:47 +02:00
committed by GitHub
parent 5c7085439b
commit 6625a318ac
12 changed files with 307 additions and 28 deletions

View File

@@ -147,8 +147,8 @@ private:
double _y_frac_min;
double _x_frac_max;
double _y_frac_max;
int _currentFrame;
int _currentFrame;
QSocketNotifier * _streamNotifier;
ImageResampler _imageResampler;

View File

@@ -5,6 +5,7 @@
#include <cstdint>
#include <cstring>
#include <algorithm>
#include <cassert>
#include <utils/ColorRgb.h>

View File

@@ -18,6 +18,8 @@ public:
void start();
void stop();
quint16 getPort() { return _port; };
private:
Hyperion* _hyperion;
QString _baseUrl;