Elias Steurer
f3ccc50739
Merge branch 'master' of https://gitlab.com/kelteseth/ScreenPlay into master
2020-08-11 16:01:42 +02:00
Elias Steurer
b91b5aea9c
Remove nlohmann include
2020-08-11 16:01:17 +02:00
Elias Steurer
b781121728
Fix CI paths
2020-08-11 13:59:58 +00:00
Elias Steurer
7ed2a09656
Fix CI
2020-08-10 22:57:57 +02:00
Elias Steurer
3574d217b8
Remove more nlohmann_json
2020-08-10 22:25:10 +02:00
Elias Steurer
888f00b31f
Fix CI
2020-08-10 22:07:16 +02:00
Elias Steurer
49747b50a9
Remove no longer used nlohman-json
2020-08-10 21:57:55 +02:00
Elias Steurer
33a4b940db
Fix CI
2020-08-10 21:49:46 +02:00
Elias Steurer
fa9cd676b0
Fix CI
2020-08-10 21:31:58 +02:00
Elias Steurer
88fe5b6f0f
Fix ci compile error
2020-08-10 21:09:45 +02:00
Elias Steurer
0b31d2b31a
Fix windows c++20 compiler error by updating Qt to 5.14.2
2020-08-10 17:42:49 +02:00
Elias Steurer
13b7bd80fa
Fix build info compile definition
2020-08-10 17:39:42 +02:00
Elias Steurer
d930f0d7d3
Fix ffmpeg color dark styling issues
2020-08-10 17:38:56 +02:00
Elias Steurer
e7d4193e2c
Update CI
2020-08-10 16:53:12 +02:00
Elias Steurer
a37fab0692
Fix #99
2020-08-10 16:42:12 +02:00
Elias Steurer
4f8a4a2681
Fix issue #100 by replaceing custom popup with Qt Controls popup
2020-08-09 12:46:51 +02:00
Elias Steurer
750b0d1ef8
Merge remote-tracking branch 'origin/master' into master
2020-08-08 19:40:04 +02:00
Elias Steurer
c4423a1497
WIP: Refactor saving/loading of profiles
...
We now partially support saving and loading custom properties. This is acomplished
via a flat ProjectSettingsListModel that is only used for the properties. We still
display the DefaultVideoControls.qml if the content is a video. For this I added
the m_installedType to the MonitorListModel.
2020-08-08 19:39:58 +02:00
Elias Steurer
9852b09abe
Update ffmpeg to 4.3.1
2020-08-08 19:29:39 +02:00
Elias Steurer
0b2a66ff41
Fix NaN value when starting wallpaper other than video
2020-08-07 18:14:01 +02:00
Elias Steurer
b89de66bd8
Merge branch 'patch-1' into 'master'
...
Lil language update, also lil update for me - MagVI has become Overseen :p
See merge request kelteseth/ScreenPlay!35
2020-08-05 14:01:04 +00:00
Overseen
701526749e
Lil language update, also lil update for me - MagVI has become Overseen :p
2020-08-05 12:20:36 +00:00
Elias Steurer
e1b40a7d4c
More settings save reworking
2020-07-31 11:58:05 +02:00
Elias Steurer
281c3cf639
Add missing fadeIn when using QML/HTML Wallpaper
2020-07-25 15:04:28 +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
0d7cb55643
Move more functions into dedicated ScreenPlayWallpaper class
2020-07-18 20:22:47 +02:00
Elias Steurer
7df52a12b3
Add Wallpaper and Widgets settings background
2020-07-18 20:22:22 +02:00
Elias Steurer
3c1f5f72a4
Replace setContextProperty that will be removed in Qt6 with qmlRegisterSingletonInstance
2020-07-18 20:21:47 +02:00
Elias Steurer
3ba635a077
Merge SDKConnector into ScreenPlayManager
2020-07-18 19:06:53 +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
5f0d81df9e
Change sidebar monitor selection to no longer clip
...
Add flickable when the selection area is bigger than the sidebar
2020-07-13 18:00:22 +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
88fb8d888c
Fix spelling
2020-07-10 20:48:34 +02:00
Elias Steurer
175867410b
Bump stomt git submodule
2020-07-09 19:28:33 +02:00
Elias Steurer
dd9cf8c46e
Fix copying of korean font
2020-07-09 18:43:02 +02:00
Elias Steurer
6913934e46
Remove disabled threejs button
2020-07-09 18:42:39 +02:00
Elias Steurer
c76bebb68b
Remove install step
2020-07-08 17:10:27 +02:00
Elias Steurer
db637a44b0
Fix cmake resources variables
2020-07-03 14:38:01 +02:00
Elias Steurer
19636edc0c
Add error message
2020-07-03 14:37:43 +02:00
Elias Steurer
cffeec4814
Fix sidebar FillMode
2020-07-03 14:37:20 +02:00
Elias Steurer
1ee39de01f
Add Collaboration Guidelines
2020-06-27 08:13:22 +00:00
Elias Steurer
f63284e915
Fixed to fast reloading if folder content has changed
2020-06-21 16:49:08 +02:00
Elias Steurer
6d4afb5b62
Fix window flash on startup
2020-06-21 16:10:56 +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
73730eaac5
Add replace wallpaper that reuses the existing ScreenPlayWallpaper process
2020-06-21 16:07:10 +02:00
Elias Steurer
a83d1fc491
Change wallpaper selection to always select the first monitor
2020-06-21 13:34:44 +02:00
Elias Steurer
4f2854ba5a
Add search type enum
...
Change FillMode namespace
2020-06-19 21:27:26 +02:00
Elias Steurer
7b4a5cb747
Fix btn being click able if it is a widget
2020-06-19 20:27:23 +02:00