[chronojump] GUI options to top (4) jumps done WIP
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] GUI options to top (4) jumps done WIP
- Date: Thu, 2 Jul 2015 12:07:08 +0000 (UTC)
commit f54ec93c8cf738714cc44aca7713b90ac599c804
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Jul 2 12:45:19 2015 +0200
GUI options to top (4) jumps done WIP
glade/chronojump.glade | 285 +++++++++++++++++++++++++++++++++----------
images/dj-from-in.png | Bin 437 -> 453 bytes
images/dj-from-out.png | Bin 427 -> 439 bytes
images/svg/bosco_jumps.svg | 71 +----------
images/svg/icons.svg | 232 ++++++++++++++++++++++++++++++++++-
src/gui/chronojump.cs | 6 +-
src/gui/jump.cs | 30 ++---
7 files changed, 464 insertions(+), 160 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index c28b0b6..55ae906 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -3337,22 +3337,46 @@
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkRadioButton"
id="extra_window_jumps_radio_dj_fall_calculate">
+ <widget class="GtkCheckButton"
id="extra_window_jumps_check_dj_fall_calculate">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
- <property name="tooltip"
translatable="yes">Calculate falling height using a previous jump</property>
- <property
name="xalign">0.40000000596046448</property>
+ <property name="image_position">bottom</property>
<property name="active">True</property>
<property name="draw_indicator">False</property>
- <signal name="toggled"
handler="on_extra_window_jumps_radio_dj_fall_calculate_toggled" swapped="no"/>
+ <signal name="toggled"
handler="on_extra_window_jumps_check_dj_fall_calculate_toggled" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox23">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<widget class="GtkImage"
id="extra_windows_jumps_image_dj_fall_calculate">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="tooltip"
translatable="yes">Calculate falling height using a previous jump</property>
+ <property
name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkImage"
id="extra_windows_jumps_image_dj_fall_predefined">
+ <property name="can_focus">False</property>
+ <property name="tooltip" translatable="yes">Fall
from a predefined height</property>
<property
name="stock">gtk-missing-image</property>
<property name="icon-size">2</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
</child>
</widget>
<packing>
@@ -3362,35 +3386,70 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox136">
+ <widget class="GtkHBox" id="hbox300">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
<child>
- <widget class="GtkRadioButton"
id="extra_window_jumps_radio_dj_fall_predefined">
+ <widget class="GtkLabel" id="label95">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="active">True</property>
- <property name="draw_indicator">False</property>
- <property
name="group">extra_window_jumps_radio_dj_fall_calculate</property>
- <signal name="toggled"
handler="on_extra_window_jumps_radio_dj_fall_predefined_toggled" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="label">[</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <widget class="GtkImage"
id="extra_windows_jumps_image_dj_fall_predefined">
+ <widget class="GtkLabel"
id="extra_window_jumps_label_dj_start_inside">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="tooltip"
translatable="yes">Calculate falling height using a previous jump</property>
+ <property name="label" translatable="yes">Start
inside</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel"
id="extra_window_jumps_label_dj_start_outside">
+ <property name="can_focus">False</property>
<property name="tooltip" translatable="yes">Fall
from a predefined height</property>
- <property
name="stock">gtk-missing-image</property>
- <property name="icon-size">2</property>
+ <property name="label" translatable="yes">Start
outside</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label187">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">]</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
+ <property name="position">3</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">20</property>
<child>
<widget class="GtkHBox"
id="hbox_extra_window_jumps_fall_height">
<property name="can_focus">False</property>
@@ -3442,17 +3501,12 @@
</packing>
</child>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
@@ -3557,7 +3611,6 @@ weight</property>
<property name="label" translatable="yes">Using
arms</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
- <property
name="xalign">0.46000000834465027</property>
<property name="draw_indicator">True</property>
<signal name="clicked"
handler="on_extra_window_jumps_check_dj_arms_clicked" swapped="no"/>
</widget>
@@ -3827,8 +3880,8 @@ weight</property>
</child>
</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">4</property>
</packing>
</child>
@@ -4847,47 +4900,7 @@ Second Chronopic to platforms.</property>
<property name="can_focus">False</property>
<property name="show_border">False</property>
<child>
- <widget class="GtkHBox" id="hbox98">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkLabel" id="label95">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">TODO: DJ stuff</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel"
id="extra_window_jumps_label_dj_start_inside">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Start
inside</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel"
id="extra_window_jumps_label_dj_start_outside">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Start
outside</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
+ <placeholder/>
</child>
<child>
<widget class="GtkLabel" id="label8">
@@ -7417,6 +7430,12 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -8468,6 +8487,12 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -9771,6 +9796,12 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -10715,6 +10746,12 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -22041,6 +22078,12 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -22890,6 +22933,12 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -24231,6 +24280,12 @@ by you</property>
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkButton" id="button_video_url">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -24629,6 +24684,12 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -35569,6 +35630,42 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -36928,6 +37025,30 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -38241,6 +38362,12 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -39128,6 +39255,12 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -42473,6 +42606,12 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -42986,6 +43125,12 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -43514,6 +43659,12 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/images/dj-from-in.png b/images/dj-from-in.png
index f9521c8..bccc871 100644
Binary files a/images/dj-from-in.png and b/images/dj-from-in.png differ
diff --git a/images/dj-from-out.png b/images/dj-from-out.png
index 9769b2d..5c71f1e 100644
Binary files a/images/dj-from-out.png and b/images/dj-from-out.png differ
diff --git a/images/svg/bosco_jumps.svg b/images/svg/bosco_jumps.svg
index 9ed4808..0f30130 100644
--- a/images/svg/bosco_jumps.svg
+++ b/images/svg/bosco_jumps.svg
@@ -24,7 +24,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- <dc:title></dc:title>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -33,15 +33,15 @@
borderopacity="1.0"
id="base"
inkscape:current-layer="svg1507"
- inkscape:cx="591.89299"
- inkscape:cy="209.50689"
+ inkscape:cx="319.79325"
+ inkscape:cy="254.74924"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-height="714"
inkscape:window-width="1366"
inkscape:window-x="0"
inkscape:window-y="25"
- inkscape:zoom="0.82659344"
+ inkscape:zoom="1.0539776"
pagecolor="#ffffff"
showguides="true"
inkscape:guide-bbox="true"
@@ -2712,67 +2712,4 @@
style="fill:none;stroke:#000000;stroke-width:1.68355167;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
</g>
- <g
- id="g5638"
-
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/dj-from-out.png"
- inkscape:export-xdpi="37.457169"
- inkscape:export-ydpi="37.457169">
- <path
- sodipodi:nodetypes="ccc"
- inkscape:connector-curvature="0"
- id="path3640"
- d="m 546.71377,296.46243 c 4.46331,0.37761 12.57291,-4.4669 13.01407,27.32225 l -0.4365,-52.23"
-
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-mid:none;marker-end:url(#Arrow2Lend)"
/>
- <path
- inkscape:connector-curvature="0"
- id="path2536-6-6"
- d="m 552.13314,325.31572 16.28644,-0.19399"
-
style="fill:none;stroke:#006f8a;stroke-width:2.8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
/>
- <rect
- y="302.47708"
- x="536.47186"
- height="23.238638"
- width="13.503287"
- id="rect6921-1"
-
style="fill:none;stroke:#008b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
/>
- </g>
- <text
- xml:space="preserve"
-
style="font-size:12.51780605px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- x="684.74353"
- y="290.09976"
- id="text5579"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan5581"
- x="684.74353"
- y="290.09976">dj-from-out.png 24px height</tspan></text>
- <text
- xml:space="preserve"
-
style="font-size:12.51780605px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- x="683.83942"
- y="319.49918"
- id="text5579-9"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan5581-1"
- x="683.83942"
- y="319.49918">dj-from-in.png 24px height</tspan></text>
- <g
- id="g5643"
-
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/dj-from-in.png"
- inkscape:export-xdpi="37.457169"
- inkscape:export-ydpi="37.457169">
- <path
- sodipodi:nodetypes="ccc"
- inkscape:connector-curvature="0"
- id="path3640-6"
- d="m 597.51076,323.86155 c -0.13017,-37.14099 15.06519,-31.86601 15.50635,-0.0769 l -0.4365,-51.92054"
-
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-mid:none;marker-end:url(#Arrow2Lend)"
/>
- <path
- inkscape:connector-curvature="0"
- id="path2536-6-6-5"
- d="m 596.02608,325.30578 18.40517,-0.17411"
-
style="fill:none;stroke:#006f8a;stroke-width:2.819875;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
/>
- </g>
</svg>
diff --git a/images/svg/icons.svg b/images/svg/icons.svg
index ccea41d..e7b9e42 100644
--- a/images/svg/icons.svg
+++ b/images/svg/icons.svg
@@ -22,6 +22,30 @@
<defs
id="defs4">
<marker
+ inkscape:stockid="TriangleOutS"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="TriangleOutS"
+ style="overflow:visible">
+ <path
+ id="path5919"
+ d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+ transform="scale(0.2)" />
+ </marker>
+ <linearGradient
+ id="linearGradient5294">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop5296" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0.2;"
+ offset="1"
+ id="stop5298" />
+ </linearGradient>
+ <marker
inkscape:stockid="TriangleOutM"
orient="auto"
refY="0"
@@ -5211,6 +5235,100 @@
y1="171.28"
x2="309.56"
y2="167.34" />
+ <linearGradient
+ id="linearGradient5294-5">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop5296-6" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0.2;"
+ offset="1"
+ id="stop5298-7" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5294-3">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop5296-1" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0.2;"
+ offset="1"
+ id="stop5298-8" />
+ </linearGradient>
+ <marker
+ inkscape:stockid="TriangleOutS"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="TriangleOutS-8"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path5919-1"
+ d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+ transform="scale(0.2,0.2)" />
+ </marker>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5294"
+ id="linearGradient6730"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(2,0)"
+ x1="63.14085"
+ y1="1190.7301"
+ x2="62.605453"
+ y2="1190.7495" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5294-3"
+ id="linearGradient6732"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(18.141829,0.08397587)"
+ x1="63.14085"
+ y1="1190.7301"
+ x2="62.605453"
+ y2="1190.7495" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5294"
+ id="linearGradient15905"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(2,0)"
+ x1="63.14085"
+ y1="1190.7301"
+ x2="62.605453"
+ y2="1190.7495" />
+ <marker
+ inkscape:stockid="TriangleOutS"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="TriangleOutS-9"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path5919-3"
+ d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+ transform="scale(0.2,0.2)" />
+ </marker>
+ <marker
+ inkscape:stockid="TriangleOutS"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="TriangleOutS-0"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path5919-8"
+ d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+ transform="scale(0.2,0.2)" />
+ </marker>
</defs>
<sodipodi:namedview
id="base"
@@ -5219,23 +5337,24 @@
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="1.6388146"
- inkscape:cx="145.14997"
- inkscape:cy="173.29598"
+ inkscape:zoom="11.566045"
+ inkscape:cx="226.85353"
+ inkscape:cy="275.74355"
inkscape:document-units="px"
inkscape:current-layer="capa1"
showgrid="false"
inkscape:window-width="1366"
- inkscape:window-height="711"
+ inkscape:window-height="714"
inkscape:window-x="0"
- inkscape:window-y="27"
+ inkscape:window-y="25"
inkscape:window-maximized="1"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
- showguides="false"
- inkscape:guide-bbox="true">
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:snap-global="false">
<sodipodi:guide
orientation="0,1"
position="117.90375,196.78693"
@@ -5256,6 +5375,30 @@
orientation="1,0"
position="152.34678,184.66878"
id="guide4885" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="170.88722,123.48872"
+ id="guide4402" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="171.12782,112.54135"
+ id="guide4404" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="161.80451,120.90226"
+ id="guide4406" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="174.31579,117.41353"
+ id="guide4408" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="164.41304,99.172331"
+ id="guide6718" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="180.81203,118.19549"
+ id="guide6720" />
</sodipodi:namedview>
<metadata
id="metadata7">
@@ -8203,5 +8346,80 @@
height="57.184448"
x="99.074821"
y="1159.3739" />
+ <text
+ xml:space="preserve"
+
style="font-size:6.40506649px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="76.398582"
+ y="1048.9115"
+ id="text5579"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan5581"
+ x="76.398582"
+ y="1048.9115">dj-from-out.png 16x16px</tspan></text>
+ <text
+ xml:space="preserve"
+
style="font-size:6.40506649px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="78.383598"
+ y="1012.819"
+ id="text5579-9"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan5581-1"
+ x="78.383598"
+ y="1012.819">dj-from-in.png 16x16px</tspan></text>
+ <g
+ id="g16051">
+ <rect
+ y="991.28235"
+ x="118.51299"
+ height="11.499177"
+ width="11.499177"
+ id="rect15989-0"
+ style="fill:#ffffff;fill-opacity:0;stroke:none" />
+ <rect
+ y="1000.9247"
+ x="119.56591"
+ height="1.6118824"
+ width="7.7737932"
+ id="rect16031"
+ style="fill:#001aff;fill-opacity:1;stroke:none" />
+ <path
+ sodipodi:nodetypes="ccc"
+ inkscape:connector-curvature="0"
+ id="path3792-0-1-3"
+ d="m 121.1628,1001.6481 c 1.05928,-5.62007 2.73875,-5.37307 4.23542,0 0.77778,-1.3172
1.06468,-8.06537 1.06468,-8.06537"
+
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#TriangleOutS)"
/>
+ </g>
+ <g
+ id="g16066">
+ <rect
+ y="1037.5801"
+ x="120.37041"
+ height="1.6118824"
+ width="7.0095878"
+ id="rect16031-5"
+ style="fill:#001aff;fill-opacity:1;stroke:none" />
+ <g
+ transform="translate(-22.794056,1.576678)"
+ inkscape:export-ydpi="125.23"
+ inkscape:export-xdpi="125.23"
+
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/dj-from-out.png"
+ id="g16021">
+ <rect
+ style="fill:#ffffff;fill-opacity:0;stroke:none"
+ id="rect15989"
+ width="11.499177"
+ height="11.499177"
+ x="139.76294"
+ y="1026.3796" />
+ <path
+
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#TriangleOutS)"
+ d="m 142.39258,1032.7342 c 1.60137,0.028 2.7791,-0.01 4.27576,4.0112 0.77779,-1.3172
1.06469,-8.0653 1.06469,-8.0653"
+ id="path3792-0-1-9-9"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccc" />
+ </g>
+ </g>
</g>
</svg>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index bd367d0..6726e41 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -3837,10 +3837,10 @@ public partial class ChronoJumpWindow
}
double myFall = 0;
if(currentJumpType.HasFall) {
- if(extra_window_jumps_radio_dj_fall_predefined.Active)
- myFall = (double) extra_window_jumps_spinbutton_fall.Value;
- else
+ if(extra_window_jumps_check_dj_fall_calculate.Active)
myFall = -1;
+ else
+ myFall = (double) extra_window_jumps_spinbutton_fall.Value;
}
string description = "";
diff --git a/src/gui/jump.cs b/src/gui/jump.cs
index 0e59c07..ed1ae0d 100644
--- a/src/gui/jump.cs
+++ b/src/gui/jump.cs
@@ -974,8 +974,7 @@ partial class ChronoJumpWindow
//options jumps
[Widget] Gtk.SpinButton extra_window_jumps_spinbutton_weight;
[Widget] Gtk.Box extra_window_jumps_hbox_fall;
- [Widget] Gtk.RadioButton extra_window_jumps_radio_dj_fall_predefined;
- [Widget] Gtk.RadioButton extra_window_jumps_radio_dj_fall_calculate;
+ [Widget] Gtk.CheckButton extra_window_jumps_check_dj_fall_calculate;
[Widget] Gtk.Label extra_window_jumps_label_dj_start_inside;
[Widget] Gtk.Label extra_window_jumps_label_dj_start_outside;
[Widget] Gtk.SpinButton extra_window_jumps_spinbutton_fall;
@@ -1054,21 +1053,20 @@ partial class ChronoJumpWindow
}
- private void on_extra_window_jumps_radio_dj_fall_calculate_toggled (object o, EventArgs args) {
- if(extra_window_jumps_radio_dj_fall_calculate.Active) {
- extra_window_jumps_label_dj_start_inside.Visible = true;
- extra_window_jumps_label_dj_start_outside.Visible = false;
-
- hbox_extra_window_jumps_fall_height.Visible = false;
- }
- }
- private void on_extra_window_jumps_radio_dj_fall_predefined_toggled (object o, EventArgs args) {
- if(extra_window_jumps_radio_dj_fall_predefined.Active) {
- extra_window_jumps_label_dj_start_inside.Visible = false;
- extra_window_jumps_label_dj_start_outside.Visible = true;
+ /*
+ * when pre-jump from inside, dj fall is calculated
+ * when fall down from outside, the dj fall is predefined
+ */
+ private void on_extra_window_jumps_check_dj_fall_calculate_toggled (object o, EventArgs args)
+ {
+ bool calculate = extra_window_jumps_check_dj_fall_calculate.Active;
- hbox_extra_window_jumps_fall_height.Visible = true;
- }
+ extra_windows_jumps_image_dj_fall_calculate.Visible = calculate;
+ extra_window_jumps_label_dj_start_inside.Visible = calculate;
+
+ extra_windows_jumps_image_dj_fall_predefined.Visible = ! calculate;
+ extra_window_jumps_label_dj_start_outside.Visible = ! calculate;
+ hbox_extra_window_jumps_fall_height.Visible = ! calculate;
}
private void on_extra_window_jumps_test_changed(object o, EventArgs args)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
