mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-19 06:15:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

UI change of "images"/"photo" to "media" or "media files"

Browse source 
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:
Stefan Fuchs 2018-07-13 20:46:45 +02:00 • committed by Dirk Hohndel
parent 80761beb93
commit 669277d490
10 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
desktop-widgets/divelistview.cpp
View file

@ -924,9 +924,9 @@ void DiveListView::loadImages()
{
QStringList filters = imageExtensionFilters();
QStringList fileNames = QFileDialog::getOpenFileNames(this,
tr("Open image files"),
tr("Open media files"),
lastUsedImageDir(),
tr("Image files (%1)").arg(filters.join(" ")));
tr("Media files (%1)").arg(filters.join(" ")));
if (fileNames.isEmpty())
return;

8
desktop-widgets/findmovedimagesdialog.cpp
View file

@ -170,7 +170,7 @@ void FindMovedImagesDialog::on_scanButton_clicked()
// TODO: is lastUsedImageDir really well-placed in DiveListView?
QString dirName = QFileDialog::getExistingDirectory(this,
tr("Traverse image directories"),
tr("Traverse media directories"),
DiveListView::lastUsedImageDir(),
QFileDialog::ShowDirsOnly);
if (dirName.isEmpty())
@ -251,7 +251,7 @@ void FindMovedImagesDialog::searchDone()
stopScanning = 0;
}
if (matches.isEmpty()) {
text += "<i>" + tr("No matching images found") + "</i>";
text += "<i>" + tr("No matching media files found") + "</i>";
} else {
QString matchesText;
for (const Match &match: matches) {
@ -263,9 +263,9 @@ void FindMovedImagesDialog::searchDone()
}
int numUnchanged = matches.size() - numChanged;
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) {
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;
}
}

6
desktop-widgets/findmovedimagesdialog.ui
View file

@ -20,7 +20,7 @@
</sizepolicy>
</property>
<property name="windowTitle">
<string>Find moved images</string>
<string>Find moved media files</string>
</property>
<property name="windowIcon">
<iconset>
@ -34,7 +34,7 @@
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Found images</string>
<string>Found media files</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
@ -68,7 +68,7 @@
</sizepolicy>
</property>
<property name="text">
<string>Match only images in selected dive(s)</string>
<string>Match only media files in selected dive(s)</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>

4
desktop-widgets/mainwindow.ui
View file

@ -625,7 +625,7 @@
<normaloff>:photo-icon</normaloff>:photo-icon</iconset>
</property>
<property name="text">
<string>Toggle pictures</string>
<string>Toggle media</string>
</property>
</action>
<action name="profTankbar">
@ -686,7 +686,7 @@
</action>
<action name="actionHash_images">
<property name="text">
<string>&amp;Find moved images</string>
<string>&amp;Find moved media files</string>
</property>
</action>
<action name="actionCloudstorageopen">

2
desktop-widgets/preferences/preferences_graph.ui
View file

@ -371,7 +371,7 @@
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="auto_recalculate_thumbnails">
<property name="text">
<string>Recalculate thumbnails if older than image</string>
<string>Recalculate thumbnails if older than media file</string>
</property>
</widget>
</item>

4
desktop-widgets/shiftimagetimes.ui
View file

@ -126,7 +126,7 @@
</property>
<property name="text">
<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>
</property>
</widget>
@ -134,7 +134,7 @@ Not all images have timestamps in the range between
<item>
<widget class="QCheckBox" name="matchAllImages">
<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>
</widget>
</item>

10
desktop-widgets/tab-widgets/TabDivePhotos.cpp
View file

@ -49,11 +49,11 @@ void TabDivePhotos::clear()
void TabDivePhotos::contextMenuEvent(QContextMenuEvent *event)
{
QMenu popup(this);
popup.addAction(tr("Load image(s) from file(s)"), this, SLOT(addPhotosFromFile()));
popup.addAction(tr("Load image(s) from web"), this, SLOT(addPhotosFromURL()));
popup.addAction(tr("Load media from file(s)"), this, SLOT(addPhotosFromFile()));
popup.addAction(tr("Load media file(s) from web"), this, SLOT(addPhotosFromURL()));
popup.addSeparator();
popup.addAction(tr("Delete selected images"), this, SLOT(removeSelectedPhotos()));
popup.addAction(tr("Delete all images"), this, SLOT(removeAllPhotos()));
popup.addAction(tr("Delete selected media files"), this, SLOT(removeSelectedPhotos()));
popup.addAction(tr("Delete all media files"), this, SLOT(removeAllPhotos()));
popup.addAction(tr("Recalculate selected thumbnails"), this, SLOT(recalculateSelectedThumbnails()));
popup.exec(event->globalPos());
event->accept();
@ -101,7 +101,7 @@ void TabDivePhotos::addPhotosFromURL()
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();
removeSelectedPhotos();
}

2
desktop-widgets/tab-widgets/maintab.cpp
View file

@ -57,7 +57,7 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent),
extraWidgets << new TabDiveStatistics();
ui.tabWidget->addTab(extraWidgets.last(), tr("Statistics"));
extraWidgets << new TabDivePhotos();
ui.tabWidget->addTab(extraWidgets.last(), tr("Photos"));
ui.tabWidget->addTab(extraWidgets.last(), tr("Media"));
extraWidgets << new TabDiveExtraInfo();
ui.tabWidget->addTab(extraWidgets.last(), tr("Extra Info"));

2
desktop-widgets/urldialog.ui
View file

@ -49,7 +49,7 @@
</rect>
</property>
<property name="text">
<string>Enter URL for images</string>
<string>Enter URL for media files</string>
</property>
</widget>
</widget>

6
qt-models/divetripmodel.cpp
View file

@ -276,7 +276,7 @@ QVariant DiveItem::data(int column, int role) const
retVal = tr("Tags");
break;
case PHOTOS:
retVal = tr("Photos before/during/after dive");
retVal = tr("Media before/during/after dive");
break;
case COUNTRY:
retVal = tr("Country");
@ -518,7 +518,7 @@ QVariant DiveTripModel::headerData(int section, Qt::Orientation orientation, int
ret = tr("Tags");
break;
case PHOTOS:
ret = tr("Photos");
ret = tr("Media");
break;
case COUNTRY:
ret = tr("Country");
@ -575,7 +575,7 @@ QVariant DiveTripModel::headerData(int section, Qt::Orientation orientation, int
ret = tr("Tags");
break;
case PHOTOS:
ret = tr("Photos before/during/after dive");
ret = tr("Media before/during/after dive");
break;
case LOCATION:
ret = tr("Location");