projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added selection_changed signal to Ruler and Header
[pulseview.git]
/
pv
/
mainwindow.cpp
diff --git
a/pv/mainwindow.cpp
b/pv/mainwindow.cpp
index 7320bf1aa740a488fe014d6e10aac2ba66621aab..6b3398f22d9a40c7bb8266b24a37e29972fe3bef 100644
(file)
--- a/
pv/mainwindow.cpp
+++ b/
pv/mainwindow.cpp
@@
-41,6
+41,7
@@
#include "devicemanager.h"
#include "dialogs/about.h"
#include "dialogs/connect.h"
#include "devicemanager.h"
#include "dialogs/about.h"
#include "dialogs/connect.h"
+#include "toolbars/contextbar.h"
#include "toolbars/samplingbar.h"
#include "view/view.h"
#include "toolbars/samplingbar.h"
#include "view/view.h"
@@
-204,6
+205,11
@@
void MainWindow::setup_ui()
SLOT(run_stop()));
addToolBar(_sampling_bar);
SLOT(run_stop()));
addToolBar(_sampling_bar);
+ // Setup the context bar
+ _context_bar = new toolbars::ContextBar(this);
+ addToolBar(_context_bar);
+ insertToolBarBreak(_context_bar);
+
// Set the title
setWindowTitle(QApplication::translate("MainWindow", "PulseView", 0,
QApplication::UnicodeUTF8));
// Set the title
setWindowTitle(QApplication::translate("MainWindow", "PulseView", 0,
QApplication::UnicodeUTF8));
@@
-269,9
+275,13
@@
void MainWindow::show_session_error(
void MainWindow::on_actionOpen_triggered()
{
void MainWindow::on_actionOpen_triggered()
{
+ // Enumerate the file formats
+ QString filters(tr("Sigrok Sessions (*.sr)"));
+ filters.append(tr(";;All Files (*.*)"));
+
+ // Show the dialog
const QString file_name = QFileDialog::getOpenFileName(
const QString file_name = QFileDialog::getOpenFileName(
- this, tr("Open File"), "",
- tr("Sigrok Sessions (*.sr)"));
+ this, tr("Open File"), "", filters);
if (!file_name.isEmpty())
load_file(file_name);
}
if (!file_name.isEmpty())
load_file(file_name);
}