[chronojump] webcam: If no cameras found, do not show the stop after controls
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] webcam: If no cameras found, do not show the stop after controls
- Date: Fri, 3 May 2019 19:24:43 +0000 (UTC)
commit 57258caa7f74190845ff2ea2b746639156073c78
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri May 3 21:24:15 2019 +0200
webcam: If no cameras found, do not show the stop after controls
glade/preferences_win.glade | 138 ++++++++++++++++++++++++--------------------
src/gui/preferences.cs | 2 +
2 files changed, 77 insertions(+), 63 deletions(-)
---
diff --git a/glade/preferences_win.glade b/glade/preferences_win.glade
index 5da7ea86..8f67950d 100644
--- a/glade/preferences_win.glade
+++ b/glade/preferences_win.glade
@@ -3572,47 +3572,23 @@ Other</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox33">
+ <widget class="GtkVBox" id="vbox_camera_stop_after_all">
<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>
+ <property name="spacing">8</property>
<child>
- <widget class="GtkHBox" id="hbox_camera_stop_after_seconds">
+ <widget class="GtkHBox" id="hbox33">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkSpinButton" id="spin_camera_stop_after">
+ <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="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>
+ <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>
@@ -3621,14 +3597,50 @@ Other</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label82">
+ <widget class="GtkHBox" id="hbox_camera_stop_after_seconds">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">seconds</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">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -3636,46 +3648,46 @@ Other</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment13">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">20</property>
<child>
- <widget class="GtkVBox" id="vbox_camera_stop_after">
+ <widget class="GtkAlignment" id="alignment13">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">10</property>
+ <property name="left_padding">20</property>
<child>
- <widget class="GtkLabel" id="label83">
+ <widget class="GtkVBox" id="vbox_camera_stop_after">
<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>
+ <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>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
</child>
</widget>
+ <packing>
+ <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">True</property>
- <property name="position">5</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
@@ -3693,7 +3705,7 @@ Other</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">6</property>
+ <property name="position">5</property>
</packing>
</child>
<child>
@@ -3705,7 +3717,7 @@ Other</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">7</property>
+ <property name="position">6</property>
</packing>
</child>
</widget>
diff --git a/src/gui/preferences.cs b/src/gui/preferences.cs
index baf114bc..fb0a73bd 100644
--- a/src/gui/preferences.cs
+++ b/src/gui/preferences.cs
@@ -154,6 +154,7 @@ public class PreferencesWindow
[Widget] Gtk.Label label_webcam_windows;
[Widget] Gtk.Image image_video_preview;
[Widget] Gtk.CheckButton check_camera_stop_after;
+ [Widget] Gtk.VBox vbox_camera_stop_after_all;
//[Widget] Gtk.VBox vbox_camera_stop_after;
[Widget] Gtk.HBox hbox_camera_stop_after_seconds;
[Widget] Gtk.SpinButton spin_camera_stop_after;
@@ -622,6 +623,7 @@ public class PreferencesWindow
current = "";
hbox_camera_resolution_framerate.Visible = false;
+ vbox_camera_stop_after_all.Visible = false;
return;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
