[chronojump] Camera preview: new icon
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Camera preview: new icon
- Date: Fri, 15 Mar 2019 16:05:29 +0000 (UTC)
commit da862ee1bba6a0cb79a2e45096b59a69de12986c
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Mar 15 17:05:01 2019 +0100
Camera preview: new icon
glade/app1.glade | 40 +++++++++++++++++++--
glade/person_win.glade | 8 ++---
.../md/baseline_photo_camera_preview_blue_24dp.png | Bin 0 -> 623 bytes
src/Makefile.am | 1 +
src/gui/chronojumpIcons.cs | 6 ++++
src/gui/person.cs | 6 ++--
6 files changed, 51 insertions(+), 10 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 740671d7..8f431b0e 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -10145,11 +10145,41 @@ EncoderInertialCapture</property>
<property name="can_focus">False</property>
<child>
<widget class="GtkButton"
id="button_video_preview">
- <property name="label"
translatable="yes">Preview</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip"
translatable="yes">Preview video</property>
<signal name="clicked"
handler="on_button_video_preview_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox321">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_video_preview">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label392">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Preview</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -22595,11 +22625,17 @@ Concentric</property>
</child>
<child>
<widget class="GtkButton"
id="button_video_encoder_preview">
- <property name="label"
translatable="yes">Preview</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip"
translatable="yes">Preview video</property>
<signal name="clicked"
handler="on_button_video_encoder_preview_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkImage"
id="image_video_encoder_preview">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/glade/person_win.glade b/glade/person_win.glade
index 6b173431..863d1517 100644
--- a/glade/person_win.glade
+++ b/glade/person_win.glade
@@ -359,7 +359,7 @@
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkImage" id="image_photo_start_end_camera">
+ <widget class="GtkImage" id="image_photo_preview">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-missing-image</property>
@@ -653,9 +653,6 @@
<child>
<placeholder/>
</child>
- <child>
- <placeholder/>
- </child>
<child>
<widget class="GtkLabel" id="label218">
<property name="visible">True</property>
@@ -2079,6 +2076,9 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/images/md/baseline_photo_camera_preview_blue_24dp.png
b/images/md/baseline_photo_camera_preview_blue_24dp.png
new file mode 100644
index 00000000..e17dc507
Binary files /dev/null and b/images/md/baseline_photo_camera_preview_blue_24dp.png differ
diff --git a/src/Makefile.am b/src/Makefile.am
index 4f934e97..4404d293 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -390,6 +390,7 @@ RESOURCES = \
../images/md/baseline_photo_camera_start_blue_24dp.png,image_photo_start_camera.png \
../images/md/baseline_photo_camera_end_blue_24dp.png,image_photo_end_camera.png \
../images/md/baseline_photo_camera_do_red_24dp.png,image_photo_do.png \
+ ../images/md/baseline_photo_camera_preview_blue_24dp.png,image_photo_preview.png \
../images/md/baseline_play_arrow_blue_24dp.png,video_play.png \
../images/md/ic_home_blue_24dp_1x.png,image_home.png \
../images/md/ic_import_1x.png,import.png \
diff --git a/src/gui/chronojumpIcons.cs b/src/gui/chronojumpIcons.cs
index c33459c7..8bd08d08 100644
--- a/src/gui/chronojumpIcons.cs
+++ b/src/gui/chronojumpIcons.cs
@@ -155,6 +155,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_video_play_selected_pulse;
[Widget] Gtk.Image image_video_play_selected_reaction_time;
[Widget] Gtk.Image image_video_play_selected_multi_chronopic;
+ [Widget] Gtk.Image image_video_preview;
+ [Widget] Gtk.Image image_video_encoder_preview;
private void putNonStandardIcons()
{
@@ -379,6 +381,10 @@ public partial class ChronoJumpWindow
image_video_no.Pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
"image_photo_end_camera.png");
image_video_encoder_no.Pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
"image_photo_end_camera.png");
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_photo_preview.png");
+ image_video_preview.Pixbuf = pixbuf;
+ image_video_encoder_preview.Pixbuf = pixbuf;
+
/*
* <------ end of material design icons
*/
diff --git a/src/gui/person.cs b/src/gui/person.cs
index ca013d96..9f9e3b88 100644
--- a/src/gui/person.cs
+++ b/src/gui/person.cs
@@ -811,7 +811,7 @@ public class PersonAddModifyWindow
[Widget] Gtk.Image image_load_person;
[Widget] Gtk.Image image_photo_from_file;
- [Widget] Gtk.Image image_photo_start_end_camera;
+ [Widget] Gtk.Image image_photo_preview;
[Widget] Gtk.Image image_photo_do;
[Widget] Gtk.Button button_add_photo_file;
@@ -927,7 +927,7 @@ public class PersonAddModifyWindow
image_load_person.Pixbuf = pixbuf;
image_photo_from_file.Pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
"image_attachment.png");
- image_photo_start_end_camera.Pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
"image_photo_start_camera.png");
+ image_photo_preview.Pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
"image_photo_preview.png");
image_photo_do.Pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_photo_do.png");
if(UtilAll.GetOSEnum() == UtilAll.OperatingSystems.LINUX)
@@ -1073,7 +1073,6 @@ public class PersonAddModifyWindow
if(webcam != null && webcam.Running)
{
webcam.ExitCamera();
- image_photo_start_end_camera.Pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
"image_photo_start_camera.png");
button_take_photo_start_end_camera.TooltipText = Catalog.GetString("Start webcam");
return;
@@ -1111,7 +1110,6 @@ public class PersonAddModifyWindow
showMiniPhoto(filenameMini);
}
- image_photo_start_end_camera.Pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
"image_photo_start_camera.png");
}
//libCesarplayer method, jpeg
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
