Merge icon rework and OS X updates

.bzrignore

 eeschema/cmp_library_base.cpp
 eeschema/cmp_library_base.h
 pcbnew/dialog_freeroute_exchange_help_html.h
+Makefile
+CMakeFiles
+CMakeCache.txt
+auto_renamed_to_cpp
+Testing
+version.h
+config.h
+install_manifest.txt
+*.cmake

Documentation/compiling/mac-osx.txt

@@ -47,6 +47,11 @@ make
 sudo make install
 
 
+Move the old Mac OS X wxconfig and symlink it to the new compiled 2.9
+
+sudo mv /usr/bin/wx-config /usr/bin/wx-config.osx
+sudo ln -s /opt/wxwidgets-svn/bin/wx-config /usr
+
 Building KiCad
 ~~~~~~~~~~~~~~
 Extract the sources or get them from subversion.
@@ -113,3 +118,14 @@ Installing rosetta and xcode with all architectures fixes this "problem"
 ld: warning: in /Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks//QuickTime.framework/QuickTime, missing required architecture x86_64 in file
 
 You get this error because the QuickTime 10.6 framework is not build with 64bit support. This not a real issue for KiCad because we don't use it anyway.
+
+
+Undefined symbols:
+  "TestForIntersectionOfStraightLineSegments(int, int, int, int, int, int, int, int, int*, int*, double*)", referenced from:
+      clipLine(EDA_Rect*, int&, int&, int&, int&)in libcommon.a(gr_basic.cpp.o)
+
+Make sure you marked the build type Release:
+
+//Choose the type of build, options are: None(CMAKE_CXX_FLAGS or
+// CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.
+CMAKE_BUILD_TYPE:STRING=Release
\ No newline at end of file

artwork/AND_ANSI.svg

+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="100" height="50" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" version="1.0" sodipodi:docname="AND ANSI.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs id="defs4">
+    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 15 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="50 : 15 : 1" inkscape:persp3d-origin="25 : 10 : 1" id="perspective2714"/>
+    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="1 : 0.5 : 1" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" id="perspective2806"/>
+    <inkscape:perspective id="perspective2819" inkscape:persp3d-origin="372.04724 : 350.78739 : 1" inkscape:vp_z="744.09448 : 526.18109 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 526.18109 : 1" sodipodi:type="inkscape:persp3d"/>
+    <inkscape:perspective id="perspective2777" inkscape:persp3d-origin="75 : 40 : 1" inkscape:vp_z="150 : 60 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 60 : 1" sodipodi:type="inkscape:persp3d"/>
+    <inkscape:perspective id="perspective3275" inkscape:persp3d-origin="50 : 33.333333 : 1" inkscape:vp_z="100 : 50 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 50 : 1" sodipodi:type="inkscape:persp3d"/>
+    <inkscape:perspective id="perspective5533" inkscape:persp3d-origin="32 : 21.333333 : 1" inkscape:vp_z="64 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 32 : 1" sodipodi:type="inkscape:persp3d"/>
+  </defs>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="8" inkscape:cx="56.698348" inkscape:cy="25.326899" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" inkscape:grid-bbox="true" inkscape:grid-points="true" gridtolerance="10000" inkscape:window-width="1399" inkscape:window-height="874" inkscape:window-x="33" inkscape:window-y="0" inkscape:snap-bbox="true">
+    <inkscape:grid id="GridFromPre046Settings" type="xygrid" originx="0px" originy="0px" spacingx="1px" spacingy="1px" color="#0000ff" empcolor="#0000ff" opacity="0.2" empopacity="0.4" empspacing="5" visible="true" enabled="true"/>
+  </sodipodi:namedview>
+  <metadata id="metadata7">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1">
+    <path style="fill: none; stroke: rgb(0, 0, 0); stroke-width: 2; stroke-linecap: butt; stroke-linejoin: miter; stroke-opacity: 1;" d="m 70,25 c 20,0 25,0 25,0" id="path3059" sodipodi:nodetypes="cc"/>
+    <path style="fill: none; stroke: rgb(0, 0, 0); stroke-width: 2; stroke-linecap: butt; stroke-linejoin: miter; stroke-opacity: 1;" d="M 31,15 5,15" id="path3061"/>
+    <path style="fill: none; stroke: rgb(0, 0, 0); stroke-width: 2; stroke-linecap: butt; stroke-linejoin: miter; stroke-opacity: 1;" d="M 32,35 5,35" id="path3944"/>
+    <path style="font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; font-stretch: normal; text-indent: 0pt; text-align: start; text-decoration: none; line-height: normal; letter-spacing: normal; word-spacing: normal; text-transform: none; direction: ltr; text-anchor: start; fill: rgb(0, 0, 0); fill-opacity: 1; stroke: none; stroke-width: 3; marker: none; visibility: visible; display: inline; overflow: visible; font-family: Bitstream Vera Sans;" d="M 30,5 L 30,6.4285714 L 30,43.571429 L 30,45 L 31.428571,45 L 50.47619,45 C 61.744098,45 70.47619,35.999955 70.47619,25 C 70.47619,14.000045 61.744099,5.0000002 50.47619,5 C 50.47619,5 50.47619,5 31.428571,5 L 30,5 z M 32.857143,7.8571429 C 40.834264,7.8571429 45.918368,7.8571429 48.095238,7.8571429 C 49.285714,7.8571429 49.880952,7.8571429 50.178571,7.8571429 C 50.327381,7.8571429 50.409227,7.8571429 50.446429,7.8571429 C 50.465029,7.8571429 50.471543,7.8571429 50.47619,7.8571429 C 60.236853,7.857143 67.142857,15.497098 67.142857,25 C 67.142857,34.502902 59.760662,42.142857 50,42.142857 L 32.857143,42.142857 L 32.857143,7.8571429 z" id="path2884" sodipodi:nodetypes="ccccccsccccsssssccc"/>
+  </g>
+</svg>
\ No newline at end of file

artwork/Not-gate-en.svg

+<?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://web.resource.org/cc/" 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://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg2" sodipodi:version="0.32" inkscape:version="0.43" width="400pt" height="144pt" sodipodi:docbase="D:\wiki_svg" sodipodi:docname="Not-gate-en.png.svg" version="1.0">
+  <metadata id="metadata7">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs5"/>
+  <sodipodi:namedview inkscape:window-height="652" inkscape:window-width="756" inkscape:pageshadow="2" inkscape:pageopacity="0.0" borderopacity="1.0" bordercolor="#666666" pagecolor="#ffffff" id="base" inkscape:showpageshadow="false" borderlayer="top" inkscape:zoom="0.70710678" inkscape:cx="299.78322" inkscape:cy="81.877528" inkscape:window-x="66" inkscape:window-y="66" inkscape:current-layer="svg2"/>
+  <text xml:space="preserve" style="font-size: 72px; font-style: normal; font-variant: normal; font-weight: normal; font-stretch: normal; text-align: start; line-height: 125%; text-anchor: start; fill: rgb(0, 0, 0); fill-opacity: 1; stroke: none; stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-opacity: 1; font-family: Verdana;" x="9" y="116.174" id="text1308" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan1310" x="9" y="116.174">A</tspan></text>
+  <path style="fill: none; fill-opacity: 0.75; fill-rule: evenodd; stroke: rgb(0, 0, 0); stroke-width: 7.5; stroke-linecap: round; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-opacity: 1;" d="M 72,90 L 185,90" id="path1316"/>
+  <use x="0" y="0" xlink:href="#path1316" id="use2208" transform="translate(196.576)" width="500" height="180"/>
+  <path style="fill: rgb(255, 255, 255); fill-opacity: 1; fill-rule: evenodd; stroke: rgb(0, 0, 0); stroke-width: 7.5; stroke-linecap: butt; stroke-linejoin: round; stroke-miterlimit: 4; stroke-dashoffset: 0pt; stroke-opacity: 1;" d="M 148,10.750011 L 261.2807,89.999989 L 148,169.24995 L 148,10.750011 z " id="rect2193" sodipodi:nodetypes="cccc"/>
+  <text xml:space="preserve" style="font-size: 56px; font-style: normal; font-variant: normal; font-weight: normal; font-stretch: normal; text-align: start; line-height: 125%; text-anchor: start; fill: rgb(0, 0, 0); fill-opacity: 1; stroke: none; stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-opacity: 1; font-family: Verdana;" x="395.412" y="109.236" id="text2210" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan2212" x="395.412" y="109.236">out</tspan></text>
+  <path sodipodi:type="arc" style="opacity: 1; fill: rgb(255, 255, 255); fill-opacity: 1; fill-rule: evenodd; stroke: rgb(0, 0, 0); stroke-width: 7.5; stroke-linecap: round; stroke-linejoin: round; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1;" id="path2247" sodipodi:cx="285.3176" sodipodi:cy="89.843887" sodipodi:rx="20.152544" sodipodi:ry="20.152544" d="M 305.47014 89.843887 A 20.152544 20.152544 0 1 1  265.16505,89.843887 A 20.152544 20.152544 0 1 1  305.47014 89.843887 z" transform="translate(-2.82842, 0.156093)"/>
+</svg>
\ No newline at end of file

eeschema/CMakeLists.txt

@@ -148,8 +148,6 @@ if(APPLE)
     set(EESCHEMA_RESOURCES eeschema.icns eeschema_doc.icns)
     set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/eeschema.icns"
                                 PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
-    set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/eeschema_doc.icns"
-                                PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
     set(MACOSX_BUNDLE_ICON_FILE eeschema.icns)
     set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.eeschema)
 endif(APPLE)

eeschema/Info.plist

@@ -10,7 +10,7 @@
 				<string>sch</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>eeschema_doc.icns</string>
+			<string>eeschema.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>eeschema document</string>
 			<key>LSHandlerRank</key>

include/macros.h

@@ -128,7 +128,11 @@ static inline void ADD_MENUITEM( wxMenu* menu, int id,
     wxMenuItem* l_item;
 
     l_item = new wxMenuItem( menu, id, text );
+
+#if !defined( __WXMAC__ )
     l_item->SetBitmap( icon );
+#endif /* !defined( __WXMAC__ ) */
+
     menu->Append( l_item );
 };
 
@@ -140,7 +144,11 @@ static inline void ADD_MENUITEM_WITH_HELP( wxMenu* menu, int id,
     wxMenuItem* l_item;
 
     l_item = new wxMenuItem( menu, id, text, help );
+
+#if !defined( __WXMAC__ )
     l_item->SetBitmap( icon );
+#endif /* !defined( __WXMAC__ ) */
+
     menu->Append( l_item );
 };
 
@@ -182,7 +190,11 @@ static inline void ADD_MENUITEM_WITH_SUBMENU( wxMenu* menu, wxMenu* submenu,
 
     l_item = new wxMenuItem( menu, id, text );
     l_item->SetSubMenu( submenu );
+
+#if !defined( __WXMAC__ )
     l_item->SetBitmap( icon );
+#endif /* !defined( __WXMAC__ ) */
+
     menu->Append( l_item );
 };
 
@@ -197,16 +209,20 @@ static inline void ADD_MENUITEM_WITH_HELP_AND_SUBMENU( wxMenu*         menu,
 
     l_item = new wxMenuItem( menu, id, text, help );
     l_item->SetSubMenu( submenu );
+
+#if !defined( __WXMAC__ )
     l_item->SetBitmap( icon );
+#endif /* !defined( __WXMAC__ ) */
+
     menu->Append( l_item );
 };
 
 #endif
 
 #ifdef __WINDOWS__
-#define SETBITMAPS( icon ) item->SetBitmaps( apply_xpm, (icon) )
+#  define SETBITMAPS( icon ) item->SetBitmaps( apply_xpm, (icon) )
 #else
-#define SETBITMAPS( icon )
+#  define SETBITMAPS( icon )
 #endif
 
 #endif /* ifdef MACRO_H */

kicad/menubar.cpp

@@ -88,7 +88,11 @@ void WinEDA_MainFrame::ReCreateMenuBar()
     /* Open */
     item = new wxMenuItem( filesMenu, ID_LOAD_PROJECT, _( "&Open\tCtrl+O" ),
                            _( "Open an existing project" ) );
+
+#if !defined( __WXMAC__ )
     item->SetBitmap( open_project_xpm );
+#endif /* !defined( __WXMAC__ ) */
+
     filesMenu->Append( item );
 
     /* Open Recent submenu */
@@ -102,13 +106,21 @@ void WinEDA_MainFrame::ReCreateMenuBar()
     /* New */
     item = new wxMenuItem( filesMenu, ID_NEW_PROJECT, _( "&New\tCtrl+N" ),
                            _( "Start a new project" ) );
+
+#if !defined( __WXMAC__ )
     item->SetBitmap( new_project_xpm );
+#endif /* !defined( __WXMAC__ ) */
+
     filesMenu->Append( item );
 
     /* Save */
     item = new wxMenuItem( filesMenu, ID_SAVE_PROJECT, _( "&Save\tCtrl+S" ),
                            _( "Save current project" ) );
+
+#if !defined( __WXMAC__ )
     item->SetBitmap( save_project_xpm );
+#endif /* !defined( __WXMAC__ ) */
+
     filesMenu->Append( item );
 
     /* Separator */
@@ -117,13 +129,21 @@ void WinEDA_MainFrame::ReCreateMenuBar()
     /* Archive */
     item = new wxMenuItem( filesMenu, ID_SAVE_AND_ZIP_FILES, _( "&Archive" ),
                            _( "Archive project files in zip archive" ) );
+
+#if !defined( __WXMAC__ )
     item->SetBitmap( zip_xpm );
+#endif /* !defined( __WXMAC__ ) */
+
     filesMenu->Append( item );
 
     /* Unarchive */
     item = new wxMenuItem( filesMenu, ID_READ_ZIP_ARCHIVE, _( "&Unarchive" ),
                            _( "Unarchive project files from zip file" ) );
+
+#if !defined( __WXMAC__ )
     item->SetBitmap( unzip_xpm );
+#endif /* !defined( __WXMAC__ ) */
+
     filesMenu->Append( item );
 
     /* Quit on all platforms except WXMAC */
@@ -147,14 +167,20 @@ void WinEDA_MainFrame::ReCreateMenuBar()
     /* Text editor */
     item = new wxMenuItem( browseMenu, ID_TO_EDITOR, _( "Text E&ditor" ),
                            _( "Open prefered text editor" ) );
+#if !defined( __WXMAC__ )
     item->SetBitmap( editor_xpm );
+#endif /* !defined( __WXMAC__ ) */
+
     browseMenu->Append( item );
 
     /* Browse files */
     item = new wxMenuItem( browseMenu, ID_BROWSE_AN_SELECT_FILE,
                            _( "&View File" ),
                            _( "View, read or edit file with a text editor" ) );
+#if !defined( __WXMAC__ )
     item->SetBitmap( browse_files_xpm );
+#endif /* !defined( __WXMAC__ ) */
+
     browseMenu->Append( item );
 
 
@@ -168,7 +194,10 @@ void WinEDA_MainFrame::ReCreateMenuBar()
     item = new wxMenuItem( PreferencesMenu, ID_SELECT_PREFERED_EDITOR,
                            _( "&Text Editor" ),
                            _( "Select your prefered text editor" ) );
+#if !defined( __WXMAC__ )
     item->SetBitmap( editor_xpm );
+#endif /* !defined( __WXMAC__ ) */
+
     PreferencesMenu->Append( item );
 
     /**
@@ -183,7 +212,11 @@ void WinEDA_MainFrame::ReCreateMenuBar()
                            _( "Default" ),
                            _( "Use system default PDF viewer used to browse datasheets" ),
                            wxITEM_CHECK );
+
+#if !defined( __WXMAC__ )
     SETBITMAPS( datasheet_xpm );
+#endif /* !defined( __WXMAC__ ) */
+
     SubMenuPdfBrowserChoice->Append( item );
     SubMenuPdfBrowserChoice->Check( ID_SELECT_DEFAULT_PDF_BROWSER,
                                     wxGetApp().m_PdfBrowserIsDefault );
@@ -194,7 +227,10 @@ void WinEDA_MainFrame::ReCreateMenuBar()
                            _( "Favourite" ),
                            _( "Use your favourite PDF viewer used to browse datasheets" ),
                            wxITEM_CHECK );
+#if !defined( __WXMAC__ )
     SETBITMAPS( preference_xpm );
+#endif /* !defined( __WXMAC__ ) */
+
     SubMenuPdfBrowserChoice->Append( item );
     SubMenuPdfBrowserChoice->AppendSeparator();
     SubMenuPdfBrowserChoice->Check( ID_SELECT_PREFERED_PDF_BROWSER,
@@ -205,7 +241,10 @@ void WinEDA_MainFrame::ReCreateMenuBar()
                            ID_SELECT_PREFERED_PDF_BROWSER_NAME,
                            _( "PDF Viewer" ),
                            _( "Select your favourite PDF viewer used to browse datasheets" ) );
+#if !defined( __WXMAC__ )
     item->SetBitmap( datasheet_xpm );
+#endif /* !defined( __WXMAC__ ) */
+
     SubMenuPdfBrowserChoice->Append( item );
 
     ADD_MENUITEM_WITH_HELP_AND_SUBMENU( PreferencesMenu,
@@ -227,7 +266,10 @@ void WinEDA_MainFrame::ReCreateMenuBar()
     /* Contents */
     item = new wxMenuItem( helpMenu, ID_GENERAL_HELP, _( "&Contents" ),
                            _( "Open the kicad manual" ) );
+#if !defined( __WXMAC__ )
     item->SetBitmap( online_help_xpm );
+#endif /* !defined( __WXMAC__ ) */
+
     helpMenu->Append( item );
 
     /* About on all platforms except WXMAC */