From e3136fc48577d9482ff955f2c230536d22a92bb0 Mon Sep 17 00:00:00 2001 From: dogmaphobic Date: Tue, 3 Feb 2015 17:29:14 -0500 Subject: [PATCH] Fixing grammar in file filters (and making them consistent). --- src/ui/QGCBaseParamWidget.cc | 4 ++-- src/ui/QGCDataPlot2D.cc | 2 +- src/ui/QGCMAVLinkLogPlayer.cc | 2 +- src/ui/WaypointList.cc | 4 ++-- src/ui/designer/QGCToolWidget.cc | 4 ++-- src/ui/linechart/LinechartWidget.cc | 2 +- src/ui/map3D/Pixhawk3DWidget.cc | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/ui/QGCBaseParamWidget.cc b/src/ui/QGCBaseParamWidget.cc index 76c4f2abb..5c6f570bb 100644 --- a/src/ui/QGCBaseParamWidget.cc +++ b/src/ui/QGCBaseParamWidget.cc @@ -106,7 +106,7 @@ void QGCBaseParamWidget::saveParametersToFile() if (!mav) return; QString fileName = QGCFileDialog::getSaveFileName( - this, tr("Save Parameters"), qgcApp()->savedParameterFilesLocation(), tr("Parameter File (*.params)"), "params", true); + this, tr("Save Parameters"), qgcApp()->savedParameterFilesLocation(), tr("Parameter Files (*.params)"), "params", true); if (!fileName.isEmpty()) { QFile file(fileName); // TODO Display error message to the user if the file can't be created @@ -126,7 +126,7 @@ void QGCBaseParamWidget::loadParametersFromFile() return; QString fileName = QGCFileDialog::getOpenFileName( this, tr("Load Parameters"), qgcApp()->savedParameterFilesLocation(), - tr("Parameter file (*.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)) { diff --git a/src/ui/QGCDataPlot2D.cc b/src/ui/QGCDataPlot2D.cc index a676f1191..93b23db35 100644 --- a/src/ui/QGCDataPlot2D.cc +++ b/src/ui/QGCDataPlot2D.cc @@ -699,7 +699,7 @@ void QGCDataPlot2D::saveCsvLog() { QString fileName = QGCFileDialog::getSaveFileName( this, "Save CSV Log File", QStandardPaths::writableLocation(QStandardPaths::DesktopLocation), - "CSV file (*.csv)", + "CSV files (*.csv)", "csv", true); diff --git a/src/ui/QGCMAVLinkLogPlayer.cc b/src/ui/QGCMAVLinkLogPlayer.cc index 39a29601d..38ddafc6c 100644 --- a/src/ui/QGCMAVLinkLogPlayer.cc +++ b/src/ui/QGCMAVLinkLogPlayer.cc @@ -266,7 +266,7 @@ void QGCMAVLinkLogPlayer::_selectLogFileForPlayback(void) this, tr("Load MAVLink Log File"), qgcApp()->mavlinkLogFilesLocation(), - tr("MAVLink or Binary Logfile (*.mavlink *.bin *.log);;All Files (*)")); + tr("MAVLink or Binary Log Files (*.mavlink *.bin *.log);;All Files (*)")); if (!logFile.isEmpty()) { loadLogFile(logFile); diff --git a/src/ui/WaypointList.cc b/src/ui/WaypointList.cc index 8632ecc58..f2f39b3a8 100644 --- a/src/ui/WaypointList.cc +++ b/src/ui/WaypointList.cc @@ -218,14 +218,14 @@ void WaypointList::setUAS(UASInterface* uas) void WaypointList::saveWaypoints() { // TODO Need better default directory - QString fileName = QGCFileDialog::getSaveFileName(this, tr("Save Waypoint File"), "./untitled.waypoints", tr("Waypoint File (*.waypoints)"), "waypoints", true); + QString fileName = QGCFileDialog::getSaveFileName(this, tr("Save Waypoint File"), "./untitled.waypoints", tr("Waypoint Files (*.waypoints)"), "waypoints", true); WPM->saveWaypoints(fileName); } void WaypointList::loadWaypoints() { // TODO Need better default directory - QString fileName = QGCFileDialog::getOpenFileName(this, tr("Load Waypoint File"), ".", tr("Waypoint File (*.waypoints);;All Files (*)")); + QString fileName = QGCFileDialog::getOpenFileName(this, tr("Load Waypoint File"), ".", tr("Waypoint Files (*.waypoints);;All Files (*)")); WPM->loadWaypoints(fileName); } diff --git a/src/ui/designer/QGCToolWidget.cc b/src/ui/designer/QGCToolWidget.cc index d81a20f78..6536af9eb 100644 --- a/src/ui/designer/QGCToolWidget.cc +++ b/src/ui/designer/QGCToolWidget.cc @@ -575,7 +575,7 @@ void QGCToolWidget::exportWidget() QString fileName = QGCFileDialog::getSaveFileName( this, tr("Save Widget File"), QStandardPaths::writableLocation(QStandardPaths::DesktopLocation), - tr("QGroundControl Widget (*.qgw)"), + tr("QGroundControl Widget Files (*.qgw)"), "qgw", true); //-- Save it if we have it @@ -589,7 +589,7 @@ void QGCToolWidget::importWidget() { QString fileName = QGCFileDialog::getOpenFileName( this, tr("Load Widget File"), QStandardPaths::writableLocation(QStandardPaths::DesktopLocation), - tr("QGroundControl Widget (*.qgw);;All Files (*)")); + tr("QGroundControl Widget Files (*.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); diff --git a/src/ui/linechart/LinechartWidget.cc b/src/ui/linechart/LinechartWidget.cc index d87d049a9..26a938ea3 100644 --- a/src/ui/linechart/LinechartWidget.cc +++ b/src/ui/linechart/LinechartWidget.cc @@ -447,7 +447,7 @@ void LinechartWidget::startLogging() QString fileName = QGCFileDialog::getSaveFileName(this, tr("Save Log File"), QStandardPaths::writableLocation(QStandardPaths::DesktopLocation), - tr("Log file (*.log)"), + tr("Log files (*.log)"), "log", // Default type true); // Enforce default type diff --git a/src/ui/map3D/Pixhawk3DWidget.cc b/src/ui/map3D/Pixhawk3DWidget.cc index d62377c9e..7d6ab3c41 100644 --- a/src/ui/map3D/Pixhawk3DWidget.cc +++ b/src/ui/map3D/Pixhawk3DWidget.cc @@ -590,7 +590,7 @@ Pixhawk3DWidget::loadTerrainModel(void) QString filename = QGCFileDialog::getOpenFileName( this, "Load Terrain Model", QStandardPaths::writableLocation(QStandardPaths::DesktopLocation), - tr("Collada (*.dae)")); + tr("Collada Files (*.dae)")); if (filename.isEmpty()) { -- 2.22.0