#include <pv/popups/deviceoptions.hpp>
#include <pv/popups/channels.hpp>
#include <pv/util.hpp>
+#include <pv/widgets/exportmenu.hpp>
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
using std::back_inserter;
using std::copy;
setMovable(false);
setFloatable(false);
+ setContextMenuPolicy(Qt::PreventContextMenu);
+
+ // Save button
+ QToolButton *const save_button = new QToolButton(this);
+
+ widgets::ExportMenu *export_menu = new widgets::ExportMenu(this,
+ session.device_manager().context(),
+ main_window.action_save_as());
+ connect(export_menu,
+ SIGNAL(format_selected(std::shared_ptr<sigrok::OutputFormat>)),
+ &main_window_,
+ SLOT(export_file(std::shared_ptr<sigrok::OutputFormat>)));
+
+ save_button->setMenu(export_menu);
+ save_button->setDefaultAction(main_window.action_save_as());
+ save_button->setPopupMode(QToolButton::MenuButtonPopup);
// Device selector menu
connect(&device_selector_, SIGNAL(device_selected()),
// Setup the toolbar
addAction(main_window.action_open());
- addAction(main_window.action_save_as());
+ addWidget(save_button);
addSeparator();
addAction(main_window.action_view_zoom_in());
addAction(main_window.action_view_zoom_out());
const auto iter = keys.find(ConfigKey::SAMPLERATE);
if (iter != keys.end() &&
(*iter).second.find(sigrok::LIST) != (*iter).second.end()) {
- const auto keys = device->config_keys(
- ConfigKey::DEVICE_OPTIONS);
try {
gvar_dict = device->config_list(ConfigKey::SAMPLERATE);
} catch(const sigrok::Error &e) {
}
}
- if (!gvar_dict) {
+ if (!gvar_dict.gobj()) {
sample_rate_.show_none();
updating_sample_rate_ = false;
return;
try {
auto gvar =
device->config_list(ConfigKey::LIMIT_SAMPLES);
- if (gvar)
+ if (gvar.gobj())
g_variant_get(gvar.gobj(), "(tt)",
&min_sample_count, &max_sample_count);
} catch(const sigrok::Error &e) {