Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-25 20:22:39 +01:00
Code Issues Projects Releases Activity
2,767 Commits 19 Branches 35 Tags 192 MiB
b4a3cb806a
Commit Graph

318 Commits

Author SHA1 Message Date
Elias Steurer
b52c89c933 Fix mixed scaling issues (again) 
Now we no longer trust Qt and use the data
we get from the Windows api directly.

Move monitor query function into util to be used
later in the main app, because we also must
user the correct values there.
 2021-11-13 14:12:19 +01:00
Elias Steurer
ee1ee157c9 Merge commit '4c29196a14da422b5553671428b47f201ebe9335' 2021-11-12 15:26:54 +01:00
Elias Steurer
77daa040bb Fix HTML Wallpaper 
Remove old WebView that is now MultimediaWebView
 2021-11-12 14:56:22 +01:00
Elias Steurer
13b548aae7 Fix html wallpaper 2021-11-12 14:42:19 +01:00
Elias Steurer
e6d817d1e0 Fix Qt6 scaling changes on Windows 2021-11-11 18:09:00 +01:00
Elias Steurer
fc4fb2ccdd Fix windows detection 2021-11-11 18:08:24 +01:00
Elias Steurer
c15920ea1d Fix incorrect platform check 2021-11-09 10:30:44 +01:00
Elias Steurer
e6272e0db5 Refactor KDE plugin to work at any state... 
... ScreenPlay no longer needs to run before
the wallpaper. This paves the way to start
the wallpaper from QSettings even when
the main application is not running.

Add quit command and action
 2021-11-08 19:49:51 +01:00
Elias Steurer
b6b134a81b Merge commit '6a3395286ade1cbf0bf59a0f417ef2a848abe453' into qt6-kde 2021-11-04 10:30:59 +01:00
Elias Steurer
6a3395286a Fix osx only check 2021-11-01 19:12:58 +01:00
Elias Steurer
c0cfef1536 Add index.html copy step to macos version 2021-11-01 19:02:39 +01:00
Elias Steurer
8074535cfb Fix local webengine video loading... 
When using the index.html from the qrc file
we cannot load local content for some reason...

Add Windows looping workaround
 2021-11-01 18:25:46 +01:00
Graphicscore
96f9621038 Implement support for KDE wallpaper being started prior to ScreenPlay 2021-10-27 18:42:12 +02:00
Graphicscore
1ecf2937d9 Merge remote-tracking branch 'origin/qt6-support' into qt6-kde 2021-10-25 19:34:34 +02:00
Graphicscore
0957975eac Basic KDE video playback without loops lagging 2021-10-25 19:32:09 +02:00
Graphicscore
c89c3ae3e2 Merge Basic kde support via websockets 2021-10-23 16:30:13 +02:00
Elias Steurer
e155879e37 Merge remote-tracking branch 'origin/qt6-support' into qt6-support 2021-10-23 13:46:54 +02:00
Elias Steurer
0419676af2 Add MultimediaWebView 
This is for now macOS only because macOS MM only can play h264,
 so we still need the webview to render webm
 2021-10-23 10:35:15 +02:00
Elias Steurer
feb9648684 Refactor to use Qt6 style cmake/qml plugins 2021-10-15 15:06:05 +02:00
Elias Steurer
3650f9bfb1 Remove more deprecated version import 2021-10-08 10:14:11 +02:00
Elias Steurer
6b653bdfdc Merge branch 'master' into qt6-support 
# Conflicts:
#	.gitlab-ci.yml
#	CMakeLists.txt
#	ScreenPlay/CMakeLists.txt
#	ScreenPlay/qml/Workshop/Workshop.qml
#	ScreenPlay/qml/Workshop/upload/UploadProjectItem.qml
#	ScreenPlay/translations/ScreenPlay_.ts
#	ScreenPlay/translations/ScreenPlay_de.ts
#	ScreenPlay/translations/ScreenPlay_es.ts
#	ScreenPlay/translations/ScreenPlay_fr.ts
#	ScreenPlay/translations/ScreenPlay_ko.ts
#	ScreenPlay/translations/ScreenPlay_pt_br.ts
#	ScreenPlay/translations/ScreenPlay_ru.ts
#	ScreenPlay/translations/ScreenPlay_vi.qm
#	ScreenPlay/translations/ScreenPlay_vi.ts
#	ScreenPlay/translations/ScreenPlay_zh_cn.ts
 2021-09-26 17:56:40 +02:00
Elias Steurer
6549ef86f5 Fix live reloading 2021-09-18 10:52:17 +02:00
Elias Steurer
b52f9fcfa8 Fix qt6 qml capture => 2021-09-10 12:45:54 +02:00
Elias Steurer
b0c36c4c67 Remove versioned qml imports #2 
Fix some labs file dialogs
 2021-09-10 12:45:15 +02:00
Elias Steurer
2b7d6422bd Fix wallpaper playing 2021-09-10 11:36:47 +02:00
Elias Steurer
40d8696e99 Remove more Qt6 #ifdef 2021-09-10 11:16:46 +02:00
Elias Steurer
4504f06eb1 Merge branch 'master' into qt6-support 
# Conflicts:
#	CMakeLists.txt
#	ScreenPlay/app.h
#	ScreenPlay/main.cpp
#	ScreenPlay/main.qml
#	ScreenPlay/qml/Navigation/Navigation.qml
#	ScreenPlay/src/settings.h
#	ScreenPlay/translations/ScreenPlay_zh_cn.qm
#	ScreenPlayWallpaper/CMakeLists.txt
#	ScreenPlayWallpaper/SPWResources.qrc
#	ScreenPlayWallpaper/qml/Wallpaper.qml
 2021-09-10 11:09:38 +02:00
Elias Steurer
f2bb03c93b Add basic kde wallpaper support via Websockets 
This means: Set ScreenPlay as a Wallpaper
( see ScreenPlayWallpaper/kde/ScreenPlay)
and start a video wallpaper.  Nothing else works yet.
 2021-09-06 19:18:56 +02:00
Elias Steurer
3240c84db8 Fix missing clearComponentCache for macos 2021-09-03 13:02:29 +02:00
Elias Steurer
1d817ae262 Fix linux compilation 2021-08-24 18:20:40 +02:00
Elias Steurer
6d4f48013e Remove not needed import that only works on windows anyways 2021-08-16 15:59:30 +02:00
Elias Steurer
47b61a23f8 Fix mac qrc main.qml path 2021-08-16 15:59:12 +02:00
Elias Steurer
bb5e753291 Move all qml files from all project into qml subfolder 
This makes the build script easier
 2021-08-14 13:38:24 +02:00
Elias Steurer
538889465d Merge remote-tracking branch 'origin/master' 2021-08-08 19:33:20 +02:00
Elias Steurer
2d04ce2608 Add macOS code signing 2021-08-08 19:31:50 +02:00
Elias Steurer
6cb31ffa3f Apply clang format 2021-07-25 15:30:37 +02:00
Elias Steurer
536813e52d Add Window termination on error to avoid zombie windows 2021-07-16 16:46:40 +02:00
Elias Steurer
59758487b4 Fix missing QtQuickCompiler and qrc 2021-07-16 16:44:28 +02:00
Elias Steurer
01031ba5d8 Add qt6 support 2021-07-15 12:07:39 +02:00
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
305026982a Remove windows only lib from global linkage 2021-06-25 13:03:48 +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
0ab4e2e42f Fix Qt 5 compilation 2021-06-25 12:06:43 +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
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