diff --git a/src/main_window.cpp b/src/main_window.cpp
index f925b65..36b66ba 100644
--- a/src/main_window.cpp
+++ b/src/main_window.cpp
@@ -36,6 +36,10 @@ AC_MainWindow::AC_MainWindow(QWidget *parent) : QMainWindow(parent) {
setWindowTitle("Acid Cam v2 - Qt");
createControls();
createMenu();
+
+ cap_camera = new CaptureCamera(this);
+ cap_video = new CaptureVideo(this);
+
statusBar()->showMessage(tr("Acid Cam v2 Loaded - Use File Menu to Start"));
}
@@ -205,11 +209,11 @@ void AC_MainWindow::file_Exit() {
}
void AC_MainWindow::file_NewVideo() {
-
+ cap_video->show();
}
void AC_MainWindow::file_NewCamera() {
-
+ cap_camera->show();
}
void AC_MainWindow::controls_Snap() {
@@ -225,6 +229,6 @@ void AC_MainWindow::controls_Step() {
}
void AC_MainWindow::help_About() {
-
+ QMessageBox::information(this, tr("About Acid Cam"), tr("Written by Jared Bruni
\n\n GitHub
\nYouTube\n"));
}
diff --git a/src/main_window.h b/src/main_window.h
index cb09237..9b04167 100644
--- a/src/main_window.h
+++ b/src/main_window.h
@@ -2,6 +2,7 @@
#define __MAIN_WINDOW_H__
#include "qtheaders.h"
+#include "new_dialog.h"
class AC_MainWindow : public QMainWindow {
Q_OBJECT
@@ -37,6 +38,9 @@ private:
void createControls();
void createMenu();
+ CaptureCamera *cap_camera;
+ CaptureVideo *cap_video;
+
};
extern const char *filer_names[];
diff --git a/src/new_dialog.cpp b/src/new_dialog.cpp
index 4202ee1..51a4e16 100644
--- a/src/new_dialog.cpp
+++ b/src/new_dialog.cpp
@@ -1 +1,13 @@
#include "new_dialog.h"
+
+CaptureCamera::CaptureCamera(QWidget *parent) : QDialog(parent) {
+ setFixedSize(640, 480);
+ setWindowTitle("Capture from Webcam");
+ setWindowIcon(QPixmap(":/images/icon.png"));
+}
+
+CaptureVideo::CaptureVideo(QWidget *parent) : QDialog(parent) {
+ setFixedSize(640, 480);
+ setWindowTitle(("Capture from Video"));
+ setWindowIcon(QPixmap(":/images/icon.png"));
+}
diff --git a/src/new_dialog.h b/src/new_dialog.h
index 2d379b8..9202477 100644
--- a/src/new_dialog.h
+++ b/src/new_dialog.h
@@ -3,4 +3,18 @@
#include "qtheaders.h"
+
+class CaptureCamera : public QDialog {
+ Q_OBJECT
+public:
+ CaptureCamera(QWidget *parent = 0);
+};
+
+class CaptureVideo : public QDialog {
+ Q_OBJECT
+public:
+ CaptureVideo(QWidget *parent = 0);
+
+};
+
#endif
diff --git a/src/qtheaders.h b/src/qtheaders.h
index 8061e59..01a938a 100644
--- a/src/qtheaders.h
+++ b/src/qtheaders.h
@@ -14,6 +14,7 @@
#include
#include
#include
+#include
#include"ac.h"
#include"fractal.h"
#include