[chronojump] Webcam preferences minor change
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Webcam preferences minor change
- Date: Fri, 5 Jul 2019 08:04:21 +0000 (UTC)
commit 2803b7e5d3713efe8d03470114f4dcc4e973bee9
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Jul 5 10:03:50 2019 +0200
Webcam preferences minor change
glade/preferences_win.glade | 3 ++-
src/gui/preferences.cs | 14 +++++++-------
2 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/glade/preferences_win.glade b/glade/preferences_win.glade
index 49ca1393..f274a815 100644
--- a/glade/preferences_win.glade
+++ b/glade/preferences_win.glade
@@ -3804,6 +3804,7 @@ Other</property>
</child>
<child>
<widget class="GtkLabel" id="label_camera_pixel_format">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label">Pixel format</property>
@@ -4064,7 +4065,7 @@ Other</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_camera_feedback">
+ <widget class="GtkLabel" id="label_camera_check_running">
<property name="visible">True</property>
<property name="can_focus">False</property>
</widget>
diff --git a/src/gui/preferences.cs b/src/gui/preferences.cs
index 02007ddc..2c3e58c5 100644
--- a/src/gui/preferences.cs
+++ b/src/gui/preferences.cs
@@ -180,7 +180,7 @@ public class PreferencesWindow
[Widget] Gtk.Label label_video_check_ffplay_running;
[Widget] Gtk.Button button_video_ffmpeg_kill;
[Widget] Gtk.Button button_video_ffplay_kill;
- [Widget] Gtk.Label label_camera_feedback;
+ [Widget] Gtk.Label label_camera_check_running;
//language tab
[Widget] Gtk.Box hbox_combo_language;
@@ -901,7 +901,7 @@ public class PreferencesWindow
combo_camera_pixel_format.Active = 0;
hbox_combo_camera_pixel_format.ShowAll();
- label_camera_pixel_format.Visible = true;
+ //label_camera_pixel_format.Visible = true;
hbox_combo_camera_pixel_format.Visible = true;
}
}
@@ -952,7 +952,7 @@ public class PreferencesWindow
label_video_check_ffplay_running.Text = "Not running";
button_video_ffmpeg_kill.Visible = false;
button_video_ffplay_kill.Visible = false;
- label_camera_feedback.Text = "";
+ label_camera_check_running.Text = "";
bool runningFfmpeg = false;
bool runningFfplay = false;
@@ -978,23 +978,23 @@ public class PreferencesWindow
{
if(ExecuteProcess.KillExternalProcess (WebcamFfmpeg.GetExecutableCapture(operatingSystem)))
{
- label_camera_feedback.Text = "Killed camera process";
+ label_camera_check_running.Text = "Killed camera process";
label_video_check_ffmpeg_running.Text = "Not running";
button_video_ffmpeg_kill.Visible = false;
}
else
- label_camera_feedback.Text = "Cannot kill camera process";
+ label_camera_check_running.Text = "Cannot kill camera process";
}
private void on_button_video_ffplay_kill_clicked (object o, EventArgs args)
{
if(ExecuteProcess.KillExternalProcess (WebcamFfmpeg.GetExecutablePlay(operatingSystem)))
{
- label_camera_feedback.Text = "Killed play process";
+ label_camera_check_running.Text = "Killed play process";
label_video_check_ffplay_running.Text = "Not running";
button_video_ffplay_kill.Visible = false;
}
else
- label_camera_feedback.Text = "Cannot kill play process";
+ label_camera_check_running.Text = "Cannot kill play process";
}
// ---- end of multimedia stuff
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]