Update a few instances of 'image' (issue #2735)

Bionus · Jul 13, 2022 · 48ee84b · 48ee84b
1 parent 0da880b
commit 48ee84b
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 12 deletions.
diff --git a/src/gui/src/batch/batch-window.ui b/src/gui/src/batch/batch-window.ui
@@ -111,7 +111,7 @@
         <item>
          <widget class="QCheckBox" name="checkScrollToDownload">
           <property name="text">
-           <string>Follow downloaded images</string>
+           <string>Follow downloaded files</string>
           </property>
          </widget>
         </item>

diff --git a/src/gui/src/tabs/downloads-tab.cpp b/src/gui/src/tabs/downloads-tab.cpp
@@ -339,7 +339,7 @@ void DownloadsTab::batchAddUnique(const DownloadQueryImage &query, bool save)
 		return;
 	}
 
-	log(QStringLiteral("Adding single image: `%1`").arg(query.image->fileUrl().toString()), Logger::Info);
+	log(QStringLiteral("Adding single file: `%1`").arg(query.image->fileUrl().toString()), Logger::Info);
 
 	m_batchs.append(query);
 	m_batchsModel->inserted(m_batchs.count() - 1);

diff --git a/src/gui/src/tabs/downloads-tab.ui b/src/gui/src/tabs/downloads-tab.ui
@@ -116,7 +116,7 @@
          <item>
           <widget class="QLabel" name="labelUniques">
            <property name="text">
-            <string>Single images</string>
+            <string>Single files</string>
            </property>
           </widget>
          </item>

diff --git a/src/gui/src/utils/rename-existing/rename-existing-1.cpp b/src/gui/src/utils/rename-existing/rename-existing-1.cpp
@@ -119,7 +119,7 @@ void RenameExisting1::on_buttonContinue_clicked()
 	m_filename.setFormat(ui->lineFilenameDestination->text());
 	m_needDetails = m_filename.needExactTags(m_sites.value(ui->comboSource->currentText()), m_profile->getSettings());
 
-	const int response = QMessageBox::question(this, tr("Rename existing images"), tr("You are about to download information from %n image(s). Are you sure you want to continue?", "", m_details.size()), QMessageBox::Yes | QMessageBox::No);
+	const int response = QMessageBox::question(this, tr("Rename existing files"), tr("You are about to download information from %n image(s). Are you sure you want to continue?", "", m_details.size()), QMessageBox::Yes | QMessageBox::No);
 	if (response == QMessageBox::Yes) {
 		// Show progress bar
 		ui->progressBar->setValue(0);

diff --git a/src/gui/src/utils/rename-existing/rename-existing-1.ui b/src/gui/src/utils/rename-existing/rename-existing-1.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Rename existing images</string>
+   <string>Rename existing files</string>
   </property>
   <property name="windowIcon">
    <iconset resource="../../../resources/resources.qrc">

diff --git a/src/gui/src/utils/rename-existing/rename-existing-2.ui b/src/gui/src/utils/rename-existing/rename-existing-2.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Rename existing images</string>
+   <string>Rename existing files</string>
   </property>
   <property name="windowIcon">
    <iconset resource="../../../resources/resources.qrc">

diff --git a/src/gui/src/viewer/viewer-window.cpp b/src/gui/src/viewer/viewer-window.cpp
@@ -798,7 +798,7 @@ void ViewerWindow::replyFinishedImage(const QSharedPointer<Image> &img, const QL
 			error(this, tr("File is too big to be displayed.\n%1").arg(m_image->url().toString()));
 		}
 	} else if (res.result == Image::SaveResult::NotFound) {
-		showLoadingError(tr("Image not found."));
+		showLoadingError(tr("File not found."));
 	} else if (res.result == Image::SaveResult::NetworkError) {
 		showLoadingError(tr("Error loading the image."));
 	} else if (res.result == Image::SaveResult::DetailsLoadError) {
@@ -1364,11 +1364,9 @@ void ViewerWindow::updateWindowTitle()
 	}
 
 	// Update title if there are infos to show
-	QString title;
-	if (infos.isEmpty()) {
-		title = tr("Image");
-	} else {
-		title = QString(tr("Image") + " (%1)").arg(infos.join(", "));
+	QString title = m_image->isVideo() ? tr("Video") : (!m_isAnimated.isEmpty() ? tr("Animation") : tr("Image"));
+	if (!infos.isEmpty()) {
+		title += QString(" (%1)").arg(infos.join(", "));
 	}
 	setWindowTitle(QStringLiteral("%1 - %2 (%3/%4)").arg(title, m_image->parentSite()->name(), QString::number(m_images.indexOf(m_image) + 1), QString::number(m_images.count())));
 }