projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pv::prop::Int: Fixed unsigned int binding
[pulseview.git]
/
pv
/
mainwindow.cpp
diff --git
a/pv/mainwindow.cpp
b/pv/mainwindow.cpp
index dc9e7de5be8589ce8f0f23244bbc7fae03c36ae9..039f4aeb7b3c9871f66cd8ebddf78ca69cc0d5c8 100644
(file)
--- a/
pv/mainwindow.cpp
+++ b/
pv/mainwindow.cpp
@@
-52,12
+52,13
@@
#ifdef ENABLE_DECODE
#include "widgets/decodermenu.hpp"
#endif
#ifdef ENABLE_DECODE
#include "widgets/decodermenu.hpp"
#endif
+#include "widgets/hidingmenubar.hpp"
#include <inttypes.h>
#include <stdint.h>
#include <stdarg.h>
#include <glib.h>
#include <inttypes.h>
#include <stdint.h>
#include <stdarg.h>
#include <glib.h>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
using std::list;
using std::map;
using std::list;
using std::map;
@@
-195,8
+196,7
@@
void MainWindow::setup_ui()
// Set the window icon
QIcon icon;
// Set the window icon
QIcon icon;
- icon.addFile(QString::fromUtf8(":/icons/sigrok-logo-notext.png"),
- QSize(), QIcon::Normal, QIcon::Off);
+ icon.addFile(QString(":/icons/sigrok-logo-notext.svg"));
setWindowIcon(icon);
// Setup the central widget
setWindowIcon(icon);
// Setup the central widget
@@
-211,8
+211,8
@@
void MainWindow::setup_ui()
vertical_layout_->addWidget(view_);
// Setup the menu bar
vertical_layout_->addWidget(view_);
// Setup the menu bar
- QMenuBar *const menu_bar = new QMenuBar(this);
-
menu_bar->setGeometry(QRect(0, 0, 400, 25)
);
+ pv::widgets::HidingMenuBar *const menu_bar =
+
new pv::widgets::HidingMenuBar(this
);
// File Menu
QMenu *const menu_file = new QMenu;
// File Menu
QMenu *const menu_file = new QMenu;
@@
-276,7
+276,7
@@
void MainWindow::setup_ui()
QString::fromUtf8("actionViewZoomFit"));
menu_view->addAction(action_view_zoom_fit_);
QString::fromUtf8("actionViewZoomFit"));
menu_view->addAction(action_view_zoom_fit_);
- action_view_zoom_one_to_one_->setText(tr("Zoom to
&O
ne-to-One"));
+ action_view_zoom_one_to_one_->setText(tr("Zoom to
O&
ne-to-One"));
action_view_zoom_one_to_one_->setIcon(QIcon::fromTheme("zoom-original",
QIcon(":/icons/zoom-original.png")));
action_view_zoom_one_to_one_->setShortcut(QKeySequence(Qt::Key_O));
action_view_zoom_one_to_one_->setIcon(QIcon::fromTheme("zoom-original",
QIcon(":/icons/zoom-original.png")));
action_view_zoom_one_to_one_->setShortcut(QKeySequence(Qt::Key_O));
@@
-326,7
+326,7
@@
void MainWindow::setup_ui()
setMenuBar(menu_bar);
QMetaObject::connectSlotsByName(this);
setMenuBar(menu_bar);
QMetaObject::connectSlotsByName(this);
- // Setup the
sampling
bar
+ // Setup the
tool
bar
main_bar_ = new toolbars::MainBar(session_, *this);
// Populate the device list and select the initially selected device
main_bar_ = new toolbars::MainBar(session_, *this);
// Populate the device list and select the initially selected device
@@
-447,6
+447,15
@@
void MainWindow::closeEvent(QCloseEvent *event)
event->accept();
}
event->accept();
}
+void MainWindow::keyReleaseEvent(QKeyEvent *event)
+{
+ if (event->key() == Qt::Key_Alt) {
+ menuBar()->setHidden(!menuBar()->isHidden());
+ menuBar()->setFocus();
+ }
+ QMainWindow::keyReleaseEvent(event);
+}
+
void MainWindow::load_file(QString file_name)
{
const QString errorMessage(
void MainWindow::load_file(QString file_name)
{
const QString errorMessage(
@@
-454,7
+463,7
@@
void MainWindow::load_file(QString file_name)
const QString infoMessage;
try {
const QString infoMessage;
try {
- session_.set_file(file_name.toStdString());
+ session_.set_
session_
file(file_name.toStdString());
} catch(Error e) {
show_session_error(tr("Failed to load ") + file_name, e.what());
session_.set_default_device();
} catch(Error e) {
show_session_error(tr("Failed to load ") + file_name, e.what());
session_.set_default_device();
@@
-518,7
+527,9
@@
void MainWindow::on_actionSaveAs_triggered()
const QString abs_path = QFileInfo(file_name).absolutePath();
settings.setValue(SettingSaveDirectory, abs_path);
const QString abs_path = QFileInfo(file_name).absolutePath();
settings.setValue(SettingSaveDirectory, abs_path);
- StoreProgress *dlg = new StoreProgress(file_name, session_, this);
+ StoreProgress *dlg = new StoreProgress(file_name,
+ device_manager_.context()->output_formats()["srzip"],
+ session_, this);
dlg->run();
}
dlg->run();
}