projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integrate the about dialog into the settings dialog
[pulseview.git]
/
pv
/
mainwindow.cpp
diff --git
a/pv/mainwindow.cpp
b/pv/mainwindow.cpp
index 2f9ab323008948395f3496e5e14bf39bb0a23736..d8247825d47c9c01ae818760b63b75679644112d 100644
(file)
--- a/
pv/mainwindow.cpp
+++ b/
pv/mainwindow.cpp
@@
-17,14
+17,15
@@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <cassert>
-
#ifdef ENABLE_DECODE
#include <libsigrokdecode/libsigrokdecode.h>
#endif
#ifdef ENABLE_DECODE
#include <libsigrokdecode/libsigrokdecode.h>
#endif
+#include <cassert>
#include <algorithm>
#include <iterator>
#include <algorithm>
#include <iterator>
+#include <cstdint>
+#include <cstdarg>
#include <QAction>
#include <QApplication>
#include <QAction>
#include <QApplication>
@@
-42,14
+43,11
@@
#include "globalsettings.hpp"
#include "util.hpp"
#include "devices/hardwaredevice.hpp"
#include "globalsettings.hpp"
#include "util.hpp"
#include "devices/hardwaredevice.hpp"
-#include "dialogs/about.hpp"
#include "dialogs/settings.hpp"
#include "toolbars/mainbar.hpp"
#include "view/view.hpp"
#include "views/trace/standardbar.hpp"
#include "dialogs/settings.hpp"
#include "toolbars/mainbar.hpp"
#include "view/view.hpp"
#include "views/trace/standardbar.hpp"
-#include <stdint.h>
-#include <stdarg.h>
#include <libsigrokcxx/libsigrokcxx.hpp>
using std::dynamic_pointer_cast;
#include <libsigrokcxx/libsigrokcxx.hpp>
using std::dynamic_pointer_cast;
@@
-79,7
+77,6
@@
MainWindow::MainWindow(DeviceManager &device_manager,
device_manager_(device_manager),
session_selector_(this),
session_state_mapper_(this),
device_manager_(device_manager),
session_selector_(this),
session_state_mapper_(this),
- action_about_(new QAction(this)),
icon_red_(":/icons/status-red.svg"),
icon_green_(":/icons/status-green.svg"),
icon_grey_(":/icons/status-grey.svg")
icon_red_(":/icons/status-red.svg"),
icon_green_(":/icons/status-green.svg"),
icon_grey_(":/icons/status-grey.svg")
@@
-125,11
+122,6
@@
MainWindow::~MainWindow()
remove_session(sessions_.front());
}
remove_session(sessions_.front());
}
-QAction* MainWindow::action_about() const
-{
- return action_about_;
-}
-
shared_ptr<views::ViewBase> MainWindow::get_active_view() const
{
// If there's only one view, use it...
shared_ptr<views::ViewBase> MainWindow::get_active_view() const
{
// If there's only one view, use it...
@@
-138,7
+130,7
@@
shared_ptr<views::ViewBase> MainWindow::get_active_view() const
// ...otherwise find the dock widget the widget with focus is contained in
QObject *w = QApplication::focusWidget();
// ...otherwise find the dock widget the widget with focus is contained in
QObject *w = QApplication::focusWidget();
- QDockWidget *dock =
0
;
+ QDockWidget *dock =
nullptr
;
while (w) {
dock = qobject_cast<QDockWidget*>(w);
while (w) {
dock = qobject_cast<QDockWidget*>(w);
@@
-168,6
+160,8
@@
shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
assert(main_window);
assert(main_window);
+ shared_ptr<MainBar> main_bar = session.main_bar();
+
QDockWidget* dock = new QDockWidget(title, main_window);
dock->setObjectName(title);
main_window->addDockWidget(Qt::TopDockWidgetArea, dock);
QDockWidget* dock = new QDockWidget(title, main_window);
dock->setObjectName(title);
main_window->addDockWidget(Qt::TopDockWidgetArea, dock);
@@
-177,7
+171,9
@@
shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
dock_main->setWindowFlags(Qt::Widget); // Remove Qt::Window flag
if (type == views::ViewTypeTrace)
dock_main->setWindowFlags(Qt::Widget); // Remove Qt::Window flag
if (type == views::ViewTypeTrace)
- v = make_shared<views::TraceView::View>(session, dock_main);
+ // This view will be the main view if there's no main bar yet
+ v = make_shared<views::TraceView::View>(session,
+ (main_bar ? false : true), dock_main);
if (!v)
return nullptr;
if (!v)
return nullptr;
@@
-209,7
+205,6
@@
shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
tv->enable_sticky_scrolling(true);
tv->enable_coloured_bg(settings.value(GlobalSettings::Key_View_ColouredBG).toBool());
tv->enable_sticky_scrolling(true);
tv->enable_coloured_bg(settings.value(GlobalSettings::Key_View_ColouredBG).toBool());
- shared_ptr<MainBar> main_bar = session.main_bar();
if (!main_bar) {
/* Initial view, create the main bar */
main_bar = make_shared<MainBar>(session, this, tv);
if (!main_bar) {
/* Initial view, create the main bar */
main_bar = make_shared<MainBar>(session, this, tv);
@@
-255,7
+250,7
@@
void MainWindow::remove_view(shared_ptr<views::ViewBase> view)
// call deleteLater() on it, which causes a double free
// since the shared_ptr in view_docks_ doesn't know
// that Qt keeps a pointer to the view around
// call deleteLater() on it, which causes a double free
// since the shared_ptr in view_docks_ doesn't know
// that Qt keeps a pointer to the view around
- view->setParent(
0
);
+ view->setParent(
nullptr
);
// Delete the view's dock widget and all widgets inside it
entry.first->deleteLater();
// Delete the view's dock widget and all widgets inside it
entry.first->deleteLater();
@@
-352,9
+347,6
@@
void MainWindow::setup_ui()
view_coloured_bg_shortcut_ = new QShortcut(QKeySequence(Qt::Key_B), this, SLOT(on_view_coloured_bg_shortcut()));
view_coloured_bg_shortcut_->setAutoRepeat(false);
view_coloured_bg_shortcut_ = new QShortcut(QKeySequence(Qt::Key_B), this, SLOT(on_view_coloured_bg_shortcut()));
view_coloured_bg_shortcut_->setAutoRepeat(false);
- action_about_->setObjectName(QString::fromUtf8("actionAbout"));
- action_about_->setToolTip(tr("&About..."));
-
// Set up the tab area
new_session_button_ = new QToolButton();
new_session_button_->setIcon(QIcon::fromTheme("document-new",
// Set up the tab area
new_session_button_ = new QToolButton();
new_session_button_->setIcon(QIcon::fromTheme("document-new",
@@
-609,7
+601,7
@@
void MainWindow::on_run_stop_clicked()
void MainWindow::on_settings_clicked()
{
void MainWindow::on_settings_clicked()
{
- dialogs::Settings dlg;
+ dialogs::Settings dlg
(device_manager_)
;
dlg.exec();
}
dlg.exec();
}
@@
-670,7
+662,7
@@
void MainWindow::on_view_close_clicked()
{
// Find the dock widget that contains the close button that was clicked
QObject *w = QObject::sender();
{
// Find the dock widget that contains the close button that was clicked
QObject *w = QObject::sender();
- QDockWidget *dock =
0
;
+ QDockWidget *dock =
nullptr
;
while (w) {
dock = qobject_cast<QDockWidget*>(w);
while (w) {
dock = qobject_cast<QDockWidget*>(w);
@@
-757,12
+749,6
@@
void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value)
}
}
}
}
-void MainWindow::on_actionAbout_triggered()
-{
- dialogs::About dlg(device_manager_.context(), this);
- dlg.exec();
-}
-
void MainWindow::on_close_current_tab()
{
int tab = session_selector_.currentIndex();
void MainWindow::on_close_current_tab()
{
int tab = session_selector_.currentIndex();