Camera combo box

zaak · Dec 21, 2017 · b3cde0f · b3cde0f
1 parent 33945f0
commit b3cde0f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/CamGrab.pro.user b/CamGrab.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.5.0, 2017-12-21T17:25:34. -->
+<!-- Written by QtCreator 4.5.0, 2017-12-21T18:39:49. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -7,21 +7,26 @@ MainWindow::MainWindow(QWidget *parent) :
     ui(new Ui::MainWindow)
 {
     ui->setupUi(this);
+    Console::setOutputControl(ui->consoleOutput);
 
-    ui->consoleDockWidget->setVisible(false);
+    QWidget *horizontalSpacer = new QWidget();
+    horizontalSpacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+    ui->mainToolBar->addWidget(horizontalSpacer);
 
-    Console::setOutputControl(ui->consoleOutput);
+    ui->mainToolBar->addWidget(new QComboBox());
+
+    ui->consoleDockWidget->setVisible(false);
 }
 
 MainWindow::~MainWindow()
 {
     delete ui;
 }
 
-void MainWindow::startCamera(bool a)
+void MainWindow::startCamera(bool enable)
 {
     QList<QCameraInfo> cameras = QCameraInfo::availableCameras();
-    qDebug() << cameras.size();
+
     foreach (const QCameraInfo &cameraInfo, cameras) {
 
         qDebug() << cameraInfo.deviceName();
@@ -37,4 +42,3 @@ void MainWindow::startCamera(bool a)
         ui->statusBar->showMessage("Aaaaa");
     }
 }
-
diff --git a/mainwindow.h b/mainwindow.h
@@ -5,6 +5,8 @@
 #include <QCamera>
 #include <QCameraInfo>
 #include <QCameraViewfinder>
+#include <QComboBox>
+#include <QSpacerItem>
 
 namespace Ui {
 class MainWindow;

diff --git a/mainwindow.ui b/mainwindow.ui
@@ -86,7 +86,8 @@
         <bool>false</bool>
        </property>
        <property name="styleSheet">
-        <string notr="true">background-color: rgb(46, 52, 54);</string>
+        <string notr="true">background-color: rgb(46, 52, 54);
+color: rgb(255, 255, 255);</string>
        </property>
        <property name="readOnly">
         <bool>true</bool>