Commit 19330ff0 authored by g_harland's avatar g_harland
Browse files

Restore functionality of 'Preferences -> Colors' and 'Preferences -> Options' commands in EEschema

parent ba04f832

eeschema/eeconfig.cpp

+9 −10
Original line number Original line Diff line number Diff line
@@ -38,10 +38,8 @@ wxString FullFileName; 
			break;

			break;





		case ID_CONFIG_REQ :		// Creation de la fenetre de configuration

		case ID_CONFIG_REQ :		// Creation de la fenetre de configuration

			{

			InstallConfigFrame(pos);

			InstallConfigFrame(pos);

			break;

			break;

			}





		case ID_OPTIONS_SETUP:

		case ID_OPTIONS_SETUP:

			DisplayOptionFrame(this, pos);

			DisplayOptionFrame(this, pos);
@@ -95,8 +93,8 @@ wxString FullFileName; 
			wxString editorname = GetEditorName();

			wxString editorname = GetEditorName();

			if ( !editorname.IsEmpty() )

			if ( !editorname.IsEmpty() )

				ExecuteFile(this, editorname, FullFileName);

				ExecuteFile(this, editorname, FullFileName);

			break;

		}

		}

			break;





		case ID_PREFERENCES_HOTKEY_PATH_IS_HOME:

		case ID_PREFERENCES_HOTKEY_PATH_IS_HOME:

		case ID_PREFERENCES_HOTKEY_PATH_IS_KICAD:

		case ID_PREFERENCES_HOTKEY_PATH_IS_KICAD:
@@ -201,3 +199,4 @@ wxString mask( wxT("*") ); 
	/* ecriture de la configuration */

	/* ecriture de la configuration */

	EDA_Appl->WriteProjectConfig(FullFileName, GROUP, ParamCfgList);

	EDA_Appl->WriteProjectConfig(FullFileName, GROUP, ParamCfgList);

}

}

eeschema/menubar.cpp

+7 −3
Original line number Original line Diff line number Diff line
@@ -147,7 +147,12 @@ wxString msg; 
	    item->SetBitmap(palette_xpm);

	    item->SetBitmap(palette_xpm);

		configmenu->Append(item);

		configmenu->Append(item);





		ADD_MENUITEM(configmenu, ID_OPTIONS_SETUP, _("&Options"), preference_xpm);

//		ADD_MENUITEM(configmenu, ID_OPTIONS_SETUP, _("&Options"), preference_xpm);

		item = new wxMenuItem(configmenu, ID_OPTIONS_SETUP,

			_("&Options"),

			_("Select general options...") );

	    item->SetBitmap(preference_xpm);

		configmenu->Append(item);





		// Font selection and setup

		// Font selection and setup

		AddFontSelectionMenu(configmenu);

		AddFontSelectionMenu(configmenu);
@@ -211,4 +216,3 @@ wxString msg; 
		}

		}

}

}

eeschema/schframe.cpp

+2 −0
Original line number Original line Diff line number Diff line
@@ -57,6 +57,8 @@ BEGIN_EVENT_TABLE(WinEDA_SchematicFrame, wxFrame) 
	EVT_MENU(ID_EXIT, WinEDA_SchematicFrame::Process_Special_Functions)

	EVT_MENU(ID_EXIT, WinEDA_SchematicFrame::Process_Special_Functions)





	EVT_MENU_RANGE(ID_CONFIG_AND_PREFERENCES_START, ID_CONFIG_AND_PREFERENCES_END, WinEDA_SchematicFrame::Process_Config)

	EVT_MENU_RANGE(ID_CONFIG_AND_PREFERENCES_START, ID_CONFIG_AND_PREFERENCES_END, WinEDA_SchematicFrame::Process_Config)

	EVT_TOOL(ID_COLORS_SETUP, WinEDA_SchematicFrame::Process_Config)

	EVT_TOOL(ID_OPTIONS_SETUP, WinEDA_SchematicFrame::Process_Config)





	EVT_MENU_RANGE(ID_LANGUAGE_CHOICE, ID_LANGUAGE_CHOICE_END,

	EVT_MENU_RANGE(ID_LANGUAGE_CHOICE, ID_LANGUAGE_CHOICE_END,

		WinEDA_DrawFrame::SetLanguage)

		WinEDA_DrawFrame::SetLanguage)

gerbview/tool_gerber.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -27,7 +27,7 @@ void WinEDA_GerberFrame::ReCreateMenuBar( void ) 
{

{

    int         ii;

    int         ii;

    wxMenuBar*  menuBar = GetMenuBar();

    wxMenuBar*  menuBar = GetMenuBar();

    wxMenuItem* item;

//  wxMenuItem* item;





    if( menuBar == NULL )

    if( menuBar == NULL )

    {

    {
@@ -457,3 +457,4 @@ void WinEDA_GerberFrame::ReCreateOptToolbar( void ) 




    SetToolbars();

    SetToolbars();

}

}

pcbnew/protos.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -403,10 +403,11 @@ MODULE * ListAndSelectModuleName(COMMAND * Cmd); 
/***************/

/***************/





/*****************/

/*****************/

/* SEL_COLOR.CPP */

/* SET_COLOR.CPP */

/*****************/

/*****************/

void DisplayColorSetupFrame(WinEDA_DrawFrame * parent,

void DisplayColorSetupFrame(WinEDA_DrawFrame * parent,

							const wxPoint & framepos);

							const wxPoint & framepos);









#endif	/* #define PROTO_H */

#endif	/* #define PROTO_H */

common/base_screen.cpp

+1 −1

File changed.

Contains only whitespace changes.