From 2ccc66a3595b23737dfce3d205cc99f106a3b0a3 Mon Sep 17 00:00:00 2001 From: Steffen Pohle Date: Wed, 7 Dec 2022 18:03:02 +0100 Subject: [PATCH] testing ui --- gui.h | 4 +++ simpleskycam.ui | 69 +++++++++++++++++++++---------------------------- video.cc | 33 +++++++++++++++++++++-- 3 files changed, 65 insertions(+), 41 deletions(-) diff --git a/gui.h b/gui.h index cae0c64..4b0b0bf 100644 --- a/gui.h +++ b/gui.h @@ -80,6 +80,10 @@ gboolean video_pre_long(gpointer data); // thread new inframe G_MODULE_EXPORT gboolean cb_thread_video (gpointer data); G_MODULE_EXPORT void cb_input_show_window (GtkWidget *widget, gpointer data); +G_MODULE_EXPORT void cb_input_btncapture (GtkWidget *widget, gpointer data); +G_MODULE_EXPORT void cb_input_btnsnapshot (GtkWidget *widget, gpointer data); +G_MODULE_EXPORT void cb_input_btnflat (GtkWidget *widget, gpointer data); +G_MODULE_EXPORT void cb_input_btnscale (GtkWidget *widget, gpointer data); // diff --git a/simpleskycam.ui b/simpleskycam.ui index c504cd6..84e7f70 100644 --- a/simpleskycam.ui +++ b/simpleskycam.ui @@ -516,6 +516,8 @@ True False + 4 + 4 4 4 8 @@ -525,9 +527,11 @@ False vertical - + True False + 6 + 6 X: 00000 @@ -537,7 +541,7 @@ - + True False Y: 00000 @@ -562,11 +566,13 @@ center 8 - + Capture True True True + + False @@ -575,11 +581,13 @@ - + Snapshot True True True + + False @@ -588,11 +596,13 @@ - + Flat True True True + + False @@ -613,11 +623,13 @@ False 8 - + 1:1 True True True + + False @@ -626,11 +638,13 @@ - + 1:2 True True True + + False @@ -639,11 +653,13 @@ - + 1:4 True True True + + False @@ -667,41 +683,16 @@ - + True False + GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK | GDK_TOUCH_MASK | GDK_SMOOTH_SCROLL_MASK | GDK_TOUCHPAD_GESTURE_MASK True True - True - - - 100 - 100 - True - False - GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK | GDK_TOUCH_MASK | GDK_SMOOTH_SCROLL_MASK | GDK_TOUCHPAD_GESTURE_MASK - True - True - - - - - - - True - True - 3 - - - - - - - - - - - + + + + True diff --git a/video.cc b/video.cc index f6baf2e..4213882 100644 --- a/video.cc +++ b/video.cc @@ -28,11 +28,9 @@ extern position_2d video_enterdata_pos; extern detect_movement detectedpos_data; extern Configuration config; - void videoctrl_grid_delete (); void videoctrl_grid_build (); - /* * stop video recording */ @@ -797,3 +795,34 @@ void cb_video_cbox_videodev (GtkWidget *widget, gpointer data) { videodev = NULL; }; + +void cb_input_btncapture (GtkWidget *widget, gpointer data) { + printf ("%s:%d %s\n", __FILE__, __LINE__, __FUNCTION__); +}; + + +void cb_input_btnsnapshot (GtkWidget *widget, gpointer data) { + printf ("%s:%d %s\n", __FILE__, __LINE__, __FUNCTION__); +}; + + +void cb_input_btnflat (GtkWidget *widget, gpointer data) { + printf ("%s:%d %s\n", __FILE__, __LINE__, __FUNCTION__); +}; + + +void cb_input_btnscale (GtkWidget *widget, gpointer data) { + printf ("%s:%d %s\n", __FILE__, __LINE__, __FUNCTION__); + + float scale = 1.0; + + GtkWidget *btn11 = GTK_WIDGET(gtk_builder_get_object (GTK_BUILDER(_builder_), "btn_inputscale11")); + GtkWidget *btn12 = GTK_WIDGET(gtk_builder_get_object (GTK_BUILDER(_builder_), "btn_inputscale12")); + GtkWidget *btn14 = GTK_WIDGET(gtk_builder_get_object (GTK_BUILDER(_builder_), "btn_inputscale14")); + + if (widget == btn11) scale = 1.0; + if (widget == btn12) scale = 0.5; + if (widget == btn14) scale = 0.25; + + scale *= 1.0; +};