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

Menu and statusbar strings made more clear

This commit is contained in:
jerryjacobs 2008-10-07 16:33:57 +00:00
parent f95e968cf8
commit 6f84112375
16 changed files with 322 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cvpcb/cvframe.cpp
View File

@ -421,14 +421,25 @@ void WinEDA_CvpcbFrame::AddFontSelectionMenu( wxMenu* main_menu )
{
wxMenu* fontmenu = new wxMenu();
ADD_MENUITEM( fontmenu, ID_PREFERENCES_FONT_DIALOG, _( "font for dialog boxes" ),
ADD_MENUITEM( fontmenu,
ID_PREFERENCES_FONT_DIALOG,
_( "Dialog boxes" ),
fonts_xpm );
ADD_MENUITEM( fontmenu, ID_PREFERENCES_FONT_INFOSCREEN, _( "font for Lists" ),
ADD_MENUITEM( fontmenu,
ID_PREFERENCES_FONT_INFOSCREEN,
_( "Lists" ),
fonts_xpm );
ADD_MENUITEM( fontmenu, ID_PREFERENCES_FONT_STATUS, _( "font for Status Line" ),
ADD_MENUITEM( fontmenu,
ID_PREFERENCES_FONT_STATUS,
_( "Status box" ),
fonts_xpm );
ADD_MENUITEM_WITH_HELP_AND_SUBMENU( main_menu, fontmenu,
ID_PREFERENCES_FONT, _( "&Font" ),
ADD_MENUITEM_WITH_HELP_AND_SUBMENU( main_menu,
fontmenu,
ID_PREFERENCES_FONT,
_( "&Font" ),
_(
"Choose font type and size for dialogs, infos and status box" ),
fonts_xpm );

4
cvpcb/tool_cvpcb.cpp
View File

@ -156,8 +156,8 @@ wxMenuBar * menuBar = GetMenuBar();
_("Open the cvpcb manual"));
item->SetBitmap(help_xpm);
helpMenu->Append(item);
item = new wxMenuItem(helpMenu , ID_CVPCB_DISPLAY_LICENCE, _("&About"),
_("About this application"));
item = new wxMenuItem(helpMenu , ID_CVPCB_DISPLAY_LICENCE, _("&About cvpcb"),
_("About cvpcb schematic to pcb converter"));
item->SetBitmap(info_xpm);
helpMenu->Append(item);

2
eeschema/dialog_edit_component_in_lib.cpp
View File

@ -144,7 +144,7 @@ void WinEDA_PartPropertiesFrame::CreateControls()
m_PanelBasicBoxSizer->Add(itemBoxSizer7, 0, wxALIGN_LEFT|wxALL, 5);
wxBoxSizer* itemBoxSizer8 = new wxBoxSizer(wxVERTICAL);
itemBoxSizer7->Add(itemBoxSizer8, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxStaticText* itemStaticText9 = new wxStaticText( m_PanelBasic, wxID_STATIC, _("Number of Units:"), wxDefaultPosition, wxDefaultSize, 0 );
wxStaticText* itemStaticText9 = new wxStaticText( m_PanelBasic, wxID_STATIC, _("Number of units:"), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer8->Add(itemStaticText9, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
SelNumberOfUnits = new wxSpinCtrl( m_PanelBasic, ID_SPINCTRL1, _T("1"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 16, 1 );

6
eeschema/edit_component_in_schematic.cpp
View File

@ -756,7 +756,7 @@ void WinEDA_SchematicFrame::EditComponentReference( SCH_COMPONENT* Cmp, wxDC* DC
flag = 1;
wxString ref = Cmp->GetRef(GetSheet());
Get_Message( _( "Reference" ), _("Component Reference"), ref, this );
Get_Message( _( "Reference" ), _("Component reference"), ref, this );
if( !ref.IsEmpty() ) // New text entered
{
@ -794,7 +794,7 @@ void WinEDA_SchematicFrame::EditComponentValue( SCH_COMPONENT* Cmp, wxDC* DC )
SCH_CMP_FIELD* TextField = Cmp->GetField( VALUE );
message = TextField->m_Text;
if( Get_Message( _( "Value" ), _("Component Value"), message, this ) )
if( Get_Message( _( "Value" ), _("Component value"), message, this ) )
message.Empty(); //allow the user to remove the value.
if( !message.IsEmpty() && !message.IsEmpty())
@ -834,7 +834,7 @@ void WinEDA_SchematicFrame::EditComponentFootprint( SCH_COMPONENT* Cmp, wxDC* DC
if(message.IsEmpty() )
wasEmpty = true;
if( Get_Message( _( "Footprint" ), _("Component Footprint"), message, this ) )
if( Get_Message( _( "Footprint" ), _("Component footprint"), message, this ) )
message.Empty(); // allow the user to remove the value.
// save old cmp in undo list if not already in edit, or moving ...

14
eeschema/menubar.cpp
View File

@ -335,8 +335,8 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
item = new wxMenuItem(
placeMenu,
ID_LINE_COMMENT_BUTT,
_( "Graphic line or poligon" ),
_( "Place the graphic line or poligon" ),
_( "Graphic line or polygon" ),
_( "Place graphic lines or polygons" ),
wxITEM_NORMAL
);
item->SetBitmap( add_dashed_line_xpm );
@ -346,7 +346,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
placeMenu,
ID_TEXT_COMMENT_BUTT,
_( "Graphic text (comment)" ),
_( "Place the graphic text (comment)" ),
_( "Place graphic text (comment)" ),
wxITEM_NORMAL
);
item->SetBitmap( add_text_xpm );
@ -356,7 +356,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
wxMenu* configmenu = new wxMenu;
item = new wxMenuItem( configmenu, ID_CONFIG_REQ,
_( "&Library" ),
_( "Setting Libraries, Directories and others..." ) );
_( "Library preferences" ) );
item->SetBitmap( library_xpm );
configmenu->Append( item );
@ -366,10 +366,10 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
item->SetBitmap( palette_xpm );
configmenu->Append( item );
// ADD_MENUITEM(configmenu, ID_OPTIONS_SETUP, _("&Options"), preference_xpm);
// Options
item = new wxMenuItem( configmenu, ID_OPTIONS_SETUP,
_( "&Options" ),
_( "Select general options..." ) );
_( "General options..." ) );
item->SetBitmap( preference_xpm );
configmenu->Append( item );
@ -399,7 +399,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
helpMenu->Append( item );
item = new wxMenuItem( helpMenu, ID_KICAD_ABOUT,
_( "&About" ), _( "About this application" ) );
_( "&About eeschema" ), _( "About eeschema schematic designer" ) );
item->SetBitmap( info_xpm );
helpMenu->Append( item );

4
eeschema/plothpgl.cpp
View File

@ -280,12 +280,12 @@ void WinEDA_PlotHPGLFrame::CreateControls()
wxBoxSizer* itemBoxSizer20 = new wxBoxSizer(wxVERTICAL);
itemBoxSizer3->Add(itemBoxSizer20, 0, wxALIGN_TOP|wxLEFT|wxTOP|wxBOTTOM, 5);
wxButton* itemButton21 = new wxButton( itemDialog1, ID_PLOT_HPGL_CURRENT_EXECUTE, _("&Plot Page"), wxDefaultPosition, wxDefaultSize, 0 );
wxButton* itemButton21 = new wxButton( itemDialog1, ID_PLOT_HPGL_CURRENT_EXECUTE, _("&Plot page"), wxDefaultPosition, wxDefaultSize, 0 );
itemButton21->SetDefault();
itemButton21->SetForegroundColour(wxColour(0, 128, 0));
itemBoxSizer20->Add(itemButton21, 0, wxGROW|wxALL, 5);
wxButton* itemButton22 = new wxButton( itemDialog1, ID_PLOT_HPGL_ALL_EXECUTE, _("Plot A&LL"), wxDefaultPosition, wxDefaultSize, 0 );
wxButton* itemButton22 = new wxButton( itemDialog1, ID_PLOT_HPGL_ALL_EXECUTE, _("Plot a&LL"), wxDefaultPosition, wxDefaultSize, 0 );
itemButton22->SetForegroundColour(wxColour(0, 0, 255));
itemBoxSizer20->Add(itemButton22, 0, wxGROW|wxALL, 5);

6
eeschema/plotps.cpp
View File

@ -215,16 +215,16 @@ void WinEDA_PlotPSFrame::CreateControls()
wxBoxSizer* itemBoxSizer10 = new wxBoxSizer(wxVERTICAL);
itemBoxSizer3->Add(itemBoxSizer10, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxButton* itemButton11 = new wxButton( itemDialog1, ID_PLOT_PS_CURRENT_EXECUTE, _("&Plot Page"), wxDefaultPosition, wxDefaultSize, 0 );
wxButton* itemButton11 = new wxButton( itemDialog1, ID_PLOT_PS_CURRENT_EXECUTE, _("&Plot page"), wxDefaultPosition, wxDefaultSize, 0 );
itemButton11->SetDefault();
itemButton11->SetForegroundColour(wxColour(0, 128, 0));
itemBoxSizer10->Add(itemButton11, 0, wxGROW|wxALL, 5);
wxButton* itemButton12 = new wxButton( itemDialog1, ID_PLOT_PS_ALL_EXECUTE, _("Plot A&LL"), wxDefaultPosition, wxDefaultSize, 0 );
wxButton* itemButton12 = new wxButton( itemDialog1, ID_PLOT_PS_ALL_EXECUTE, _("Plot a&LL"), wxDefaultPosition, wxDefaultSize, 0 );
itemButton12->SetForegroundColour(wxColour(179, 0, 0));
itemBoxSizer10->Add(itemButton12, 0, wxGROW|wxALL, 5);
m_btClose = new wxButton( itemDialog1, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
m_btClose = new wxButton( itemDialog1, wxID_CANCEL, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 );
m_btClose->SetForegroundColour(wxColour(0, 0, 255));
itemBoxSizer10->Add(m_btClose, 0, wxGROW|wxALL, 5);

6
gerbview/tool_gerber.cpp
View File

@ -148,8 +148,10 @@ void WinEDA_GerberFrame::ReCreateMenuBar( void )
wxMenu* helpMenu = new wxMenu;
ADD_MENUITEM_WITH_HELP( helpMenu, ID_GENERAL_HELP, _( "&Contents" ),
_( "Open the gerbview manual" ), help_xpm );
ADD_MENUITEM_WITH_HELP( helpMenu, ID_KICAD_ABOUT, _( "&About" ),
_( "About this application" ), info_xpm );
ADD_MENUITEM_WITH_HELP(helpMenu,
ID_KICAD_ABOUT, _( "&About gerbview" ),
_( "About gerbview gerber and drill viewer" ),
info_xpm );
menuBar->Append( m_FilesMenu, _( "&File" ) );
menuBar->Append( configmenu, _( "&Preferences" ) );

BIN
internat/nl/kicad.mo
View File

Binary file not shown.

450
internat/nl/kicad.po
View File

File diff suppressed because it is too large Load Diff

2
kicad/buildmnu.cpp
View File

@ -192,7 +192,7 @@ void WinEDA_MainFrame::ReCreateMenuBar()
helpMenu->Append(item);
item = new wxMenuItem(helpMenu , ID_KICAD_ABOUT,
_("&About"), _("About this application"));
_("&About kicad"), _("About kicad project manager"));
item->SetBitmap(info_xpm);
helpMenu->Append(item);

4
kicad/treeprj_frame.cpp
View File

@ -875,8 +875,8 @@ void WinEDA_PrjFrame::OnRenameFile( wxCommandEvent& )
return;
wxString buffer = m_TreeProject->GetItemText( curr_item );
wxString msg = _( "Change Filename: " ) + tree_data->m_FileName;
if( Get_Message(msg, _("Change Filename"), buffer, this ) != 0 )
wxString msg = _( "Change filename: " ) + tree_data->m_FileName;
if( Get_Message(msg, _("Change filename"), buffer, this ) != 0 )
return; //Abort command
if( tree_data->Rename( buffer, true ) )

18
pcbnew/menubarmodedit.cpp
View File

@ -57,12 +57,22 @@ wxMenuItem * item;
// Menu Help: //
////////////////
wxMenu *helpMenu = new wxMenu;
item = new wxMenuItem(helpMenu , ID_GENERAL_HELP, _("&Contents"), _("Open the pcbnew manual"));
item->SetBitmap(help_xpm);
// Contents
item = new wxMenuItem(helpMenu ,
ID_GENERAL_HELP,
_("&Contents"), // Menu entry name
_("Open the pcbnew manual")); // Statusbar message
item->SetBitmap(help_xpm);
helpMenu->Append(item);
item = new wxMenuItem(helpMenu , ID_KICAD_ABOUT, _("&About"), _("About this application"));
item->SetBitmap(info_xpm);
// About pcbnew
item = new wxMenuItem(helpMenu ,
ID_KICAD_ABOUT,
_("&About pcbnew"), // Menu entry name
_("About pcbnew PCB designer")); // Statusbar message
item->SetBitmap(info_xpm);
helpMenu->Append(item);
//////////////////////

4
pcbnew/menubarpcb.cpp
View File

@ -73,7 +73,7 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
m_FilesMenu->Append(item);
item = new wxMenuItem(m_FilesMenu, ID_MENU_SAVE_BOARD_AS,
_("Save board as.."),
_("Save board as..."),
_("Save current board as..") );
item->SetBitmap(save_as_xpm);
m_FilesMenu->Append(item);
@ -293,7 +293,7 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
item->SetBitmap(help_xpm);
helpMenu->Append(item);
item = new wxMenuItem(helpMenu , ID_KICAD_ABOUT, _("&About"), _("About this application"));
item = new wxMenuItem(helpMenu , ID_KICAD_ABOUT, _("&About pcbnew"), _("About pcbnew PCB designer"));
item->SetBitmap(info_xpm);
helpMenu->Append(item);

29
share/drawframe.cpp
View File

@ -131,18 +131,29 @@ void WinEDA_DrawFrame::AddFontSelectionMenu( wxMenu* main_menu )
{
wxMenu* fontmenu = new wxMenu();
ADD_MENUITEM( fontmenu, ID_PREFERENCES_FONT_DIALOG, _( "font for dialog boxes" ),
ADD_MENUITEM( fontmenu,
ID_PREFERENCES_FONT_DIALOG,
_( "Dialog boxes" ),
fonts_xpm );
ADD_MENUITEM( fontmenu, ID_PREFERENCES_FONT_INFOSCREEN, _( "font for info display" ),
ADD_MENUITEM( fontmenu,
ID_PREFERENCES_FONT_INFOSCREEN,
_( "Lists" ),
fonts_xpm );
ADD_MENUITEM( fontmenu, ID_PREFERENCES_FONT_STATUS, _( "font for Status Line" ),
fonts_xpm );
ADD_MENUITEM_WITH_HELP_AND_SUBMENU( main_menu, fontmenu,
ID_PREFERENCES_FONT, _("&Font"),
_("Choose font type and size for dialogs, infos and status box"),
fonts_xpm );
}
ADD_MENUITEM( fontmenu,
ID_PREFERENCES_FONT_STATUS,
_( "Status box" ),
fonts_xpm );
ADD_MENUITEM_WITH_HELP_AND_SUBMENU( main_menu,
fontmenu,
ID_PREFERENCES_FONT,
_( "&Font" ),
_(
"Choose font type and size for dialogs, infos and status box" ),
fonts_xpm );
}
/********************************************************************/
void WinEDA_DrawFrame::ProcessFontPreferences( wxCommandEvent& event )

1
template/kicad.pro
View File

@ -79,6 +79,7 @@ LibName5=divers
LibName6=libcms
LibName7=display
LibName8=valves
LibName9=led
[eeschema]
version=1
LibDir=