mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
UI change of "images"/"photo" to "media" or "media files"
This changes the above mentioned terms everywhere in the UI to reflect the fact that Subsurface now also supports video files on top of image files. Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
This commit is contained in:
parent
80761beb93
commit
669277d490
10 changed files with 24 additions and 24 deletions
|
@ -924,9 +924,9 @@ void DiveListView::loadImages()
|
||||||
{
|
{
|
||||||
QStringList filters = imageExtensionFilters();
|
QStringList filters = imageExtensionFilters();
|
||||||
QStringList fileNames = QFileDialog::getOpenFileNames(this,
|
QStringList fileNames = QFileDialog::getOpenFileNames(this,
|
||||||
tr("Open image files"),
|
tr("Open media files"),
|
||||||
lastUsedImageDir(),
|
lastUsedImageDir(),
|
||||||
tr("Image files (%1)").arg(filters.join(" ")));
|
tr("Media files (%1)").arg(filters.join(" ")));
|
||||||
|
|
||||||
if (fileNames.isEmpty())
|
if (fileNames.isEmpty())
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -170,7 +170,7 @@ void FindMovedImagesDialog::on_scanButton_clicked()
|
||||||
|
|
||||||
// TODO: is lastUsedImageDir really well-placed in DiveListView?
|
// TODO: is lastUsedImageDir really well-placed in DiveListView?
|
||||||
QString dirName = QFileDialog::getExistingDirectory(this,
|
QString dirName = QFileDialog::getExistingDirectory(this,
|
||||||
tr("Traverse image directories"),
|
tr("Traverse media directories"),
|
||||||
DiveListView::lastUsedImageDir(),
|
DiveListView::lastUsedImageDir(),
|
||||||
QFileDialog::ShowDirsOnly);
|
QFileDialog::ShowDirsOnly);
|
||||||
if (dirName.isEmpty())
|
if (dirName.isEmpty())
|
||||||
|
@ -251,7 +251,7 @@ void FindMovedImagesDialog::searchDone()
|
||||||
stopScanning = 0;
|
stopScanning = 0;
|
||||||
}
|
}
|
||||||
if (matches.isEmpty()) {
|
if (matches.isEmpty()) {
|
||||||
text += "<i>" + tr("No matching images found") + "</i>";
|
text += "<i>" + tr("No matching media files found") + "</i>";
|
||||||
} else {
|
} else {
|
||||||
QString matchesText;
|
QString matchesText;
|
||||||
for (const Match &match: matches) {
|
for (const Match &match: matches) {
|
||||||
|
@ -263,9 +263,9 @@ void FindMovedImagesDialog::searchDone()
|
||||||
}
|
}
|
||||||
int numUnchanged = matches.size() - numChanged;
|
int numUnchanged = matches.size() - numChanged;
|
||||||
if (numUnchanged > 0)
|
if (numUnchanged > 0)
|
||||||
text += tr("Found <b>%1</b> images at their current place.").arg(numUnchanged) + "<br/>";
|
text += tr("Found <b>%1</b> media files at their current place.").arg(numUnchanged) + "<br/>";
|
||||||
if (numChanged > 0) {
|
if (numChanged > 0) {
|
||||||
text += tr("Found <b>%1</b> images at new locations:").arg(numChanged) + "<br/>";
|
text += tr("Found <b>%1</b> media files at new locations:").arg(numChanged) + "<br/>";
|
||||||
text += matchesText;
|
text += matchesText;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>Find moved images</string>
|
<string>Find moved media files</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowIcon">
|
<property name="windowIcon">
|
||||||
<iconset>
|
<iconset>
|
||||||
|
@ -34,7 +34,7 @@
|
||||||
<item>
|
<item>
|
||||||
<widget class="QGroupBox" name="groupBox">
|
<widget class="QGroupBox" name="groupBox">
|
||||||
<property name="title">
|
<property name="title">
|
||||||
<string>Found images</string>
|
<string>Found media files</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout">
|
<layout class="QVBoxLayout" name="verticalLayout">
|
||||||
<item>
|
<item>
|
||||||
|
@ -68,7 +68,7 @@
|
||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Match only images in selected dive(s)</string>
|
<string>Match only media files in selected dive(s)</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
|
|
|
@ -625,7 +625,7 @@
|
||||||
<normaloff>:photo-icon</normaloff>:photo-icon</iconset>
|
<normaloff>:photo-icon</normaloff>:photo-icon</iconset>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Toggle pictures</string>
|
<string>Toggle media</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
<action name="profTankbar">
|
<action name="profTankbar">
|
||||||
|
@ -686,7 +686,7 @@
|
||||||
</action>
|
</action>
|
||||||
<action name="actionHash_images">
|
<action name="actionHash_images">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>&Find moved images</string>
|
<string>&Find moved media files</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
<action name="actionCloudstorageopen">
|
<action name="actionCloudstorageopen">
|
||||||
|
|
|
@ -371,7 +371,7 @@
|
||||||
<item row="2" column="0" colspan="2">
|
<item row="2" column="0" colspan="2">
|
||||||
<widget class="QCheckBox" name="auto_recalculate_thumbnails">
|
<widget class="QCheckBox" name="auto_recalculate_thumbnails">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Recalculate thumbnails if older than image</string>
|
<string>Recalculate thumbnails if older than media file</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|
|
@ -126,7 +126,7 @@
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Warning!
|
<string>Warning!
|
||||||
Not all images have timestamps in the range between
|
Not all media files have timestamps in the range between
|
||||||
30 minutes before the start and 30 minutes after the end of any selected dive.</string>
|
30 minutes before the start and 30 minutes after the end of any selected dive.</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
|
@ -134,7 +134,7 @@ Not all images have timestamps in the range between
|
||||||
<item>
|
<item>
|
||||||
<widget class="QCheckBox" name="matchAllImages">
|
<widget class="QCheckBox" name="matchAllImages">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Load images even if the time does not match the dive time</string>
|
<string>Load media files even if the time does not match the dive time</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|
|
@ -49,11 +49,11 @@ void TabDivePhotos::clear()
|
||||||
void TabDivePhotos::contextMenuEvent(QContextMenuEvent *event)
|
void TabDivePhotos::contextMenuEvent(QContextMenuEvent *event)
|
||||||
{
|
{
|
||||||
QMenu popup(this);
|
QMenu popup(this);
|
||||||
popup.addAction(tr("Load image(s) from file(s)"), this, SLOT(addPhotosFromFile()));
|
popup.addAction(tr("Load media from file(s)"), this, SLOT(addPhotosFromFile()));
|
||||||
popup.addAction(tr("Load image(s) from web"), this, SLOT(addPhotosFromURL()));
|
popup.addAction(tr("Load media file(s) from web"), this, SLOT(addPhotosFromURL()));
|
||||||
popup.addSeparator();
|
popup.addSeparator();
|
||||||
popup.addAction(tr("Delete selected images"), this, SLOT(removeSelectedPhotos()));
|
popup.addAction(tr("Delete selected media files"), this, SLOT(removeSelectedPhotos()));
|
||||||
popup.addAction(tr("Delete all images"), this, SLOT(removeAllPhotos()));
|
popup.addAction(tr("Delete all media files"), this, SLOT(removeAllPhotos()));
|
||||||
popup.addAction(tr("Recalculate selected thumbnails"), this, SLOT(recalculateSelectedThumbnails()));
|
popup.addAction(tr("Recalculate selected thumbnails"), this, SLOT(recalculateSelectedThumbnails()));
|
||||||
popup.exec(event->globalPos());
|
popup.exec(event->globalPos());
|
||||||
event->accept();
|
event->accept();
|
||||||
|
@ -101,7 +101,7 @@ void TabDivePhotos::addPhotosFromURL()
|
||||||
|
|
||||||
void TabDivePhotos::removeAllPhotos()
|
void TabDivePhotos::removeAllPhotos()
|
||||||
{
|
{
|
||||||
if (QMessageBox::warning(this, tr("Deleting Images"), tr("Are you sure you want to delete all images?"), QMessageBox::Cancel | QMessageBox::Ok, QMessageBox::Cancel) != QMessageBox::Cancel ) {
|
if (QMessageBox::warning(this, tr("Deleting media files"), tr("Are you sure you want to delete all media files?"), QMessageBox::Cancel | QMessageBox::Ok, QMessageBox::Cancel) != QMessageBox::Cancel ) {
|
||||||
ui->photosView->selectAll();
|
ui->photosView->selectAll();
|
||||||
removeSelectedPhotos();
|
removeSelectedPhotos();
|
||||||
}
|
}
|
||||||
|
|
|
@ -57,7 +57,7 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent),
|
||||||
extraWidgets << new TabDiveStatistics();
|
extraWidgets << new TabDiveStatistics();
|
||||||
ui.tabWidget->addTab(extraWidgets.last(), tr("Statistics"));
|
ui.tabWidget->addTab(extraWidgets.last(), tr("Statistics"));
|
||||||
extraWidgets << new TabDivePhotos();
|
extraWidgets << new TabDivePhotos();
|
||||||
ui.tabWidget->addTab(extraWidgets.last(), tr("Photos"));
|
ui.tabWidget->addTab(extraWidgets.last(), tr("Media"));
|
||||||
extraWidgets << new TabDiveExtraInfo();
|
extraWidgets << new TabDiveExtraInfo();
|
||||||
ui.tabWidget->addTab(extraWidgets.last(), tr("Extra Info"));
|
ui.tabWidget->addTab(extraWidgets.last(), tr("Extra Info"));
|
||||||
|
|
||||||
|
|
|
@ -49,7 +49,7 @@
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Enter URL for images</string>
|
<string>Enter URL for media files</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</widget>
|
</widget>
|
||||||
|
|
|
@ -276,7 +276,7 @@ QVariant DiveItem::data(int column, int role) const
|
||||||
retVal = tr("Tags");
|
retVal = tr("Tags");
|
||||||
break;
|
break;
|
||||||
case PHOTOS:
|
case PHOTOS:
|
||||||
retVal = tr("Photos before/during/after dive");
|
retVal = tr("Media before/during/after dive");
|
||||||
break;
|
break;
|
||||||
case COUNTRY:
|
case COUNTRY:
|
||||||
retVal = tr("Country");
|
retVal = tr("Country");
|
||||||
|
@ -518,7 +518,7 @@ QVariant DiveTripModel::headerData(int section, Qt::Orientation orientation, int
|
||||||
ret = tr("Tags");
|
ret = tr("Tags");
|
||||||
break;
|
break;
|
||||||
case PHOTOS:
|
case PHOTOS:
|
||||||
ret = tr("Photos");
|
ret = tr("Media");
|
||||||
break;
|
break;
|
||||||
case COUNTRY:
|
case COUNTRY:
|
||||||
ret = tr("Country");
|
ret = tr("Country");
|
||||||
|
@ -575,7 +575,7 @@ QVariant DiveTripModel::headerData(int section, Qt::Orientation orientation, int
|
||||||
ret = tr("Tags");
|
ret = tr("Tags");
|
||||||
break;
|
break;
|
||||||
case PHOTOS:
|
case PHOTOS:
|
||||||
ret = tr("Photos before/during/after dive");
|
ret = tr("Media before/during/after dive");
|
||||||
break;
|
break;
|
||||||
case LOCATION:
|
case LOCATION:
|
||||||
ret = tr("Location");
|
ret = tr("Location");
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue