1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-07 03:22:33 +01:00
Commit Graph

157 Commits

Author SHA1 Message Date
Elias Steurer
eccc67d0c0 Remove native rendering setting
Looks like this version is worse than not setting it. This changes
every Qt version....
2023-02-24 16:54:56 +01:00
Elias Steurer
6e2cecddb3 Fix compilation and signing
Move TrayIcon back to ScreenPlay:
- This fixes the missing labs plugins when running the macdeployqt script
- We don't need it here only in the SP main folder anyway

Move building and sign of the osx version for x64 and arm64 into the
actual build script.

Remove the qml plugin path workaround from the addImportPath
2023-02-11 11:57:09 +01:00
Elias Steurer
abddca8685 Remove seperate .app for wallpaper and widgets 2023-02-04 17:34:59 +01:00
Elias Steurer
924819bb0b Formatting 2023-02-04 12:16:24 +01:00
Elias Steurer
e96f80c68c Fix linux compilation 2023-02-04 12:15:41 +01:00
Elias Steurer
6501a4c79f Add automatic moc include for faster compile times 2023-02-04 11:42:32 +01:00
Elias Steurer
46391d1e5d Fix osx compilation 2023-02-03 17:55:22 +01:00
Elias Steurer
d129bf5cf4 Fix long standing qml error internal crash
We now wait until the event loop is done until
we call terminate. Before ScreenPlayWallpaper would
crash internally and stay alive as a zombie process for some
reason...
2023-02-03 17:03:10 +01:00
Elias Steurer
10eabc0a56 Formatting 2023-02-03 16:18:13 +01:00
Elias Steurer
4bce0a2cab Remove QApplication in favor of QGuiApplication 2023-02-03 16:17:47 +01:00
Elias Steurer
0a1da4f4a7 Fix all wallpaper except video not showing 2023-02-03 15:44:06 +01:00
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
3f99f934a9 Add missing quit msg implementation for osx 2023-01-26 14:24:45 +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
804812181e Formatting 2022-11-02 11:36:40 +01: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
12e3aa91ac Refactor ScreenPlaySDK and remove old QML support 2022-05-05 13:43:49 +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
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
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
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
55b4608f69 WIP on master: bb738ca Fix qml Wallpaper and Widget setup missing qrc 2021-12-11 17:05:41 +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
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
e6d817d1e0 Fix Qt6 scaling changes on Windows 2021-11-11 18:09:00 +01:00
Elias Steurer
b6b134a81b Merge commit '6a3395286ade1cbf0bf59a0f417ef2a848abe453' into qt6-kde 2021-11-04 10:30:59 +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
1ecf2937d9 Merge remote-tracking branch 'origin/qt6-support' into qt6-kde 2021-10-25 19:34:34 +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
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