X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.cpp;h=c31d0d33860021fe11fb2eacb020c3535a3a8de9;hb=c32bf63a93d8135b5d71c70270dbf45f9b4a8267;hp=ea36a77e90957609158017775c9a01bfae694247;hpb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;p=pulseview.git

diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index ea36a77..c31d0d3 100644
--- a/pv/toolbars/mainbar.cpp
+++ b/pv/toolbars/mainbar.cpp
@@ -89,7 +89,6 @@ const char *MainBar::SettingSaveDirectory = "MainWindow/SaveDirectory";
 
 MainBar::MainBar(Session &session, MainWindow &main_window) :
 	QToolBar("Sampling Bar", &main_window),
-	action_new_session_(new QAction(this)),
 	action_new_view_(new QAction(this)),
 	action_open_(new QAction(this)),
 	action_save_as_(new QAction(this)),
@@ -111,12 +110,7 @@ MainBar::MainBar(Session &session, MainWindow &main_window) :
 	sample_rate_("Hz", this),
 	updating_sample_rate_(false),
 	updating_sample_count_(false),
-	sample_count_supported_(false),
-	icon_red_(":/icons/status-red.svg"),
-	icon_green_(":/icons/status-green.svg"),
-	icon_grey_(":/icons/status-grey.svg"),
-	run_stop_button_(this),
-	run_stop_button_action_(nullptr)
+	sample_count_supported_(false)
 #ifdef ENABLE_DECODE
 	, menu_decoders_add_(new pv::widgets::DecoderMenu(this, true))
 #endif
@@ -128,12 +122,6 @@ MainBar::MainBar(Session &session, MainWindow &main_window) :
 	setContextMenuPolicy(Qt::PreventContextMenu);
 
 	// Actions
-	action_new_session_->setText(tr("New &Session"));
-	action_new_session_->setIcon(QIcon::fromTheme("document-new",
-		QIcon(":/icons/document-new.png")));
-	connect(action_new_session_, SIGNAL(triggered(bool)),
-		this, SLOT(on_actionNewSession_triggered()));
-
 	action_new_view_->setText(tr("New &View"));
 	action_new_view_->setIcon(QIcon::fromTheme("window-new",
 		QIcon(":/icons/window-new.png")));
@@ -268,7 +256,6 @@ MainBar::MainBar(Session &session, MainWindow &main_window) :
 #endif
 
 	// Setup the toolbar
-	addAction(action_new_session_);
 	addAction(action_new_view_);
 	addSeparator();
 	addWidget(open_button);
@@ -282,8 +269,6 @@ MainBar::MainBar(Session &session, MainWindow &main_window) :
 	addAction(action_view_show_cursors_);
 	addSeparator();
 
-	connect(&run_stop_button_, SIGNAL(clicked()),
-		this, SLOT(on_run_stop()));
 	connect(&sample_count_, SIGNAL(value_changed()),
 		this, SLOT(on_sample_count_changed()));
 	connect(&sample_rate_, SIGNAL(value_changed()),
@@ -299,14 +284,11 @@ MainBar::MainBar(Session &session, MainWindow &main_window) :
 	channels_button_.setIcon(QIcon::fromTheme("channels",
 		QIcon(":/icons/channels.svg")));
 
-	run_stop_button_.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-
 	addWidget(&device_selector_);
 	configure_button_action_ = addWidget(&configure_button_);
 	channels_button_action_ = addWidget(&channels_button_);
 	addWidget(&sample_count_);
 	addWidget(&sample_rate_);
-	run_stop_button_action_ = addWidget(&run_stop_button_);
 #ifdef ENABLE_DECODE
 	addSeparator();
 	addWidget(add_decoder_button);
@@ -347,12 +329,6 @@ void MainBar::update_device_list()
 
 void MainBar::set_capture_state(pv::Session::capture_state state)
 {
-	const QIcon *icons[] = {&icon_grey_, &icon_red_, &icon_green_};
-	run_stop_button_.setIcon(*icons[state]);
-	run_stop_button_.setText((state == pv::Session::Stopped) ?
-		tr("Run") : tr("Stop"));
-	run_stop_button_.setShortcut(QKeySequence(Qt::Key_Space));
-
 	bool ui_enabled = (state == pv::Session::Stopped) ? true : false;
 
 	device_selector_.setEnabled(ui_enabled);
@@ -453,20 +429,6 @@ QAction* MainBar::action_view_show_cursors() const
 	return action_view_show_cursors_;
 }
 
-void MainBar::run_stop()
-{
-	switch (session_.get_capture_state()) {
-	case Session::Stopped:
-		session_.start_capture([&](QString message) {
-			session_error("Capture failed", message); });
-		break;
-	case Session::AwaitingTrigger:
-	case Session::Running:
-		session_.stop_capture();
-		break;
-	}
-}
-
 void MainBar::load_file(QString file_name,
 	std::shared_ptr<sigrok::InputFormat> format,
 	const std::map<std::string, Glib::VariantBase> &options)
@@ -659,7 +621,6 @@ void MainBar::update_device_config_widgets()
 
 	// Hide the widgets if no device is selected
 	channels_button_action_->setVisible(!!device);
-	run_stop_button_action_->setVisible(!!device);
 	if (!device) {
 		configure_button_action_->setVisible(false);
 		sample_count_.show_none();
@@ -867,7 +828,8 @@ void MainBar::export_file(shared_ptr<OutputFormat> format,
 		options = dlg.options();
 	}
 
-	session_.set_name(QFileInfo(file_name).fileName());
+	if (!selection_only)
+		session_.set_name(QFileInfo(file_name).fileName());
 
 	StoreProgress *dlg = new StoreProgress(file_name, format, options,
 		sample_range, session_, this);
@@ -944,24 +906,12 @@ void MainBar::on_sample_rate_changed()
 		commit_sample_rate();
 }
 
-void MainBar::on_run_stop()
-{
-	commit_sample_count();
-	commit_sample_rate();	
-	run_stop();
-}
-
 void MainBar::on_config_changed()
 {
 	commit_sample_count();
 	commit_sample_rate();	
 }
 
-void MainBar::on_actionNewSession_triggered()
-{
-	new_session();
-}
-
 void MainBar::on_actionNewView_triggered()
 {
 	new_view(&session_);