projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
permit file names not containing dots on import
[pulseview.git]
/
pv
/
toolbars
/
mainbar.cpp
diff --git
a/pv/toolbars/mainbar.cpp
b/pv/toolbars/mainbar.cpp
index 0f92f060cb96135b5905dc529f5d1e43b05a77f3..114e6fd72cb7c5ac44d71577f7b491b0085800b6 100644
(file)
--- a/
pv/toolbars/mainbar.cpp
+++ b/
pv/toolbars/mainbar.cpp
@@
-114,6
+114,8
@@
MainBar::MainBar(Session &session, QWidget *parent,
{
setObjectName(QString::fromUtf8("MainBar"));
{
setObjectName(QString::fromUtf8("MainBar"));
+ setContextMenuPolicy(Qt::PreventContextMenu);
+
// Actions
action_new_view_->setText(tr("New &View"));
action_new_view_->setIcon(QIcon::fromTheme("window-new",
// Actions
action_new_view_->setText(tr("New &View"));
action_new_view_->setIcon(QIcon::fromTheme("window-new",
@@
-624,9
+626,9
@@
void MainBar::export_file(shared_ptr<OutputFormat> format, bool selection_only)
QString::fromStdString(format->description()));
if (exts.empty())
QString::fromStdString(format->description()));
if (exts.empty())
- filter += "(*
.*
)";
+ filter += "(*)";
else
else
- filter += QString("(*.%1);;%2 (*
.*
)").arg(
+ filter += QString("(*.%1);;%2 (*)").arg(
QString::fromStdString(join(exts, ", *.")),
tr("All Files"));
QString::fromStdString(join(exts, ", *.")),
tr("All Files"));
@@
-677,7
+679,7
@@
void MainBar::import_file(shared_ptr<InputFormat> format)
// Show the file dialog
const QString file_name = QFileDialog::getOpenFileName(
this, tr("Import File"), dir, tr(
// 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())
QString::fromStdString(format->description())));
if (file_name.isEmpty())
@@
-755,7
+757,7
@@
void MainBar::on_actionOpen_triggered()
const QString file_name = QFileDialog::getOpenFileName(
this, tr("Open File"), dir, tr(
"Sigrok Sessions (*.sr);;"
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);
if (!file_name.isEmpty()) {
session_.load_file(file_name);