projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put context bar back on the same row as the other toolbars
[pulseview.git]
/
pv
/
mainwindow.cpp
diff --git
a/pv/mainwindow.cpp
b/pv/mainwindow.cpp
index e70ca9891c565ca81891ef30e2f1b2246aa661d8..2a4ebc251746e37c156e4ee028c7b640b1921b74 100644
(file)
--- a/
pv/mainwindow.cpp
+++ b/
pv/mainwindow.cpp
@@
-216,7
+216,6
@@
void MainWindow::setup_ui()
// Setup the context bar
_context_bar = new toolbars::ContextBar(this);
addToolBar(_context_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,
// Set the title
setWindowTitle(QApplication::translate("MainWindow", "PulseView", 0,
@@
-355,6
+354,7
@@
void MainWindow::run_stop()
QString("Capture failed"), _1));
break;
QString("Capture failed"), _1));
break;
+ case SigSession::AwaitingTrigger:
case SigSession::Running:
_session.stop_capture();
break;
case SigSession::Running:
_session.stop_capture();
break;
@@
-363,7
+363,7
@@
void MainWindow::run_stop()
void MainWindow::capture_state_changed(int state)
{
void MainWindow::capture_state_changed(int state)
{
- _sampling_bar->set_
sampling(state != SigSession::Stopped
);
+ _sampling_bar->set_
capture_state((pv::SigSession::capture_state)state
);
}
void MainWindow::view_selection_changed()
}
void MainWindow::view_selection_changed()