projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make ExportMenu accept a vector of actions
[pulseview.git]
/
pv
/
toolbars
/
mainbar.cpp
diff --git
a/pv/toolbars/mainbar.cpp
b/pv/toolbars/mainbar.cpp
index de476e04c94444eaf58c0d3317297efc7b3a5ea3..3b1698669a9ac8634a8af1ce87a7786f02cd6833 100644
(file)
--- a/
pv/toolbars/mainbar.cpp
+++ b/
pv/toolbars/mainbar.cpp
@@
-110,9
+110,12
@@
MainBar::MainBar(Session &session, MainWindow &main_window) :
// Save button
QToolButton *const save_button = new QToolButton(this);
// Save button
QToolButton *const save_button = new QToolButton(this);
+ vector<QAction *> open_actions;
+ open_actions.push_back(main_window.action_save_as());
+
widgets::ExportMenu *export_menu = new widgets::ExportMenu(this,
session.device_manager().context(),
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_,
connect(export_menu,
SIGNAL(format_selected(std::shared_ptr<sigrok::OutputFormat>)),
&main_window_,
@@
-584,10
+587,11
@@
bool MainBar::eventFilter(QObject *watched, QEvent *event)
{
if ((watched == &sample_count_ || watched == &sample_rate_) &&
(event->type() == QEvent::ToolTip)) {
{
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);
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;
QToolTip::showText(help_event->globalPos(), str);
return true;