[chronojump] New icon for encoder-analyze-position
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] New icon for encoder-analyze-position
- Date: Fri, 6 Apr 2018 23:19:30 +0000 (UTC)
commit 8f7744ed86271514f6b9ae92a969d4c33a5f11a4
Author: Xavier de Blas <xaviblas gmail com>
Date: Sat Apr 7 01:18:43 2018 +0200
New icon for encoder-analyze-position
glade/app1.glade | 44 ++++++++++++++++++-
images/encoder-analyze-position.png | Bin 0 -> 206 bytes
images/svg/icons.svg | 68 ++++++++++++++++++++++++++----
images/xcf/encoder-analyze-position.xcf | Bin 0 -> 2074 bytes
src/Makefile.am | 1 +
src/constants.cs | 1 +
src/gui/chronojumpIcons.cs | 3 +
src/gui/encoder.cs | 5 +-
8 files changed, 108 insertions(+), 14 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 54fd7e7..e8bda9f 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -1673,6 +1673,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>
@@ -22915,10 +22918,12 @@ then click this button.</property>
</packing>
</child>
<child>
- <widget class="GtkLabel"
id="label_encoder_analyze_show_SAFE_position">
+ <widget class="GtkImage"
id="image_encoder_analyze_show_SAFE_position">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Position</property>
+ <property name="tooltip" translatable="yes">Show
position</property>
+ <property
name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -23256,7 +23261,6 @@ then click this button.</property>
<property name="spacing">8</property>
<child>
<widget class="GtkCheckButton"
id="check_encoder_analyze_show_position">
- <property name="label"
translatable="yes">Position</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
@@ -23265,6 +23269,37 @@ then click this button.</property>
<property name="active">True</property>
<property name="draw_indicator">False</property>
<signal name="toggled"
handler="on_check_encoder_analyze_show_option_toggled" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox268">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkImage"
id="image_encoder_analyze_position">
+ <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="label355">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Position</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>
@@ -25609,6 +25644,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/images/encoder-analyze-position.png b/images/encoder-analyze-position.png
new file mode 100644
index 0000000..1fbda39
Binary files /dev/null and b/images/encoder-analyze-position.png differ
diff --git a/images/svg/icons.svg b/images/svg/icons.svg
index e04b705..c0f76f7 100644
--- a/images/svg/icons.svg
+++ b/images/svg/icons.svg
@@ -7248,6 +7248,17 @@
y1="21.865999"
x2="29.955999"
y2="43.144001" />
+ <linearGradient
+ id="eraserFill-6">
+ <stop
+ id="stop5742_1-1"
+ offset="0.0000000"
+ style="stop-color:#ffffff;stop-opacity:1" />
+ <stop
+ id="stop5744_1-5"
+ offset="1.0000000"
+ style="stop-color:#f3b698;stop-opacity:1" />
+ </linearGradient>
</defs>
<sodipodi:namedview
id="base"
@@ -7256,9 +7267,9 @@
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="3.7578996"
- inkscape:cx="122.80214"
- inkscape:cy="319.32099"
+ inkscape:zoom="1.2931686"
+ inkscape:cx="321.23616"
+ inkscape:cy="199.89658"
inkscape:document-units="px"
inkscape:current-layer="capa1"
showgrid="false"
@@ -7276,7 +7287,7 @@
inkscape:snap-global="false">
<sodipodi:guide
orientation="0,1"
- position="117.90375,196.78693"
+ position="23.455264,196.39654"
id="guide4353"
inkscape:locked="false" />
<sodipodi:guide
@@ -7325,11 +7336,6 @@
id="guide6720"
inkscape:locked="false" />
<sodipodi:guide
- position="296.21612,212.58169"
- orientation="0,1"
- id="guide6487"
- inkscape:locked="false" />
- <sodipodi:guide
position="287.18606,209.26778"
orientation="1,0"
id="guide6489"
@@ -7344,6 +7350,21 @@
orientation="1,0"
id="guide6521"
inkscape:locked="false" />
+ <sodipodi:guide
+ position="68.713819,211.39347"
+ orientation="0,1"
+ id="guide6837"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="67.181983,213.36297"
+ orientation="0,1"
+ id="guide6839"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="52.575517,227.14363"
+ orientation="0,1"
+ id="guide6841"
+ inkscape:locked="false" />
</sodipodi:namedview>
<metadata
id="metadata7">
@@ -11512,5 +11533,34 @@
x="23.570536"
y="975.02356"
style="font-size:2px;line-height:1.25;font-family:sans-serif">encoder-analyze-all-set.png</tspan></text>
+ <text
+ xml:space="preserve"
+
style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+ x="-97.630188"
+ y="1079.1968"
+ id="text3938-3-00-06"><tspan
+ sodipodi:role="line"
+ id="tspan3940-6-5-32"
+ x="-97.630188"
+ y="1079.1968"
+
style="font-size:2px;line-height:1.25;font-family:sans-serif">encoder-analyze-position.png</tspan></text>
+ <rect
+
style="opacity:1;fill:#ffffff;fill-opacity:0;stroke:none;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke
fill markers"
+ id="rect6727"
+ width="20"
+ height="20"
+ x="-89.284592"
+ y="1079.9078" />
+ <text
+ xml:space="preserve"
+
style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+ x="-94.028122"
+ y="1089.7882"
+ id="text3938-3-00-06-2"><tspan
+ sodipodi:role="line"
+ id="tspan3940-6-5-32-2"
+ x="-94.028122"
+ y="1089.7882"
+ style="font-size:2px;line-height:1.25;font-family:sans-serif">( see xcf folder )</tspan></text>
</g>
</svg>
diff --git a/images/xcf/encoder-analyze-position.xcf b/images/xcf/encoder-analyze-position.xcf
new file mode 100644
index 0000000..6ca17dd
Binary files /dev/null and b/images/xcf/encoder-analyze-position.xcf differ
diff --git a/src/Makefile.am b/src/Makefile.am
index 97fcee3..5b98017 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -497,6 +497,7 @@ RESOURCES = \
../images/encoder-analyze-nmp.png,encoder-analyze-nmp.png \
../images/encoder-analyze-eccon-together.png,encoder-analyze-eccon-together.png \
../images/encoder-analyze-eccon-separated.png,encoder-analyze-eccon-separated.png \
+ ../images/encoder-analyze-position.png,encoder-analyze-position.png \
../images/encoder-analyze-speed.png,encoder-analyze-speed.png \
../images/encoder-analyze-accel.png,encoder-analyze-accel.png \
../images/encoder-analyze-force.png,encoder-analyze-force.png \
diff --git a/src/constants.cs b/src/constants.cs
index dc3d510..4d3ae5d 100644
--- a/src/constants.cs
+++ b/src/constants.cs
@@ -479,6 +479,7 @@ public class Constants
public static string FileNameEncoderAnalyzeEcconTogetherIcon = "encoder-analyze-eccon-together.png";
public static string FileNameEncoderAnalyzeEcconSeparatedIcon = "encoder-analyze-eccon-separated.png";
+ public static string FileNameEncoderAnalyzePositionIcon = "encoder-analyze-position.png";
public static string FileNameEncoderAnalyzeSpeedIcon = "encoder-analyze-speed.png";
public static string FileNameEncoderAnalyzeAccelIcon = "encoder-analyze-accel.png";
public static string FileNameEncoderAnalyzeForceIcon = "encoder-analyze-force.png";
diff --git a/src/gui/chronojumpIcons.cs b/src/gui/chronojumpIcons.cs
index 13be49d..0e36743 100644
--- a/src/gui/chronojumpIcons.cs
+++ b/src/gui/chronojumpIcons.cs
@@ -573,6 +573,9 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
Constants.FileNameEncoderAnalyzeEcconSeparatedIcon);
image_encoder_analyze_eccon_separated.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
Constants.FileNameEncoderAnalyzePositionIcon);
+ image_encoder_analyze_position.Pixbuf = pixbuf;
+ image_encoder_analyze_show_SAFE_position.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
Constants.FileNameEncoderAnalyzeSpeedIcon);
image_encoder_analyze_speed.Pixbuf = pixbuf;
image_encoder_analyze_show_SAFE_speed.Pixbuf = pixbuf;
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index bd6be2a..97fac8c 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -170,7 +170,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Frame frame_encoder_analyze_options;
[Widget] Gtk.Table table_encoder_analyze_options;
- [Widget] Gtk.Label label_encoder_analyze_show_SAFE_position;
+ [Widget] Gtk.Image image_encoder_analyze_show_SAFE_position;
[Widget] Gtk.Image image_encoder_analyze_show_SAFE_speed;
[Widget] Gtk.Image image_encoder_analyze_show_SAFE_accel;
[Widget] Gtk.Image image_encoder_analyze_show_SAFE_force;
@@ -273,6 +273,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_encoder_analyze_eccon_together;
[Widget] Gtk.Image image_encoder_analyze_eccon_separated;
+ [Widget] Gtk.Image image_encoder_analyze_position;
[Widget] Gtk.Image image_encoder_analyze_speed;
[Widget] Gtk.Image image_encoder_analyze_accel;
[Widget] Gtk.Image image_encoder_analyze_force;
@@ -3460,7 +3461,7 @@ public partial class ChronoJumpWindow
private void on_check_encoder_analyze_show_option_toggled (object o, EventArgs args)
{
if(o == (object) check_encoder_analyze_show_position)
- label_encoder_analyze_show_SAFE_position.Visible =
(check_encoder_analyze_show_position.Active);
+ image_encoder_analyze_show_SAFE_position.Visible =
(check_encoder_analyze_show_position.Active);
else if(o == (object) check_encoder_analyze_show_speed)
image_encoder_analyze_show_SAFE_speed.Visible =
(check_encoder_analyze_show_speed.Active);
else if(o == (object) check_encoder_analyze_show_accel)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
