Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-22 02:32:29 +01:00
Code Issues Projects Releases Activity
2,973 Commits 19 Branches 35 Tags 192 MiB
master
Commit Graph

165 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
36839dad26 Sort includes 2022-10-22 16:42:12 +02:00
Elias Steurer
73078edee6 Fix macOS universal signing 2022-08-26 15:45:49 +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
bcfb188cf2 Remove all qml import version number 
Fix sidebar
 2022-05-05 13:02:54 +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
e76648b8b5 Fix missing osx excludes 2022-04-24 10:45:37 +02:00
Elias Steurer
5c138fa8d4 Update to latest vcpkg 
Add libxkbcommon for compiling shader
Fix SysInfo not available on osx and linux
 2022-04-23 20:15:32 +02:00
Elias Steurer
bb700780ef Move workshop qml files into ScreenPlayWorkshop 
Move common qml stuff into ScreenPlayUtil
 2022-04-23 14:32:36 +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
c281ec5599 Add our own Dialog and Popup with blur background 
Remove all => for now because the qml formatter does
not like the new syntax
Fix states auf mute/play all buttons
Remove useless playback speed option
 2022-01-20 16:37:07 +01:00
Elias Steurer
feb9648684 Refactor to use Qt6 style cmake/qml plugins 2021-10-15 15:06:05 +02:00
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
Elias Steurer
9ce9467dd7 Fix cmake be compilable on linux 
Downgrade to 3.16 that ships with Ubuntu 20.04
Fix QML modules that does not exists ( cmake on Windows just ignores this lol)
 2020-05-16 13:37:32 +02:00
Elias Steurer
bd77099c06 Remove old project files 2020-05-01 16:46:09 +02:00
Elias Steurer
c7fd69a78e Add first working cmake version for ScreenPlay 
Refactor stomt sdk from qmake/github to cmake/gitlab
 2020-04-30 20:03:14 +02:00
Elias Steurer
27d298e8b3 Merge branch 'master' into 66-port-screenplay-from-qmake-to-cmake 2020-04-23 09:45:30 +02:00
Elias Steurer
38f117b369 Merge branch 'master' into 66-port-screenplay-from-qmake-to-cmake 2020-04-16 11:14:49 +02:00
Dominik Louven
2df2df12fb Migrate from QGuiApplication to QApplication for linux support 2020-03-27 14:29:44 +01:00
Elias Steurer
0658d3f8c8 Fix 5.15 warnings for c++ singals to QML slots not using function 2020-03-25 21:29:01 +01:00
Elias Steurer
8b347cad9f Fix version an add auto install script to replace install-dependencies 2020-03-16 11:50:35 +01:00
Elias Steurer
2e20673e67 Fix cmake files to be able to open the project in QtCreator 2020-03-10 12:34:34 +01:00
Elias Steurer
d1bee5aa8f Add autoconversion based of https://github.com/davidtazy/QMake2CMake 2020-03-10 12:16:58 +01:00
Elias Steurer
9e85f2eaea Fix qmake variable overrides triggering wrong {} 2020-02-08 13:55:34 +01:00
Elias Steurer
40eefb74c1 Merge remote-tracking branch 'origin/linuxFixes' into dev 2020-02-08 13:48:51 +01:00
Elias Steurer
9731b61583 Formatting (1.000 commit :) 2020-02-08 13:36:49 +01:00
Elias Steurer
dddab507ce Fix some linux compile issues 2020-01-30 16:32:24 +01:00
Elias Steurer
38c6916bce Add custom size, color and opacity for widgets to set 2020-01-26 10:59:52 +01:00
Elias
4c4f5356e9 Add refresh ability of widgets via F5 2020-01-23 09:48:48 +01:00
Elias Steurer
bfd7a839de Fix install paths 
Add openSSL to readme as dep
 2020-01-18 14:33:33 +01:00
Elias Steurer
d110fbc9d2 Update openSSL to 1.1.1d via vcpkg now 2020-01-18 14:20:39 +01:00
Elias Steurer
369b01ac9b Fix widget moving jitter thanks to bardao https://stackoverflow.com/a/55367441/12619313 2020-01-10 20:54:27 +01:00
Elias Steurer
63a2cca679 Add nice fadeout on sdkDisconnected 2020-01-10 15:26:53 +01:00
Elias Steurer
dbe1135708 Fix sdk connection not sending appID with the "appID=" in the beginning of the string 2020-01-10 15:26:25 +01:00
Elias Steurer
f72b4163cf Remove soon to be deprecated rootContext 2020-01-10 14:30:21 +01:00
Elias Steurer
04705a5ec3 Add widget type to the ScreenPlayWidget executable as an argument. This can be ether qmlWidget or htmlWidget for now. 2020-01-09 16:08:32 +01:00
Elias
74e0f68622 Rename ScreenPlayWindow to the more fitting ScreenPlayWallpaper 2019-07-26 13:08:27 +02:00
Elias
8c1b535fad Add widget fadeout 2019-06-13 18:06:24 +02:00
Elias
54f597529a Cleanup 2019-06-10 16:27:17 +02:00
Elias
90990b827f Remove aimber 2019-06-10 16:03:05 +02:00
Elias
dc0d8afa8b Fix sdk build 2019-04-04 17:19:05 +02:00
Elias Steurer
ac1eee9d27 Fix linux compilation 2019-04-01 13:03:49 +02:00
Elias
6b370d57ba Add a way easier way to debug wallpaper and widgets 2019-03-27 18:38:36 +01:00
Elias
9b606a79bc Cleanup widgets and Window. When a developer now opens the widget or window project it opens a instance without screenplay sdk. This makes debugging way easier 2019-03-24 16:52:07 +01:00
Elias
970aeea99f Fix massive widget movement jitter bug 2019-03-17 15:18:49 +01:00
Elias
c096be89cc Make import consistent from using 2.x -> 2.12 2019-02-15 12:07:29 +01:00