1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-22 18:52:30 +01:00
Commit Graph

1842 Commits

Author SHA1 Message Date
Elias Steurer
42bc6f869b Fix steam lib copy on macos 2021-07-16 11:36:02 +02:00
Elias Steurer
a9b2a7130e Set workshop out path for this lib only 2021-07-16 11:29:22 +02:00
Elias Steurer
fe2be3665e Make ScreenPlayWorkshop open source 2021-07-16 11:14:21 +02:00
Elias Steurer
37175b9107 Fix new workshop explicit init 2021-07-11 08:35:29 +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
a6ac44a953 Add link to sentry.io to thank them for free premium 2021-06-25 15:24:04 +02:00
Elias Steurer
818b328802 Fix having profile with invalid entries
Just save all content that is active via calling saveProfiles
2021-06-25 15:02:20 +02:00
Elias Steurer
134a04979e Add check if monitor index exists before starting
This can happen when the user has a valid config and
removes one monitor with an active wallpaper while
ScreenPlay is not running.
2021-06-25 14:55:40 +02:00
Elias Steurer
305026982a Remove windows only lib from global linkage 2021-06-25 13:03:48 +02:00
Elias Steurer
2448e9462e Update vcpkg 2021-06-25 12:42:03 +02:00
Elias Steurer
2fb51d20e4 Add curl to satisfy sentry 2021-06-25 12:35:41 +02:00
Elias Steurer
60bf972c26 Fix vcpkg command call 2021-06-25 12:32:19 +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
1b292b7a6a Add localsocket error info 2021-06-25 12:08:26 +02:00
Elias Steurer
4ba2a1d3e5 Add app version to sentry 2021-06-25 12:08:07 +02:00
Elias Steurer
7c2e5dc9cc Add basic steam profile 2021-06-25 12:07:28 +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
caff9d424e Merge branch '130-add-macos-support' into 'master'
Resolve "Add MacOS support"

Closes #130

See merge request kelteseth/ScreenPlay!56
2021-06-17 15:50:16 +00:00
Elias Steurer
30d05aa5e9 Fix sentry and ffmpeg 2021-06-17 15:50:33 +02:00
Elias Steurer
e118fa235c Add sentry support for macos
Fix cmake apple define because apple
is a unix system.
2021-06-12 15:17:38 +02:00
Elias Steurer
dd1e5e614d Add missing silent parameter for autostart 2021-06-12 14:43:11 +02:00
Elias Steurer
5add9d869e Fix setup script for macos and linux 2021-06-12 14:42:55 +02:00
Elias Steurer
3efbda68ee Add autostart for MacOS 2021-06-10 16:24:03 +02:00
Elias Steurer
2416a7074c Fix incorrect setOrganizationDomain 2021-06-10 16:23:39 +02:00
Elias Steurer
7410052139 Merge branch 'master' into 'master'
monthly update & improve zh_cn translations

See merge request kelteseth/ScreenPlay!61
2021-05-28 18:10:55 +00:00
poly000
805a354c08 update & improve zh_cn translations 2021-05-28 23:17:19 +08:00
Elias Steurer
3cd5d619a7 Fix steam plugin missing folder 2021-05-24 14:27:54 +02:00
Elias Steurer
c4812402f8 Merge 2021-05-24 14:26:06 +02:00
Elias Steurer
2596c9700b Remove explicit wigdet count workaround
We now list to the pipe connection to make this
behavior implicit.
2021-05-23 17:24:52 +02:00
Elias Steurer
8c344b7c3d Remove explicit workshop loading
This does not really make sense because it (und)loaded the
plugin twice and cause crashes on macos. The new version
now lets the QML engine handle the lifetime.
2021-05-23 17:23:59 +02:00
Elias Steurer
b0eac04ff9 Remove old files entries 2021-05-21 12:54:41 +02:00
Elias Steurer
dfd81468f4 Merge commit 'f9bc0c718bd2a83d08a2318c82e13d75b1c1a04c' into 130-add-macos-support 2021-05-21 12:20:02 +02:00
Elias Steurer
f9bc0c718b Fix wrong id 2021-05-21 12:18:45 +02:00
Elias Steurer
1e29d44d7d Add ffmpeg and fix video import 2021-05-21 12:02:16 +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
60dc7ef54f Format via qmlformat 2021-05-16 19:37:55 +02:00
Elias Steurer
3fd25dcbeb Change formatter to 6.1
6.1 actually now has support for some modern
qml features like inline components.
2021-05-16 19:35:05 +02:00
Elias Steurer
4001d1ddd2 Fix join of arguments being to early 2021-05-16 16:38:04 +02:00
Elias Steurer
1bb3cd36b0 Fix arch 2021-05-16 16:34:05 +02:00
Elias Steurer
818987310b Formatting 2021-05-16 14:19:29 +02:00
Elias Steurer
766c793994 Update linux CI image 2021-05-16 14:17:07 +02:00
Elias Steurer
201b7efe9a Remove timeout 2021-05-16 14:13:27 +02:00
Elias Steurer
71c422cbca Fix check for not set args.path 2021-05-16 14:10:37 +02:00
Elias Steurer
5164a7b916 Change CI to use setup.py 2021-05-16 13:12:24 +02:00
Elias Steurer
20be6ba4a9 Refacot setup and formatting tools 2021-05-16 13:09:32 +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