Elias Steurer
b2f0b3135e
Remove no longer existing qtquick_compiler_add_resources
2021-09-10 12:46:44 +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
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
41f02cc2d9
Remove window blur call because it is only available on mac
2021-09-04 14:04:08 +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
59758487b4
Fix missing QtQuickCompiler and qrc
2021-07-16 16:44:28 +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
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
60dc7ef54f
Format via qmlformat
2021-05-16 19:37:55 +02:00
Elias Steurer
e54e0c2acb
Refactor widget removal/restore
2021-05-16 11:57:50 +02:00
Elias Steurer
a78a48bb2e
Add live reloading to Widgets
2021-05-14 13:11:12 +02:00
Elias Steurer
ebfe616460
Refactor Widget and Wallpaper to use same project properties
...
- projectPath
- C:\Program Files (x86)\Steam\steamapps\workshop\content\672870\_tmp_171806
- projectSourceFile
- main.qml
- projectSourceFileAbsolute
- C:\Program Files (x86)\Steam\steamapps\workshop\content\672870\_tmp_171806\main.qml
2021-05-14 12:50:22 +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
e73ac98fc9
Refactor project to use Util functions
2021-05-12 17:33:17 +02:00
Elias Steurer
2cd40c559d
Merge
2021-04-22 16:07:22 +02:00
Elias Steurer
36a59518e9
Fix clazy connect-3arg-lambda
2021-04-16 10:59:18 +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
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
d3f2b7724a
Refactor code
2020-12-28 17:26:15 +01:00
Elias Steurer
2a659b1538
Fix not initialized QJsonParseError
2020-11-07 14:02:51 +01:00
Elias Steurer
685c13d87d
Call format-cmake.py
2020-10-29 19:48:40 +01:00
Elias Steurer
e9d333ba2e
Call format-cpp
2020-10-29 19:17:37 +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
88fe5b6f0f
Fix ci compile error
2020-08-10 21:09:45 +02:00
Elias Steurer
e1b40a7d4c
More settings save reworking
2020-07-31 11:58:05 +02:00
Elias Steurer
8bed32ae93
Fix workshop type not set resulting in not showing anything
2020-07-18 20:48:24 +02:00
Elias Steurer
49b75a463a
Move SDKConnectors SDKConnection class into seperate file
...
The next will be to merge SDKConnector into the ScreenPlayManager.
We now have the first version of bi directional messages. This is for updating values like
saving the current Widget position. We also save a SDKConnection shared reference inside
our ScreenPlayWallpaper or ScreenPlayWidget instance. So we now have all logic in these classes.
2020-07-18 18:26:41 +02:00
Elias Steurer
7c0b5741af
Add basic saving and loading of Widgets
2020-07-13 17:59:20 +02:00
Elias Steurer
12ab2a24a6
Fix SDK to properly export header files
2020-07-13 17:58:03 +02:00
Elias Steurer
14991cb317
Change Resources into two seperate qrc files
2020-07-10 20:49:11 +02:00
Elias Steurer
19636edc0c
Add error message
2020-07-03 14:37:43 +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
a5ef63e3fe
Rename main qml file of wallpaper and widget to match their project names
2020-05-24 14:32:07 +02:00
Elias Steurer
2ac4540461
Add AGPL and Commercial copyright header
2020-05-16 23:01:09 +02:00
Elias Steurer
6148288570
Change name to ${PROJECT_NAME}
2020-05-16 13:40:38 +02:00
