diff --git a/src/main_window.cpp b/src/main_window.cpp index 05dc726..5ec3f8d 100644 --- a/src/main_window.cpp +++ b/src/main_window.cpp @@ -282,10 +282,30 @@ void AC_MainWindow::createMenu() { file_exit->setShortcut(tr("Ctrl+X")); file_menu->addAction(file_exit); + options = menuBar()->addMenu(tr("&Options")); + movement = options->addMenu("Movement"); + in_out_increase = new QAction(tr("Move In, Move Out, Increase"), this); + in_out_increase->setCheckable(true); + in_out_increase->setChecked(true); + + movement->addAction(in_out_increase); + + in_out = new QAction(tr("Move in, Move Out"), this); + in_out->setCheckable(true); + movement->addAction(in_out); + + out_reset = new QAction(tr("Move Out, Reset"), this); + out_reset->setCheckable(true); + movement->addAction(out_reset); + connect(file_new_capture, SIGNAL(triggered()), this, SLOT(file_NewCamera())); connect(file_new_video, SIGNAL(triggered()), this, SLOT(file_NewVideo())); connect(file_exit, SIGNAL(triggered()), this, SLOT(file_Exit())); + connect(in_out_increase, SIGNAL(triggered()), this, SLOT(movementOption1())); + connect(in_out, SIGNAL(triggered()), this, SLOT(movementOption2())); + connect(out_reset, SIGNAL(triggered()), this, SLOT(movementOption3())); + controls_stop = new QAction(tr("Sto&p"), this); controls_stop->setShortcut(tr("Ctrl+C")); controls_menu->addAction(controls_stop); @@ -352,6 +372,29 @@ void AC_MainWindow::createMenu() { controls_snapshot->setEnabled(false); } +void AC_MainWindow::movementOption1() { + ac::setProcMode(0); + in_out_increase->setChecked(true); + in_out->setChecked(false); + out_reset->setChecked(false); + Log(tr("Proc Mode set to: 0\n")); +} +void AC_MainWindow::movementOption2() { + in_out_increase->setChecked(false); + in_out->setChecked(true); + out_reset->setChecked(false); + ac::setProcMode(1); + Log(tr("Proc Mode set to: 1\n")); +} + +void AC_MainWindow::movementOption3() { + in_out_increase->setChecked(false); + in_out->setChecked(false); + out_reset->setChecked(true); + ac::setProcMode(2); + Log(tr("Proc Mode set to: 2\n")); +} + void AC_MainWindow::chk_Clicked() { playback->setOptions(chk_negate->isChecked(), combo_rgb->currentIndex()); } diff --git a/src/main_window.h b/src/main_window.h index d903df0..b5c4e7f 100644 --- a/src/main_window.h +++ b/src/main_window.h @@ -32,11 +32,14 @@ public: QSlider *slide_r, *slide_g, *slide_b, *slide_bright, *slide_gamma, *slide_saturation; QProgressBar *progress_bar; QComboBox *color_maps, *filters; - QMenu *file_menu, *controls_menu, *help_menu; + QMenu *file_menu, *controls_menu, *help_menu, *options, *movement; QAction *file_exit, *file_new_capture, *file_new_video; QAction *controls_snapshot, *controls_pause, *controls_step, *controls_stop, *controls_setimage,*controls_setkey,*controls_showvideo, *clear_images, *reset_filters; QAction *help_about; QAction *open_search; + QAction *in_out_increase; + QAction *in_out; + QAction *out_reset; QRadioButton *filter_single, *filter_custom; void updateList(); public slots: @@ -70,6 +73,9 @@ public slots: void setFilterSingle(); void setFilterCustom(); void openSearch(); + void movementOption1(); + void movementOption2(); + void movementOption3(); private: void createControls(); void createMenu(); diff --git a/src/qtheaders.h b/src/qtheaders.h index 4ef4cff..614aae2 100644 --- a/src/qtheaders.h +++ b/src/qtheaders.h @@ -6,7 +6,7 @@ #ifndef _QT_HEADERS__ #define _QT_HEADERS__ -#define ac_version "v1.15" +#define ac_version "v1.16" #include #include #include