fixed minor issues. (1d9c3cce) · Commits · Elphel / kicad-source-mirror

common/drawframe.cpp

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -376,13 +376,14 @@ void WinEDA_DrawFrame::OnSize( wxSizeEvent& SizeEv )
	void WinEDA_DrawFrame::SetToolID( int id, int new_cursor_id,		void WinEDA_DrawFrame::SetToolID( int id, int new_cursor_id,
	const wxString& title )		const wxString& title )
	{		{
	// Change Cursor		// Keep default cursor in toolbars
			SetCursor( wxNullCursor );
			// Change Cursor in DrawPanel only
	if( DrawPanel )		if( DrawPanel )
	{		{
	DrawPanel->m_PanelDefaultCursor = new_cursor_id;		DrawPanel->m_PanelDefaultCursor = new_cursor_id;
	DrawPanel->SetCursor( new_cursor_id );		DrawPanel->SetCursor( new_cursor_id );
	}		}
	SetCursor( wxCURSOR_ARROW );
	DisplayToolMsg( title );		DisplayToolMsg( title );

	if( id < 0 )		if( id < 0 )

eeschema/menubar.cpp

+11 −7

Original line number	Original line	Diff line number	Diff line
	@@ -206,7 +206,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
	wxMenu* viewMenu = new wxMenu;		wxMenu* viewMenu = new wxMenu;

	/* Important Note for ZOOM IN and ZOOM OUT commands from menubar:		/* Important Note for ZOOM IN and ZOOM OUT commands from menubar:
	* we cannot add hotkey info here, because the hotkey HK_ZOOM_IN and HK_ZOOM_OUT		* we cannot add hotkey shortcut here, because the hotkey HK_ZOOM_IN and HK_ZOOM_OUT
	* events(default = WXK_F1 and WXK_F2) are NOT equivalent to this menu command:		* events(default = WXK_F1 and WXK_F2) are NOT equivalent to this menu command:
	* zoom in and out from hotkeys are equivalent to the pop up menu zoom		* zoom in and out from hotkeys are equivalent to the pop up menu zoom
	* From here, zoomming is made around the screen center		* From here, zoomming is made around the screen center
	@@ -215,16 +215,20 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
	*		*
	* in others words HK_ZOOM_IN and HK_ZOOM_OUT are NOT accelerators		* in others words HK_ZOOM_IN and HK_ZOOM_OUT are NOT accelerators
	* for Zoom in and Zoom out sub menus		* for Zoom in and Zoom out sub menus
			* SO WE ADD THE NAME OF THE CORRESPONDING HOTKEY AS A COMMENT, NOT AS A SHORTCUT
			* using in AddHotkeyName call the option "false" (not a shortcut)
	*/		*/
	/* Zoom in */		/* Zoom in */
	text = _( "Zoom In" );		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,		item = new wxMenuItem( viewMenu, ID_ZOOM_IN, text, HELP_ZOOM_IN,
	wxITEM_NORMAL );		wxITEM_NORMAL );
	item->SetBitmap( zoom_in_xpm );		item->SetBitmap( zoom_in_xpm );
	viewMenu->Append( item );		viewMenu->Append( item );

	/* Zoom out */		/* Zoom out */
	text = _( "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,		item = new wxMenuItem( viewMenu, ID_ZOOM_OUT, text, HELP_ZOOM_OUT,
	wxITEM_NORMAL );		wxITEM_NORMAL );
	item->SetBitmap( zoom_out_xpm );		item->SetBitmap( zoom_out_xpm );
	@@ -259,7 +263,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()

	/* Component */		/* Component */
	text = AddHotkeyName( _( "&Component" ), s_Schematic_Hokeys_Descr,		text = AddHotkeyName( _( "&Component" ), s_Schematic_Hokeys_Descr,
	HK_ADD_NEW_COMPONENT );		HK_ADD_NEW_COMPONENT, false ); // add comment, not a shortcut
	item = new wxMenuItem( placeMenu, ID_COMPONENT_BUTT, text,		item = new wxMenuItem( placeMenu, ID_COMPONENT_BUTT, text,
	HELP_PLACE_COMPONENTS, wxITEM_NORMAL );		HELP_PLACE_COMPONENTS, wxITEM_NORMAL );
	item->SetBitmap( add_component_xpm );		item->SetBitmap( add_component_xpm );
	@@ -273,7 +277,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()

	/* Wire */		/* Wire */
	text = AddHotkeyName( _( "&Wire" ), s_Schematic_Hokeys_Descr,		text = AddHotkeyName( _( "&Wire" ), s_Schematic_Hokeys_Descr,
	HK_BEGIN_WIRE );		HK_BEGIN_WIRE, false ); // add comment, not a shortcut
	item = new wxMenuItem( placeMenu, ID_WIRE_BUTT, text,		item = new wxMenuItem( placeMenu, ID_WIRE_BUTT, text,
	HELP_PLACE_WIRE, wxITEM_NORMAL );		HELP_PLACE_WIRE, wxITEM_NORMAL );
	item->SetBitmap( add_line_xpm );		item->SetBitmap( add_line_xpm );
	@@ -301,7 +305,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()

	/* No connect flag */		/* No connect flag */
	text = AddHotkeyName( _( "No connect flag" ), s_Schematic_Hokeys_Descr,		text = AddHotkeyName( _( "No connect flag" ), s_Schematic_Hokeys_Descr,
	HK_ADD_NOCONN_FLAG );		HK_ADD_NOCONN_FLAG, false ); // add comment, not a shortcut
	item = new wxMenuItem( placeMenu, ID_NOCONN_BUTT, text,		item = new wxMenuItem( placeMenu, ID_NOCONN_BUTT, text,
	HELP_PLACE_NC_FLAG, wxITEM_NORMAL );		HELP_PLACE_NC_FLAG, wxITEM_NORMAL );
	item->SetBitmap( noconn_button );		item->SetBitmap( noconn_button );
	@@ -309,7 +313,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()

	/* Net name */		/* Net name */
	text = AddHotkeyName( _( "Label" ), s_Schematic_Hokeys_Descr,		text = AddHotkeyName( _( "Label" ), s_Schematic_Hokeys_Descr,
	HK_ADD_LABEL );		HK_ADD_LABEL, false ); // add comment, not a shortcut
	item = new wxMenuItem( placeMenu, ID_LABEL_BUTT, text,		item = new wxMenuItem( placeMenu, ID_LABEL_BUTT, text,
	HELP_PLACE_NETLABEL, wxITEM_NORMAL );		HELP_PLACE_NETLABEL, wxITEM_NORMAL );
	item->SetBitmap( add_line_label_xpm );		item->SetBitmap( add_line_label_xpm );

Admin message