From 9ab54d0b9e288bce8d21e56e65b7add7ff010fd2 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Wed, 3 Jul 2024 16:02:57 -0400 Subject: [PATCH] Fixes for new image hosting format --- src/artdetailwindow.cpp | 3 ++- src/artmodel.cpp | 16 ++++------------ src/main.cpp | 1 - 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/artdetailwindow.cpp b/src/artdetailwindow.cpp index 44a6d3e..4658e94 100644 --- a/src/artdetailwindow.cpp +++ b/src/artdetailwindow.cpp @@ -68,9 +68,10 @@ ArtDetailWindow::ArtDetailWindow(const QString &filename, const QUrl &imagePath, auto imageView = new ImageLabel(); imageView->setQPixmap(QPixmap::fromImage(image)); - previewLayout->addWidget(imageView); + previewLayout->addWidget(imageView, 1, Qt::AlignCenter); m_titleEdit = new QLineEdit(); + m_titleEdit->setPlaceholderText(i18n("Untitled Artwork")); formLayout->addRow(i18nc("@label:textbox", "Title"), m_titleEdit); m_knowExactDateBox = new QCheckBox(); diff --git a/src/artmodel.cpp b/src/artmodel.cpp index 99ac1a0..0f2d136 100644 --- a/src/artmodel.cpp +++ b/src/artmodel.cpp @@ -184,20 +184,12 @@ ArtPiece::ArtPiece(const QString &filename, const QString &assetFilename) QUrl ArtPiece::getImagePath() const { - if (date.year() > 2022) { - QFileInfo info(filename); - return QUrl::fromUserInput(QStringLiteral("https://images.redstrate.com/art/%1.jpg").arg(info.fileName())); - } else { - return QUrl::fromLocalFile(QStringLiteral("%1.webp").arg(filename)); - } + const QFileInfo info(filename); + return QUrl::fromUserInput(QStringLiteral("https://images.redstrate.com/art/%1.jpg").arg(info.fileName())); } QUrl ArtPiece::getThumbnailPath() const { - if (date.year() > 2022) { - QFileInfo info(filename); - return QUrl::fromUserInput(QStringLiteral("https://images.redstrate.com/thumb/%1.jpg").arg(info.fileName())); - } else { - return QUrl::fromLocalFile(QStringLiteral("%1.webp").arg(filename)); - } + const QFileInfo info(filename); + return QUrl::fromUserInput(QStringLiteral("https://images.redstrate.com/thumb/%1.jpg").arg(info.fileName())); } diff --git a/src/main.cpp b/src/main.cpp index 75b710a..cda577a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include "mainwindow.h"