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
