projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainBar: Renamed from SamplingBar
[pulseview.git]
/
pv
/
mainwindow.cpp
diff --git
a/pv/mainwindow.cpp
b/pv/mainwindow.cpp
index 9fa4eee6baa2735281a4c3e4dbfda21cc7a3bb62..924e70581fa442d064413b2a9b6e5f862d8553aa 100644
(file)
--- a/
pv/mainwindow.cpp
+++ b/
pv/mainwindow.cpp
@@
-46,7
+46,7
@@
#include "dialogs/about.hpp"
#include "dialogs/connect.hpp"
#include "dialogs/storeprogress.hpp"
#include "dialogs/about.hpp"
#include "dialogs/connect.hpp"
#include "dialogs/storeprogress.hpp"
-#include "toolbars/
sampling
bar.hpp"
+#include "toolbars/
main
bar.hpp"
#include "view/logicsignal.hpp"
#include "view/view.hpp"
#ifdef ENABLE_DECODE
#include "view/logicsignal.hpp"
#include "view/view.hpp"
#ifdef ENABLE_DECODE
@@
-283,12
+283,12
@@
void MainWindow::setup_ui()
addToolBar(toolbar);
// Setup the sampling bar
addToolBar(toolbar);
// Setup the sampling bar
-
sampling_bar_ = new toolbars::Sampling
Bar(session_, *this);
+
main_bar_ = new toolbars::Main
Bar(session_, *this);
// Populate the device list and select the initially selected device
update_device_list();
// Populate the device list and select the initially selected device
update_device_list();
- addToolBar(
sampling
_bar_);
+ addToolBar(
main
_bar_);
// Set the title
setWindowTitle(tr("PulseView"));
// Set the title
setWindowTitle(tr("PulseView"));
@@
-394,7
+394,7
@@
void MainWindow::session_error(
void MainWindow::update_device_list()
{
void MainWindow::update_device_list()
{
- assert(
sampling
_bar_);
+ assert(
main
_bar_);
shared_ptr<Device> selected_device = session_.device();
list< shared_ptr<Device> > devices;
shared_ptr<Device> selected_device = session_.device();
list< shared_ptr<Device> > devices;
@@
-410,7
+410,7
@@
void MainWindow::update_device_list()
devices.push_back(selected_device);
assert(selected_device);
devices.push_back(selected_device);
assert(selected_device);
-
sampling
_bar_->set_device_list(devices, selected_device);
+
main
_bar_->set_device_list(devices, selected_device);
}
void MainWindow::closeEvent(QCloseEvent *event)
}
void MainWindow::closeEvent(QCloseEvent *event)
@@
-563,7
+563,7
@@
void MainWindow::add_decoder(srd_decoder *decoder)
void MainWindow::capture_state_changed(int state)
{
void MainWindow::capture_state_changed(int state)
{
-
sampling
_bar_->set_capture_state((pv::Session::capture_state)state);
+
main
_bar_->set_capture_state((pv::Session::capture_state)state);
}
void MainWindow::device_selected()
}
void MainWindow::device_selected()