#include "dialogs/about.hpp"
#include "dialogs/connect.hpp"
#include "dialogs/storeprogress.hpp"
-#include "toolbars/samplingbar.hpp"
+#include "toolbars/mainbar.hpp"
#include "view/logicsignal.hpp"
#include "view/view.hpp"
#ifdef ENABLE_DECODE
using std::list;
using std::map;
-using std::pair;
using std::shared_ptr;
using std::string;
namespace pv {
namespace view {
-class SelectableItem;
+class ViewItem;
}
const char *MainWindow::SettingOpenDirectory = "MainWindow/OpenDirectory";
addToolBar(toolbar);
// Setup the sampling bar
- sampling_bar_ = new toolbars::SamplingBar(session_, *this);
+ main_bar_ = new toolbars::MainBar(session_, *this);
// 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"));
void MainWindow::update_device_list()
{
- assert(sampling_bar_);
+ assert(main_bar_);
shared_ptr<Device> selected_device = session_.device();
list< shared_ptr<Device> > devices;
devices.push_back(selected_device);
assert(selected_device);
- list< pair< shared_ptr<Device>, string> > device_list;
-
- for (auto device : devices)
- device_list.push_back(make_pair(
- device, device_manager_.get_display_name(device)));
-
- sampling_bar_->set_device_list(device_list, selected_device);
+ main_bar_->set_device_list(devices, selected_device);
}
void MainWindow::closeEvent(QCloseEvent *event)
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()