updated formatting, changed location of combobox, upped version number

This commit is contained in:
lostjared
2018-11-18 10:59:48 -08:00
parent b1addfb21c
commit a93038a9ba
14 changed files with 32 additions and 32 deletions

View File

@@ -102,13 +102,13 @@ void ChromaWindow::createControls() {
highButton->setGeometry(300, 90, 25, 20); highButton->setGeometry(300, 90, 25, 20);
select_mode = new QComboBox(this); select_mode = new QComboBox(this);
select_mode->setGeometry(15, 235, 290, 25); select_mode->setGeometry(10, 235, 295, 25);
select_mode->addItem("Replace with Filter"); select_mode->addItem("Replace with Filter");
select_mode->addItem("Replace with Image"); select_mode->addItem("Replace with Image");
select_setimage = new QPushButton("Image", this); select_setimage = new QPushButton("Image", this);
select_setimage->setGeometry(20, 265, 60, 20); select_setimage->setGeometry(15, 265, 60, 20);
select_image_path = new QLabel("Test Path", this); select_image_path = new QLabel("Test Path", this);
select_image_path->setGeometry(85, 265, 400-85-25, 20); select_image_path->setGeometry(85, 265, 400-85-25, 20);

View File

@@ -12,7 +12,7 @@ public:
bool checkEdit(QLineEdit *edit); bool checkEdit(QLineEdit *edit);
void setEditFromColor(int val, QColor color); void setEditFromColor(int val, QColor color);
void enableKey(bool op); void enableKey(bool op);
public slots: public slots:
void openColorSelectRange(); void openColorSelectRange();
void openColorSelectTolerance(); void openColorSelectTolerance();
void colorAdd(); void colorAdd();

View File

@@ -2,7 +2,7 @@
* Acid Cam v2 - Qt/OpenCV Edition * Acid Cam v2 - Qt/OpenCV Edition
* written by Jared Bruni ( http://lostsidedead.com ) * written by Jared Bruni ( http://lostsidedead.com )
* (C) 2017 GPL * (C) 2017 GPL
*/ */
#ifndef __DISPLAY_WINDOW_H__ #ifndef __DISPLAY_WINDOW_H__

View File

@@ -28,7 +28,7 @@ private:
QLineEdit *goto_sec, *goto_frame; QLineEdit *goto_sec, *goto_frame;
QPushButton *goto_jump; QPushButton *goto_jump;
Playback *playback_thread; Playback *playback_thread;
public slots: public slots:
void pressedGo(); void pressedGo();
void slideChanged(int pos); void slideChanged(int pos);

View File

@@ -3,7 +3,7 @@
* Acid Cam v2 - Qt/OpenCV Edition * Acid Cam v2 - Qt/OpenCV Edition
* written by Jared Bruni ( http://lostsidedead.com ) * written by Jared Bruni ( http://lostsidedead.com )
* (C) 2017 GPL * (C) 2017 GPL
*/ */
#ifndef __MAIN_WINDOW_H__ #ifndef __MAIN_WINDOW_H__
#define __MAIN_WINDOW_H__ #define __MAIN_WINDOW_H__
@@ -55,7 +55,7 @@ public:
void updateList(); void updateList();
void setSubFilter(const QString &num); void setSubFilter(const QString &num);
void setFrameIndex(int i); void setFrameIndex(int i);
public slots: public slots:
void addClicked(); void addClicked();
void rmvClicked(); void rmvClicked();
void upClicked(); void upClicked();

View File

@@ -3,7 +3,7 @@
* Acid Cam v2 - Qt/OpenCV Edition * Acid Cam v2 - Qt/OpenCV Edition
* written by Jared Bruni ( http://lostsidedead.com ) * written by Jared Bruni ( http://lostsidedead.com )
* (C) 2017 GPL * (C) 2017 GPL
*/ */
#include "new_dialog.h" #include "new_dialog.h"

View File

@@ -3,7 +3,7 @@
* Acid Cam v2 - Qt/OpenCV Edition * Acid Cam v2 - Qt/OpenCV Edition
* written by Jared Bruni ( http://lostsidedead.com ) * written by Jared Bruni ( http://lostsidedead.com )
* (C) 2017 GPL * (C) 2017 GPL
*/ */
#ifndef _NEW_DIALOG_H_ #ifndef _NEW_DIALOG_H_
#define _NEW_DIALOG_H_ #define _NEW_DIALOG_H_
@@ -24,7 +24,7 @@ public:
QCheckBox *chk_record; QCheckBox *chk_record;
QPushButton *btn_start, *btn_select; QPushButton *btn_start, *btn_select;
QComboBox *video_type; QComboBox *video_type;
public slots: public slots:
void btn_Select(); void btn_Select();
void btn_Start(); void btn_Start();
@@ -44,7 +44,7 @@ public:
QCheckBox *chk_record; QCheckBox *chk_record;
QComboBox *video_type; QComboBox *video_type;
public slots: public slots:
void btn_SetSourceFile(); void btn_SetSourceFile();
void btn_SetOutputDir(); void btn_SetOutputDir();
void btn_Start(); void btn_Start();

View File

@@ -2,7 +2,7 @@
* Acid Cam v2 - Qt/OpenCV Edition * Acid Cam v2 - Qt/OpenCV Edition
* written by Jared Bruni ( http://lostsidedead.com ) * written by Jared Bruni ( http://lostsidedead.com )
* (C) 2017 GPL * (C) 2017 GPL
*/ */
#include"playback_thread.h" #include"playback_thread.h"

View File

@@ -3,7 +3,7 @@
* Acid Cam v2 - Qt/OpenCV Edition * Acid Cam v2 - Qt/OpenCV Edition
* written by Jared Bruni ( http://lostsidedead.com ) * written by Jared Bruni ( http://lostsidedead.com )
* (C) 2017 GPL * (C) 2017 GPL
*/ */
#ifndef __PLAYBACK_WINDOW_H__ #ifndef __PLAYBACK_WINDOW_H__
#define __PLAYBACK_WINDOW_H__ #define __PLAYBACK_WINDOW_H__

View File

@@ -2,11 +2,11 @@
* Acid Cam v2 - Qt/OpenCV Edition * Acid Cam v2 - Qt/OpenCV Edition
* written by Jared Bruni ( http://lostsidedead.com ) * written by Jared Bruni ( http://lostsidedead.com )
* (C) 2017 GPL * (C) 2017 GPL
*/ */
#ifndef _QT_HEADERS__ #ifndef _QT_HEADERS__
#define _QT_HEADERS__ #define _QT_HEADERS__
#define ac_version "v1.20.0" #define ac_version "v1.20.1"
#include<QApplication> #include<QApplication>
#include<QMainWindow> #include<QMainWindow>
#include<QDialog> #include<QDialog>

View File

@@ -12,7 +12,7 @@ public:
SearchWindow(QWidget *parent = 0); SearchWindow(QWidget *parent = 0);
void createControls(); void createControls();
void setFiltersControl(QComboBox *filter_box, QListWidget *custom); void setFiltersControl(QComboBox *filter_box, QListWidget *custom);
public slots: public slots:
void search_filter(); void search_filter();
void add_current(); void add_current();
void set_subf(); void set_subf();