1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-09 12:32:40 +01:00
Commit Graph

1655 Commits

Author SHA1 Message Date
Elias Steurer
954bb11c7d Merge branch 'master' into 107-refactor-create-screen
# Conflicts:
#	ScreenPlay/main.qml
2020-11-07 14:09:54 +01:00
Elias Steurer
2d8c9f2af8 Merge branch 'master' of https://gitlab.com/kelteseth/ScreenPlay 2020-11-07 14:04:09 +01:00
Elias Steurer
3b558e2f99 Fix loadFromFile 2020-11-07 14:03:44 +01:00
Elias Steurer
c0f858c9c5 Add basic windows service 2020-11-07 14:03:33 +01:00
Elias Steurer
2a659b1538 Fix not initialized QJsonParseError 2020-11-07 14:02:51 +01:00
Elias Steurer
1fde330685 Fix live wallpaper editing 2020-11-07 14:02:27 +01:00
Elias Steurer
6e89828a14 Add user notification that one has to reconfigure setup
When a monitor gets pluggin in or out
2020-11-07 13:29:50 +01:00
Elias Steurer
1a63646e6c Fix monitorlistmodel on monitor plugged in or out
Add Dialog when it happens for the user to setup again
2020-11-06 15:40:30 +01:00
Elias Steurer
b169e60af4 Add missing emit 2020-11-06 15:29:50 +01:00
Elias Steurer
492261c737 Merge branch 'master' into 'master'
update chinese translation

See merge request kelteseth/ScreenPlay!48
2020-11-02 18:22:23 +00:00
poly000
23760bc725 update chinese translation 2020-11-02 23:04:43 +08:00
Elias Steurer
c51a05e1da Update ch translation provided by poly000 2020-11-01 14:14:04 +01:00
Elias Steurer
b43769cc14 Fix osx ci not executing command in shell 2020-10-31 20:10:28 +01:00
Elias Steurer
f188e6eb1c Fix osx compilation and CI 2020-10-31 19:59:46 +01:00
Elias Steurer
2ca67739ef Fix build.py syntax 2020-10-31 19:34:42 +01:00
Elias Steurer
051a31a065 Fix casing and macos build 2020-10-31 19:32:15 +01:00
Elias Steurer
e1f75d639c Add OSX 2020-10-31 19:30:38 +01:00
Elias Steurer
612f37c45b Add install_dependencies_linux_mac to CI 2020-10-31 13:50:50 +01:00
Elias Steurer
c347c63bef Test CI 2020-10-31 13:47:41 +01:00
Elias Steurer
80d8750b58 Test CI 2020-10-31 13:33:32 +01:00
Elias Steurer
8e283bec26 Merge branch 'refactor/ci-benchmark-doctest' into 'master'
Refactor/ci benchmark doctest

See merge request kelteseth/ScreenPlay!47
2020-10-31 11:44:28 +00:00
Elias Steurer
79dc835e53 Add links 2020-10-30 17:38:59 +00:00
Elias Steurer
f29a65e10c Add shields 2020-10-30 16:41:33 +00:00
Elias Steurer
206203fba0 Add auto exit when using --benchmark
Maybe we should exit after we created the ScreenPlay app.
Depends on what kind of benchmark we use in the future.
2020-10-30 17:24:28 +01:00
Elias Steurer
d5ff21725a Add remove everything at the beginning of ci 2020-10-30 17:02:14 +01:00
Elias Steurer
ec9e16ad67 Add missing exit on test 2020-10-30 16:56:31 +01:00
Elias Steurer
6aadd9a972 Fix missing windows s 2020-10-30 16:53:13 +01:00
Elias Steurer
17cf5e8c97 Fix windows spelling 2020-10-30 16:44:20 +01:00
Elias Steurer
dcc7986ff9 Add benchmark and doctest metrics 2020-10-30 16:40:16 +01:00
Elias Steurer
927973868e Fix CI 2020-10-30 15:38:19 +01:00
Elias Steurer
536d2623c1 Add doctest and google benchmark 2020-10-30 15:37:00 +01:00
Elias Steurer
92e781afc9 Merge branch 'refactor/gitlab-ci' into 'master'
Refactor/gitlab ci

See merge request kelteseth/ScreenPlay!46
2020-10-29 21:44:42 +00:00
Elias Steurer
4d7807c6dd Test CI 2020-10-29 21:38:08 +01:00
Elias Steurer
ac48d0005a Allow linux ci failure for now 2020-10-29 21:36:19 +01:00
Elias Steurer
1adceb6bf6 Add kitware key 2020-10-29 21:28:01 +01:00
Elias Steurer
23d1836df0 Fix CI 2020-10-29 21:22:53 +01:00
Elias Steurer
bca024425a Add latest cmake instead of 3.10 2020-10-29 21:20:10 +01:00
Elias Steurer
030f85cb21 Fix CI 2020-10-29 21:03:11 +01:00
Elias Steurer
7515bb2140 Add apt update to CI 2020-10-29 21:02:54 +01:00
Elias Steurer
4d1b4dcc95 Test CI 2020-10-29 21:00:47 +01:00
Elias Steurer
f377e0f8b0 Test CI 2020-10-29 20:58:37 +01:00
Elias Steurer
50370a15bb Test CI 2020-10-29 20:51:33 +01:00
Elias Steurer
f246a5243e Test CI 2020-10-29 20:44:14 +01:00
Elias Steurer
2311cdaccb Format file with latest python 3.9
Apparently my python 3.6 install an old cmakelang
2020-10-29 20:06:13 +01:00
Elias Steurer
f6db59f955 Add print for git diff 2020-10-29 19:52:28 +01:00
Elias Steurer
685c13d87d Call format-cmake.py 2020-10-29 19:48:40 +01:00
Elias Steurer
a367b222f2 Fix build paths 2020-10-29 19:47:22 +01:00
Elias Steurer
3ad6a61aa3 Fix build path
Add check if build type arg is missing
2020-10-29 19:17:45 +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