Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-06 19:12:30 +01:00
Code Issues Projects Releases Activity
2,784 Commits 19 Branches 35 Tags 192 MiB
9c9a61c48d
Commit Graph

323 Commits

Author SHA1 Message Date
Elias Steurer
64cde196eb Update qdoc and formatting 
turns out we need the Q_PROPERTY setter
in the cpp file for qdoc to recognize it
 2023-01-28 11:02:10 +01:00
Elias Steurer
37db908db1 Refactor linux X11 support 
Rename LinuxWindow to LinuxX11Window, for kde
we use a desktop wallpaper plugin and for
Wayland we need something else entirely.
 2023-01-27 11:12:45 +01:00
Elias Steurer
4dab506b41 Fix linux compilation 
- Downgrade to stable Qt for now, because linux mirrors are not yet updated
- Launch.json linux "type": "lldb" does not work for some reason...
 2023-01-27 10:04:51 +01:00
Elias Steurer
8e72488f62 Merge branch '161-refactor-screenplaywallpaper-to-no-longer-inherit-from-basewindow' of https://gitlab.com/kelteseth/ScreenPlay into 161-refactor-screenplaywallpaper-to-no-longer-inherit-from-basewindow 2023-01-27 09:01:44 +01:00
Elias Steurer
64d2c3adb5 Bump to Qt 6.5.0 and use FFMPEG 
FFMPEG will become default in 6.6.0 anyways
and this fixes the broken rendering on osx and performs
better on my AMD Vega VII on Windows
 2023-01-27 09:01:37 +01:00
Elias Steurer
3f99f934a9 Add missing quit msg implementation for osx 2023-01-26 14:24:45 +01:00
Elias Steurer
d06f5b04c1 Add fadeIn workaround #2 2023-01-22 16:28:41 +01:00
Elias Steurer
ae845d2604 Add missing include 2023-01-22 16:28:15 +01:00
Elias Steurer
a6eb6b0660 Add fadeIn not working workaround 
See https://bugreports.qt.io/browse/QTBUG-110456

Add exit codes
 2023-01-22 16:27:18 +01:00
Elias Steurer
9cfc4bb154 Formatting with clang 15 2023-01-21 11:12:04 +01:00
Elias Steurer
9fcae64806 Adapt changes for osx 2023-01-20 15:55:17 +01:00
Elias Steurer
c5ec7e7bff WIP refactor ScreenPlayWallpaper 
This is Windows only for now:
Make Classes default constructible. We now have:
setup():
- Can return status of the input data. This is most important, because
  we can now properly exit if this fails
- We now use the same ProjectFile struct as we do in InstalledListModel
- Gets called on all platforms
start():
- Platform specific code

Move argument parsing into main
 2023-01-20 14:42:48 +01:00
Elias Steurer
1e8ca2e2d8 Refactor project struct to be self contained 2023-01-19 14:09:06 +01:00
Elias Steurer
7871573179 Update to use SPDX-License-Identifier 2023-01-19 10:33:49 +01:00
Elias Steurer
40cde43a68 Fix disable sdk on debug mode 2022-12-17 13:30:08 +01:00
Elias Steurer
e2beadb671 Fix windows wallpaper fade in calculation again 2022-12-03 17:01:50 +01:00
Elias Steurer
561986b093 Add FHD 21:9 monitor offset 2022-11-12 14:45:41 +01:00
Elias Steurer
9538023b40 Change default image offset when using WQHD 21:9 2022-11-12 14:34:58 +01:00
Elias Steurer
ad8074ed12 Fix sidebar preview if now gif is available 2022-11-04 16:21:46 +01:00
Elias Steurer
804812181e Formatting 2022-11-02 11:36:40 +01:00
Elias Steurer
8e0a3a8f50 Fix cmake format 
Apparently auto format does not work via
general set variables
 2022-11-02 11:33:40 +01:00
Elias Steurer
bda6716d3a Refactor build &ci script to use aqt 
Refactor gitlab-ci to inherit base
Add defines.py that stores variables like versions
Bump Qt version to 6.3.2
 2022-10-10 11:35:41 +02:00
Elias Steurer
73078edee6 Fix macOS universal signing 2022-08-26 15:45:49 +02:00
Elias Steurer
ff371eeba5 Add missing terminate command for osx 2022-08-14 11:58:54 +02:00
Elias Steurer
376e96f96c Add macos folder copy for qml folder 2022-07-15 13:05:47 +02:00
Elias Steurer
4da09711e6 Merge remote-tracking branch 'origin/HEAD' 2022-05-12 14:36:18 +02:00
Elias Steurer
6a40f7e69d Fix FillMode web and Qt based fillModes 2022-05-06 14:52:23 +02:00
Elias Steurer
12e3aa91ac Refactor ScreenPlaySDK and remove old QML support 2022-05-05 13:43:49 +02:00
Elias Steurer
bcfb188cf2 Remove all qml import version number 
Fix sidebar
 2022-05-05 13:02:54 +02:00
Elias Steurer
844a4ab676 Remove all .qrc files . We now use qt_add_qml_module 
Copy fonts manually now
Fix paths
 2022-04-30 13:22:17 +02:00
Elias Steurer
12b6911635 Merge and adapt change to make it runnable on linux 
Move all qml components into a dedicated qml subfolder.  This was needed to fix linker
errors where we would have a folder that has the same name as our executable.
 2022-04-30 12:07:54 +02:00
Elias Steurer
12053d9531 Add basic kde setup 2022-04-24 16:38:12 +02:00
Elias Steurer
5c138fa8d4 Update to latest vcpkg 
Add libxkbcommon for compiling shader
Fix SysInfo not available on osx and linux
 2022-04-23 20:15:32 +02:00
Elias Steurer
bb700780ef Move workshop qml files into ScreenPlayWorkshop 
Move common qml stuff into ScreenPlayUtil
 2022-04-23 14:32:36 +02:00
Elias Steurer
5d1c941cb3 Formatting 2022-04-04 18:09:45 +02:00
Elias Steurer
77a81451ca Multiple refactoring.... 
Bump Qt to 6.3 to fix video loop
Remove no longer working shader and add new
WIP: Shader compilation path is wrong for some reason
Add Steamless version content path
Remove cmake-format: sortable from CMakeLists.txt
Add Widnow scale indocator icon to the bottom right
Remove unused doctest and benchmark
Fix tests and installer cmake logic
 2022-04-04 18:06:43 +02:00
Elias Steurer
42bdd7682c Fix cmake formatting script ignoring sort 2022-03-12 14:36:03 +01:00
Elias Steurer
d1b4896c0a Formatting 2022-02-20 17:59:00 +01:00
Elias Steurer
caa8daf2d8 Remove windows buggy loop hack with Qt 6.3 fix 2022-02-20 17:57:00 +01:00
Elias Steurer
fb5d6581ec Change all plugins to be QML_ELEMENT 
Add ScreenPlayWeather
 2022-02-20 17:55:26 +01:00
Elias Steurer
0adc9c8002 Merge remote-tracking branch 'origin/master' 2022-01-27 16:59:20 +01:00
Elias Steurer
0c837d81cb Fix linux ui loading 
This was because of buggy require property and
missing Q_IMPORT_QML_PLUGIN
 2022-01-27 16:59:08 +01:00
Elias Steurer
52749edb94 Add missing border width 2022-01-27 14:58:38 +01:00
Elias Steurer
c281ec5599 Add our own Dialog and Popup with blur background 
Remove all => for now because the qml formatter does
not like the new syntax
Fix states auf mute/play all buttons
Remove useless playback speed option
 2022-01-20 16:37:07 +01:00
Elias Steurer
0f5b310f68 Merge branch 'master' into qt6-kde 
# Conflicts:
#	ScreenPlay/CMakeLists.txt
#	ScreenPlay/app.cpp
#	ScreenPlay/src/screenplaymanager.cpp
#	Tools/build.py
 2021-12-31 13:32:37 +01:00
Elias Steurer
429a5b231d Merge remote-tracking branch 'origin/HEAD' 2021-12-18 13:24:18 +01:00
Elias Steurer
6bfdd9894c Fix steam plugin loading 2021-12-18 13:24:03 +01:00
Elias Steurer
5fba1df486 Add Qt MM based wallpaper property changes 2021-12-18 12:40:25 +01:00
Elias Steurer
55b4608f69 WIP on master: bb738ca Fix qml Wallpaper and Widget setup missing qrc 2021-12-11 17:05:41 +01:00
Elias Steurer
996526c1cd Add basic kde wallpaper installation 2021-12-03 14:23:45 +01:00
Elias Steurer
41fb12c6b1 Merge remote-tracking branch 'origin/qt6-support' into qt6-kde 2021-12-02 16:16:29 +01:00
Elias Steurer
a5cc167d1f Change monitor selection when using Windows scaling 2021-11-20 19:22:11 +01:00
Elias Steurer
20fa5de37d Merge commit 'db4a7c7391f0a8dc80a7c9b282b4a531efc6454c' into qt6-kde 2021-11-14 19:14:43 +01:00
Elias Steurer
c74e80f00a Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	ScreenPlayWallpaper/qml/Wallpaper.qml
 2021-11-13 14:30:02 +01:00
Elias Steurer
b78f20a4bf Refactor platform check 2021-11-13 14:26:48 +01:00
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