diff --git a/Documentation/compiling/mac-osx.txt b/Documentation/compiling/mac-osx.txt index e26f194315..c7b63d17a0 100644 --- a/Documentation/compiling/mac-osx.txt +++ b/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 diff --git a/artwork/AND_ANSI.svg b/artwork/AND_ANSI.svg new file mode 100644 index 0000000000..56c8efb1f9 --- /dev/null +++ b/artwork/AND_ANSI.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + \ No newline at end of file diff --git a/artwork/Document-new.svg b/artwork/Document-new.svg new file mode 100644 index 0000000000..b1a339c332 --- /dev/null +++ b/artwork/Document-new.svg @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + New Document + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/artwork/Not-gate-en.svg b/artwork/Not-gate-en.svg new file mode 100644 index 0000000000..4b73912242 --- /dev/null +++ b/artwork/Not-gate-en.svg @@ -0,0 +1,20 @@ + + + + + + + image/svg+xml + + + + + + + A + + + + out + + \ No newline at end of file diff --git a/artwork/cvpcb.svg b/artwork/cvpcb.svg new file mode 100644 index 0000000000..af91ac4e5b --- /dev/null +++ b/artwork/cvpcb.svg @@ -0,0 +1,704 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/artwork/cvpcb_doc.svg b/artwork/cvpcb_doc.svg new file mode 100644 index 0000000000..590ac0d8fa --- /dev/null +++ b/artwork/cvpcb_doc.svg @@ -0,0 +1,758 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/artwork/kicad.svg b/artwork/kicad.svg new file mode 100644 index 0000000000..980fd8fef6 --- /dev/null +++ b/artwork/kicad.svg @@ -0,0 +1,91 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/artwork/kicad_doc.svg b/artwork/kicad_doc.svg new file mode 100644 index 0000000000..71cacfafe5 --- /dev/null +++ b/artwork/kicad_doc.svg @@ -0,0 +1,407 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/artwork/kicad_pro.svg b/artwork/kicad_pro.svg new file mode 100644 index 0000000000..03e3cc292c --- /dev/null +++ b/artwork/kicad_pro.svg @@ -0,0 +1,438 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PRO + + diff --git a/cvpcb/cvpcb.icns b/cvpcb/cvpcb.icns index 360820273d..643412ff8b 100644 Binary files a/cvpcb/cvpcb.icns and b/cvpcb/cvpcb.icns differ diff --git a/cvpcb/cvpcb_doc.icns b/cvpcb/cvpcb_doc.icns index f1c122851b..ec0124da7d 100644 Binary files a/cvpcb/cvpcb_doc.icns and b/cvpcb/cvpcb_doc.icns differ diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt index 670a8c4d77..9942764872 100644 --- a/eeschema/CMakeLists.txt +++ b/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) diff --git a/eeschema/Info.plist b/eeschema/Info.plist index 69f9dce884..4f09b8d389 100644 --- a/eeschema/Info.plist +++ b/eeschema/Info.plist @@ -10,7 +10,7 @@ sch CFBundleTypeIconFile - eeschema_doc.icns + eeschema.icns CFBundleTypeName eeschema document LSHandlerRank diff --git a/eeschema/eeschema.icns b/eeschema/eeschema.icns index c4e9ded119..4187f071ce 100644 Binary files a/eeschema/eeschema.icns and b/eeschema/eeschema.icns differ diff --git a/eeschema/eeschema_doc.icns b/eeschema/eeschema_doc.icns deleted file mode 100644 index 2d776c463d..0000000000 Binary files a/eeschema/eeschema_doc.icns and /dev/null differ diff --git a/include/macros.h b/include/macros.h index 17abdd50ab..0c7b5fd9c3 100644 --- a/include/macros.h +++ b/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 */ diff --git a/kicad/file_pro.icns b/kicad/file_pro.icns index 7cd4df4c32..28921b181b 100644 Binary files a/kicad/file_pro.icns and b/kicad/file_pro.icns differ diff --git a/kicad/kicad.icns b/kicad/kicad.icns index fc9d052862..8184f846cd 100644 Binary files a/kicad/kicad.icns and b/kicad/kicad.icns differ diff --git a/kicad/kicad_doc.icns b/kicad/kicad_doc.icns index 27d4b54512..b877d8c2ce 100644 Binary files a/kicad/kicad_doc.icns and b/kicad/kicad_doc.icns differ diff --git a/kicad/menubar.cpp b/kicad/menubar.cpp index 1883f6daf5..c0bea3cf57 100644 --- a/kicad/menubar.cpp +++ b/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 */