1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-06 19:12:30 +01:00
Commit Graph

323 Commits

Author SHA1 Message Date
Elias Steurer
3cd5d619a7 Fix steam plugin missing folder 2021-05-24 14:27:54 +02:00
Elias Steurer
1e29d44d7d Add ffmpeg and fix video import 2021-05-21 12:02:16 +02:00
Elias Steurer
a6ecc53db6 Merge master 2021-05-18 17:26:02 +02:00
Elias Steurer
4010018057 Add default Info.plist 2021-05-18 16:07:53 +02:00
Elias Steurer
60dc7ef54f Format via qmlformat 2021-05-16 19:37:55 +02:00
Elias Steurer
818987310b Formatting 2021-05-16 14:19:29 +02:00
Elias Steurer
e54e0c2acb Refactor widget removal/restore 2021-05-16 11:57:50 +02:00
Elias Steurer
ebfe616460 Refactor Widget and Wallpaper to use same project properties
- projectPath
    - C:\Program Files (x86)\Steam\steamapps\workshop\content\672870\_tmp_171806
- projectSourceFile
    - main.qml
- projectSourceFileAbsolute
    - C:\Program Files (x86)\Steam\steamapps\workshop\content\672870\_tmp_171806\main.qml
2021-05-14 12:50:22 +02:00
Elias Steurer
f01e713d11 Change unhook only be called if we hook in the first place 2021-05-13 13:59:35 +02:00
Elias Steurer
ea8852dafc Add exit to test wallpaper 2021-05-13 13:57:19 +02:00
Elias Steurer
4205b325b9 Fix crash mouse hook on exit 2021-05-13 13:56:53 +02:00
Elias Steurer
f60c93ee64 Add more docs 2021-05-13 13:35:54 +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
8e8b8b0480 Fix live reloading
The path contain invalid file:///
We now simply save the base path and
use this variable
2021-05-12 18:36:37 +02:00
Elias Steurer
36c6f627cf Cleanup comments and OS specific defines 2021-05-12 17:42:38 +02:00
Elias Steurer
dd5f7248c6 Refactor BaseWindow to use Util functions 2021-05-12 17:34:25 +02:00
Elias Steurer
1e1dd057e6 Remove no longer used source file 2021-05-12 17:32:38 +02:00
Elias Steurer
5445012cb5 Add missing sdk connection 2021-05-09 12:00:34 +02:00
Elias Steurer
fa95faca1a Formatting 2021-05-09 12:00:25 +02:00
Elias Steurer
7a428812cd Fix wallpaper position 2021-05-09 11:24:33 +02:00
Elias Steurer
ba13492c7e Fix OSX compilation 2021-04-22 18:27:55 +02:00
Elias Steurer
2cd40c559d Merge 2021-04-22 16:07:22 +02:00
Elias Steurer
e258c89281 Fix fade in showing black 2021-04-21 18:13:47 +02:00
Elias Steurer
3563c32409 Fix more flickering 2021-04-18 18:17:47 +02:00
Elias Steurer
eafba32c2e Fix some flickering when setup multiple wallpaper
Fix function comment
2021-04-18 18:14:28 +02:00
Elias Steurer
9065a4cb88 Refactor most ScreenPlayManager functions to retrun bool
Fix removal of ScreenPlay Wallpaper iteration
2021-04-18 18:03:08 +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
a5e07f5694 Add text for mouse position 2021-04-16 10:28:45 +02:00
Elias Steurer
a70aa8da2d Add simple workaround for clients that use scaling
Somehow this fixes the scaling problem, by simply
calling the function twice. I do not know why.
2021-04-08 13:36:46 +02:00
Elias Steurer
e07960f8c3 Add orange border to see the actual borders 2021-04-08 13:35:58 +02:00
Elias Steurer
d5efc93bc1 Replace manual offset calc with workerW
This now works when the monitors are in the negative
coordinate system aka left top from the main monitor.
2021-04-03 11:03:24 +02:00
Elias Steurer
2ce576d112 Fix dpi scalings 2021-03-28 18:07:49 +02:00
Elias Steurer
21ac302488 Add more test code 2021-03-27 16:25:15 +01:00
Elias Steurer
5dcf6a83fd Add copy step 2021-03-13 16:17:56 +01:00
Elias Steurer
0e97e805d2 Merge branch 'tmp/macos' into 130-add-macos-support 2021-03-12 09:20:01 +01:00
Elias Steurer
2852659e58 Add macos fixes 2021-03-12 09:19:19 +01:00
Elias Steurer
6cdfec4e7e Add 4k testing code 2021-03-07 15:58:54 +01:00
Elias Steurer
637ecee1ef Format file to use less boilerplate space 2021-02-28 12:47:21 +01: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
eedfcdab47 Fix uninitialized vars 2021-02-28 12:37:28 +01:00
Elias Steurer
322f0d7908 Fix set replace wallpaper from type video to gif
Fix some wallpaper flickering (most of)
2021-02-19 17:21:17 +01:00
Elias Steurer
394237d11d Change enum to use ScreenPlayUtil enums 2021-01-31 16:21:32 +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
c20f83756d Fix website Wallpaper
Add https:// to wizard.
2021-01-23 11:34:46 +01:00
Elias Steurer
c823c525d1 Fix enum names and casings 2021-01-21 18:38:39 +01:00
Elias Steurer
4d37a513e4 Format cmake 2021-01-16 17:57:36 +01:00
Elias Steurer
9fa317a6c5 Fix osx build script 2021-01-16 17:31:07 +01:00
Elias Steurer
3a320748d1 Add development info for KDE wallpaper 2021-01-02 21:16:47 +01:00
Elias Steurer
1b955eddb3 Refactor basewindow code 2020-12-29 18:16:34 +01:00
Elias Steurer
53f7b2757f Add basic Gif and Website wallpaper 2020-12-28 17:26:56 +01:00
Elias Steurer
489b00c046 Enabled high dpi scaling that now works again with 5.15.2 only! 2020-12-26 12:07:37 +01:00
Elias Steurer
0fc196368b Fix wallpaper custom margin 2020-12-11 14:14:00 +01:00
Elias Steurer
f13b9b8709 Add more wizards and wallpaper types
Add WebsiteWallpaper
Add GifWallpaper
Add generic FileSelector
Add required flag to TextField

Add generic LicenseSelector
Add Licenes for CC, GPL, Apache etc.
2020-12-11 11:58:04 +01:00
Elias Steurer
793b442051 Fix Test.qml casing 2020-11-13 10:56:13 +00:00
Elias Steurer
da59b2f4c6 Add basic wallpaper logic to qml file
We now use websocket for communcation. For this to work
we must add the logic to the screenplaymanager class.
2020-11-13 11:22:42 +01:00
Elias Steurer
bf1fa16d88 Add basic kde support 2020-11-07 17:44:13 +01:00
Elias Steurer
3b558e2f99 Fix loadFromFile 2020-11-07 14:03:44 +01:00
Elias Steurer
1fde330685 Fix live wallpaper editing 2020-11-07 14:02:27 +01:00
Elias Steurer
f188e6eb1c Fix osx compilation and CI 2020-10-31 19:59:46 +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
a8720d51dd Remove unused code 2020-10-02 21:29:20 +02: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
0fa55884ac Add shadertoy shader 2020-09-24 19:08:06 +02:00
Elias Steurer
25df082d88 Add tmp 2020-09-13 19:51:20 +02:00
Elias Steurer
1b8e708836 Replace qt-breakpad with sentry.io 2020-09-11 16:33:27 +02:00
Elias Steurer
1d11f6970c Add debug qrc version when running RelWithDebInfo
This is so we browser qrc files in QtCreator project
tree
2020-08-30 17:23:37 +02:00
Elias Steurer
5e775b202d Cleanup 2020-08-23 19:06:17 +02:00
Elias Steurer
8838f4f00e Remove copying of html file
It is now in the qrc
2020-08-22 12:15:18 +02:00
Elias Steurer
c32ea21e13 Add html files to qrc
Apparently this works now with newer Qt versions...
2020-08-22 12:14:05 +02:00
Elias Steurer
1fe1fb2c4b Fix replacing wallpaper from different types 2020-08-11 20:18:34 +02:00
Elias Steurer
e1b40a7d4c More settings save reworking 2020-07-31 11:58:05 +02:00
Elias Steurer
281c3cf639 Add missing fadeIn when using QML/HTML Wallpaper 2020-07-25 15:04:28 +02:00
Elias Steurer
3c1f5f72a4 Replace setContextProperty that will be removed in Qt6 with qmlRegisterSingletonInstance 2020-07-18 20:21:47 +02:00
Elias Steurer
12ab2a24a6 Fix SDK to properly export header files 2020-07-13 17:58:03 +02:00
Elias Steurer
14991cb317 Change Resources into two seperate qrc files 2020-07-10 20:49:11 +02:00
Elias Steurer
c76bebb68b Remove install step 2020-07-08 17:10:27 +02:00
Elias Steurer
6d4afb5b62 Fix window flash on startup 2020-06-21 16:10:56 +02:00
Elias Steurer
f7a78448e5 Change compilation mode to c++ 20
Fix qml compilation in release mode
2020-06-21 16:07:41 +02:00
Elias Steurer
73730eaac5 Add replace wallpaper that reuses the existing ScreenPlayWallpaper process 2020-06-21 16:07:10 +02:00
Elias Steurer
a72c7ed149 Add qt quick compiler and fix windows cmd opening in release 2020-06-19 18:06:09 +02:00
Elias Steurer
b13d643d44 Change cmake to compile into a separate bin folder for easier deployment 2020-06-07 13:06:55 +02:00
Elias Steurer
c3de439436 Remove high DPI scaling for now 2020-06-06 16:01:44 +02:00
Elias Steurer
9410375a4b Fix more casing errors of wallpaper type 2020-06-01 18:46:58 +02:00
Elias Steurer
4cf2318147 Change QSysInfo to be private member
Fix include order
2020-06-01 16:09:13 +02:00
Elias Steurer
4a709635a4 Fix buggy mouse click input by using the same position and mouse flags on release 2020-05-26 16:03:50 +02:00
Elias Steurer
a5ef63e3fe Rename main qml file of wallpaper and widget to match their project names 2020-05-24 14:32:07 +02:00
Elias Steurer
23a2e5eb42 Add mouse movement on wallpaper without click 2020-05-23 18:10:52 +02:00
Elias Steurer
feaa87014d Fix issue #84 2020-05-23 14:37:00 +02:00
Elias Steurer
2ac4540461 Add AGPL and Commercial copyright header 2020-05-16 23:01:09 +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
365e054003 Merge branch 'master' into refactor/save-configs
# Conflicts:
#	ScreenPlay/ScreenPlay.pro
#	ScreenPlay/src/settings.cpp
#	ScreenPlay/src/settings.h
2020-05-03 19:22:40 +02:00
Elias Steurer
b868be7fbe Fix initialization order 2020-05-03 13:59:35 +02:00
Elias Steurer
37d021c078 Add missing index.html for the wallpaper to cmake install step 2020-05-03 13:29:38 +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
1b01e33282 Merge branch 'master' into stashing/refactor/save-configs
# Conflicts:
#	ScreenPlay/src/screenplaymanager.cpp
2020-04-26 16:25:24 +02:00
Elias Steurer
27d298e8b3 Merge branch 'master' into 66-port-screenplay-from-qmake-to-cmake 2020-04-23 09:45:30 +02:00
Elias Steurer
36644ba12d Fix wallpaper functionallity for one screen on MacOS 2020-04-20 16:54:26 +02:00
Elias Steurer
a837bd3fe7 Fixed macOS compilation by replacing std::optional obj.value() that throws with *obj 2020-04-20 16:36:49 +02:00
Elias Steurer
3a8c686043 Remove linux code files from macos 2020-04-20 16:35:46 +02:00
Elias Steurer
f0550d9508 Merge remote-tracking branch 'origin/linuxFixes3'
# Conflicts:
#	ScreenPlay/app.cpp
#	ScreenPlay/src/sdkconnector.cpp

Removing QtBreakpad for now for linux and mac
2020-04-19 15:39:48 +02:00
Elias Steurer
6fdf2f5fb9 Fix mouse hook not being called on HTMLWallpaper 2020-04-17 15:04:12 +02:00
Elias Steurer
38f117b369 Merge branch 'master' into 66-port-screenplay-from-qmake-to-cmake 2020-04-16 11:14:49 +02:00
Elias Steurer
82fddb100c Add stash 2020-04-16 11:13:33 +02:00
Elias Steurer
7e90f63f87 Change testing path to something download able from the steam workshop 2020-03-28 17:22:56 +01:00
Elias Steurer
cab12c4af8 Change wallpaper check again because the old code didn't work for WS_MAXIMIZE windows that weren't in the foreground 2020-03-28 17:22:29 +01:00
Elias Steurer
5d32ff8163 Fix visible check for one monitor 2020-03-28 12:54:46 +01:00
Elias Steurer
fb782e599b Add small pause to wait until window animation is finished to not display black background for a few frames 2020-03-28 12:39:53 +01:00
Dominik Louven
17c2f60bf0 WIP: Desktop Overlay rendering 2020-03-27 16:18:15 +01:00
Dominik Louven
2df2df12fb Migrate from QGuiApplication to QApplication for linux support 2020-03-27 14:29:44 +01:00
Elias Steurer
d066ac22ff Fix linux compilation 2020-03-27 14:20:39 +01:00
Elias Steurer
0658d3f8c8 Fix 5.15 warnings for c++ singals to QML slots not using function 2020-03-25 21:29:01 +01:00
Elias Steurer
3b5ee229d5 Add description text when the wallpaper does not render to guide the user to disable the VisualsPaused feature if he can read this 2020-03-21 13:07:27 +01: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
cf229fe075 Refactor fullscreen window check to use the same check on one or more monitors 2020-03-14 13:58:44 +01:00
Elias Steurer
0ebcf43e56 Add delay for setting up mouse hook. This is a workaround for a lag on startup for now. 2020-03-13 17:25:50 +01:00
Elias Steurer
c9d7e3a62b Fix VisualsPaused check for multiple monitors
Fix inverted bool logic
2020-03-13 10:59:48 +01:00
Elias Steurer
221b209cf9 Merge remote-tracking branch 'origin/dev' into dev 2020-03-10 18:26:43 +01:00
Elias Steurer
4cbcb9bd57 Add release event to mouse hook 2020-03-10 18:26:15 +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
Dominik Louven
b48ed5b50e Implement loadFromFile function for qml usage 2020-03-09 19:22:23 +01:00
Dominik Louven
69796c1179 Refactored code to match style guide 2020-03-09 18:12:42 +01:00
Dominik Louven
ea1f07774b Remove qdebug from wallpaper fs watcher 2020-03-09 18:08:55 +01:00
Dominik Louven
640e91277f Add Filesystemwatcher for wallpaper 2020-03-09 18:06:50 +01:00
Elias Steurer
ee521bce9e Remove debug prints 2020-03-06 13:25:34 +01:00
Elias Steurer
7e076aa4a0 Add browser and buttons for click testing 2020-03-06 13:25:20 +01:00
Elias Steurer
c45e81dbbb Remove useless window flags 2020-03-06 13:24:51 +01:00
Elias Steurer
6274dc2f31 Change ctor parameters with references 2020-03-06 13:24:34 +01:00
Elias Steurer
5aff6dd2ab Remove debugs 2020-03-06 13:23:08 +01:00
Elias Steurer
321635a1cc Add breakpad support for ScreenPlayWallpaper 2020-03-06 12:54:10 +01:00
Elias Steurer
edac66ed4b Fix wallpaper not using mouse inputs when enabled 2020-03-05 16:02:00 +01:00
Elias Steurer
71b5d2294b Fix wallpaper window flags for now. This introduces a 1pixel border but it is still the only way to reliably display the wallpaper without interfering of the window manager. This means no longer minimizing when pressing "minimize all windows". Because of this the wallpaper is 2 pixel larger in height and widget and offset by one in x and y. 2020-02-22 18:25:37 +01:00
Elias Steurer
f2c80af5a3 Remove Qt version checks
Add comments to the ScreenPlayWindow tests
2020-02-15 18:03:36 +01:00
Elias Steurer
9f06f75f66 Add working pause visual part of the video with settings 2020-02-15 17:49:48 +01:00
Elias Steurer
4ebd0af183 Add activeScreensList to base Window
Add check for multiple monitors for pausing wallpaper if an app is maximized on the same screen
2020-02-15 13:27:07 +01:00
Elias
d0baf10cc0 Add basic detection of fullscreen window. Only tested with one monitor and simply pause the wallpaper for now! 2020-02-09 21:40:14 +01:00
Elias Steurer
9e85f2eaea Fix qmake variable overrides triggering wrong {} 2020-02-08 13:55:34 +01:00
Elias Steurer
40eefb74c1 Merge remote-tracking branch 'origin/linuxFixes' into dev 2020-02-08 13:48:51 +01:00
Elias Steurer
36938b8a18 Fix wallpaper start 2020-02-08 13:36:19 +01:00
Elias Steurer
e217c7fbbc Fix html wallpaper using invalid paths 2020-02-06 18:39:48 +01:00
Elias Steurer
f72e54e044 Fix 1px window border 2020-02-06 17:30:01 +01:00
Elias Steurer
dddab507ce Fix some linux compile issues 2020-01-30 16:32:24 +01:00
Elias Steurer
17e3d91b01 Fix window minimizing when user presses minimize all windows. This apparently also fixes some overlay problems. This closes #53 2020-01-29 16:47:04 +01:00
Elias Steurer
bfd7a839de Fix install paths
Add openSSL to readme as dep
2020-01-18 14:33:33 +01:00
Elias Steurer
d110fbc9d2 Update openSSL to 1.1.1d via vcpkg now 2020-01-18 14:20:39 +01:00
Elias Steurer
d3b5cd2244 Formatting 2020-01-10 15:27:04 +01:00
Elias
a9c29494ac Fix Html wallpaper 2019-11-23 18:20:32 +01:00
Elias Steurer
0a27b61885 Some refactoring of the wallpaper. Split video/webview into seperate qml file.
Add sanity check for current time.
Change animation from OpacityAnimation to states. This is a behavior change in Qt 5.14 resulting in not starting the animation when no mouse enter was detected at all.
2019-11-23 17:22:24 +01:00
Elias Steurer
bf70046cc1 Add better check for Wallpaper app parameter 2019-11-23 17:19:26 +01:00
Elias Steurer
72670e72cc QtWebEngine initialize is not required if using AA_ShareOpenGLContexts 2019-11-23 11:40:52 +01:00
Elias Steurer
30017db8d5 Remove topmargin after confirming that it was indeed never necessary. Nobody saw that! 2019-10-28 18:23:24 +01:00
Elias Steurer
bbb70ece42 Merge remote-tracking branch 'origin/dev' into dev 2019-10-23 17:09:22 +02:00
Elias Steurer
224b3d63e3 Add ThreeJSScene and 2019-10-23 17:09:13 +02:00
Elias
ab2704a998 Fix flickering of wallpaper creation. My guess is that I was wrong about windows 1903 changing the position of the wallpaper. I think it was manly because the with and height was set to late. Now we use the basewindow width an height property without the topmargin. When this code works on 21:9 we can remove the calc completely. 2019-10-21 18:14:11 +02:00
Elias Steurer
6f38c82525 Fix copy and paste error when testing the ScreenPlayWallpaper standalone 2019-09-16 20:31:47 +02: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
99751491c8 Add explicit AA_ShareOpenGLContexts because of warnings in qt 5.13.1 2019-09-14 19:29:33 +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
e26e38efe1 Disable the windows mouse capture for now because it is laggy and unusable 2019-09-12 21:04:36 +02:00
Elias Steurer
b211a3eb23 Remove the no longer used 4th. argument (rendering backend) 2019-09-12 21:03:58 +02:00
Elias Steurer
42dd81c319 Fix parsing of fillmode to all lowercase before comparing to the available onces 2019-09-06 14:16:57 +02:00
Elias Steurer
2b6602483a Remove comment and add default values 2019-09-06 14:16:08 +02:00
Elias Steurer
5f477507e5 Add FillMode in the sidebar, active monitor config and windows wallpaper. This is done via HTML object-fit. See: https://developer.mozilla.org/en-US/docs/Web/CSS/object-fit
Change sidebar layout to fix some regressions regarding sidebar type (wallpaper/scene/widget)
Change QML Material Style to dense for smaller desktop controls
Change sidebar content title into the image
Change create wallpaper button to only be active when at least one monitor is selected
2019-09-01 12:00:04 +02:00
Elias
7c2a6b8e1f Add can fade property 2019-08-11 19:48:07 +02:00
Elias
da63c09920 Add base multi monitor wallpaper setup 2019-08-10 16:38:44 +02:00
Elias
819ba923b6 Add ratio based transition for windows 10 > 1903 for some ratios.. 2019-08-05 19:22:10 +02:00
Elias
17729a590f Add initial wallpaper start on startup 2019-08-02 13:11:31 +02:00
Elias
6299e1e7dd Fix ci
Fix exe icon
Fix Qt version to 5.13
2019-07-27 11:36:33 +02:00
Elias
e9fc6fe83d Fix win 7 potential crash 2019-07-27 11:05:03 +02:00
Elias
9211441b1f Fix windows 10 version >= 1903 topmargin. They changed the topmargin to 10% of the monitor height. Dunno why... 2019-07-26 17:28:30 +02:00
Elias
74e0f68622 Rename ScreenPlayWindow to the more fitting ScreenPlayWallpaper 2019-07-26 13:08:27 +02:00