From 0262ce2107bacd61f0b466352e91c6c623340d3d Mon Sep 17 00:00:00 2001 From: dogmaphobic Date: Fri, 30 Jan 2015 19:47:08 -0500 Subject: [PATCH] Removing unnecessary double semi-colon from single type filters in file dialogs --- src/ui/MainWindow.cc | 2 +- src/ui/designer/QGCToolWidget.cc | 4 ++-- src/ui/linechart/LinechartWidget.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc index 0e5f5bc..8e59022 100644 --- a/src/ui/MainWindow.cc +++ b/src/ui/MainWindow.cc @@ -836,7 +836,7 @@ void MainWindow::createCustomWidget() void MainWindow::loadCustomWidget() { QString widgetFileExtension(".qgw"); - QString fileName = QGCFileDialog::getOpenFileName(this, tr("Specify Widget File Name"), QStandardPaths::writableLocation(QStandardPaths::DesktopLocation), tr("QGroundControl Widget (*%1);;").arg(widgetFileExtension)); + QString fileName = QGCFileDialog::getOpenFileName(this, tr("Specify Widget File Name"), QStandardPaths::writableLocation(QStandardPaths::DesktopLocation), tr("QGroundControl Widget (*%1)").arg(widgetFileExtension)); if (fileName != "") loadCustomWidget(fileName); } void MainWindow::loadCustomWidget(const QString& fileName, int view) diff --git a/src/ui/designer/QGCToolWidget.cc b/src/ui/designer/QGCToolWidget.cc index d56262c..61c565c 100644 --- a/src/ui/designer/QGCToolWidget.cc +++ b/src/ui/designer/QGCToolWidget.cc @@ -576,7 +576,7 @@ void QGCToolWidget::exportWidget() QString fileName = QGCFileDialog::getSaveFileName( this, tr("Specify File Name"), QStandardPaths::writableLocation(QStandardPaths::DesktopLocation), - tr("QGroundControl Widget (*%1);;").arg(widgetFileExtension), + tr("QGroundControl Widget (*%1)").arg(widgetFileExtension), 0,0, &defaultSuffix); //-- Note that if the user enters foo.bar, this will end up foo.bar.qgw @@ -591,7 +591,7 @@ void QGCToolWidget::exportWidget() void QGCToolWidget::importWidget() { const QString widgetFileExtension(".qgw"); - QString fileName = QGCFileDialog::getOpenFileName(this, tr("Specify File Name"), QStandardPaths::writableLocation(QStandardPaths::DesktopLocation), tr("QGroundControl Widget (*%1);;").arg(widgetFileExtension)); + QString fileName = QGCFileDialog::getOpenFileName(this, tr("Specify File Name"), QStandardPaths::writableLocation(QStandardPaths::DesktopLocation), tr("QGroundControl Widget (*%1)").arg(widgetFileExtension)); loadSettings(fileName); } diff --git a/src/ui/linechart/LinechartWidget.cc b/src/ui/linechart/LinechartWidget.cc index c6c5a2e..0975bb7 100644 --- a/src/ui/linechart/LinechartWidget.cc +++ b/src/ui/linechart/LinechartWidget.cc @@ -437,7 +437,7 @@ QString LinechartWidget::getLogSaveFilename() QString fileName = QGCFileDialog::getSaveFileName(this, tr("Specify log file name"), QStandardPaths::writableLocation(QStandardPaths::DesktopLocation), - tr("Logfile (*.log);;"), + tr("Logfile (*.log)"), 0,0, &defaultSuffix); return fileName;