Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-09-18 08:22:33 +02:00
Code Issues Projects Releases Activity

Replace png with smaller jpg

Browse Source 
Fix wallpaper property change panel for videoWallpaper
This commit is contained in:
Elias 2019-07-27 11:05:49 +02:00
parent e9fc6fe83d
commit 974c737dc4
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ScreenPlay/qml/Monitors/Monitors.qml
View File

@ -96,7 +96,7 @@ Item {
onProjectSettingsListModelFound: {
gridView.model = li
// TODO via states
if (type == "video") {
if (type == "videoWallpaper") {
videoControlWrapper.z = 10
gridView.z = 0
videoControlWrapper.visible = true

5
ScreenPlay/src/create.cpp
View File

@ -53,6 +53,9 @@ void Create::createWallpaperStart(QString videoPath)
connect(m_createImportVideo, &CreateImportVideo::createWallpaperStateChanged, this, &Create::createWallpaperStateChanged);
connect(m_createImportVideoThread, &QThread::started, m_createImportVideo, &CreateImportVideo::process);
connect(m_createImportVideo, &CreateImportVideo::canceled, this, &Create::abortAndCleanup);
connect(m_createImportVideo, &CreateImportVideo::createWallpaperStateChanged, this, [](CreateImportVideo::ImportVideoState state) {
qDebug() << state;
});
connect(m_createImportVideo, &CreateImportVideo::finished, m_createImportVideoThread, &QThread::quit);
connect(m_createImportVideo, &CreateImportVideo::finished, m_createImportVideo, &QObject::deleteLater);
connect(m_createImportVideoThread, &QThread::finished, m_createImportVideoThread, &QObject::deleteLater);
@ -99,7 +102,7 @@ void Create::saveWallpaper(QString title, QString description, QString filePath,
if (previewImageFile.exists()) {
obj.insert("preview", previewImageFile.fileName());
} else {
obj.insert("preview", "preview.png");
obj.insert("preview", "preview.jpg");
}
obj.insert("type", "videoWallpaper");

7
ScreenPlay/src/createimportvideo.cpp
View File

@ -38,6 +38,9 @@ void CreateImportVideo::process()
if (!createWallpaperGifPreview())
return;
if (!createWallpaperImagePreview())
return;
if (!createWallpaperVideo())
return;
@ -271,7 +274,7 @@ bool CreateImportVideo::createWallpaperImagePreview()
args.append("1");
args.append("-q:v");
args.append("2");
args.append(m_exportPath + "/preview.png");
args.append(m_exportPath + "/preview.jpg");
QScopedPointer<QProcess> proConvertImage(new QProcess());
proConvertImage.data()->setArguments(args);
@ -298,7 +301,7 @@ bool CreateImportVideo::createWallpaperImagePreview()
}
QString tmpErrImg = proConvertImage.data()->readAllStandardError();
if (!tmpErrImg.isEmpty()) {
QFile previewImg(m_exportPath + "/preview.png");
QFile previewImg(m_exportPath + "/preview.jpg");
if (!previewImg.exists() && !(previewImg.size() > 0)) {
emit createWallpaperStateChanged(ImportVideoState::ConvertingPreviewImageError);
return false;