menu cleaning and changing obscure menu info. and menu labels (04f41a4a) · Commits · Elphel / kicad-source-mirror

bitmaps/CMakeLists.txt

+3 −1

Original line number	Diff line number	Diff line
		@@ -19,8 +19,9 @@ set(BITMAP_SRCS
		Add_Circle.xpm
		Add_Component.xpm
		Add_Corner.xpm
		add_cotation.xpm
		add_dimension.xpm
		Add_Dashed_Line.xpm
		add_dimension.xpm
		Add_Entry.xpm
		Add_GLabel.xpm
		add_hierarchical_label.xpm
		@@ -146,6 +147,7 @@ set(BITMAP_SRCS
		Hidden_Pin.xpm
		Hierarchy_cursor.xpm
		Hierarchy_Nav.xpm
		hotkeys.xpm
		icon_3d.xpm
		icon_cvpcb_small.xpm
		icon_cvpcb.xpm

bitmaps/add_cotation.xpm→bitmaps/add_dimension.xpm

+2 −6

Original line number	Diff line number	Diff line
		/* XPM */
		#ifndef XPMMAIN
		extern const char* add_cotation_xpm[];
		#else
		const char * add_cotation_xpm[] = {
		const char * add_dimension_xpm[] = {
		/* columns rows colors const chars-per-pixel */
		"16 16 14 1",
		" c None",
		". c #000000",
		@@ -34,5 +32,3 @@ const char * add_cotation_xpm[] = {
		"+ + ",
		"+ + ",
		" "};

		#endif

bitmaps/hotkeys.xpm

0 → 100644

+37 −0

Original line number	Diff line number	Diff line
		/* XPM */
		const char *hotkeys_xpm[] = {
		/* columns rows colors chars-per-pixel */
		"16 16 15 1",
		"@ c #AFB0AB",
		"O c #A5A5A2",
		"X c #BCBFBB",
		"% c #E7E9E6",
		". c #C4C4C4",
		"= c #DEDFDD",
		"* c #FCFAFC",
		"; c #94928D",
		" c None",
		"+ c #9C9A94",
		"& c #F1F3EF",
		"$ c #B6B8B3",
		"- c #D4D3CF",
		"# c #ACAAAC",
		"o c #B4B2B4",
		/* pixels */
		" ",
		" ",
		" . ",
		" ......XoOO+@ ",
		" Xoo##o$. O. ",
		" @O ",
		" XOo ",
		" .OX ",
		" OO@@@$$$$$$XX ",
		"XX%%&&****&%%o. ",
		"O =.- --.==.=X# ",
		"+-=========%=-+ ",
		"+;;;;;;;;;;;;;O ",
		" ",
		" ",
		" "
		};

common/CMakeLists.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ set(PCB_COMMON_SRCS
		../pcbnew/class_board_connected_item.cpp
		../pcbnew/class_board_design_settings.cpp
		../pcbnew/class_board_item.cpp
		../pcbnew/class_cotation.cpp
		../pcbnew/class_dimension.cpp
		../pcbnew/class_drawsegment.cpp
		../pcbnew/class_drc_item.cpp
		../pcbnew/class_edge_mod.cpp

common/hotkeys_basic.cpp

+13 −14

Original line number	Diff line number	Diff line
		@@ -615,25 +615,25 @@ wxString ReturnHotkeyConfigFilePath( int choice )
		/** add hotkey config options submenu to a menu
		* @param menu : initial menu
		*/
		void AddHotkeyConfigMenu( wxMenu* menu )
		void AddHotkeyConfigMenu( wxMenu* aMenu )
		{
		if( aMenu == NULL )
		return;

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

		if( menu == NULL )
		return;

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

		/* (Re)create hotkey file */
		item = new wxMenuItem( HotkeySubmenu, ID_PREFERENCES_HOTKEY_CREATE_CONFIG,
		_( "(Re)create" ),
		_( "(Re)create Hotkeys File" ),
		_( "Create or recreate the hotkey configuration file from current hotkey list" )
		);
		item->SetBitmap( save_setup_xpm );
		@@ -641,23 +641,22 @@ void AddHotkeyConfigMenu( wxMenu* menu )

		/* Reload hotkey file */
		item = new wxMenuItem( HotkeySubmenu, ID_PREFERENCES_HOTKEY_READ_CONFIG,
		_( "Reload" ),
		_( "Reload Hotkeys File" ),
		_( "Reload the hotkey configuration file" ) );
		item->SetBitmap( reload_xpm );
		HotkeySubmenu->Append( item );

		/* Edit hotkey file */
		item = new wxMenuItem( HotkeySubmenu, ID_PREFERENCES_HOTKEY_EDIT_CONFIG,
		_( "Edit" ),
		_( "Edit Hotkeys File" ),
		_( "Edit the hotkey configuration file in a text editor" ) );
		item->SetBitmap( editor_xpm );
		HotkeySubmenu->Append( item );

		/* Append HotkeySubmenu to menu */
		menu->Append( ID_PREFERENCES_HOTKEY_SUBMENU,
		_("Hotkey"),
		HotkeySubmenu,
		_("Hotkey configuration and preferences"));
		ADD_MENUITEM_WITH_HELP_AND_SUBMENU( aMenu, HotkeySubmenu,
		ID_PREFERENCES_HOTKEY_SUBMENU, _( "Hotkeys" ),
		_("Hotkeys configuration and preferences" ), hotkeys_xpm );

		/* Hotkey path */
		wxMenu* HotkeyLocationSubmenu = new wxMenu();