Peter M. Groen / openhantek

Commit cd4d510df3028dca74981eaf45ff877519dd5294

Authored by David Graeff
1 parent 307fb7a2

Show active device in main window title. Dock windows need a parent. Fixes #75

Inline Side-by-side
Showing 2 changed files with 11 additions and 9 deletions
openhantek/src/dockwindows.h
  View file @cd4d510
... ... @@ -45,7 +45,7 @@ class HorizontalDock : public QDockWidget {
45 45 Q_OBJECT
46 46  
47 47 public:
48   - HorizontalDock(DsoSettings *settings, QWidget *parent = 0,
  48 + HorizontalDock(DsoSettings *settings, QWidget *parent,
49 49 Qt::WindowFlags flags = 0);
50 50 ~HorizontalDock();
51 51  
... ... @@ -114,7 +114,7 @@ class TriggerDock : public QDockWidget {
114 114  
115 115 public:
116 116 TriggerDock(DsoSettings *settings, const QStringList *specialTriggers,
117   - QWidget *parent = 0, Qt::WindowFlags flags = 0);
  117 + QWidget *parent, Qt::WindowFlags flags = 0);
118 118 ~TriggerDock();
119 119  
120 120 int setMode(Dso::TriggerMode mode);
... ... @@ -162,7 +162,7 @@ class VoltageDock : public QDockWidget {
162 162 Q_OBJECT
163 163  
164 164 public:
165   - VoltageDock(DsoSettings *settings, QWidget *parent = 0,
  165 + VoltageDock(DsoSettings *settings, QWidget *parent,
166 166 Qt::WindowFlags flags = 0);
167 167 ~VoltageDock();
168 168  
... ... @@ -215,7 +215,7 @@ class SpectrumDock : public QDockWidget {
215 215 Q_OBJECT
216 216  
217 217 public:
218   - SpectrumDock(DsoSettings *settings, QWidget *parent = 0,
  218 + SpectrumDock(DsoSettings *settings, QWidget *parent,
219 219 Qt::WindowFlags flags = 0);
220 220 ~SpectrumDock();
221 221  
... ...
openhantek/src/mainwindow.cpp
  View file @cd4d510
... ... @@ -18,6 +18,7 @@
18 18 #include "dataanalyzer.h"
19 19 #include "dockwindows.h"
20 20 #include "hantekdsocontrol.h"
  21 +#include "usb/usbdevice.h"
21 22 #include "dsowidget.h"
22 23 #include "hantek/hantekdsocontrol.h"
23 24 #include "settings.h"
... ... @@ -32,7 +33,7 @@ OpenHantekMainWindow::OpenHantekMainWindow(std::shared_ptr<HantekDsoControl> dso
32 33  
33 34 // Window title
34 35 setWindowIcon(QIcon(":openhantek.png"));
35   - setWindowTitle(tr("OpenHantek"));
  36 + setWindowTitle(tr("OpenHantek - Device %1").arg(QString::fromStdString(dsoControl->getDevice()->getModel().name)));
36 37  
37 38 // Application settings
38 39 settings = new DsoSettings();
... ... @@ -40,6 +41,7 @@ OpenHantekMainWindow::OpenHantekMainWindow(std::shared_ptr<HantekDsoControl> dso
40 41 readSettings();
41 42  
42 43 // Create dock windows before the dso widget, they fix messed up settings
  44 + setDockOptions(dockOptions() | QMainWindow::GroupedDragging);
43 45 createDockWindows();
44 46  
45 47 // Central oszilloscope widget
... ... @@ -249,10 +251,10 @@ void OpenHantekMainWindow::createStatusBar() {
249 251  
250 252 /// \brief Create all docking windows.
251 253 void OpenHantekMainWindow::createDockWindows() {
252   - horizontalDock = new HorizontalDock(settings);
253   - triggerDock = new TriggerDock(settings, dsoControl->getSpecialTriggerSources());
254   - spectrumDock = new SpectrumDock(settings);
255   - voltageDock = new VoltageDock(settings);
  254 + horizontalDock = new HorizontalDock(settings, this);
  255 + triggerDock = new TriggerDock(settings, dsoControl->getSpecialTriggerSources(), this);
  256 + spectrumDock = new SpectrumDock(settings, this);
  257 + voltageDock = new VoltageDock(settings, this);
256 258 }
257 259  
258 260 /// \brief Connect general signals and device management signals.
... ...