Eeschema: fix bug 783535. Minor code cleaning. (94372b81) · Commits · Elphel / kicad-source-mirror

common/basicframe.cpp

+3 −14

Original line number	Diff line number	Diff line
		@@ -339,22 +339,11 @@ void EDA_BASE_FRAME::AddHelpVersionInfoMenuEntry( wxMenu* aMenu )
		{
		wxASSERT( aMenu != NULL );

		wxMenuItem* item = NULL;

		// Copy version string to clipboard for bug report purposes.
		item = new wxMenuItem( aMenu, ID_HELP_COPY_VERSION_STRING,
		ADD_MENUITEM_WITH_HELP( aMenu, ID_HELP_COPY_VERSION_STRING,
		_( "Copy &Version Information" ),
		_( "Copy the version string to clipboard to send with bug reports" ) );

		// For some reason images are not always added to the OSX menu items. Anyone want
		// to clarify as to why this is the case? Putting this information in some formal
		// developer notes would be helpful. A good place to put this information would be
		// ./documentation/guidelines/UIpolicies.txt.
		#if !defined( __WXMAC__ )
		item->SetBitmap( copy_button );
		#endif

		aMenu->Append( item );
		_( "Copy the version string to clipboard to send with bug reports" ),
		copy_button );
		}

common/hotkeys_basic.cpp

+12 −19

Original line number	Diff line number	Diff line
		@@ -632,41 +632,34 @@ void AddHotkeyConfigMenu( wxMenu* aMenu )
		if( aMenu == NULL )
		return;

		wxMenuItem* item;
		wxMenu* HotkeySubmenu = new wxMenu();

		/* List existing hotkey menu*/
		item = new wxMenuItem( HotkeySubmenu,
		ADD_MENUITEM_WITH_HELP( HotkeySubmenu,
		ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST,
		_( "List Current Keys" ),
		_( "Displays the current hotkeys list and corresponding commands" ) );
		item->SetBitmap( info_xpm );
		HotkeySubmenu->Append( item );
		_( "Displays the current hotkeys list and corresponding commands" ),
		info_xpm );

		/* Call hotkeys editor*/
		item = new wxMenuItem( HotkeySubmenu, ID_PREFERENCES_HOTKEY_SHOW_EDITOR,
		ADD_MENUITEM_WITH_HELP( HotkeySubmenu, ID_PREFERENCES_HOTKEY_SHOW_EDITOR,
		_( "Edit Hotkeys" ),
		_( "Call the hotkeys editor" ) );
		item->SetBitmap( editor_xpm );
		HotkeySubmenu->Append( item );
		_( "Call the hotkeys editor" ),
		editor_xpm );

		HotkeySubmenu->AppendSeparator();

		/* create hotkey file to export current hotkeys config */
		item = new wxMenuItem( HotkeySubmenu, ID_PREFERENCES_HOTKEY_EXPORT_CONFIG,
		ADD_MENUITEM_WITH_HELP( HotkeySubmenu, ID_PREFERENCES_HOTKEY_EXPORT_CONFIG,
		_( "Export Hotkeys Config" ),
		_(
		"Create a hotkey configuration file to export the current hotkey config" )
		);
		item->SetBitmap( save_setup_xpm );
		HotkeySubmenu->Append( item );
		_( "Create a hotkey configuration file to export the current hotkey config" ),
		save_setup_xpm );

		/* Reload hotkey file */
		item = new wxMenuItem( HotkeySubmenu, ID_PREFERENCES_HOTKEY_IMPORT_CONFIG,
		ADD_MENUITEM_WITH_HELP( HotkeySubmenu, ID_PREFERENCES_HOTKEY_IMPORT_CONFIG,
		_( "Import Hotkeys Config" ),
		_( "Load an existing hotkey configuration file" ) );
		item->SetBitmap( reload_xpm );
		HotkeySubmenu->Append( item );
		_( "Load an existing hotkey configuration file" ),
		reload_xpm );

		/* Append HotkeySubmenu to menu */
		ADD_MENUITEM_WITH_HELP_AND_SUBMENU( aMenu, HotkeySubmenu,

eeschema/edit_label.cpp

+3 −2

Original line number	Diff line number	Diff line
		@@ -60,7 +60,8 @@ static void abortMoveText( EDA_DRAW_PANEL* aPanel, wxDC* aDC )

		if( item->IsNew() )
		{
		SAFE_DELETE( item );
		delete item;
		item = NULL;
		}
		else // Move command on an existing text item, restore the copy of the original.
		{
		@@ -77,7 +78,7 @@ static void abortMoveText( EDA_DRAW_PANEL* aPanel, wxDC* aDC )
		item->ClearFlags();
		}

		screen->SetCurItem( NULL );
		screen->SetCurItem( item );
		}

eeschema/libeditframe.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -115,6 +115,7 @@ BEGIN_EVENT_TABLE( LIB_EDIT_FRAME, EDA_DRAW_FRAME )
		EVT_MENU( ID_LIBEDIT_GEN_PNG_FILE, LIB_EDIT_FRAME::OnPlotCurrentComponent )
		EVT_MENU( ID_LIBEDIT_GEN_SVG_FILE, LIB_EDIT_FRAME::OnPlotCurrentComponent )
		EVT_MENU( wxID_HELP, EDA_DRAW_FRAME::GetKicadHelp )
		EVT_MENU( wxID_ABOUT, EDA_BASE_FRAME::GetKicadAbout )

		EVT_MENU( ID_COLORS_SETUP, LIB_EDIT_FRAME::OnColorConfig )
		EVT_MENU( ID_CONFIG_REQ, LIB_EDIT_FRAME::InstallConfigFrame )

Admin message