1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-25 04:02:50 +01:00
Commit Graph

53 Commits

Author SHA1 Message Date
Elias Steurer
d5276b8169 Add Qt5 and Qt6 compatibility to CMake
Because the WebEngine got renamed we have
to make it this ugly. This will only work with Qt5
for now because Qt6 still breaks things.
2021-07-11 08:27:13 +02:00
Elias Steurer
2fb9e728d0 Format target_link_libraries 2021-06-25 16:28:30 +02:00
Elias Steurer
b70ba77714 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ScreenPlay/CMakeLists.txt
#	ScreenPlay/app.cpp
#	ScreenPlay/main.cpp
#	ScreenPlayWallpaper/CMakeLists.txt
2021-06-25 12:31:55 +02:00
Elias Steurer
a577decdc9 Add some Qt6 cmake support
WebEngine is missing because the current 6.2 installed
has a broken WebEngine
2021-06-20 18:50:54 +02:00
Elias Steurer
a6ecc53db6 Merge master 2021-05-18 17:26:02 +02:00
Elias Steurer
e54e0c2acb Refactor widget removal/restore 2021-05-16 11:57:50 +02:00
Elias Steurer
e8fbe8e565 Add ScreenPlayUtil and ScreenPlayShader to developer docs
Update to qdoc Qt 6.1
Add module for every project
2021-05-13 13:05:05 +02:00
Elias Steurer
fa95faca1a Formatting 2021-05-09 12:00:25 +02:00
Elias Steurer
e7f1e61d33 Refactor wallpaper connection
Change sdk connection from shared to unqiue ptr
to make sure to only have one connection alive at
every time. This fixes to removal of wallpaper because
of a bug a shared connection as set in the monitorlistmodel.

The SDK connection is now part of the ScreenPlayWallpaper/Widget.
2021-04-18 17:23:21 +02:00
Elias Steurer
36a59518e9 Fix clazy connect-3arg-lambda 2021-04-16 10:59:18 +02:00
Elias Steurer
dc35dacb47 Fix quit when qml file contains an error
I cannt reproduce this in an empty project but _something_
stopped the quit call in the terminate function. The only
workaround I found was using an async loader...

Increase ping alive to 3000ms and change it to a static variable

Move getAvailableFillModes to globalvariables.h
2021-02-28 12:46:56 +01:00
Elias Steurer
4dcea75242 Move util functions and global enums into dedicated lib
This will make reusing easier like enum parsing between
ScreenPlay and ScreenPlayWallpaper &
project load/save
2021-01-28 15:19:46 +01:00
Elias Steurer
6a3872fb2a Fix cpp formatting 2021-01-16 17:59:42 +01:00
Elias Steurer
d2080c2bd3 Add initialization to QJsonParseError 2020-11-13 11:23:10 +01:00
Elias Steurer
e9d333ba2e Call format-cpp 2020-10-29 19:17:37 +01:00
Elias Steurer
8e117cebfd Call format-cmake.py 2020-10-29 18:53:52 +01:00
Elias Steurer
d6b27d30a5 Remove CMake min version to only set it in main CMakeList.txt 2020-10-02 21:29:11 +02:00
Elias Steurer
ddad721574 Add basic shader plugin 2020-09-10 11:40:07 +02:00
Elias Steurer
0ca674a313 Add another check if main application is still running
The timeout of pipes is quite high so we need to ping them regularly
2020-08-14 11:28:58 +02:00
Elias Steurer
e1b40a7d4c More settings save reworking 2020-07-31 11:58:05 +02:00
Elias Steurer
49b75a463a Move SDKConnectors SDKConnection class into seperate file
The next will be to merge SDKConnector into the ScreenPlayManager.

We now have the first version of bi directional messages. This is for updating values like
saving the current Widget position. We also save a SDKConnection shared reference inside
our ScreenPlayWallpaper or ScreenPlayWidget instance. So we now have all logic in these classes.
2020-07-18 18:26:41 +02:00
Elias Steurer
12ab2a24a6 Fix SDK to properly export header files 2020-07-13 17:58:03 +02:00
Elias Steurer
73730eaac5 Add replace wallpaper that reuses the existing ScreenPlayWallpaper process 2020-06-21 16:07:10 +02:00
Elias Steurer
43666b0860 Add explicit quit command when removing a wallpaper 2020-05-31 15:13:51 +02:00
Elias Steurer
d8b3814504 Fix missing license 2020-05-16 23:08:54 +02:00
Elias Steurer
2ac4540461 Add AGPL and Commercial copyright header 2020-05-16 23:01:09 +02:00
Elias Steurer
6900bccb7c Add single shot test if connected after 1 second
There can be a rare case where disconnected is never fired because it was never connected in the first place.
For this we wait 1 second and check the state. If not connected we abort.
2020-05-16 22:50:12 +02:00
Elias Steurer
9ce9467dd7 Fix cmake be compilable on linux
Downgrade to 3.16 that ships with Ubuntu 20.04
Fix QML modules that does not exists ( cmake on Windows just ignores this lol)
2020-05-16 13:37:32 +02:00
Elias Steurer
bd77099c06 Remove old project files 2020-05-01 16:46:09 +02:00
Elias Steurer
c7fd69a78e Add first working cmake version for ScreenPlay
Refactor stomt sdk from qmake/github to cmake/gitlab
2020-04-30 20:03:14 +02:00
Elias Steurer
8b347cad9f Fix version an add auto install script to replace install-dependencies 2020-03-16 11:50:35 +01:00
Elias Steurer
2e20673e67 Fix cmake files to be able to open the project in QtCreator 2020-03-10 12:34:34 +01:00
Elias Steurer
d1bee5aa8f Add autoconversion based of https://github.com/davidtazy/QMake2CMake 2020-03-10 12:16:58 +01:00
Elias Steurer
0e92a329c5 Fix casing of the ScreenPlaySDK 2020-02-06 10:47:03 +01:00
Elias Steurer
dddab507ce Fix some linux compile issues 2020-01-30 16:32:24 +01:00
Elias Steurer
272a86a61f Add connection type to sdkconnector. This means we no can distinguish between wallpaper and widgets.
Add remove all wallpaper button. No we can close all wallpapers and widgets seperate.
Add static function to write an QJsonObject into a file. Truncate is optional.
2019-09-14 19:33:58 +02:00
Elias Steurer
0d20c0d280 Add wallpaper for multiple monitors. This new method is used when we have more than one wallpaper but not when the user selected all monitors 2019-09-13 15:10:44 +02:00
Elias Steurer
3e2f2e94be Change redirectMessageOutputToMainWindow to a member function 2019-09-01 12:03:37 +02:00
Elias
17729a590f Add initial wallpaper start on startup 2019-08-02 13:11:31 +02:00
Elias
185ddb45e9 Cleanup 2019-07-18 21:51:10 +02:00
Elias
54f597529a Cleanup 2019-06-10 16:27:17 +02:00
Elias
90990b827f Remove aimber 2019-06-10 16:03:05 +02:00
Elias
55b3d0f3f3 Fix scene value set from screenplay to screenplaywindow
Add mouse hook for input
2019-06-09 12:21:03 +02:00
Elias
dc0d8afa8b Fix sdk build 2019-04-04 17:19:05 +02:00
Elias Steurer
ac1eee9d27 Fix linux compilation 2019-04-01 13:03:49 +02:00
Elias
a7394dfb06 Fix displaying wallpaper 2019-03-14 18:56:19 +01:00
Elias
dcfa165d85 Add cleaner message output if the widgets or the wallpaper call qDebug() 2018-12-15 21:30:04 +01:00
kelteseth
7411697e1c Fix critical bug when sending debug message not parsing appID
Remove spammign debug messages
2018-09-22 16:01:34 +02:00
kelteseth
a500911ad7 Add more video controls 2018-09-08 13:46:31 +02:00
kelteseth
300f98aff0 Cleanup 2018-09-06 13:57:36 +02:00