haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
g_harland 2007-09-24 07:14:01 +00:00
parent ba04f83247
commit 19330ff0f4
6 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
eeschema/eeconfig.cpp
View File

@ -38,10 +38,8 @@ wxString FullFileName;
break;
case ID_CONFIG_REQ : // Creation de la fenetre de configuration
{
InstallConfigFrame(pos);
break;
}
case ID_OPTIONS_SETUP:
DisplayOptionFrame(this, pos);
@ -95,8 +93,8 @@ wxString FullFileName;
wxString editorname = GetEditorName();
if ( !editorname.IsEmpty() )
ExecuteFile(this, editorname, FullFileName);
break;
}
break;
case ID_PREFERENCES_HOTKEY_PATH_IS_HOME:
case ID_PREFERENCES_HOTKEY_PATH_IS_KICAD:
@ -201,3 +199,4 @@ wxString mask( wxT("*") );
/* ecriture de la configuration */
EDA_Appl->WriteProjectConfig(FullFileName, GROUP, ParamCfgList);
}

8
eeschema/menubar.cpp
View File

@ -147,7 +147,12 @@ wxString msg;
item->SetBitmap(palette_xpm);
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
AddFontSelectionMenu(configmenu);
@ -211,4 +216,3 @@ wxString msg;
}
}

2
eeschema/schframe.cpp
View File

@ -57,6 +57,8 @@ BEGIN_EVENT_TABLE(WinEDA_SchematicFrame, wxFrame)
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_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,
WinEDA_DrawFrame::SetLanguage)

3
gerbview/tool_gerber.cpp
View File

@ -27,7 +27,7 @@ void WinEDA_GerberFrame::ReCreateMenuBar( void )
{
int ii;
wxMenuBar* menuBar = GetMenuBar();
wxMenuItem* item;
// wxMenuItem* item;
if( menuBar == NULL )
{
@ -457,3 +457,4 @@ void WinEDA_GerberFrame::ReCreateOptToolbar( void )
SetToolbars();
}

3
pcbnew/protos.h
View File

@ -403,10 +403,11 @@ MODULE * ListAndSelectModuleName(COMMAND * Cmd);
/***************/
/*****************/
/* SEL_COLOR.CPP */
/* SET_COLOR.CPP */
/*****************/
void DisplayColorSetupFrame(WinEDA_DrawFrame * parent,
const wxPoint & framepos);
#endif /* #define PROTO_H */