nou/tenmon
1
0
Fork 1
Code Issues Pull Requests Projects Releases 33 Wiki Activity

Rebase fixup

Browse Source
This commit is contained in:
Dušan Poizl
2019-11-26 06:01:36 +01:00
parent c03067d45e
commit fcc1696c2c
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mainwindow.cpp
+12 -10
View File
@@ -39,14 +39,23 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
//setCentralWidget(m_image);
resize(800, 600);
m_imageGL = new ImageScrollAreaGL(this);
setCentralWidget(m_imageGL);
PhotoCapture *photoCapture = new PhotoCapture(this);
QDockWidget *captureDock = new QDockWidget(tr("Photo capture"), this);
captureDock->setWidget(photoCapture);
captureDock->setObjectName("captureDock");
addDockWidget(Qt::BottomDockWidgetArea, captureDock);
m_imageGL = new ImageScrollAreaGL(this);
setCentralWidget(m_imageGL);
StretchPanel *stretchPanel = new StretchPanel(this);
connect(stretchPanel, SIGNAL(lowChanged(int)), m_imageGL, SLOT(setLow(int)));
connect(stretchPanel, SIGNAL(highChanged(int)), m_imageGL, SLOT(setHigh(int)));
QDockWidget *stretchDock = new QDockWidget(tr("Stretch"), this);
stretchDock->setWidget(stretchPanel);
stretchDock->setObjectName("strechDock");
addDockWidget(Qt::LeftDockWidgetArea, stretchDock);
setWindowTitle(tr("Tenmon"));
@@ -110,16 +119,9 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
QMenu *dockMenu = new QMenu(tr("Docks"), this);
dockMenu->addAction(infoDock->toggleViewAction());
dockMenu->addAction(captureDock->toggleViewAction());
dockMenu->addAction(stretchDock->toggleViewAction());
menuBar()->addMenu(dockMenu);
StretchPanel *stretchPanel = new StretchPanel(this);
connect(stretchPanel, SIGNAL(lowChanged(int)), m_imageGL, SLOT(setLow(int)));
connect(stretchPanel, SIGNAL(highChanged(int)), m_imageGL, SLOT(setHigh(int)));
QDockWidget *stretchDock = new QDockWidget(tr("Stretch"), this);
stretchDock->setWidget(stretchPanel);
addDockWidget(Qt::LeftDockWidgetArea, stretchDock);
setupSigterm();
QSettings settings;
restoreGeometry(settings.value("mainwindow/geometry").toByteArray());