From: Sergey Alirzaev Date: Tue, 6 Jun 2017 01:23:24 +0000 (+0300) Subject: permit file names not containing dots on import X-Git-Tag: pulseview-0.4.0~32 X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=75ab6b87f1184630a03cdef015f8010d2faf4653 permit file names not containing dots on import --- diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp index 4f5cd158..114e6fd7 100644 --- a/pv/toolbars/mainbar.cpp +++ b/pv/toolbars/mainbar.cpp @@ -626,9 +626,9 @@ void MainBar::export_file(shared_ptr format, bool selection_only) QString::fromStdString(format->description())); if (exts.empty()) - filter += "(*.*)"; + filter += "(*)"; else - filter += QString("(*.%1);;%2 (*.*)").arg( + filter += QString("(*.%1);;%2 (*)").arg( QString::fromStdString(join(exts, ", *.")), tr("All Files")); @@ -679,7 +679,7 @@ void MainBar::import_file(shared_ptr format) // Show the file dialog const QString file_name = QFileDialog::getOpenFileName( this, tr("Import File"), dir, tr( - "%1 files (*.*);;All Files (*.*)").arg( + "%1 files (*);;All Files (*)").arg( QString::fromStdString(format->description()))); if (file_name.isEmpty()) @@ -757,7 +757,7 @@ void MainBar::on_actionOpen_triggered() const QString file_name = QFileDialog::getOpenFileName( this, tr("Open File"), dir, tr( "Sigrok Sessions (*.sr);;" - "All Files (*.*)")); + "All Files (*)")); if (!file_name.isEmpty()) { session_.load_file(file_name);