feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: since jpg is allowd, add jpeg to icon/splash file dialog

Browse Source 
Change-Id: I018650a33d681f4ea75c9333eb875a197ce96e3d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Assam Boudjelthia
2021-11-05 15:21:21 +02:00
parent d80f3f4d8a
commit bcc5c9a344
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androidmanifesteditoriconwidget.cpp
View File

@@ -166,7 +166,7 @@ void AndroidManifestEditorIconWidget::selectIcon()
{ {
FilePath file = FileUtils::getOpenFilePath(this, m_iconSelectionText, FilePath file = FileUtils::getOpenFilePath(this, m_iconSelectionText,
FileUtils::homePath(), FileUtils::homePath(),
tr("Images (*.png *.jpg *.webp *.svg)")); tr("Images (*.png *.jpg *.jpeg *.webp *.svg)"));
if (file.isEmpty()) if (file.isEmpty())
return; return;
setIconFromPath(file); setIconFromPath(file);

6
src/plugins/android/splashscreencontainerwidget.cpp
View File

@@ -62,7 +62,7 @@ const char splashscreenFileName[] = "logo";
const char splashscreenPortraitFileName[] = "logo_port"; const char splashscreenPortraitFileName[] = "logo_port";
const char splashscreenLandscapeFileName[] = "logo_land"; const char splashscreenLandscapeFileName[] = "logo_land";
const char imageSuffix[] = ".png"; const char imageSuffix[] = ".png";
const QString fileDialogImageFiles = QString(QWidget::tr("Images (*.png *.jpg)")); const QString fileDialogImageFiles = QString(QWidget::tr("Images (*.png *.jpg *.jpeg)"));
const QSize lowDpiImageSize{200, 320}; const QSize lowDpiImageSize{200, 320};
const QSize mediumDpiImageSize{320, 480}; const QSize mediumDpiImageSize{320, 480};
const QSize highDpiImageSize{480, 800}; const QSize highDpiImageSize{480, 800};
@@ -608,8 +608,8 @@ void SplashScreenContainerWidget::checkSplashscreenImage(const QString &name)
for (const QString &path : paths) { for (const QString &path : paths) {
const FilePath filePath = baseDir.pathAppended(path + name); const FilePath filePath = baseDir.pathAppended(path + name);
if (filePath.stringAppended(".png").exists() if (filePath.stringAppended(".png").exists() || filePath.stringAppended(".jpg").exists()
|| filePath.stringAppended(".jpg").exists()) { || filePath.stringAppended(".jpeg").exists()) {
setCurrentIndex(1); setCurrentIndex(1);
break; break;
} }

3
src/plugins/android/splashscreenwidget.cpp
View File

@@ -189,7 +189,8 @@ void SplashScreenWidget::selectImage()
{ {
const FilePath file = FileUtils::getOpenFilePath(this, m_imageSelectionText, const FilePath file = FileUtils::getOpenFilePath(this, m_imageSelectionText,
FileUtils::homePath(), FileUtils::homePath(),
QStringLiteral("%1 (*.png *.jpg)").arg(tr("Images"))); QStringLiteral("%1 (*.png *.jpg *.jpeg)")
.arg(tr("Images")));
if (file.isEmpty()) if (file.isEmpty())
return; return;
setImageFromPath(file, false); setImageFromPath(file, false);