X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.cpp;h=50e1908fb66031005cefbbadcbc9439461c1ace3;hp=a1761291ddb835a4ba84c1bcc176849d676e821e;hb=61501398c32a261d87430337536f04dea174698a;hpb=c7b03d9daa9574bd633fbac2d5976716f58027f5

diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index a176129..50e1908 100644
--- a/pv/toolbars/mainbar.cpp
+++ b/pv/toolbars/mainbar.cpp
@@ -110,9 +110,13 @@ MainBar::MainBar(Session &session, MainWindow &main_window) :
 	// Save button
 	QToolButton *const save_button = new QToolButton(this);
 
+	vector<QAction *> open_actions;
+	open_actions.push_back(main_window.action_save_as());
+	open_actions.push_back(main_window.action_save_selection_as());
+
 	widgets::ExportMenu *export_menu = new widgets::ExportMenu(this,
 		session.device_manager().context(),
-		main_window.action_save_as());
+		open_actions);
 	connect(export_menu,
 		SIGNAL(format_selected(std::shared_ptr<sigrok::OutputFormat>)),
 		&main_window_,
@@ -232,6 +236,14 @@ void MainBar::set_capture_state(pv::Session::capture_state 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);
+	configure_button_.setEnabled(ui_enabled);
+	channels_button_.setEnabled(ui_enabled);
+	sample_count_.setEnabled(ui_enabled);
+	sample_rate_.setEnabled(ui_enabled);
 }
 
 void MainBar::update_sample_rate_selector()
@@ -576,10 +588,11 @@ bool MainBar::eventFilter(QObject *watched, QEvent *event)
 {
 	if ((watched == &sample_count_ || watched == &sample_rate_) &&
 		(event->type() == QEvent::ToolTip)) {
-		double sec = (double)sample_count_.value() / sample_rate_.value();
+		auto sec = pv::util::Timestamp(sample_count_.value()) / sample_rate_.value();
 		QHelpEvent *help_event = static_cast<QHelpEvent*>(event);
 
-		QString str = tr("Total sampling time: %1").arg(pv::util::format_second(sec));
+		QString str = tr("Total sampling time: %1").arg(
+			pv::util::format_time_si(sec, pv::util::SIPrefix::unspecified, 0, "s", false));
 		QToolTip::showText(help_event->globalPos(), str);
 
 		return true;