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

31 Commits

Author SHA1 Message Date
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
26352ee9ca Add connected socket check
Fix WinMonitorStats member order
2021-12-18 13:01:01 +01:00
Elias Steurer
3550391eca Make enum checks CaseInsensitive 2021-11-13 14:12:52 +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
8615d7371f Add basic http server
this is for content like godot webasm
that is only able to be shown from a
webserver
2021-10-23 18:34:25 +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
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
a8152b5ab0 Fix installed list sorting because of missing LastModified
Fix ScreenPlayItem isNew location
2021-08-29 12:19:28 +02:00
Debash Bora
441f06f45b Added basic isNew feature. 2021-08-27 15:32:30 +05:30
Debash Bora
df126bef09 Changes made Till Now. 2021-08-25 13:18:23 +05:30
Elias Steurer
59758487b4 Fix missing QtQuickCompiler and qrc 2021-07-16 16:44:28 +02:00
Elias Steurer
fe2be3665e Make ScreenPlayWorkshop open source 2021-07-16 11:14:21 +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
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
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
30d05aa5e9 Fix sentry and ffmpeg 2021-06-17 15:50:33 +02:00
Elias Steurer
a6ecc53db6 Merge master 2021-05-18 17:26:02 +02:00
Elias Steurer
818987310b Formatting 2021-05-16 14:19:29 +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
c7dcb968f1 Add warning on file open error 2021-05-02 17:45:36 +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
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
6549530258 Add sort by date for installed content 2021-02-19 16:42:55 +01:00
Elias Steurer
3dd2ff0852 Move projectfile to be used elsewhere 2021-02-03 17:52:29 +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