projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modified header guards to match file names
[pulseview.git]
/
pv
/
mainwindow.cpp
diff --git
a/pv/mainwindow.cpp
b/pv/mainwindow.cpp
index 2652d50be777ecd6dc22b6042bd30766ac5b1866..039f4aeb7b3c9871f66cd8ebddf78ca69cc0d5c8 100644
(file)
--- a/
pv/mainwindow.cpp
+++ b/
pv/mainwindow.cpp
@@
-196,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
@@
-327,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
@@
-464,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();
@@
-528,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();
}