Settle on consistent 'capture' name for captured files, dropping 'log'

This commit is contained in:
baldurk
2017-06-08 16:32:39 +01:00
parent 4263b55ffa
commit 2f1301e758
3 changed files with 14 additions and 14 deletions
+1 -1
View File
@@ -125,7 +125,7 @@ void CaptureContext::LoadLogfile(const QString &logFile, const QString &origFile
thread->selfDelete(true);
thread->start();
ShowProgressDialog(m_MainWindow, tr("Loading Log: %1").arg(origFilename),
ShowProgressDialog(m_MainWindow, tr("Loading Capture: %1").arg(origFilename),
[this]() { return !m_LoadInProgress; },
[this]() { return UpdateLoadProgress(); });
+7 -7
View File
@@ -274,10 +274,10 @@ void MainWindow::on_action_Open_Log_triggered()
if(!PromptCloseLog())
return;
QString filename =
RDDialog::getOpenFileName(this, tr("Select Logfile to open"), m_Ctx.Config().LastLogPath,
tr("Log Files (*.rdc);;Image Files (*.dds *.hdr *.exr *.bmp *.jpg "
"*.jpeg *.png *.tga *.gif *.psd;;All Files (*.*)"));
QString filename = RDDialog::getOpenFileName(
this, tr("Select Logfile to open"), m_Ctx.Config().LastLogPath,
tr("Capture Files (*.rdc);;Image Files (*.dds *.hdr *.exr *.bmp *.jpg "
"*.jpeg *.png *.tga *.gif *.psd;;All Files (*.*)"));
if(!filename.isEmpty())
LoadFromFilename(filename);
@@ -580,7 +580,7 @@ QString MainWindow::GetSavePath()
}
QString filename =
RDDialog::getSaveFileName(this, tr("Save Capture As"), dir, tr("Log Files (*.rdc)"));
RDDialog::getSaveFileName(this, tr("Save Capture As"), dir, tr("Capture Files (*.rdc)"));
if(!filename.isEmpty())
{
@@ -910,8 +910,8 @@ void MainWindow::setLogHasErrors(bool errors)
statusIcon->setPixmap(m_messageAlternate ? empty : Pixmaps::del());
QString text;
text = tr("%1 loaded. Log has %2 errors, warnings or performance notes. "
"See the 'Log Errors and Warnings' window.")
text = tr("%1 loaded. Capture has %2 errors, warnings or performance notes. "
"See the 'Errors and Warnings' window.")
.arg(filename)
.arg(m_Ctx.DebugMessages().size());
if(m_Ctx.UnreadMessageCount() > 0)
+6 -6
View File
@@ -62,7 +62,7 @@
</property>
<widget class="QMenu" name="menu_Recent_Logs">
<property name="title">
<string>&amp;Recent Logs</string>
<string>&amp;Recent Captures</string>
</property>
<addaction name="separator"/>
<addaction name="action_Clear_Log_History"/>
@@ -173,7 +173,7 @@
</action>
<action name="action_Open_Log">
<property name="text">
<string>&amp;Open Log</string>
<string>&amp;Open Capture</string>
</property>
<property name="shortcut">
<string>Ctrl+O</string>
@@ -181,7 +181,7 @@
</action>
<action name="action_Save_Log">
<property name="text">
<string>&amp;Save Log</string>
<string>&amp;Save Capture</string>
</property>
<property name="shortcut">
<string>Ctrl+S</string>
@@ -189,7 +189,7 @@
</action>
<action name="action_Close_Log">
<property name="text">
<string>&amp;Close Log</string>
<string>&amp;Close Capture</string>
</property>
<property name="shortcut">
<string>Ctrl+W</string>
@@ -235,7 +235,7 @@
</action>
<action name="action_Errors_and_Warnings">
<property name="text">
<string>Log Errors and &amp;Warnings</string>
<string>Errors and &amp;Warnings</string>
</property>
</action>
<action name="action_Timeline">
@@ -330,7 +330,7 @@
</action>
<action name="action_Log_Statistics">
<property name="text">
<string>&amp;Log Statistics</string>
<string>&amp;Statistics</string>
</property>
</action>
<action name="action_Settings">