[chronojump] 1s Message "Tests will be filmed" on encoder
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] 1s Message "Tests will be filmed" on encoder
- Date: Tue, 16 Jul 2019 15:38:52 +0000 (UTC)
commit 31cd34104c954a81586d746c027c95e9c1850088
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Jul 16 17:38:08 2019 +0200
1s Message "Tests will be filmed" on encoder
glade/app1.glade | 21 +++++++++++++++++++++
glade/preferences_win.glade | 7 ++++---
src/gui/chronojumpIcons.cs | 1 +
src/gui/webcam.cs | 15 +++++++++++++++
4 files changed, 41 insertions(+), 3 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 35b7af1b..8ffc9bdb 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -2062,6 +2062,9 @@
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkLabel"
id="label_start_selector_jumps">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -21310,6 +21313,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -23306,6 +23312,18 @@ Concentric</property>
</packing>
</child>
<child>
+ <widget class="GtkLabel"
id="label_video_encoder_tests_will_be_filmed">
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Tests
will be filmed</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkHBox"
id="hbox_video_encoder_no_capturing">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -30091,6 +30109,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/glade/preferences_win.glade b/glade/preferences_win.glade
index 0ee01190..4a699f43 100644
--- a/glade/preferences_win.glade
+++ b/glade/preferences_win.glade
@@ -3541,6 +3541,7 @@ Other</property>
<widget class="GtkLabel" id="label62">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">Select the camera</property>
</widget>
<packing>
@@ -3852,6 +3853,9 @@ Other</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
<child>
<widget class="GtkLabel" id="label_camera_pixel_format">
<property name="visible">True</property>
@@ -3908,9 +3912,6 @@ Other</property>
<property name="bottom_attach">3</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
<child>
<widget class="GtkLabel" id="label_camera_pixel_format_current">
<property name="can_focus">False</property>
diff --git a/src/gui/chronojumpIcons.cs b/src/gui/chronojumpIcons.cs
index 2bf1f344..d2f718d6 100644
--- a/src/gui/chronojumpIcons.cs
+++ b/src/gui/chronojumpIcons.cs
@@ -399,6 +399,7 @@ public partial class ChronoJumpWindow
image_video_yes.Pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "videocamera_on.png");
image_video_encoder_yes.Pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
"videocamera_on.png");
+ image_video_encoder_yes1.Pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
"videocamera_on.png");
image_video_no.Pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "videocamera_off.png");
image_video_encoder_no.Pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
"videocamera_off.png");
diff --git a/src/gui/webcam.cs b/src/gui/webcam.cs
index d6d1e6a1..67eea509 100644
--- a/src/gui/webcam.cs
+++ b/src/gui/webcam.cs
@@ -46,7 +46,9 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_video_yes;
[Widget] Gtk.Image image_video_no;
[Widget] Gtk.Image image_video_encoder_yes;
+ [Widget] Gtk.Image image_video_encoder_yes1;
[Widget] Gtk.Image image_video_encoder_no;
+ [Widget] Gtk.Label label_video_encoder_tests_will_be_filmed;
[Widget] Gtk.Button button_video_play_this_test;
[Widget] Gtk.Button button_video_play_this_test_encoder;
[Widget] Gtk.ProgressBar pulsebar_webcam;
@@ -635,6 +637,11 @@ public partial class ChronoJumpWindow
preferences.videoOn = true;
SqlitePreferences.Update("videoOn", "True", false);
+
+ //this allows to see the label during 500 ms
+ hbox_video_encoder_no_capturing.Visible = false;
+ label_video_encoder_tests_will_be_filmed.Visible = true;
+ GLib.Timeout.Add(1000, new GLib.TimeoutHandler(checkbutton_video_encoder_active_end));
} else {
preferences.videoOn = false;
SqlitePreferences.Update("videoOn", "False", false);
@@ -650,6 +657,14 @@ public partial class ChronoJumpWindow
videoCapturePrepare(true); //if error, show message
}
+ private bool checkbutton_video_encoder_active_end()
+ {
+ hbox_video_encoder_no_capturing.Visible = true;
+ label_video_encoder_tests_will_be_filmed.Visible = false;
+
+ return false; //do not call this again
+ }
+
/* ---------------------------------------------------------
* ---------------- EVENTS PLAY VIDEO ---------------------
* --------------------------------------------------------
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]