projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use QMessageBox::setInformativeText()
[pulseview.git]
/
pv
/
mainwindow.cpp
diff --git
a/pv/mainwindow.cpp
b/pv/mainwindow.cpp
index c79364ebe738c8aca735f7cdae2a7f9c0ce1ce51..960c38977ab98b49ef0d22061077cec2b2f64906 100644
(file)
--- a/
pv/mainwindow.cpp
+++ b/
pv/mainwindow.cpp
@@
-75,9
+75,6
@@
MainWindow::MainWindow(DeviceManager &device_manager, QWidget *parent) :
icon_green_(":/icons/status-green.svg"),
icon_grey_(":/icons/status-grey.svg")
{
icon_green_(":/icons/status-green.svg"),
icon_grey_(":/icons/status-grey.svg")
{
- qRegisterMetaType<util::Timestamp>("util::Timestamp");
- qRegisterMetaType<uint64_t>("uint64_t");
-
GlobalSettings::add_change_handler(this);
setup_ui();
GlobalSettings::add_change_handler(this);
setup_ui();
@@
-98,8
+95,7
@@
void MainWindow::show_session_error(const QString text, const QString info_text)
qDebug() << "Notifying user of session error:" << info_text;
QMessageBox msg;
qDebug() << "Notifying user of session error:" << info_text;
QMessageBox msg;
- msg.setText(text);
- msg.setInformativeText(info_text);
+ msg.setText(text + "\n\n" + info_text);
msg.setStandardButtons(QMessageBox::Ok);
msg.setIcon(QMessageBox::Warning);
msg.exec();
msg.setStandardButtons(QMessageBox::Ok);
msg.setIcon(QMessageBox::Warning);
msg.exec();