Commit 1b813145 authored by dogmaphobic's avatar dogmaphobic

More work on filter description consistency.

parent e3136fc4
......@@ -480,7 +480,7 @@ void QGCApplication::saveTempFlightDataLogOnMainThread(QString tempLogfile)
MainWindow::instance(),
tr("Save Flight Data Log"),
qgcApp()->mavlinkLogFilesLocation(),
tr("Flight Data Log (*.mavlink)"),
tr("Flight Data Log Files (*.mavlink)"),
"mavlink");
if (!saveFilename.isEmpty()) {
QFile::copy(tempLogfile, saveFilename);
......
......@@ -766,7 +766,7 @@ void MainWindow::_loadCustomWidgetFromFile(void)
QString fileName = QGCFileDialog::getOpenFileName(
this, tr("Load Widget File"),
QStandardPaths::writableLocation(QStandardPaths::DesktopLocation),
tr("QGroundControl Widget (*.qgw);;All Files (*)"));
tr("QGroundControl Widgets (*.qgw);;All Files (*)"));
if (!fileName.isEmpty()) {
QGCToolWidget* tool = new QGCToolWidget("", "", this);
if (tool->loadSettings(fileName, true)) {
......
......@@ -126,7 +126,7 @@ void QGCBaseParamWidget::loadParametersFromFile()
return;
QString fileName = QGCFileDialog::getOpenFileName(
this, tr("Load Parameters"), qgcApp()->savedParameterFilesLocation(),
tr("Parameter files (*.params);;All Files (*)"));
tr("Parameter Files (*.params);;All Files (*)"));
QFile file(fileName);
// TODO Display error message to the user if the file can't be opened
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
......
......@@ -269,11 +269,11 @@ void QGCDataPlot2D::selectFile()
// Open a file dialog prompting the user for the file to load.
// Note the special case for the Pixhawk.
if (ui->inputFileType->currentText().contains("pxIMU") || ui->inputFileType->currentText().contains("RAW")) {
fileName = QGCFileDialog::getOpenFileName(this, tr("Load Log File"), QString(), "Log files (*.imu *.raw)");
fileName = QGCFileDialog::getOpenFileName(this, tr("Load Log File"), QString(), "Log Files (*.imu *.raw)");
}
else
{
fileName = QGCFileDialog::getOpenFileName(this, tr("Load Log File"), QString(), "Log files (*.csv);;All Files (*)");
fileName = QGCFileDialog::getOpenFileName(this, tr("Load Log File"), QString(), "Log Files (*.csv);;All Files (*)");
}
// Check if the user hit cancel, which results in an empty string.
......@@ -699,7 +699,7 @@ void QGCDataPlot2D::saveCsvLog()
{
QString fileName = QGCFileDialog::getSaveFileName(
this, "Save CSV Log File", QStandardPaths::writableLocation(QStandardPaths::DesktopLocation),
"CSV files (*.csv)",
"CSV Files (*.csv)",
"csv",
true);
......
......@@ -266,7 +266,7 @@ void QGCMAVLinkLogPlayer::_selectLogFileForPlayback(void)
this,
tr("Load MAVLink Log File"),
qgcApp()->mavlinkLogFilesLocation(),
tr("MAVLink or Binary Log Files (*.mavlink *.bin *.log);;All Files (*)"));
tr("MAVLink Log Files (*.mavlink);;All Files (*)"));
if (!logFile.isEmpty()) {
loadLogFile(logFile);
......
......@@ -589,7 +589,7 @@ void QGCToolWidget::importWidget()
{
QString fileName = QGCFileDialog::getOpenFileName(
this, tr("Load Widget File"), QStandardPaths::writableLocation(QStandardPaths::DesktopLocation),
tr("QGroundControl Widget Files (*.qgw);;All Files (*)"));
tr("QGroundControl Widgets (*.qgw);;All Files (*)"));
if (!fileName.isEmpty()) {
// TODO There is no error checking. If the load fails, there is nothing telling the user what happened.
loadSettings(fileName);
......
......@@ -447,7 +447,7 @@ void LinechartWidget::startLogging()
QString fileName = QGCFileDialog::getSaveFileName(this,
tr("Save Log File"),
QStandardPaths::writableLocation(QStandardPaths::DesktopLocation),
tr("Log files (*.log)"),
tr("Log Files (*.log)"),
"log", // Default type
true); // Enforce default type
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment