More native changes for OSX, see CHANGELOG.txt (fb475361) · Commits · Elphel / kicad-source-mirror

CHANGELOG.txt

+13 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,19 @@ KiCad ChangeLog 2010
		Please add newer entries at the top, list the date and your name with
		email address.

		2011-Apr-4, UPDATE Jerry Jacobs <xor.gate.engineering@gmail.com>
		================================================================================
		More native OSX changes, this removes some WXMAC defines replaced by wxID
		macros. These are handled by wxWidgets itself and reduces in-app platform
		defines. More work needs to be done for CvPCB and Gerbview.

		All:
		Hotkey names in menu's all have tabs, this looks more uniform and pretty.

		EESschema & PCBNew:
		Fix about and preferences wxMenu to be more native (remove unneeded WXMAC )
		Disable all icons in wxMenu on OSX with macro SETBITMAPS

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

Documentation/compiling/mac-osx.txt

+3 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,9 @@ At time of writing (2009-01-16) this is on line 18381
		into this: OSX_UNIV_OPTS="-arch ppc -arch i386 -arch x86_64"

		Building a universal monolib wxWidgets 2.9 with the following parameters:
		./configure --enable-unicode=yes --enable-shared=no --enable-monolithic --with-opengl --with-expat=builtin --enable-universal_binary --enable-aui --enable-debug --with-osx_cocoa --with-macosx-sdk=/Developer/SDKs/MacOSX10.5.sdk/ --prefix=/opt/wxwidgets-svn
		./configure --enable-unicode=yes --enable-shared=no --enable-monolithic --with-opengl --with-expat=builtin --enable-universal_binary --enable-aui --enable-debug --with-osx_cocoa --with-macosx-sdk=/Developer/SDKs/MacOSX10.5.sdk/ --prefix=/opt/wxwidgets/<rev>

		<rev> Should be subsituded with the revision from SVN

		Then you should a message like this:

common/hotkeys_basic.cpp

+3 −9

Original line number	Diff line number	Diff line
		@@ -189,12 +189,8 @@ wxString AddHotkeyName( const wxString& aText, Ki_HotkeyInfo** aList,
		keyname = ReturnKeyNameFromCommandId( aList, aCommandId );

		if( !keyname.IsEmpty() )
		{
		if( aIsShortCut )
		msg << wxT( "\t" ) << keyname;
		else
		msg << wxT( " <" ) << keyname << wxT( ">" );
		}

		return msg;
		}

		@@ -223,12 +219,10 @@ wxString AddHotkeyName( const wxString& aText,
		{
		List = aDescList->m_HK_InfoList;
		keyname = ReturnKeyNameFromCommandId( List, aCommandId );

		if( !keyname.IsEmpty() )
		{
		if( aIsShortCut )
		msg << wxT( "\t" ) << keyname;
		else
		msg << wxT( " <" ) << keyname << wxT( ">" );
		break;
		}
		}

eeschema/eeschema.cpp

+1 −9

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@


		// Global variables

		bool g_OptNetListUseNames; /* TRUE to use names rather than net
		* The numbers (PSPICE netlist only) */
		wxSize g_RepeatStep;
		@@ -113,13 +112,6 @@ void WinEDA_App::MacOpenFile( const wxString &fileName )

		bool WinEDA_App::OnInit()
		{
		/* WXMAC application specific */
		#ifdef __WXMAC__
		// wxApp::SetExitOnFrameDelete(false);
		wxApp::s_macAboutMenuItemId = ID_KICAD_ABOUT;
		wxApp::s_macPreferencesMenuItemId = ID_OPTIONS_SETUP;
		#endif /* __WXMAC__ */

		wxFileName filename;
		SCH_EDIT_FRAME* frame = NULL;

		@@ -134,7 +126,7 @@ bool WinEDA_App::OnInit()
		if( argc > 1 )
		filename = argv[1];

		/* init EESCHEMA */
		// Init EESchema
		SeedLayers();

		// read current setup and reopen last directory if no filename to open in

eeschema/menubar.cpp

+56 −56

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@
		#include "protos.h"
		#include "eeschema_id.h"
		#include "hotkeys.h"
		#include "macros.h"

		#include "help_common_strings.h"

		@@ -46,13 +47,13 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
		item = new wxMenuItem( filesMenu, ID_NEW_PROJECT, _( "&New\tCtrl+N" ),
		_( "New schematic project" ) );

		item->SetBitmap( new_xpm );
		SETBITMAPS( new_xpm );
		filesMenu->Append( item );

		// Open
		item = new wxMenuItem( filesMenu, ID_LOAD_PROJECT, _( "&Open\tCtrl+O" ),
		_( "Open an existing schematic project" ) );
		item->SetBitmap( open_document_xpm );
		SETBITMAPS( open_document_xpm );
		filesMenu->Append( item );

		// Open Recent submenu
		@@ -69,26 +70,26 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
		item = new wxMenuItem( filesMenu, ID_SAVE_PROJECT,
		_( "&Save Whole Schematic Project\tCtrl+S" ),
		_( "Save all sheets in the schematic project" ) );
		item->SetBitmap( save_project_xpm );
		SETBITMAPS( save_project_xpm );
		filesMenu->Append( item );

		item = new wxMenuItem( filesMenu, ID_SAVE_ONE_SHEET, _( "Save &Current Sheet Only" ),
		_( "Save only current schematic sheet" ) );
		item->SetBitmap( save_xpm );
		SETBITMAPS( save_xpm );
		filesMenu->Append( item );

		// Save as...
		item = new wxMenuItem( filesMenu, ID_SAVE_ONE_SHEET_AS,
		_( "Save Current Sheet &as" ),
		_( "Save current schematic sheet as..." ) );
		item->SetBitmap( save_as_xpm );
		SETBITMAPS( save_as_xpm );
		filesMenu->Append( item );


		// Print
		filesMenu->AppendSeparator();
		item = new wxMenuItem( filesMenu, wxID_PRINT, _( "P&rint" ), _( "Print schematic" ) );
		item->SetBitmap( print_button );
		SETBITMAPS( print_button );
		filesMenu->Append( item );

		// Plot submenu
		@@ -96,25 +97,25 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
		item = new wxMenuItem( choice_plot_fmt, ID_GEN_PLOT_PS,
		_( "Plot PostScript" ),
		_( "Plot schematic sheet in PostScript format" ) );
		item->SetBitmap( plot_PS_xpm );
		SETBITMAPS( plot_PS_xpm );
		choice_plot_fmt->Append( item );

		/* Plot HPGL */
		item = new wxMenuItem( choice_plot_fmt, ID_GEN_PLOT_HPGL, _( "Plot HPGL" ),
		_( "Plot schematic sheet in HPGL format" ) );
		item->SetBitmap( plot_HPG_xpm );
		SETBITMAPS( plot_HPG_xpm );
		choice_plot_fmt->Append( item );

		// Plot SVG
		item = new wxMenuItem( choice_plot_fmt, ID_GEN_PLOT_SVG, _( "Plot SVG" ),
		_( "Plot schematic sheet in SVG format" ) );
		item->SetBitmap( plot_xpm );
		SETBITMAPS( plot_xpm );
		choice_plot_fmt->Append( item );

		// Plot DXF
		item = new wxMenuItem( choice_plot_fmt, ID_GEN_PLOT_DXF, _( "Plot DXF" ),
		_( "Plot schematic sheet in DXF format" ) );
		item->SetBitmap( plot_xpm );
		SETBITMAPS( plot_xpm );
		choice_plot_fmt->Append( item );

		// Under windows, one can draw to the clipboard
		@@ -123,7 +124,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
		item = new wxMenuItem( choice_plot_fmt, ID_GEN_COPY_SHEET_TO_CLIPBOARD,
		_( "Plot to Clipboard" ),
		_( "Export drawings to clipboard" ) );
		item->SetBitmap( copy_button );
		SETBITMAPS( copy_button );
		choice_plot_fmt->Append( item );
		#endif

		@@ -133,15 +134,12 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
		plot_xpm );

		// Quit on all platforms except WXMAC
		#if !defined(__WXMAC__)

		filesMenu->AppendSeparator();

		item = new wxMenuItem( filesMenu, wxID_EXIT, _( "&Quit" ), _( "Quit EESchema" ) );
		item->SetBitmap( exit_xpm );
		SETBITMAPS( exit_xpm );
		filesMenu->Append( item );

		#endif // !defined( __WXMAC__)

		// Edit menu
		wxMenu* editMenu = new wxMenu;

		@@ -149,21 +147,21 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
		text = AddHotkeyName( _( "Undo" ), s_Schematic_Hokeys_Descr, HK_UNDO );

		item = new wxMenuItem( editMenu, wxID_UNDO, text, HELP_UNDO, wxITEM_NORMAL );
		item->SetBitmap( undo_xpm );
		SETBITMAPS( undo_xpm );
		editMenu->Append( item );

		/* Redo */
		text = AddHotkeyName( _( "Redo" ), s_Schematic_Hokeys_Descr, HK_REDO );

		item = new wxMenuItem( editMenu, wxID_REDO, text, HELP_REDO, wxITEM_NORMAL );
		item->SetBitmap( redo_xpm );
		SETBITMAPS( redo_xpm );
		editMenu->Append( item );

		/* Delete */
		editMenu->AppendSeparator();
		item = new wxMenuItem( editMenu, ID_SCHEMATIC_DELETE_ITEM_BUTT,
		_( "Delete" ), HELP_DELETE_ITEMS, wxITEM_NORMAL );
		item->SetBitmap( delete_body_xpm );
		SETBITMAPS( delete_body_xpm );
		editMenu->Append( item );

		/* Separator */
		@@ -172,7 +170,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
		/* Find */
		text = AddHotkeyName( _( "&Find" ), s_Schematic_Hokeys_Descr, HK_FIND_ITEM );
		item = new wxMenuItem( editMenu, ID_FIND_ITEMS, text, HELP_FIND, wxITEM_NORMAL );
		item->SetBitmap( find_xpm );
		SETBITMAPS( find_xpm );
		editMenu->Append( item );

		/* Separator */
		@@ -182,7 +180,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
		item = new wxMenuItem( editMenu, ID_BACKANNO_ITEMS, _( "Backannotate" ),
		_( "Back annotated footprint fields" ),
		wxITEM_NORMAL );
		item->SetBitmap( backanno_xpm );
		SETBITMAPS( backanno_xpm );
		editMenu->Append( item );


		@@ -206,20 +204,20 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
		text = AddHotkeyName( _( "Zoom In" ), s_Schematic_Hokeys_Descr,
		ID_ZOOM_IN, false ); // add comment, not a shortcut
		item = new wxMenuItem( viewMenu, ID_ZOOM_IN, text, HELP_ZOOM_IN, wxITEM_NORMAL );
		item->SetBitmap( zoom_in_xpm );
		SETBITMAPS( zoom_in_xpm );
		viewMenu->Append( item );

		/* Zoom out */
		text = AddHotkeyName( _( "Zoom Out" ), s_Schematic_Hokeys_Descr,
		ID_ZOOM_OUT, false ); // add comment, not a shortcut
		item = new wxMenuItem( viewMenu, ID_ZOOM_OUT, text, HELP_ZOOM_OUT, wxITEM_NORMAL );
		item->SetBitmap( zoom_out_xpm );
		SETBITMAPS( zoom_out_xpm );
		viewMenu->Append( item );

		/* Fit on screen */
		text = AddHotkeyName( _( "Fit on Screen" ), s_Schematic_Hokeys_Descr, HK_ZOOM_AUTO );
		item = new wxMenuItem( viewMenu, ID_ZOOM_PAGE, text, HELP_ZOOM_FIT, wxITEM_NORMAL );
		item->SetBitmap( zoom_fit_in_page_xpm );
		SETBITMAPS( zoom_fit_in_page_xpm );
		viewMenu->Append( item );

		viewMenu->AppendSeparator();
		@@ -227,7 +225,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
		/* Redraw view */
		text = AddHotkeyName( _( "Redraw" ), s_Schematic_Hokeys_Descr, HK_ZOOM_REDRAW );
		item = new wxMenuItem( viewMenu, ID_ZOOM_REDRAW, text, HELP_ZOOM_REDRAW, wxITEM_NORMAL );
		item->SetBitmap( zoom_redraw_xpm );
		SETBITMAPS( zoom_redraw_xpm );
		viewMenu->Append( item );


		@@ -242,7 +240,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
		HK_ADD_NEW_COMPONENT, false ); // add comment, not a shortcut
		item = new wxMenuItem( placeMenu, ID_SCH_PLACE_COMPONENT, text,
		HELP_PLACE_COMPONENTS, wxITEM_NORMAL );
		item->SetBitmap( add_component_xpm );
		SETBITMAPS( add_component_xpm );
		placeMenu->Append( item );

		/* Power port */
		@@ -250,7 +248,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
		HK_ADD_NEW_POWER, false ); // add comment, not a shortcut
		item = new wxMenuItem( placeMenu, ID_PLACE_POWER_BUTT, text,
		HELP_PLACE_POWERPORT, wxITEM_NORMAL );
		item->SetBitmap( add_power_xpm );
		SETBITMAPS( add_power_xpm );
		placeMenu->Append( item );

		/* Wire */
		@@ -258,7 +256,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
		HK_BEGIN_WIRE, false ); // add comment, not a shortcut
		item = new wxMenuItem( placeMenu, ID_WIRE_BUTT, text,
		HELP_PLACE_WIRE, wxITEM_NORMAL );
		item->SetBitmap( add_line_xpm );
		SETBITMAPS( add_line_xpm );
		placeMenu->Append( item );

		/* Bus */
		@@ -266,7 +264,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
		HK_BEGIN_BUS, false ); // add comment, not a shortcut
		item = new wxMenuItem( placeMenu, ID_BUS_BUTT, text,
		HELP_PLACE_BUS, wxITEM_NORMAL );
		item->SetBitmap( add_bus_xpm );
		SETBITMAPS( add_bus_xpm );
		placeMenu->Append( item );

		/* Wire to Bus entry */
		@@ -274,7 +272,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
		HK_ADD_WIRE_ENTRY, false ); // add comment, not a shortcut
		item = new wxMenuItem( placeMenu, ID_WIRETOBUS_ENTRY_BUTT, text,
		HELP_PLACE_WIRE2BUS_ENTRY, wxITEM_NORMAL );
		item->SetBitmap( add_line2bus_xpm );
		SETBITMAPS( add_line2bus_xpm );
		placeMenu->Append( item );

		/* Bus to Bus entry */
		@@ -282,14 +280,14 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
		HK_ADD_BUS_ENTRY, false ); // add comment, not a shortcut
		item = new wxMenuItem( placeMenu, ID_BUSTOBUS_ENTRY_BUTT, text,
		HELP_PLACE_BUS2BUS_ENTRY, wxITEM_NORMAL );
		item->SetBitmap( add_bus2bus_xpm );
		SETBITMAPS( add_bus2bus_xpm );
		placeMenu->Append( item );

		/* No connect flag */
		text = AddHotkeyName( _( "No connect flag" ), s_Schematic_Hokeys_Descr,
		HK_ADD_NOCONN_FLAG, false ); // add comment, not a shortcut
		item = new wxMenuItem( placeMenu, ID_NOCONN_BUTT, text, HELP_PLACE_NC_FLAG, wxITEM_NORMAL );
		item->SetBitmap( noconn_button );
		SETBITMAPS( noconn_button );
		placeMenu->Append( item );

		/* Net name */
		@@ -297,7 +295,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
		HK_ADD_LABEL, false ); // add comment, not a shortcut
		item = new wxMenuItem( placeMenu, ID_LABEL_BUTT, text,
		HELP_PLACE_NETLABEL, wxITEM_NORMAL );
		item->SetBitmap( add_line_label_xpm );
		SETBITMAPS( add_line_label_xpm );
		placeMenu->Append( item );

		/* Global label */
		@@ -305,7 +303,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
		HK_ADD_GLABEL, false ); // add comment, not a shortcut
		item = new wxMenuItem( placeMenu, ID_GLABEL_BUTT, text,
		HELP_PLACE_GLOBALLABEL, wxITEM_NORMAL );
		item->SetBitmap( add_glabel_xpm );
		SETBITMAPS( add_glabel_xpm );
		placeMenu->Append( item );

		/* Junction */
		@@ -313,7 +311,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
		HK_ADD_JUNCTION, false ); // add comment, not a shortcut
		item = new wxMenuItem( placeMenu, ID_JUNCTION_BUTT, text,
		HELP_PLACE_JUNCTION, wxITEM_NORMAL );
		item->SetBitmap( add_junction_xpm );
		SETBITMAPS( add_junction_xpm );
		placeMenu->Append( item );

		/* Separator */
		@@ -324,7 +322,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
		HK_ADD_HLABEL, false ); // add comment, not a shortcut
		item = new wxMenuItem( placeMenu, ID_HIERLABEL_BUTT, text,
		HELP_PLACE_HIER_LABEL, wxITEM_NORMAL );
		item->SetBitmap( add_hierarchical_label_xpm );
		SETBITMAPS( add_hierarchical_label_xpm );
		placeMenu->Append( item );

		/* Hierarchical sheet */
		@@ -332,19 +330,19 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
		HK_ADD_HIER_SHEET, false ); // add comment, not a shortcut
		item = new wxMenuItem( placeMenu, ID_SHEET_SYMBOL_BUTT, text,
		HELP_PLACE_SHEET, wxITEM_NORMAL );
		item->SetBitmap( add_hierarchical_subsheet_xpm );
		SETBITMAPS( add_hierarchical_subsheet_xpm );
		placeMenu->Append( item );

		/* Import hierarchical sheet */
		item = new wxMenuItem( placeMenu, ID_IMPORT_HLABEL_BUTT, _( "Import Hierarchical Label" ),
		HELP_IMPORT_SHEETPIN, wxITEM_NORMAL );
		item->SetBitmap( import_hierarchical_label_xpm );
		SETBITMAPS( import_hierarchical_label_xpm );
		placeMenu->Append( item );

		/* Add hierarchical Pin to Sheet */
		item = new wxMenuItem( placeMenu, ID_SHEET_PIN_BUTT, _( "Add Hierarchical Pin to Sheet" ),
		HELP_PLACE_SHEETPIN, wxITEM_NORMAL );
		item->SetBitmap( add_hierar_pin_xpm );
		SETBITMAPS( add_hierar_pin_xpm );
		placeMenu->Append( item );

		/* Separator */
		@@ -355,7 +353,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
		HK_ADD_GRAPHIC_POLYLINE, false ); // add comment, not a shortcut
		item = new wxMenuItem( placeMenu, ID_LINE_COMMENT_BUTT, text,
		HELP_PLACE_GRAPHICLINES, wxITEM_NORMAL );
		item->SetBitmap( add_dashed_line_xpm );
		SETBITMAPS( add_dashed_line_xpm );
		placeMenu->Append( item );

		/* Graphic text */
		@@ -363,7 +361,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
		HK_ADD_GRAPHIC_TEXT, false ); // add comment, not a shortcut
		item = new wxMenuItem( placeMenu, ID_TEXT_COMMENT_BUTT, text,
		HELP_PLACE_GRAPHICTEXTS, wxITEM_NORMAL );
		item->SetBitmap( add_text_xpm );
		SETBITMAPS( add_text_xpm );
		placeMenu->Append( item );


		@@ -373,19 +371,26 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
		/* Library */
		item = new wxMenuItem( configmenu, ID_CONFIG_REQ, _( "&Library" ),
		_( "Library preferences" ) );
		item->SetBitmap( library_xpm );
		SETBITMAPS( library_xpm );
		configmenu->Append( item );

		/* Colors */
		item = new wxMenuItem( configmenu, ID_COLORS_SETUP, _( "&Colors" ),
		_( "Color preferences" ) );
		item->SetBitmap( palette_xpm );
		SETBITMAPS( palette_xpm );
		configmenu->Append( item );

		/* Options */
		item = new wxMenuItem( configmenu, ID_OPTIONS_SETUP, _( "&Options" ),
		_( "Eeschema general options and preferences" ) );
		item->SetBitmap( preference_xpm );
		item = new wxMenuItem( configmenu, wxID_PREFERENCES,

		#ifdef __WXMAC__
		_( "&Preferences..." ),
		#else
		_( "&Options" ),
		#endif

		_( "EESchema preferences" ) );
		SETBITMAPS( preference_xpm );
		configmenu->Append( item );

		/* Language submenu */
		@@ -400,13 +405,13 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
		/* Save preferences */
		item = new wxMenuItem( configmenu, ID_CONFIG_SAVE, _( "&Save preferences" ),
		_( "Save application preferences" ) );
		item->SetBitmap( save_setup_xpm );
		SETBITMAPS( save_setup_xpm );
		configmenu->Append( item );

		/* Read preferences */
		item = new wxMenuItem( configmenu, ID_CONFIG_READ, _( "&Read preferences" ),
		_( "Read application preferences" ) );
		item->SetBitmap( read_setup_xpm );
		SETBITMAPS( read_setup_xpm );
		configmenu->Append( item );


		@@ -417,20 +422,15 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()

		item = new wxMenuItem( helpMenu, ID_GENERAL_HELP, _( "&Contents" ),
		_( "Open the eeschema manual" ) );
		item->SetBitmap( online_help_xpm );
		SETBITMAPS( online_help_xpm );
		helpMenu->Append( item );

		/* About on all platforms except WXMAC */
		#if !defined(__WXMAC__)

		item = new wxMenuItem( helpMenu, ID_KICAD_ABOUT, _( "&About" ),
		item = new wxMenuItem( helpMenu, wxID_ABOUT, _( "&About" ),
		_( "About eeschema schematic designer" ) );
		item->SetBitmap( info_xpm );
		SETBITMAPS( info_xpm );
		helpMenu->Append( item );

		#endif /* !defined(__WXMAC__) */


		// Create the menubar and append all submenus
		menuBar->Append( filesMenu, _( "&File" ) );
		menuBar->Append( editMenu, _( "&Edit" ) );

Admin message