[chronojump] minor GUI changes
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] minor GUI changes
- Date: Tue, 8 Apr 2014 10:39:51 +0000 (UTC)
commit 3487adfb8cf3dbbbc13d77035eb81dacb47a60ad
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Apr 8 12:39:05 2014 +0200
minor GUI changes
images/encoder-analyze-max.png | Bin 445 -> 536 bytes
images/encoder-analyze-mean.png | Bin 438 -> 492 bytes
images/svg/icons.svg | 35 +++++++++++++++++++----------------
src/gui/chronojump.cs | 13 +++++++------
src/gui/encoder.cs | 4 +++-
5 files changed, 29 insertions(+), 23 deletions(-)
---
diff --git a/images/encoder-analyze-max.png b/images/encoder-analyze-max.png
index 5acc61c..1da327c 100644
Binary files a/images/encoder-analyze-max.png and b/images/encoder-analyze-max.png differ
diff --git a/images/encoder-analyze-mean.png b/images/encoder-analyze-mean.png
index 000cfe2..9613eb7 100644
Binary files a/images/encoder-analyze-mean.png and b/images/encoder-analyze-mean.png differ
diff --git a/images/svg/icons.svg b/images/svg/icons.svg
index e3a53e9..720f0ba 100644
--- a/images/svg/icons.svg
+++ b/images/svg/icons.svg
@@ -13,7 +13,7 @@
height="161.54089"
id="svg2"
version="1.1"
- inkscape:version="0.48.3.1 r9886"
+ inkscape:version="0.48.4 r9939"
sodipodi:docname="icons.svg"
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/together.png"
inkscape:export-xdpi="90"
@@ -25,18 +25,18 @@
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="1"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="4.4186389"
- inkscape:cx="62.125023"
- inkscape:cy="64.452175"
+ inkscape:zoom="3.0977285"
+ inkscape:cx="63.66256"
+ inkscape:cy="72.120534"
inkscape:document-units="px"
inkscape:current-layer="capa1"
showgrid="false"
- inkscape:window-width="1920"
- inkscape:window-height="1030"
+ inkscape:window-width="1366"
+ inkscape:window-height="711"
inkscape:window-x="0"
- inkscape:window-y="25"
+ inkscape:window-y="27"
inkscape:window-maximized="1"
fit-margin-top="0"
fit-margin-left="0"
@@ -830,7 +830,7 @@
sodipodi:role="line">a</tspan></text>
</g>
<g
- id="g5156"
+ id="g3984"
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/encoder-analyze-max.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
@@ -840,7 +840,7 @@
height="16"
width="16"
id="rect2985-62-4-5-7-1"
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+ style="fill:#ffffff;fill-opacity:0;fill-rule:nonzero;stroke:none" />
<g
id="g5027">
<path
@@ -889,7 +889,7 @@
sodipodi:cy="150.00484"
sodipodi:rx="2.0107021"
sodipodi:ry="2.0107021"
- d="m 10.644894,150.00484 a 2.0107021,2.0107021 0 1 1 -4.0214046,0 2.0107021,2.0107021 0 1 1
4.0214046,0 z"
+ d="m 10.644894,150.00484 c 0,1.11048 -0.9002224,2.0107 -2.0107025,2.0107 -1.1104801,0
-2.0107021,-0.90022 -2.0107021,-2.0107 0,-1.11048 0.900222,-2.01071 2.0107021,-2.01071 1.1104801,0
2.0107025,0.90023 2.0107025,2.01071 z"
transform="matrix(1.4448628,0,0,1.4448628,-32.590964,901.86061)" />
</g>
</g>
@@ -1205,16 +1205,19 @@
style="fill:none;stroke:#000000;stroke-width:2.34336495;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
/>
</g>
<g
- id="g5134"
- transform="translate(-12.979021,-18.884033)">
+ id="g3972"
+
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/encoder-analyze-mean.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
<rect
- y="1131.3376"
- x="-46.331295"
+ y="1112.4536"
+ x="-59.310314"
height="16"
width="16"
id="rect2985-62-4-5-7-1-6"
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+ style="fill:#ffffff;fill-opacity:0;fill-rule:nonzero;stroke:none" />
<g
+ transform="translate(-12.979021,-18.884033)"
id="g5124">
<rect
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.36386502;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index e61c39b..444ff99 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -171,6 +171,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_simulated_warning;
//[Widget] Gtk.TextView textview_message_connected_chronopics;
//[Widget] Gtk.Image image_connected_chronopics;
+ [Widget] Gtk.Viewport viewport_chronopic_encoder;
[Widget] Gtk.Label label_chronopic_encoder;
[Widget] Gtk.HBox hbox_video_capture;
@@ -4375,8 +4376,9 @@ Log.WriteLine("DDD 2");
//label_connected_chronopics.UseMarkup = true;
if(colorize)
- UtilGtk.ChronopicColors(viewport_chronopics, label_chronopics,
label_connected_chronopics,
- (chronopicWin.Connected || chronopicWin.GetEncoderPort() != "") );
+ UtilGtk.ChronopicColors(viewport_chronopics,
+ label_chronopics, label_connected_chronopics,
+ chronopicWin.Connected);
}
private void chronopicEncoderLabels(bool colorize) {
@@ -4385,11 +4387,10 @@ Log.WriteLine("DDD 2");
else
label_chronopic_encoder.Text = Catalog.GetString("Encoder disconnected");
- /*
if(colorize)
- UtilGtk.ChronopicColors(viewport_chronopics, label_chronopics,
label_connected_chronopics,
- (chronopicWin.Connected || chronopicWin.GetEncoderPort() != "") );
- */
+ UtilGtk.ChronopicColors(viewport_chronopic_encoder,
+ label_chronopic_encoder, new Gtk.Label(),
+ chronopicWin.GetEncoderPort() != "");
}
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index d007643..e9d3cd9 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -342,7 +342,9 @@ public partial class ChronoJumpWindow
if(chronopicWin.GetEncoderPort() == Util.GetDefaultPort()) {
new DialogMessage(Constants.MessageTypes.WARNING,
Catalog.GetString("Chronopic port is not configured."));
- UtilGtk.ChronopicColors(viewport_chronopics, label_chronopics,
label_connected_chronopics, false);
+ UtilGtk.ChronopicColors(viewport_chronopic_encoder,
+ label_chronopic_encoder, new Gtk.Label(),
+ false);
return false;
}
return true;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]