# HG changeset patch
# User Laurent Bessard
# Date 1364165690 -3600
# Node ID 2f7721dae9a0e1241ab52c2ef2bda4322171ebba
# Parent 17d9c81b5ed845a6c4cee0f979bcd2b1a1c059ae# Parent d6da2ccafca4cca055d41b776d14141c186e1da0
Merged
diff -r 17d9c81b5ed8 -r 2f7721dae9a0 controls/LogViewer.py
--- a/controls/LogViewer.py Fri Mar 22 11:02:56 2013 +0900
+++ b/controls/LogViewer.py Sun Mar 24 23:54:50 2013 +0100
@@ -218,7 +218,7 @@
self.Position.y + (self.Size.height - h) / 2)
DATE_INFO_SIZE = 10
-MESSAGE_INFO_SIZE = 25
+MESSAGE_INFO_SIZE = 18
class LogMessage:
diff -r 17d9c81b5ed8 -r 2f7721dae9a0 images/LOG_CRITICAL.png
Binary file images/LOG_CRITICAL.png has changed
diff -r 17d9c81b5ed8 -r 2f7721dae9a0 images/LOG_DEBUG.png
Binary file images/LOG_DEBUG.png has changed
diff -r 17d9c81b5ed8 -r 2f7721dae9a0 images/LOG_INFO.png
Binary file images/LOG_INFO.png has changed
diff -r 17d9c81b5ed8 -r 2f7721dae9a0 images/LOG_WARNING.png
Binary file images/LOG_WARNING.png has changed
diff -r 17d9c81b5ed8 -r 2f7721dae9a0 images/icons.svg
--- a/images/icons.svg Fri Mar 22 11:02:56 2013 +0900
+++ b/images/icons.svg Sun Mar 24 23:54:50 2013 +0100
@@ -43,9 +43,9 @@
pagecolor="#ffffff"
id="base"
showgrid="false"
- inkscape:zoom="1.4142136"
- inkscape:cx="456.71309"
- inkscape:cy="836.95463"
+ inkscape:zoom="4.0000001"
+ inkscape:cx="590.44587"
+ inkscape:cy="681.55725"
inkscape:window-x="0"
inkscape:window-y="24"
inkscape:current-layer="svg2"
@@ -93538,31 +93538,31 @@
<rect
style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="LOG_CRITICAL"
- y="368.36218"
- x="425"
- height="23.999981"
- width="23.999981" />
+ y="366.36215"
+ x="431"
+ height="16"
+ width="16" />
<rect
style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="LOG_WARNING"
- y="367.86218"
+ y="365.86215"
x="521"
- height="23.999981"
- width="23.999981" />
+ height="16"
+ width="16" />
<rect
style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="LOG_INFO"
- y="367.36218"
- x="605"
- height="23.999981"
- width="23.999981" />
+ y="365.36215"
+ x="609.75"
+ height="16"
+ width="16" />
<rect
style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="LOG_DEBUG"
- y="367.36218"
- x="682"
- height="23.999981"
- width="23.999981" />
+ y="365.36215"
+ x="680"
+ height="16"
+ width="16" />
<path
sodipodi:type="arc"
style="color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
@@ -93572,10 +93572,10 @@
sodipodi:rx="6.25"
sodipodi:ry="6.25"
d="m 426.5,379.61218 a 6.25,6.25 0 1 1 -12.5,0 6.25,6.25 0 1 1 12.5,0 z"
- transform="matrix(1.8061017,0,0,1.8061017,-322.01425,-305.25604)" />
+ transform="matrix(1.2040688,0,0,1.2040688,-67.009896,-82.717008)" />
<path
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
- d="m 433.26562,373.92467 -2.78125,2.875 3.65625,3.5625 -3.65625,3.5625 2.78125,2.875 3.71875,-3.65625 3.75,3.65625 2.78125,-2.875 -3.65625,-3.5625 3.65625,-3.5625 -2.78125,-2.875 -3.75,3.65625 -3.71875,-3.65625 z"
+ d="m 436.51042,370.07049 -1.85417,1.91667 2.4375,2.375 -2.4375,2.375 1.85417,1.91667 2.47917,-2.4375 2.5,2.4375 1.85417,-1.91667 -2.43751,-2.375 2.43751,-2.375 -1.85417,-1.91667 -2.5,2.4375 -2.47917,-2.4375 z"
id="path18476"
inkscape:connector-curvature="0" />
<path
@@ -93593,21 +93593,21 @@
inkscape:rounded="0"
inkscape:randomized="0"
d="m 496.21218,378.13585 -10.76592,0.12973 -10.76741,-0.0718 5.27061,-9.38843 5.44591,-9.28893 5.49531,9.25869 z"
- inkscape:transform-center-x="-0.016715197"
- inkscape:transform-center-y="-2.9692899"
- transform="translate(47.554473,10.971182)" />
+ inkscape:transform-center-x="-0.011147353"
+ inkscape:transform-center-y="-1.9795276"
+ transform="matrix(0.6666672,0,0,0.6666672,205.3694,127.93464)" />
<text
xml:space="preserve"
- style="font-size:18.60616684px;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="443.67981"
- y="461.09991"
+ style="font-size:12.4041214px;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="441.56531"
+ y="451.09576"
id="text19292"
sodipodi:linespacing="125%"
transform="scale(1.191303,0.839417)"><tspan
sodipodi:role="line"
id="tspan19294"
- x="443.67981"
- y="461.09991">!</tspan></text>
+ x="441.56531"
+ y="451.09576">!</tspan></text>
<path
sodipodi:type="arc"
style="color:#000000;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
@@ -93617,29 +93617,29 @@
sodipodi:rx="6.25"
sodipodi:ry="6.25"
d="m 426.5,379.61218 a 6.25,6.25 0 1 1 -12.5,0 6.25,6.25 0 1 1 12.5,0 z"
- transform="matrix(1.8061017,0,0,1.8061017,-142.01425,-306.25604)" />
+ transform="matrix(1.2040688,0,0,1.2040688,111.7401,-83.717008)" />
<text
xml:space="preserve"
- style="font-size:23.34662056px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
- x="474.33417"
- y="498.97501"
+ style="font-size:15.56442642px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+ x="475.99768"
+ y="488.26718"
id="text19314"
sodipodi:linespacing="125%"
transform="scale(1.2919212,0.77404101)"><tspan
sodipodi:role="line"
id="tspan19316"
- x="474.33417"
- y="498.97501">i</tspan></text>
+ x="475.99768"
+ y="488.26718">i</tspan></text>
<rect
- style="color:#000000;fill:#008000;fill-opacity:1;fill-rule:nonzero;stroke:#c8c8c8;stroke-width:1;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;enable-background:accumulate"
+ style="color:#000000;fill:#008000;fill-opacity:1;fill-rule:nonzero;stroke:#c8c8c8;stroke-width:0.66666722;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;enable-background:accumulate"
id="rect19318"
- width="21.38998"
- height="19.622213"
- x="683.30499"
- y="369.55106" />
+ width="14.259998"
+ height="13.081486"
+ x="680.87"
+ y="366.82141" />
<path
- style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m 683.81323,379.69702 6.40816,0 2.17016,-3.75883 3.95368,6.84797 2.08109,-3.60455 5.76043,0"
+ style="fill:none;stroke:#ffffff;stroke-width:1.33333445;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 681.20882,373.5854 4.27211,0 1.44678,-2.50589 2.63578,4.56531 1.3874,-2.40303 3.84029,0"
id="path19324"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccc" />