[chronojump: 4/4] Changed finish/cancel buttons. And better finish sensitivity.
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump: 4/4] Changed finish/cancel buttons. And better finish sensitivity.
- Date: Thu, 14 Mar 2019 12:16:47 +0000 (UTC)
commit 6edd43f7f59bffe94bd25b4bcdec2d5c17a196f8
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Mar 14 13:15:42 2019 +0100
Changed finish/cancel buttons. And better finish sensitivity.
glade/app1.glade | 19 ++++++++++---------
images/gtk-floppy.png | Bin 0 -> 563 bytes
src/Makefile.am | 1 +
src/gui/chronojumpIcons.cs | 10 ++++++----
4 files changed, 17 insertions(+), 13 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 09451b30..14573e1e 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -9767,6 +9767,7 @@ EncoderInertialCapture</property>
<child>
<widget class="GtkButton"
id="event_execute_button_finish">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
@@ -9784,12 +9785,12 @@ EncoderInertialCapture</property>
<widget class="GtkImage"
id="image_button_finish">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-goto-last</property>
+ <property name="stock">gtk-floppy</property>
<property name="icon-size">2</property>
</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">0</property>
</packing>
</child>
@@ -9800,8 +9801,8 @@ EncoderInertialCapture</property>
<property name="label"
translatable="yes">Finish</property>
</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>
@@ -9838,8 +9839,8 @@ EncoderInertialCapture</property>
<property name="icon-size">2</property>
</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">0</property>
</packing>
</child>
@@ -9850,8 +9851,8 @@ EncoderInertialCapture</property>
<property name="label"
translatable="yes">Cancel</property>
</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>
diff --git a/images/gtk-floppy.png b/images/gtk-floppy.png
new file mode 100644
index 00000000..42439d87
Binary files /dev/null and b/images/gtk-floppy.png differ
diff --git a/src/Makefile.am b/src/Makefile.am
index 9e33400a..0fa19f43 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -402,6 +402,7 @@ RESOURCES = \
../images/md/ic_timer_blue_24dp_1x.png,image_capture.png \
../images/md/ic_timer_blue_24dp_2x.png,image_capture_big.png \
../images/md/ic_last_page_blue_24dp_1x.png,finish.png \
+ ../images/gtk-floppy.png,floppy.png \
../images/md/ic_cancel_red_24dp_1x.png,image_cancel.png \
../images/md/ic_insert_chart_blue_24dp_1x.png,image_analyze.png \
../images/md/ic_assignment_blue_24dp_1x.png,image_analyze_general.png \
diff --git a/src/gui/chronojumpIcons.cs b/src/gui/chronojumpIcons.cs
index 20ed18c4..1e24491f 100644
--- a/src/gui/chronojumpIcons.cs
+++ b/src/gui/chronojumpIcons.cs
@@ -247,9 +247,6 @@ public partial class ChronoJumpWindow
image_tests_sprint.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_cancel.png");
- image_button_cancel.Pixbuf = pixbuf;
- image_encoder_capture_cancel.Pixbuf = pixbuf;
- image_encoder_analyze_cancel.Pixbuf = pixbuf;
image_selector_start_cancel.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_person_pin.png");
@@ -505,6 +502,10 @@ public partial class ChronoJumpWindow
image_run_type_delete_simple.Pixbuf = pixbuf;
image_run_type_delete_intervallic.Pixbuf = pixbuf;
image_session_delete.Pixbuf = pixbuf;
+
+ image_button_cancel.Pixbuf = pixbuf;
+ image_encoder_capture_cancel.Pixbuf = pixbuf;
+ image_encoder_analyze_cancel.Pixbuf = pixbuf;
//zoom icons, done like this because there's one zoom icon created ad-hoc,
//and is not nice that the other are different for an user theme change
@@ -577,7 +578,8 @@ public partial class ChronoJumpWindow
image_encoder_capture_execute.Pixbuf = pixbuf;
*/
- pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "finish.png"); //gnome (white)
+ //pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "finish.png"); //gnome (white)
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "floppy.png");
image_button_finish.Pixbuf = pixbuf;
image_encoder_capture_finish.Pixbuf = pixbuf;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]