started working on categories

This commit is contained in:
lostjared
2018-12-27 12:37:17 -08:00
parent 2a0153609f
commit 2e6bc043df
2 changed files with 30 additions and 7 deletions

View File

@@ -100,17 +100,33 @@ AC_MainWindow::AC_MainWindow(QWidget *parent) : QMainWindow(parent) {
} }
void AC_MainWindow::createControls() { void AC_MainWindow::createControls() {
/*
filters = new QListWidget(this);
filters->setGeometry(10, 30, 390, 180);
filters->show();
*/
custom_filters = new QListWidget(this); custom_filters = new QListWidget(this);
custom_filters->setGeometry(400, 30, 390, 180); custom_filters->setGeometry(400, 30, 390, 180);
custom_filters->show(); custom_filters->show();
menu_cat = new QComboBox(this);
menu_cat->setGeometry(10, 85, 380, 30);
menu_cat->addItem("All");
menu_cat->addItem("All Sorted");
menu_cat->addItem("Blend");
menu_cat->addItem("Distort");
menu_cat->addItem("Pattern");
menu_cat->addItem("Gradient");
menu_cat->addItem("Mirror");
menu_cat->addItem("Strobe");
menu_cat->addItem("Blur");
menu_cat->addItem("Image");
menu_cat->addItem("Square");
menu_cat->addItem("Other");
menu_cat->addItem("SubFilter");
menu_cat->addItem("Special");
menu_cat->addItem("User");
menu_cat->setCurrentIndex(0);
filters = new QComboBox(this); filters = new QComboBox(this);
filters->setGeometry(10, 105, 380, 30); filters->setGeometry(10, 110, 380, 30);
std::vector<std::string> fnames; std::vector<std::string> fnames;
for(int i = 0; i < ac::draw_max-5; ++i) { for(int i = 0; i < ac::draw_max-5; ++i) {
@@ -135,6 +151,8 @@ void AC_MainWindow::createControls() {
} }
connect(filters, SIGNAL(currentIndexChanged(int)), this, SLOT(comboFilterChanged(int))); connect(filters, SIGNAL(currentIndexChanged(int)), this, SLOT(comboFilterChanged(int)));
connect(menu_cat, SIGNAL(currentIndexChanged(int)), this, SLOT(menuFilterChanged(int)));
filter_single = new QRadioButton(tr("Single Filter"), this); filter_single = new QRadioButton(tr("Single Filter"), this);
filter_single->setGeometry(30, 40, 100, 15); filter_single->setGeometry(30, 40, 100, 15);
@@ -1236,3 +1254,7 @@ void AC_MainWindow::openSearch() {
void AC_MainWindow::openColorWindow() { void AC_MainWindow::openColorWindow() {
chroma_window->show(); chroma_window->show();
} }
void AC_MainWindow::menuFilterChanged(int index) {
}

View File

@@ -33,7 +33,7 @@ public:
QComboBox *combo_rgb; QComboBox *combo_rgb;
QSlider *slide_r, *slide_g, *slide_b, *slide_bright, *slide_gamma, *slide_saturation; QSlider *slide_r, *slide_g, *slide_b, *slide_bright, *slide_gamma, *slide_saturation;
QProgressBar *progress_bar; QProgressBar *progress_bar;
QComboBox *color_maps, *filters; QComboBox *color_maps, *filters, *menu_cat;
QMenu *file_menu, *controls_menu, *help_menu, *options, *movement, *speed_menu; QMenu *file_menu, *controls_menu, *help_menu, *options, *movement, *speed_menu;
QAction *file_exit, *file_new_capture, *file_new_video; 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 *controls_snapshot, *controls_pause, *controls_step, *controls_stop, *controls_setimage,*controls_setkey,*controls_showvideo, *clear_images, *reset_filters;
@@ -105,6 +105,7 @@ public slots:
void repeat_vid(); void repeat_vid();
void setFade(); void setFade();
void openColorWindow(); void openColorWindow();
void menuFilterChanged(int index);
private: private:
void createControls(); void createControls();
void createMenu(); void createMenu();