Commit 3b55948d authored by jean-pierre charras's avatar jean-pierre charras
Browse files

fix an issue created by commit 2954. Gerbview: display now an indicator of... 

fix an issue created by commit 2954. Gerbview: display now an indicator of layers in use. minor code cleanup.
parent df8f7d1e

CHANGELOG.txt

+23 −1
Original line number Original line Diff line number Diff line
@@ -17,6 +17,28 @@ EESschema & PCBNew: 
     Fix about and preferences wxMenu to be more native (remove unneeded WXMAC )

     Fix about and preferences wxMenu to be more native (remove unneeded WXMAC )

     Disable all icons in wxMenu on OSX with macro SETBITMAPS

     Disable all icons in wxMenu on OSX with macro SETBITMAPS





jp charras:

    SETBITMAPS is incorrectly used here. change to SET_BITMAP



2011-Mar-25 UPDATE Wayne Stambaugh <stambaughw@verizon.net>

================================================================================

  EESchema multiple item hit testing and other minor improvements.



  * Add item clarification context menu to EESchema when multiple unresolved

    items are found at the current cross hair position.

  * Add collector class SCH_COLLECTOR for supporting multiple item hit testing.

  * Removed bit wise masked filtering from schematic item hit testing.

  * Removed all old hit testing functions and methods scattered about the

    EESchema source code.

  * Move terminal point test function into SCH_SCREEN object.

  * Fixed bug in terminal point test when terminating a bus to a label.

  * Define the < operator for sorting schematic items.

  * Add area calculation method to EDA_Rect item.

  * Add method for returning an item's bitmap for menu display purposes.

  * Add method for returning an item's menu text for menu display purposes.

  * Changed EDA_ITEMS container from boost::ptr_vector to std::vector.

  * Factor coordinate string conversion code from EDA_DRAW_FRAME to function CoordinateToString().



2011-Mar-16, UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>

2011-Mar-16, UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>

================================================================================

================================================================================

Gerbview:

Gerbview:

bitmaps/CMakeLists.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -416,6 +416,7 @@ set(BITMAP_SRCS 
    Width_Track_Via.xpm

    Width_Track_Via.xpm

    Width_Track.xpm

    Width_Track.xpm

    Width_Vias.xpm

    Width_Vias.xpm

    window_close.xpm

    zip_tool.xpm

    zip_tool.xpm

    zip.xpm

    zip.xpm

    zoom.xpm

    zoom.xpm

bitmaps/sources/window_close.svg

0 → 100644
+306 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="no"?>

<!-- Created with Inkscape (http://www.inkscape.org/) -->



<svg

   xmlns:dc="http://purl.org/dc/elements/1.1/"

   xmlns:cc="http://creativecommons.org/ns#"

   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"

   xmlns:svg="http://www.w3.org/2000/svg"

   xmlns="http://www.w3.org/2000/svg"

   xmlns:xlink="http://www.w3.org/1999/xlink"

   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"

   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

   height="16"

   id="svg7216"

   inkscape:output_extension="org.inkscape.output.svg.inkscape"

   inkscape:version="0.48.1 "

   sodipodi:docname="window-close.svg"

   sodipodi:version="0.32"

   width="16"

   version="1.1"

   inkscape:export-filename="F:\kicad-launchpad\testing\bitmaps\sources\window-close.png"

   inkscape:export-xdpi="90"

   inkscape:export-ydpi="90">

  <metadata

     id="metadata3">

    <rdf:RDF>

      <cc:Work

         rdf:about="">

        <dc:title></dc:title>

        <dc:description />

        <dc:subject>

          <rdf:Bag>

            <rdf:li>unsorted</rdf:li>

          </rdf:Bag>

        </dc:subject>

        <dc:publisher>

          <cc:Agent

             rdf:about="http://www.openclipart.org/">

            <dc:title>Open Clip Art Library, Source: GNOME-Colors, Source: GNOME-Colors, Source: GNOME-Colors, Source: GNOME-Colors, Source: GNOME-Colors, Source: GNOME-Colors, Source: GNOME-Colors, Source: GNOME-Colors, Source: GNOME-Colors, Source: GNOME-Colors, Source: GNOME-Colors, Source: GNOME-Colors, Source: GNOME-Colors, Source: GNOME-Colors, Source: GNOME-Colors</dc:title>

          </cc:Agent>

        </dc:publisher>

        <dc:creator>

          <cc:Agent>

            <dc:title />

          </cc:Agent>

        </dc:creator>

        <dc:rights>

          <cc:Agent>

            <dc:title />

          </cc:Agent>

        </dc:rights>

        <dc:date />

        <dc:format>image/svg+xml</dc:format>

        <dc:type

           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />

        <cc:license

           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />

        <dc:language>en</dc:language>

      </cc:Work>

    </rdf:RDF>

  </metadata>

  <defs

     id="defs7218">

    <linearGradient

       id="linearGradient7916">

      <stop

         id="stop7918"

         offset="0"

         style="stop-color:#ffffff;stop-opacity:1;" />

      <stop

         id="stop7920"

         offset="1.0000000"

         style="stop-color:#ffffff;stop-opacity:0" />

    </linearGradient>

    <linearGradient

       gradientTransform="matrix(1.0494758,-1.0494758,1.0494758,1.0494758,-26.939092,23.169297)"

       gradientUnits="userSpaceOnUse"

       id="linearGradient2181"

       inkscape:collect="always"

       x1="31.972097"

       x2="12.717501"

       xlink:href="#linearGradient7916"

       y1="17.041941"

       y2="36.296539" />

    <linearGradient

       id="linearGradient7955"

       inkscape:collect="always">

      <stop

         id="stop7957"

         offset="0"

         style="stop-color:#c22f2f;stop-opacity:1" />

      <stop

         id="stop7959"

         offset="1"

         style="stop-color:#a40000;stop-opacity:1" />

    </linearGradient>

    <linearGradient

       gradientUnits="userSpaceOnUse"

       id="linearGradient7961"

       inkscape:collect="always"

       x1="23.172504"

       x2="23.099995"

       xlink:href="#linearGradient7955"

       y1="6.0004601"

       y2="43.000458" />

    <linearGradient

       id="linearGradient3165">

      <stop

         id="stop3167"

         offset="0"

         style="stop-color:#e78181;stop-opacity:1" />

      <stop

         id="stop8599"

         offset="0.25"

         style="stop-color:#e15f5f;stop-opacity:1" />

      <stop

         id="stop8601"

         offset="0.68000001"

         style="stop-color:#c22f2f;stop-opacity:1" />

      <stop

         id="stop3169"

         offset="1"

         style="stop-color:#a40000;stop-opacity:1" />

    </linearGradient>

    <radialGradient

       cx="6.5734448"

       cy="24.500458"

       fx="6.5734448"

       fy="24.500458"

       gradientTransform="matrix(-2.1314195e-8,2.5479117,-4.8841578,-2.2328085e-8,144.16406,-10.748097)"

       gradientUnits="userSpaceOnUse"

       id="radialGradient7958"

       inkscape:collect="always"

       r="18.500046"

       xlink:href="#linearGradient3165" />

    <linearGradient

       id="linearGradient2091">

      <stop

         id="stop2093"

         offset="0"

         style="stop-color:#000000;stop-opacity:1;" />

      <stop

         id="stop2095"

         offset="1"

         style="stop-color:#000000;stop-opacity:0;" />

    </linearGradient>

    <radialGradient

       cx="23.070683"

       cy="35.127438"

       fx="23.070683"

       fy="35.127438"

       gradientTransform="matrix(0.914812,0.01265023,-0.00821502,0.213562,2.253914,27.18889)"

       gradientUnits="userSpaceOnUse"

       id="radialGradient2177"

       inkscape:collect="always"

       r="10.31934"

       xlink:href="#linearGradient2091" />

    <radialGradient

       inkscape:collect="always"

       xlink:href="#linearGradient2091"

       id="radialGradient3009"

       gradientUnits="userSpaceOnUse"

       gradientTransform="matrix(0.914812,0.01265023,-0.00821502,0.213562,2.253914,27.18889)"

       cx="23.070683"

       cy="35.127438"

       fx="23.070683"

       fy="35.127438"

       r="10.31934" />

    <radialGradient

       inkscape:collect="always"

       xlink:href="#linearGradient3165"

       id="radialGradient3011"

       gradientUnits="userSpaceOnUse"

       gradientTransform="matrix(-2.1314195e-8,2.5479117,-4.8841578,-2.2328085e-8,144.16406,-10.748097)"

       cx="6.5734448"

       cy="24.500458"

       fx="6.5734448"

       fy="24.500458"

       r="18.500046" />

    <linearGradient

       inkscape:collect="always"

       xlink:href="#linearGradient7955"

       id="linearGradient3013"

       gradientUnits="userSpaceOnUse"

       x1="23.172504"

       y1="6.0004601"

       x2="23.099995"

       y2="43.000458" />

    <linearGradient

       inkscape:collect="always"

       xlink:href="#linearGradient7916"

       id="linearGradient3015"

       gradientUnits="userSpaceOnUse"

       gradientTransform="matrix(1.0494758,-1.0494758,1.0494758,1.0494758,-26.939092,23.169297)"

       x1="31.972097"

       y1="17.041941"

       x2="12.717501"

       y2="36.296539" />

    <linearGradient

       inkscape:collect="always"

       xlink:href="#linearGradient7916"

       id="linearGradient3018"

       gradientUnits="userSpaceOnUse"

       gradientTransform="matrix(0.36503505,-0.42195894,0.36503505,0.42195894,-9.7179447,38.820541)"

       x1="31.972097"

       y1="17.041941"

       x2="12.717501"

       y2="36.296539" />

    <radialGradient

       inkscape:collect="always"

       xlink:href="#linearGradient3165"

       id="radialGradient3021"

       gradientUnits="userSpaceOnUse"

       gradientTransform="matrix(0,1.0244296,-1.6988375,0,49.796194,25.183498)"

       cx="6.5734448"

       cy="24.500458"

       fx="6.5734448"

       fy="24.500458"

       r="18.500046" />

    <linearGradient

       inkscape:collect="always"

       xlink:href="#linearGradient7955"

       id="linearGradient3023"

       gradientUnits="userSpaceOnUse"

       x1="23.172504"

       y1="6.0004601"

       x2="23.099995"

       y2="43.000458"

       gradientTransform="matrix(0.34782608,0,0,0.40206638,-0.34782593,29.504946)" />

    <radialGradient

       inkscape:collect="always"

       xlink:href="#linearGradient3165"

       id="radialGradient3030"

       gradientUnits="userSpaceOnUse"

       gradientTransform="matrix(0,1.0244296,-1.6988375,0,49.796194,25.183498)"

       cx="6.5734448"

       cy="24.500458"

       fx="6.5734448"

       fy="24.500458"

       r="18.500046" />

    <linearGradient

       inkscape:collect="always"

       xlink:href="#linearGradient7955"

       id="linearGradient3032"

       gradientUnits="userSpaceOnUse"

       gradientTransform="matrix(0.34782608,0,0,0.40206638,-0.34782593,29.504946)"

       x1="23.172504"

       y1="6.0004601"

       x2="23.099995"

       y2="43.000458" />

    <linearGradient

       inkscape:collect="always"

       xlink:href="#linearGradient7916"

       id="linearGradient3034"

       gradientUnits="userSpaceOnUse"

       gradientTransform="matrix(0.36503505,-0.42195894,0.36503505,0.42195894,-9.7179447,38.820541)"

       x1="31.972097"

       y1="17.041941"

       x2="12.717501"

       y2="36.296539" />

  </defs>

  <sodipodi:namedview

     bordercolor="#666666"

     borderopacity="1.0"

     id="base"

     inkscape:current-layer="layer1"

     inkscape:cx="8"

     inkscape:cy="8.0342101"

     inkscape:document-units="px"

     inkscape:grid-bbox="true"

     inkscape:pageopacity="0.0"

     inkscape:pageshadow="2"

     inkscape:window-height="686"

     inkscape:window-width="936"

     inkscape:window-x="0"

     inkscape:window-y="25"

     inkscape:zoom="30.556833"

     pagecolor="#ffffff"

     showgrid="true"

     borderlayer="false"

     inkscape:showpageshadow="false"

     showborder="true"

     inkscape:window-maximized="0" />

  <g

     id="layer1"

     inkscape:groupmode="layer"

     inkscape:label="Layer 1"

     transform="translate(0,-32)">

    <g

       id="g3026"

       transform="matrix(1.2432556,0,0,1.075408,-2.162244,-2.3227293)">

      <path

         inkscape:connector-curvature="0"

         style="font-size:59.90107727px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:url(#radialGradient3030);fill-opacity:1;stroke:url(#linearGradient3032);stroke-width:0.37396413;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Bitstream Vera Sans"

         sodipodi:nodetypes="ccccccccccccc"

         id="text1314"

         d="m 14.434782,43.577454 -3.652205,-4.42273 3.652175,-4.020664 -2.608696,-3.015497 -3.6521739,4.221696 -3.6521735,-4.221696 -2.6086952,3.015497 3.6521731,4.020664 -3.6521731,4.42273 2.6086952,3.015497 3.6521735,-4.221697 3.3043479,4.221697 2.956552,-3.015497 z" />

      <path

         inkscape:connector-curvature="0"

         style="font-size:59.90107727px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:0.4;fill:none;stroke:url(#linearGradient3034);stroke-width:0.37396413;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Bitstream Vera Sans"

         sodipodi:nodetypes="ccccccccccccc"

         id="path7076"

         d="m 13.913043,43.577454 -3.652205,-4.42273 3.652174,-4.020664 -2.086956,-2.412398 -3.6520664,4.221697 -3.652281,-4.221697 -2.0869564,2.412398 3.6521734,4.020664 -3.6521734,4.42273 2.0869564,2.412398 3.6521735,-4.221697 3.3043789,4.221513 2.434782,-2.412214 z" />

    </g>

  </g>

</svg>

bitmaps/window_close.xpm

0 → 100644
+38 −0
Original line number Original line Diff line number Diff line 
/* XPM */

const char *window_close_xpm[] = {

/* columns rows colors chars-per-pixel */

"16 16 16 1",

"O c #DE7070",

"& c #BC9392",

"o c #BF9D9C",

"X c #DC6464",

"* c #CA4545",

"% c #D45051",

"- c #C03433",

"+ c #E88080",

"= c #C43C3C",

". c #C2A6A6",

"; c #BC8684",

": c #B47274",

"  c None",

"$ c #BFB0AF",

"@ c #C55A5B",

"# c #DD5A59",

/* pixels */

"  .X.      .X.  ",

" oO+O.    .O+Oo ",

"oOOO+O.  .O+OOOo",

"@OXXXOO..OOXXXO@",

".XO#XXOXXOXX#OX.",

" $@O###OO###O@$ ",

"  $@X######X@$  ",

"   $@X%%%%X@$   ",

"   &@%%%%%%@&   ",

"  &%%******%%&  ",

" o*****%%*****o ",

"o**===****===**o",

"==---==.&*=---==",

"&=---=.  ;=---=.",

" &---o    :--=$ ",

"  &-o      @*   "

};

common/build_version.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ 
#endif

#endif





#ifndef KICAD_BUILD_VERSION

#ifndef KICAD_BUILD_VERSION

#define KICAD_BUILD_VERSION "(2011-04-01)"

#define KICAD_BUILD_VERSION "(2011-04-05)"

#endif

#endif





// uncomment this line only when creating a stable version

// uncomment this line only when creating a stable version