[chronojump] Start window done
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Start window done
- Date: Sun, 28 Aug 2016 16:46:00 +0000 (UTC)
commit 6758af601212c9e162f6a78ab4e2b973421ea634
Author: Xavier de Blas <xaviblas gmail com>
Date: Sun Aug 28 03:37:11 2016 +0200
Start window done
glade/chronojump.glade | 77 ++++++++++--
images/stock_down.png | Bin 0 -> 519 bytes
images/stock_inertial.png | Bin 0 -> 802 bytes
images/svg/stock_menu_buttons.svg | 240 ++++++++++++++++++++++++++++---------
src/Makefile.am | 2 +
src/constants.cs | 2 +
src/gui/chronojump.cs | 30 ++---
7 files changed, 267 insertions(+), 84 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index c2bd0ec..7d6768e 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -676,11 +676,12 @@
<widget class="GtkViewport" id="viewport_selector_start_jumps">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="border_width">4</property>
<child>
<widget class="GtkVBox" id="vbox_selector_start_jumps_2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">12</property>
+ <property name="border_width">16</property>
<property name="spacing">12</property>
<child>
<widget class="GtkVBox" id="vbox84">
@@ -689,7 +690,7 @@
<property name="spacing">6</property>
<child>
<widget class="GtkButton" id="button5">
- <property name="height_request">75</property>
+ <property name="height_request">60</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -760,7 +761,7 @@
<property name="spacing">6</property>
<child>
<widget class="GtkButton" id="button6">
- <property name="height_request">75</property>
+ <property name="height_request">60</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1083,6 +1084,7 @@
<widget class="GtkViewport" id="viewport_selector_start_runs">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="border_width">4</property>
<child>
<widget class="GtkVBox" id="vbox_selector_start_runs">
<property name="visible">True</property>
@@ -1096,7 +1098,7 @@
<property name="spacing">6</property>
<child>
<widget class="GtkButton" id="button7">
- <property name="height_request">75</property>
+ <property name="height_request">60</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1167,7 +1169,7 @@
<property name="spacing">6</property>
<child>
<widget class="GtkButton" id="button8">
- <property name="height_request">75</property>
+ <property name="height_request">50</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1301,6 +1303,7 @@
<widget class="GtkViewport" id="viewport_selector_start_encoder">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="border_width">4</property>
<child>
<widget class="GtkVBox" id="vbox_selector_start_encoder">
<property name="visible">True</property>
@@ -1314,7 +1317,7 @@
<property name="spacing">6</property>
<child>
<widget class="GtkButton" id="button9">
- <property name="height_request">75</property>
+ <property name="height_request">60</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1385,7 +1388,7 @@
<property name="spacing">6</property>
<child>
<widget class="GtkButton" id="button10">
- <property name="height_request">75</property>
+ <property name="height_request">60</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -18279,6 +18282,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -23127,6 +23133,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -24456,6 +24465,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -26277,6 +26289,9 @@ by you</property>
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkButton" id="button_video_url">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -27155,6 +27170,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -40657,6 +40675,24 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -43936,6 +43972,18 @@ 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>
</widget>
</child>
</widget>
@@ -45032,9 +45080,6 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<placeholder/>
</child>
<child>
- <placeholder/>
- </child>
- <child>
<widget class="GtkLabel" id="label218">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -46363,6 +46408,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -51275,6 +51323,9 @@ Other</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -52268,6 +52319,9 @@ Other</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -53276,6 +53330,9 @@ Other</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/images/stock_down.png b/images/stock_down.png
new file mode 100644
index 0000000..83a1694
Binary files /dev/null and b/images/stock_down.png differ
diff --git a/images/stock_inertial.png b/images/stock_inertial.png
new file mode 100644
index 0000000..1da68be
Binary files /dev/null and b/images/stock_inertial.png differ
diff --git a/images/svg/stock_menu_buttons.svg b/images/svg/stock_menu_buttons.svg
index 97e193a..14fa283 100644
--- a/images/svg/stock_menu_buttons.svg
+++ b/images/svg/stock_menu_buttons.svg
@@ -14,7 +14,7 @@
height="16px"
id="svg2504"
sodipodi:version="0.32"
- inkscape:version="0.48.0 r9654"
+ inkscape:version="0.48.5 r10040"
sodipodi:docname="stock_menu_buttons.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.1"
@@ -28,20 +28,21 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="4.1541139"
- inkscape:cx="2.9156118"
- inkscape:cy="-50.344529"
+ inkscape:zoom="11.424194"
+ inkscape:cx="-45.281189"
+ inkscape:cy="-32.315055"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
- inkscape:window-width="1024"
- inkscape:window-height="719"
+ inkscape:window-width="1366"
+ inkscape:window-height="702"
inkscape:window-x="0"
- inkscape:window-y="24"
+ inkscape:window-y="27"
inkscape:window-maximized="1"
- showguides="true"
- inkscape:guide-bbox="true">
+ showguides="false"
+ inkscape:guide-bbox="true"
+ inkscape:snap-global="false">
<sodipodi:guide
id="guide2996"
position="14.517203,11.487624"
@@ -114,7 +115,7 @@
x2="22.495962"
y1="35.078724"
x1="22.495962"
- gradientTransform="matrix(-0.3704967,0,0,-0.3617496,16.332316,17.508315)"
+ gradientTransform="matrix(-0.3704967,0,0,-0.3617496,16.332316,19.508315)"
gradientUnits="userSpaceOnUse"
id="linearGradient2506"
xlink:href="#linearGradient4222"
@@ -413,15 +414,6 @@
y2="0.052475106"
gradientUnits="userSpaceOnUse" />
<linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2264-3"
- id="linearGradient3838-2"
- x1="-24.920794"
- y1="0.052475106"
- x2="-12.380199"
- y2="0.052475106"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
id="linearGradient2264-3">
<stop
id="stop2266-32"
@@ -454,15 +446,6 @@
style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
- y2="0.052475106"
- x2="-18.317699"
- y1="0.052475106"
- x1="-18.983294"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3947"
- xlink:href="#linearGradient4222-4"
- inkscape:collect="always" />
- <linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2264"
id="linearGradient3988"
@@ -1316,6 +1299,119 @@
id="linearGradient4114"
xlink:href="#linearGradient2264-48"
inkscape:collect="always" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-3"
+ id="linearGradient4057"
+ gradientUnits="userSpaceOnUse"
+ x1="-24.920794"
+ y1="0.052475106"
+ x2="-12.380199"
+ y2="0.052475106" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4222-4"
+ id="linearGradient4059"
+ gradientUnits="userSpaceOnUse"
+ x1="-18.983294"
+ y1="0.052475106"
+ x2="-18.317699"
+ y2="0.052475106" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-3-6"
+ id="linearGradient4057-3"
+ gradientUnits="userSpaceOnUse"
+ x1="-24.920794"
+ y1="0.052475106"
+ x2="-12.380199"
+ y2="0.052475106" />
+ <linearGradient
+ id="linearGradient2264-3-6">
+ <stop
+ id="stop2266-32-7"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop2268-7-5"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4222-4-5"
+ id="linearGradient4059-3"
+ gradientUnits="userSpaceOnUse"
+ x1="-18.983294"
+ y1="0.052475106"
+ x2="-18.317699"
+ y2="0.052475106" />
+ <linearGradient
+ id="linearGradient4222-4-5"
+ inkscape:collect="always">
+ <stop
+ id="stop4224-5-6"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop4226-41-2"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ y2="0.052475106"
+ x2="-18.317699"
+ y1="0.052475106"
+ x1="-18.983294"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4101"
+ xlink:href="#linearGradient4222-4-5"
+ inkscape:collect="always" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-3-6"
+ id="linearGradient4134"
+ gradientUnits="userSpaceOnUse"
+ x1="-24.920794"
+ y1="0.052475106"
+ x2="-12.380199"
+ y2="0.052475106" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4222-4-5"
+ id="linearGradient4137"
+ gradientUnits="userSpaceOnUse"
+ x1="-18.983294"
+ y1="0.052475106"
+ x2="-18.317699"
+ y2="0.052475106" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-3-6"
+ id="linearGradient4147"
+ x1="-110.61889"
+ y1="45.709866"
+ x2="-99.702187"
+ y2="45.709866"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-3-6"
+ id="linearGradient4153"
+ gradientUnits="userSpaceOnUse"
+ x1="-110.61889"
+ y1="45.709866"
+ x2="-99.702187"
+ y2="45.709866" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4222-4-5"
+ id="linearGradient4155"
+ gradientUnits="userSpaceOnUse"
+ x1="-18.983294"
+ y1="0.052475106"
+ x2="-18.317699"
+ y2="0.052475106" />
</defs>
<metadata
id="metadata2509">
@@ -1342,8 +1438,8 @@
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccc"
-
style="opacity:0.35400002000000003;fill:none;stroke:url(#linearGradient2506);stroke-width:0.998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
- d="M 6.5002622,11.926403 1.9551472,8 6.5002622,3.9630618 6.5002622,5.5 14.504965,5.5112624
14.48244,10.5 l -7.9821778,0 z"
+
style="opacity:0.35400008;fill:none;stroke:url(#linearGradient2506);stroke-width:0.99800003;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+ d="M 6.5002622,13.926403 1.9551472,10 6.5002622,5.9630618 6.5002622,7.5 14.504965,7.5112624
14.48244,12.5 l -7.9821778,0 z"
id="path3290" />
<path
inkscape:connector-curvature="0"
@@ -1408,33 +1504,6 @@
d="m -34.38378,-13.500876 0,12.166568"
id="path3924"
inkscape:connector-curvature="0" />
- <g
- id="g3920-6"
- transform="translate(-14.996933,91.588597)"
- inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/pulse.png"
- inkscape:export-xdpi="188.04115"
- inkscape:export-ydpi="188.04115">
- <path
- transform="matrix(11.669177,0,0,11.669177,178.42532,-6.0500228)"
- d="m -18.380199,0.05247511 c 0,0.14928092 -0.121016,0.27029702 -0.270297,0.27029702 -0.14928,0
-0.270297,-0.1210161 -0.270297,-0.27029702 0,-0.14928093 0.121017,-0.27029702 0.270297,-0.27029702 0.149281,0
0.270297,0.12101609 0.270297,0.27029702 z"
- sodipodi:ry="0.27029702"
- sodipodi:rx="0.27029702"
- sodipodi:cy="0.052475106"
- sodipodi:cx="-18.650496"
- id="path3044-5-8"
-
style="fill:url(#linearGradient3838-2);fill-opacity:1;stroke:#699536;stroke-width:0.08569585;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
- <path
- transform="matrix(8.5180693,0,0,8.5180693,119.63005,-5.880899)"
- d="m -18.380199,0.05247511 c 0,0.14928092 -0.121016,0.27029702 -0.270297,0.27029702 -0.14928,0
-0.270297,-0.1210161 -0.270297,-0.27029702 0,-0.14928093 0.121017,-0.27029702 0.270297,-0.27029702 0.149281,0
0.270297,0.12101609 0.270297,0.27029702 z"
- sodipodi:ry="0.27029702"
- sodipodi:rx="0.27029702"
- sodipodi:cy="0.052475106"
- sodipodi:cx="-18.650496"
- id="path3044-5-3-0"
-
style="fill:none;stroke:url(#linearGradient3947);stroke-width:0.08569585;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
- </g>
<text
xml:space="preserve"
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient3988);fill-opacity:1;stroke:#699536;stroke-opacity:1;font-family:Bitstream
Vera Sans"
@@ -1634,5 +1703,62 @@
style="fill:url(#linearGradient4114);fill-opacity:1;stroke:#ffffff;stroke-opacity:1">!<tspan
style="font-size:10px;fill:url(#linearGradient4114);stroke:#ffffff;stroke-opacity:1"
id="tspan3990-2" /></tspan></text>
+ <image
+ y="15.506392"
+ x="-56.926983"
+ id="image25131"
+
xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAYxJREFU
OI2lkztIHFEUhr9x7qzjduKjCAEhXdJYjlHUKiKW2lksMU10RELsAins0wjGYRFLCUmRMtoEsUjh
aIqwCZhaRYkuy+K87u48ro0JQdQR/dv//B/ncM7RlFLcRy15BXPlvpe2Yz24MyDNVLmg6z9sx3py
JwDA+NCzzoJhuLZjDV32tLly30mSZl3XhYumIecnpszj2ikfNjci2ZRTyzPup3+AWcdK3ky+0PO6
aCZ/CKI21r5uhIEMFpamt98BCIAsbeA1KrmjtBY6eD4yWvy4tbnwauXpozjJZoUCAhngRxLIW+kh
hn7GxGB/cd39XjqunXQIUITSw4/CWwDA0AWG7pGkCUBTAPiRhx9GuYBWo50kNlmv7Aa+jFbTVL0W
AF50hmjpvjHciD3qDcX2719hnMRv38+4iwBCg9qXnb1r12joyIHHD826L/l5cBSmaVZybPfzX1/L
+wXbsVRPl6n2q9JXijHHdr/974sb0xfar8qqUgw7trt32cs9ZU1jWil6rwrDLUbI0zk57bPSwaKc 5wAAAABJRU5ErkJggg== "
+ height="16"
+ width="16" />
+ <text
+ xml:space="preserve"
+
style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu
Sans Mono;-inkscape-font-specification:DejaVu Sans Mono"
+ x="-120.74221"
+ y="26.328688"
+ id="text25134"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan25136"
+ x="-120.74221"
+ y="26.328688"
+
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:DejaVu Sans
Mono;-inkscape-font-specification:DejaVu Sans Mono">g</tspan></text>
+ <text
+ xml:space="preserve"
+
style="font-size:5.16867733px;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="-68.504135"
+ y="65.00943"
+ id="text25138"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan25140"
+ x="-68.504135"
+ y="65.00943">stock-inertial.png</tspan></text>
+ <g
+ id="g4149"
+ transform="translate(51.294647,-1.0504023)"
+
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/stock_inertial.png"
+ inkscape:export-xdpi="90.160141"
+ inkscape:export-ydpi="90.160141">
+ <path
+ transform="matrix(1.4602587,0,0,1.4602587,56.985754,-17.120171)"
+ d="m -100.02321,45.709866 c 0,2.837269 -2.30006,5.13733 -5.13733,5.13733 -2.83727,0
-5.13733,-2.300061 -5.13733,-5.13733 0,-2.83727 2.30006,-5.137331 5.13733,-5.137331 2.83727,0
5.13733,2.300061 5.13733,5.137331 z"
+ sodipodi:ry="5.1373305"
+ sodipodi:rx="5.1373305"
+ sodipodi:cy="45.709866"
+ sodipodi:cx="-105.16054"
+ id="path4139"
+
style="fill:url(#linearGradient4153);fill-opacity:1;stroke:#699536;stroke-width:0.6823017;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(22.158295,0,0,22.158295,316.71676,48.435888)"
+ d="m -18.380199,0.05247511 c 0,0.14928092 -0.121016,0.27029702 -0.270297,0.27029702 -0.14928,0
-0.270297,-0.1210161 -0.270297,-0.27029702 0,-0.14928093 0.121017,-0.27029702 0.270297,-0.27029702 0.149281,0
0.270297,0.12101609 0.270297,0.27029702 z"
+ sodipodi:ry="0.27029702"
+ sodipodi:rx="0.27029702"
+ sodipodi:cy="0.052475106"
+ sodipodi:cx="-18.650496"
+ id="path3044-5-3-0-2"
+
style="fill:none;stroke:url(#linearGradient4155);stroke-width:0.09142481;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ </g>
</g>
</svg>
diff --git a/src/Makefile.am b/src/Makefile.am
index 5fb529a..0171f8a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -298,6 +298,8 @@ RESOURCES = \
../images/stock_right_left.png,stock_right_left.png \
../images/stock_up.png,stock_up.png \
../images/stock_up_down.png,stock_up_down.png \
+ ../images/stock_down.png,stock_down.png \
+ ../images/stock_inertial.png,stock_inertial.png \
../images/reaction_time_menu.png,reaction_time_menu.png \
../images/pulse_menu.png,pulse_menu.png \
../images/multichronopic_menu.png,multichronopic_menu.png \
diff --git a/src/constants.cs b/src/constants.cs
index 9f4cbbf..7c9af88 100644
--- a/src/constants.cs
+++ b/src/constants.cs
@@ -400,6 +400,8 @@ public class Constants
public static string FileNameJumpsRJ = "stock_up_down.png";
public static string FileNameRuns = "stock_right.png";
public static string FileNameRunsInterval = "stock_right_left.png";
+ public static string FileNameEncoderGravitatory = "stock_down.png";
+ public static string FileNameEncoderInertial = "stock_inertial.png";
public static string FileNameReactionTime = "reaction_time_menu.png";
public static string FileNamePulse = "pulse_menu.png";
public static string FileNameMultiChronopic = "multichronopic_menu.png";
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 9cedd21..23bb9e8 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -69,10 +69,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Label label_version;
[Widget] Gtk.Image image_logo;
- [Widget] Gtk.Button button_selector_start_jumps;
- [Widget] Gtk.Button button_selector_start_runs;
- [Widget] Gtk.Button button_selector_start_encoder;
- [Widget] Gtk.Button button_selector_start_other;
[Widget] Gtk.Image image_selector_start_jumps;
[Widget] Gtk.Image image_selector_start_runs;
[Widget] Gtk.Image image_selector_start_encoder_gravitatory;
@@ -107,6 +103,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Label label_mode_jumps_reactive_small;
[Widget] Gtk.Label label_mode_runs_small;
[Widget] Gtk.Label label_mode_runs_intervallic_small;
+ [Widget] Gtk.Image image_mode_encoder_gravitatory;
+ [Widget] Gtk.Image image_mode_encoder_inertial;
[Widget] Gtk.Label label_mode_reaction_times_small;
[Widget] Gtk.Label label_mode_pulses_small;
[Widget] Gtk.Label label_mode_multi_chronopic_small;
@@ -738,6 +736,11 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameRunsInterval);
image_mode_runs_intervallic_small.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameEncoderGravitatory);
+ image_mode_encoder_gravitatory.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameEncoderInertial);
+ image_mode_encoder_inertial.Pixbuf = pixbuf;
+
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameReactionTime);
image_mode_reaction_times_small.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNamePulse);
@@ -3452,10 +3455,6 @@ public partial class ChronoJumpWindow
}
private void reset_buttons_selector_start()
{
- button_selector_start_jumps.Sensitive = true;
- button_selector_start_runs.Sensitive = true;
- button_selector_start_encoder.Sensitive = true;
- button_selector_start_other.Sensitive = true;
notebook_selector_start_jumps.CurrentPage = 0;
notebook_selector_start_runs.CurrentPage = 0;
notebook_selector_start_encoder.CurrentPage = 0;
@@ -3473,10 +3472,9 @@ public partial class ChronoJumpWindow
private void on_button_selector_start_jumps_clicked(object o, EventArgs args)
{
- button_selector_start_runs.Sensitive = false;
- button_selector_start_encoder.Sensitive = false;
- button_selector_start_other.Sensitive = false;
notebook_selector_start_jumps.CurrentPage = 1;
+ notebook_selector_start_runs.CurrentPage = 0;
+ notebook_selector_start_encoder.CurrentPage = 0;
}
private void on_button_selector_start_jumps_simple_clicked(object o, EventArgs args)
{
@@ -3497,10 +3495,9 @@ public partial class ChronoJumpWindow
private void on_button_selector_start_runs_clicked(object o, EventArgs args)
{
- button_selector_start_jumps.Sensitive = false;
- button_selector_start_encoder.Sensitive = false;
- button_selector_start_other.Sensitive = false;
+ notebook_selector_start_jumps.CurrentPage = 0;
notebook_selector_start_runs.CurrentPage = 1;
+ notebook_selector_start_encoder.CurrentPage = 0;
}
private void on_button_selector_start_runs_simple_clicked(object o, EventArgs args)
{
@@ -3519,9 +3516,8 @@ public partial class ChronoJumpWindow
private void on_button_selector_start_encoder_clicked(object o, EventArgs args)
{
- button_selector_start_jumps.Sensitive = false;
- button_selector_start_runs.Sensitive = false;
- button_selector_start_other.Sensitive = false;
+ notebook_selector_start_jumps.CurrentPage = 0;
+ notebook_selector_start_runs.CurrentPage = 0;
notebook_selector_start_encoder.CurrentPage = 1;
}
private void on_button_selector_start_encoder_gravitatory_clicked(object o, EventArgs args)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
