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

9 Commits

Author SHA1 Message Date
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
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
01031ba5d8 Add qt6 support 2021-07-15 12:07:39 +02:00
Elias Steurer
53f7b2757f Add basic Gif and Website wallpaper 2020-12-28 17:26:56 +01:00
Elias Steurer
793b442051 Fix Test.qml casing 2020-11-13 10:56:13 +00:00
Elias Steurer
c32ea21e13 Add html files to qrc
Apparently this works now with newer Qt versions...
2020-08-22 12:14:05 +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
0a27b61885 Some refactoring of the wallpaper. Split video/webview into seperate qml file.
Add sanity check for current time.
Change animation from OpacityAnimation to states. This is a behavior change in Qt 5.14 resulting in not starting the animation when no mouse enter was detected at all.
2019-11-23 17:22:24 +01:00
Elias
74e0f68622 Rename ScreenPlayWindow to the more fitting ScreenPlayWallpaper 2019-07-26 13:08:27 +02:00