commit b13644d4a120d98b818a29c534fb1c2a23bc22ed
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Jul 5 09:21:51 2019 +0200
webcam preferences advanced controls hidden
glade/preferences_win.glade | 465 +++++++++++++++++++++++---------------------
src/gui/preferences.cs | 10 +-
2 files changed, 252 insertions(+), 223 deletions(-)
---
diff --git a/glade/preferences_win.glade b/glade/preferences_win.glade
index 6fb3103d..49ca1393 100644
--- a/glade/preferences_win.glade
+++ b/glade/preferences_win.glade
@@ -3897,116 +3897,15 @@ Other</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox_camera_stop_after_all">
+ <widget class="GtkAlignment" id="alignment8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkHBox" id="hbox33">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <widget class="GtkCheckButton" id="check_camera_stop_after">
- <property name="label">Camera will be stopped n seconds after end
test</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_check_camera_stop_after_toggled"
swapped="no"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox_camera_stop_after_seconds">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkSpinButton" id="spin_camera_stop_after">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Recording time</property>
- <property name="invisible_char">●</property>
- <property name="width_chars">1</property>
- <property name="invisible_char_set">True</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
- <property name="adjustment">2 0 9 1 10 0</property>
- <property name="climb_rate">1</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label82">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">seconds</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="top_padding">10</property>
<child>
- <widget class="GtkAlignment" id="alignment13">
- <property name="visible">True</property>
+ <widget class="GtkLabel" id="label_webcam_windows">
<property name="can_focus">False</property>
- <property name="left_padding">20</property>
- <child>
- <widget class="GtkVBox" id="vbox_camera_stop_after">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkLabel" id="label83">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">To ensure the end of test
is recorded, it is recommended 2 seconds.</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
+ <property name="label" translatable="yes">On Windows at least Windows 7 is
required.</property>
</widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</widget>
<packing>
@@ -4016,179 +3915,301 @@ Other</property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment8">
+ <widget class="GtkCheckButton" id="check_camera_advanced">
+ <property name="label" translatable="yes">Show advanced controls</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">10</property>
- <child>
- <widget class="GtkLabel" id="label_webcam_windows">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">On Windows at least Windows 7 is
required.</property>
- </widget>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_check_camera_advanced_toggled" swapped="no"/>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">4</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame10">
+ <widget class="GtkAlignment" id="alignment13">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="left_padding">20</property>
<child>
- <widget class="GtkAlignment" id="alignment19">
- <property name="visible">True</property>
+ <widget class="GtkFrame" id="frame_camera_advanced">
<property name="can_focus">False</property>
- <property name="left_padding">12</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
<child>
- <widget class="GtkVBox" id="vbox33">
+ <widget class="GtkAlignment" id="alignment19">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="left_padding">12</property>
<child>
- <widget class="GtkHBox" id="hbox21">
+ <widget class="GtkVBox" id="vbox33">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">8</property>
- <property name="spacing">20</property>
<child>
- <widget class="GtkButton"
id="button_video_check_ffmpeg_ffplay_running">
+ <widget class="GtkHBox" id="hbox21">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_video_check_ffmpeg_ffplay_running_clicked" swapped="no"/>
- <child>
- <widget class="GtkLabel" id="label11">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Check if camera is
running</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkTable" id="table_video_advanced_actions">
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">8</property>
+ <property name="border_width">8</property>
+ <property name="spacing">20</property>
<child>
- <widget class="GtkLabel" id="label90">
+ <widget class="GtkButton"
id="button_video_check_ffmpeg_ffplay_running">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Capture</property>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label91">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Play</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_video_check_ffmpeg_ffplay_running_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkLabel" id="label11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Check if
camera is running</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_video_check_ffmpeg_running">
- <property name="visible">True</property>
+ <widget class="GtkTable" id="table_video_advanced_actions">
<property name="can_focus">False</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">8</property>
+ <child>
+ <widget class="GtkLabel" id="label90">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Capture</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label91">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Play</property>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel"
id="label_video_check_ffmpeg_running">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel"
id="label_video_check_ffplay_running">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_video_ffmpeg_kill">
+ <property name="label" translatable="yes">Force
stop</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_video_ffmpeg_kill_clicked" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_video_ffplay_kill">
+ <property name="label" translatable="yes">Force
stop</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_video_ffplay_kill_clicked" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_camera_feedback">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox_camera_stop_after_all">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
<child>
- <widget class="GtkLabel" id="label_video_check_ffplay_running">
+ <widget class="GtkHBox" id="hbox33">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <widget class="GtkCheckButton"
id="check_camera_stop_after">
+ <property name="label">Camera will be stopped n seconds
after end test</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled"
handler="on_check_camera_stop_after_toggled" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox"
id="hbox_camera_stop_after_seconds">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkSpinButton"
id="spin_camera_stop_after">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip"
translatable="yes">Recording time</property>
+ <property name="invisible_char">●</property>
+ <property name="width_chars">1</property>
+ <property name="invisible_char_set">True</property>
+ <property
name="primary_icon_activatable">False</property>
+ <property
name="secondary_icon_activatable">False</property>
+ <property
name="primary_icon_sensitive">True</property>
+ <property
name="secondary_icon_sensitive">True</property>
+ <property name="adjustment">2 0 9 1 10 0</property>
+ <property name="climb_rate">1</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label82">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">seconds</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_video_ffmpeg_kill">
- <property name="label" translatable="yes">Force
stop</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_video_ffmpeg_kill_clicked" swapped="no"/>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_video_ffplay_kill">
- <property name="label" translatable="yes">Force
stop</property>
+ <widget class="GtkAlignment" id="alignment20">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_video_ffplay_kill_clicked" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="left_padding">20</property>
+ <child>
+ <widget class="GtkVBox" id="vbox_camera_stop_after">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkLabel" id="label83">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">To ensure
the end of test is recorded, it is recommended 2 seconds.</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">True</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_camera_feedback">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</widget>
</child>
+ <child>
+ <widget class="GtkLabel" id="label61">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes"><b>Advanced</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
</widget>
</child>
- <child>
- <widget class="GtkLabel" id="label61">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes"><b>Advanced</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/preferences.cs b/src/gui/preferences.cs
index f1dd7fd3..02007ddc 100644
--- a/src/gui/preferences.cs
+++ b/src/gui/preferences.cs
@@ -169,6 +169,8 @@ public class PreferencesWindow
[Widget] Gtk.Image image_multimedia_video;
[Widget] Gtk.Image image_video_preview;
[Widget] Gtk.CheckButton check_camera_stop_after;
+ [Widget] Gtk.CheckButton check_camera_advanced;
+ [Widget] Gtk.Frame frame_camera_advanced;
[Widget] Gtk.VBox vbox_camera_stop_after_all;
//[Widget] Gtk.VBox vbox_camera_stop_after;
[Widget] Gtk.HBox hbox_camera_stop_after_seconds;
@@ -674,7 +676,8 @@ public class PreferencesWindow
current = "";
hbox_camera_resolution_framerate.Visible = false;
- vbox_camera_stop_after_all.Visible = false;
+ check_camera_advanced.Visible = false;
+
return;
}
@@ -801,6 +804,11 @@ public class PreferencesWindow
hbox_camera_framerate_custom.Visible = UtilGtk.ComboGetActive(combo_camera_framerate) ==
Catalog.GetString("Custom");
}
+ private void on_check_camera_advanced_toggled (object o, EventArgs args)
+ {
+ frame_camera_advanced.Visible = check_camera_advanced.Active;
+ }
+
private void on_check_appearance_maximized_toggled (object obj, EventArgs args)
{
alignment_undecorated.Visible = check_appearance_maximized.Active;