action_view_zoom_fit_(new QAction(this)),
action_view_zoom_one_to_one_(new QAction(this)),
action_view_sticky_scrolling_(new QAction(this)),
+ action_view_coloured_bg_(new QAction(this)),
action_view_show_cursors_(new QAction(this)),
action_about_(new QAction(this))
#ifdef ENABLE_DECODE
return action_view_sticky_scrolling_;
}
+QAction* MainWindow::action_view_coloured_bg() const
+{
+ return action_view_coloured_bg_;
+}
+
QAction* MainWindow::action_view_show_cursors() const
{
return action_view_show_cursors_;
filter += "(*.*)";
else
filter += QString("(*.%1);;%2 (*.*)").arg(
- QString::fromStdString(join(exts, ", *."))).arg(
+ QString::fromStdString(join(exts, ", *.")),
tr("All Files"));
// Show the file dialog
const vector<string> exts = format->extensions();
const QString filter = exts.empty() ? "" :
tr("%1 files (*.%2)").arg(
- QString::fromStdString(format->description())).arg(
+ QString::fromStdString(format->description()),
QString::fromStdString(join(exts, ", *.")));
// Show the file dialog
QString::fromUtf8("actionViewZoomOneToOne"));
menu_view->addAction(action_view_zoom_one_to_one_);
- menu_file->addSeparator();
+ menu_view->addSeparator();
action_view_sticky_scrolling_->setCheckable(true);
action_view_sticky_scrolling_->setChecked(true);
menu_view->addSeparator();
+ action_view_coloured_bg_->setCheckable(true);
+ action_view_coloured_bg_->setChecked(true);
+ action_view_coloured_bg_->setShortcut(QKeySequence(Qt::Key_B));
+ action_view_coloured_bg_->setObjectName(
+ QString::fromUtf8("actionViewColouredBg"));
+ action_view_coloured_bg_->setText(tr("Use &coloured backgrounds"));
+ menu_view->addAction(action_view_coloured_bg_);
+
+ view_->enable_coloured_bg(action_view_coloured_bg_->isChecked());
+
+ menu_view->addSeparator();
+
action_view_show_cursors_->setCheckable(true);
action_view_show_cursors_->setChecked(view_->cursors_shown());
action_view_show_cursors_->setIcon(QIcon::fromTheme("show-cursors",
QSettings settings;
map<string, string> dev_info;
list<string> key_list;
+ shared_ptr<devices::HardwareDevice> device;
- // Re-select last used device if possible.
+ // Re-select last used device if possible but only if it's not demo
settings.beginGroup("Device");
key_list.push_back("vendor");
key_list.push_back("model");
dev_info.insert(std::make_pair(key, value));
}
- const shared_ptr<devices::HardwareDevice> device =
- device_manager_.find_device_from_info(dev_info);
+ if (dev_info.count("model") > 0)
+ if (dev_info.at("model").find("Demo device") == std::string::npos)
+ device = device_manager_.find_device_from_info(dev_info);
+
+ // When we can't find a device similar to the one we used last
+ // time and there is at least one device aside from demo, use it
+ if (!device) {
+ for (shared_ptr<devices::HardwareDevice> dev : device_manager_.devices()) {
+ dev_info = device_manager_.get_device_info(dev);
+
+ if (dev_info.count("model") > 0)
+ if (dev_info.at("model").find("Demo device") == std::string::npos) {
+ device = dev;
+ break;
+ }
+ }
+ }
+
select_device(device);
update_device_list();
view_->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked());
}
+void MainWindow::on_actionViewColouredBg_triggered()
+{
+ view_->enable_coloured_bg(action_view_coloured_bg_->isChecked());
+}
+
void MainWindow::on_actionViewShowCursors_triggered()
{
assert(view_);