# HG changeset patch
# User Laurent Bessard
# Date 1363214959 -3600
# Node ID 1a68113a323d4dff13749aae980b57961b7be839
# Parent  3290eff761f1dcc63b8c967a84639d07e3cc0b0a
Fixed conflicting icon names on Windows

diff -r 3290eff761f1 -r 1a68113a323d controls/LogViewer.py
--- a/controls/LogViewer.py	Wed Mar 13 23:17:30 2013 +0100
+++ b/controls/LogViewer.py	Wed Mar 13 23:49:19 2013 +0100
@@ -256,7 +256,7 @@
         self.ResetLogMessages()
         self.ParentWindow = window
     
-        self.LevelIcons = [GetBitmap(level) for level in LogLevels]
+        self.LevelIcons = [GetBitmap("LOG_" + level) for level in LogLevels]
         self.LevelFilters = [range(i) for i in xrange(4, 0, -1)]
         self.CurrentFilter = self.LevelFilters[0]
         
diff -r 3290eff761f1 -r 1a68113a323d images/CRITICAL.png
Binary file images/CRITICAL.png has changed
diff -r 3290eff761f1 -r 1a68113a323d images/DEBUG.png
Binary file images/DEBUG.png has changed
diff -r 3290eff761f1 -r 1a68113a323d images/INFO.png
Binary file images/INFO.png has changed
diff -r 3290eff761f1 -r 1a68113a323d images/LOG_CRITICAL.png
Binary file images/LOG_CRITICAL.png has changed
diff -r 3290eff761f1 -r 1a68113a323d images/LOG_DEBUG.png
Binary file images/LOG_DEBUG.png has changed
diff -r 3290eff761f1 -r 1a68113a323d images/LOG_INFO.png
Binary file images/LOG_INFO.png has changed
diff -r 3290eff761f1 -r 1a68113a323d images/LOG_WARNING.png
Binary file images/LOG_WARNING.png has changed
diff -r 3290eff761f1 -r 1a68113a323d images/WARNING.png
Binary file images/WARNING.png has changed
diff -r 3290eff761f1 -r 1a68113a323d images/icons.svg
--- a/images/icons.svg	Wed Mar 13 23:17:30 2013 +0100
+++ b/images/icons.svg	Wed Mar 13 23:49:19 2013 +0100
@@ -34,18 +34,18 @@
      inkscape:window-height="1056"
      inkscape:window-width="1920"
      inkscape:pageshadow="2"
-     inkscape:pageopacity="1"
+     inkscape:pageopacity="0"
      guidetolerance="10.0"
      gridtolerance="10000"
      objecttolerance="10.0"
      borderopacity="1.0"
      bordercolor="#666666"
-     pagecolor="#f2f1f0"
+     pagecolor="#ffffff"
      id="base"
      showgrid="false"
-     inkscape:zoom="1"
-     inkscape:cx="301.65135"
-     inkscape:cy="426.18259"
+     inkscape:zoom="1.4142136"
+     inkscape:cx="456.71309"
+     inkscape:cy="836.95463"
      inkscape:window-x="0"
      inkscape:window-y="24"
      inkscape:current-layer="svg2"
@@ -90933,7 +90933,7 @@
      sodipodi:nodetypes="cccccccccccccccccccc" />
   <rect
      inkscape:label="#rect16270"
-     style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     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="Debug"
      y="131.36218"
      x="670"
@@ -93534,33 +93534,33 @@
        y="360.20483"
        x="365.61026"
        id="tspan16195-3-3"
-       sodipodi:role="line">%% CRITICAL WARNING INFO DEBUG %%</tspan></text>
+       sodipodi:role="line">%% LOG_CRITICAL LOG_WARNING LOG_INFO LOG_DEBUG %%</tspan></text>
   <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="CRITICAL"
+     id="LOG_CRITICAL"
      y="368.36218"
-     x="409"
+     x="425"
      height="23.999981"
      width="23.999981" />
   <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="WARNING"
+     id="LOG_WARNING"
      y="367.86218"
-     x="473"
+     x="521"
      height="23.999981"
      width="23.999981" />
   <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="INFO"
+     id="LOG_INFO"
      y="367.36218"
-     x="525"
+     x="605"
      height="23.999981"
      width="23.999981" />
   <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="DEBUG"
+     id="LOG_DEBUG"
      y="367.36218"
-     x="568"
+     x="682"
      height="23.999981"
      width="23.999981" />
   <path
@@ -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,-338.01425,-305.25604)" />
+     transform="matrix(1.8061017,0,0,1.8061017,-322.01425,-305.25604)" />
   <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 417.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 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"
      id="path18476"
      inkscape:connector-curvature="0" />
   <path
@@ -93595,18 +93595,18 @@
      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(-0.44552723,10.971182)" />
+     transform="translate(47.554473,10.971182)" />
   <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="403.38782"
+     x="443.67981"
      y="461.09991"
      id="text19292"
      sodipodi:linespacing="125%"
      transform="scale(1.191303,0.839417)"><tspan
        sodipodi:role="line"
        id="tspan19294"
-       x="403.38782"
+       x="443.67981"
        y="461.09991">!</tspan></text>
   <path
      sodipodi:type="arc"
@@ -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,-222.01425,-306.25604)" />
+     transform="matrix(1.8061017,0,0,1.8061017,-142.01425,-306.25604)" />
   <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="412.4111"
+     x="474.33417"
      y="498.97501"
      id="text19314"
      sodipodi:linespacing="125%"
      transform="scale(1.2919212,0.77404101)"><tspan
        sodipodi:role="line"
        id="tspan19316"
-       x="412.4111"
+       x="474.33417"
        y="498.97501">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"
      id="rect19318"
      width="21.38998"
      height="19.622213"
-     x="569.30499"
+     x="683.30499"
      y="369.55106" />
   <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 569.81323,379.69702 6.40816,0 2.17016,-3.75883 3.95368,6.84797 2.08109,-3.60455 5.76043,0"
+     d="m 683.81323,379.69702 6.40816,0 2.17016,-3.75883 3.95368,6.84797 2.08109,-3.60455 5.76043,0"
      id="path19324"
      inkscape:connector-curvature="0"
      sodipodi:nodetypes="cccccc" />