1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-09-14 22:42:34 +02:00
Commit Graph

1175 Commits

Author SHA1 Message Date
Elias Steurer
112fa9f2d5 Update readme and move content into separate readme 2020-05-16 14:04:53 +02:00
Elias Steurer
0fa58c1c33 Merge remote-tracking branch 'origin/master' into refactor/save-configs
# Conflicts:
#	ScreenPlay/CMakeLists.txt
2020-05-16 13:54:08 +02:00
Elias Steurer
6148288570 Change name to ${PROJECT_NAME} 2020-05-16 13:40:38 +02:00
Elias Steurer
191dc7cbac Fix ScreenPlay cmake path 2020-05-16 13:37:47 +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
52fb670d55 Change widget and wallpaper types to use enums
Apparently this is the only way for qml to work
 * https://www.kdab.com/new-qt-5-8-meta-object-support-namespaces/

moc needs full enum namespace info see QTBUG-58454

    void createWallpaper(
        const ScreenPlay::Enums::WallpaperType type,
        const ScreenPlay::Enums::FillMode fillMode,
        const QString& absoluteStoragePath,
        const QString& previewImage,
        QVector<int> monitorIndex,
        const float volume,
        const bool saveToProfilesConfigFile);
2020-05-14 16:45:50 +02:00
Elias Steurer
cdc1ee8d9e Update README.md 2020-05-14 09:16:44 +00:00
Elias Steurer
e80887cd0d Update .gitlab/media/QtCreator_install.png, README.md files 2020-05-14 09:14:59 +00:00
Elias Steurer
03d43f4ee4 Update .gitlab/media/QtCreator_kit.png, README.md files 2020-05-14 09:00:08 +00:00
Elias Steurer
51137c6758 Update README.md 2020-05-14 08:54:23 +00:00
Elias Steurer
6dc968894f Update README.md, .gitlab/media/QtCreator_kit.png files 2020-05-14 08:53:23 +00:00
Elias Steurer
db5903f272 Revert last commit 2020-05-07 18:51:34 +02:00
Elias Steurer
9f911d5ad9 Add missing globalvariables.cpp in CMakeLists.txt 2020-05-07 18:49:26 +02:00
Elias Steurer
0f87f8dac7 Add missing globalvariables.cpp in CMakeLists.txt 2020-05-07 17:41:11 +02:00
Elias Steurer
dc3464cd42 Update breakpad submodule 2020-05-03 19:24:50 +02:00
Elias Steurer
365e054003 Merge branch 'master' into refactor/save-configs
# Conflicts:
#	ScreenPlay/ScreenPlay.pro
#	ScreenPlay/src/settings.cpp
#	ScreenPlay/src/settings.h
2020-05-03 19:22:40 +02:00
Elias Steurer
c7106a85cd Merge branch '37-support-system-wide-dark-mode' into 'master'
Resolve "Support system wide dark mode"

Closes #37

See merge request kelteseth/ScreenPlay!31
2020-05-03 17:20:35 +00:00
Elias Steurer
8367303ca3 Fix dark/light styling 2020-05-03 19:20:03 +02:00
Elias Steurer
8da12bb89c Fix more theming stuff for light and dark mode 2020-05-03 19:14:19 +02:00
Elias Steurer
ec7873dce2 Merge branch 'master' into 'master'
Diverse French and English localisation fixes and corrections

See merge request kelteseth/ScreenPlay!30
2020-05-03 13:37:18 +00:00
PoorPockets McNewHold
23e9363ebb Content of patch-1 6190655d23
— Capitalization of Autostart (démarrage → Démarrage)
— Correct translation of High Priority Autostart (Haute priorité autostart → Démarrage automatique en haute priorité)
— Removal of the Windows mention as ScreenPlay is multi-platform. (will start with Windows → will start with your operating system | démarrera avec Windows → démarrera avec votre système d´exploitation)
— Correct translation of wallpaper (Pause wallpaper → Met en pause le fond d´écran)
— Translated ¨News & Patchnotes¨ (Nouveautées et notes de versions)
2020-05-03 13:04:30 +00:00
PoorPockets McNewHold
ef74e7a9b5 — Creation of the ¨Import a Creation¨ and ¨Upload a Creation¨.
— Correction of the ¨Wallaper¨ typo.
2020-05-03 12:59:00 +00:00
PoorPockets McNewHold
7adfe5c460 — Correct translation of ¨Create Widgets and Scenes¨ as it was translated in the wrong language (Crear Widgets y Escenarios → Créer des widgets et des scènes)
— Correction of the mistranslated word ¨Empty¨ (un widget Empty → un widget vide)
— Translation of the redundant ¨Create Empty Widget¨ and ¨Example Widgets and Scenes¨.
This one need to be inspected as it is already translated in the text file.
— Creation of the ¨Import a Creation¨ and ¨Upload a Creation¨. (Import a Creation → Importer une création | Upload a Creation → Poster une création)
— Correction of the wrong translation for ¨Converting Video ERROR !¨ as it is translated in a different language. (Convertir no tiene éxito! → Conversion de la vidéo ERREUR !)
— Translation of ¨Youtube URL¨ (Youtube URL → URL Youtube)
— Correction of the ¨wallpaper¨ translation. Technically, translating it as a ¨papier peint¨ isn’t wrong, but it is the name used for litteral WALL papers. As the usage of ¨fond d´écran¨ is more common for this dedicated type of usage, and due to the already common usage of this translation along the ScreenPlay program, I’ve allowed myself to edit it.
— Capitalization of ¨Playback¨ (taux de lecture → Taux de lecture)
— Correction of the ¨FFMPEG¨ translation. The first is translated in the wrong language, and the second one is grammatically incorrect. (ERROR extrayendo ffmpeg de la RAM → ERREUR de l´extraction du FFMPEG de la RAM | ERREUR extraire ffmpeg → ERREUR de l´extraction du FFMPEG)
— Correction of the ¨Extraction successful¨ translation, as it is translated in the wrong language. (Добыча прошла успешно → Succès de l´extraction)
— Correction of the translation of ¨Wallaper¨. Not only it is a typo in the original English source translation, but it has been ported back into the French localization.
2020-05-03 12:56:29 +00:00
PoorPockets McNewHold
6d5aae8ed1 Removal of the mention of Windows, as Screenplay is multi-platform. 2020-05-03 12:37:04 +00:00
Elias Steurer
b868be7fbe Fix initialization order 2020-05-03 13:59:35 +02:00
Elias Steurer
d4812e476c Change many dark and light theming issues 2020-05-03 13:59:20 +02:00
Elias Steurer
49a33fad52 Change Connections syntax to 5.15 style 2020-05-03 13:56:26 +02:00
Elias Steurer
f3f3f8b93e Remove Qt Windows HighDPI Scaling because of buggy monitor width and height values QTBUG-81694 2020-05-03 13:56:11 +02:00
Elias Steurer
37d021c078 Add missing index.html for the wallpaper to cmake install step 2020-05-03 13:29:38 +02:00
Elias Steurer
1e6d819b1a Update stomt submodule 2020-05-03 13:22:43 +02:00
Elias Steurer
e8dd488059 Merge branch 'master' into 37-support-system-wide-dark-mode 2020-05-03 13:16:43 +02:00
Elias Steurer
11e7594e6b Update stomt submodule 2020-05-03 13:16:26 +02:00
Elias Steurer
49aad4bf31 Update breakpad cmake integration 2020-05-03 13:16:15 +02:00
Elias Steurer
6190655d23 Merge branch '66-port-screenplay-from-qmake-to-cmake' into 'master'
Resolve "Port ScreenPlay from qmake to cmake"

Closes #66

See merge request kelteseth/ScreenPlay!22
2020-05-03 11:13:44 +00:00
Elias Steurer
a2f2877540 Merge branch 'master' into 66-port-screenplay-from-qmake-to-cmake
# Conflicts:
#	ScreenPlay/src/settings.cpp
2020-05-03 13:13:04 +02:00
Elias Steurer
799a115c36 Add cmake QtCreator readme setup 2020-05-03 13:11:26 +02:00
Elias Steurer
b69d71544c Add copy of files into the qt/qml folder 2020-05-01 17:44:21 +02:00
Elias Steurer
fba846ab99 Add copy of korean fonts 2020-05-01 17:43:44 +02:00
Elias Steurer
bd77099c06 Remove old project files 2020-05-01 16:46:09 +02:00
Elias Steurer
1cca1d028f Update vcpkg install method 2020-04-30 20:18:27 +02:00
Elias Steurer
a944582d99 Fix stomt path 2020-04-30 20:11:25 +02:00
Elias Steurer
e29571a225 Fix pathing because we now compile everyting into the same build dir 2020-04-30 20:08:33 +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
5d7a97ff8b Remove old stomt qt sdk 2020-04-30 19:11:47 +02:00
Elias Steurer
1b01e33282 Merge branch 'master' into stashing/refactor/save-configs
# Conflicts:
#	ScreenPlay/src/screenplaymanager.cpp
2020-04-26 16:25:24 +02:00
Elias Steurer
ee133b8197 Fix macos start of wallpaper on release for now. This will not work in the steam version because the apps in the steam version are in the same folder 2020-04-25 11:09:03 +02:00
Elias Steurer
0575c30c25 Fix opening folder on macos 2020-04-25 11:08:18 +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
36644ba12d Fix wallpaper functionallity for one screen on MacOS 2020-04-20 16:54:26 +02:00
Elias Steurer
1365cfc47b Fix ffmpeg download for macos not using mac files 2020-04-20 16:48:35 +02:00