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

56 Commits

Author SHA1 Message Date
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
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
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
fb5d6581ec Change all plugins to be QML_ELEMENT
Add ScreenPlayWeather
2022-02-20 17:55:26 +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
996526c1cd Add basic kde wallpaper installation 2021-12-03 14:23:45 +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
77daa040bb Fix HTML Wallpaper
Remove old WebView that is now MultimediaWebView
2021-11-12 14:56:22 +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
Elias Steurer
e155879e37 Merge remote-tracking branch 'origin/qt6-support' into qt6-support 2021-10-23 13:46:54 +02:00
Elias Steurer
feb9648684 Refactor to use Qt6 style cmake/qml plugins 2021-10-15 15:06:05 +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
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
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
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
2ce576d112 Fix dpi scalings 2021-03-28 18:07:49 +02:00
Elias Steurer
5dcf6a83fd Add copy step 2021-03-13 16:17:56 +01:00
Elias Steurer
2852659e58 Add macos fixes 2021-03-12 09:19:19 +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
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
f188e6eb1c Fix osx compilation and CI 2020-10-31 19:59:46 +01:00
Elias Steurer
8e117cebfd Call format-cmake.py 2020-10-29 18:53:52 +01: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
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
e1b40a7d4c More settings save reworking 2020-07-31 11:58:05 +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
f7a78448e5 Change compilation mode to c++ 20
Fix qml compilation in release mode
2020-06-21 16:07:41 +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