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

(confirm.cpp) Get_Message frame caption added

This commit is contained in:
jerryjacobs 2008-09-22 16:03:12 +00:00
parent fcb2743812
commit 26af26619a
18 changed files with 7878 additions and 7821 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/about_kicad.cpp
View File

@ -96,8 +96,9 @@ void InitKiCadAbout( wxAboutDialogInfo& info )
/* Add developers */
info.AddDeveloper( wxT( "Jean-Pierre Charras <jean-pierre.charras@inpg.fr>" ) );
info.AddDeveloper( SetMsg( wxT( "Jerry Jacobs <jerkejacobs@gmail.com>" ) ) );
info.AddDeveloper( SetMsg( wxT( "Dick Hollenbeck <dick@softplc.com>" ) ) );
info.AddDeveloper( SetMsg( wxT( "kbool library: http://boolean.klaasholwerda.nl/bool.html" ) ) );
info.AddDeveloper( SetMsg( wxT( "KBool Library <http://boolean.klaasholwerda.nl/bool.html>" ) ) );
/* Add document writers */
info.AddDocWriter( wxT( "Jean-Pierre Charras <jean-pierre.charras@inpg.fr>" ) );

7
common/confirm.cpp
View File

@ -124,7 +124,10 @@ bool IsOK( wxWindow* parent, const wxString& text )
/***********************************************************************/
int Get_Message( const wxString& title, wxString& buffer, wxWindow* frame )
int Get_Message( const wxString& title, // The question
const wxString& frame_caption, // The frame caption
wxString& buffer, // String input buffer
wxWindow* frame )
/***********************************************************************/
/* Get a text from user
@ -142,7 +145,7 @@ int Get_Message( const wxString& title, wxString& buffer, wxWindow* frame )
if( buffer )
default_text = buffer;
message = wxGetTextFromUser( title, _( "Text:" ),
message = wxGetTextFromUser( title, frame_title,
default_text, frame );
if( !message.IsEmpty() )
{

4
eeschema/edit_component_in_lib.cpp
View File

@ -912,7 +912,7 @@ void WinEDA_PartPropertiesFrame::AddAliasOfPart( wxCommandEvent& WXUNUSED (event
if( CurrentLibEntry == NULL )
return;
if( Get_Message( _( "New alias:" ), Line, this ) != 0 )
if( Get_Message( _( "New alias:" ), _("Component Alias"), Line, this ) != 0 )
return;
Line.Replace( wxT( " " ), wxT( "_" ) );
@ -1186,7 +1186,7 @@ void WinEDA_PartPropertiesFrame::AddFootprintFilter( wxCommandEvent& WXUNUSED (e
if( CurrentLibEntry == NULL )
return;
if( Get_Message( _( "New FootprintFilter:" ), Line, this ) != 0 )
if( Get_Message( _( "New FootprintFilter:" ), _("Footprint Filter"), Line, this ) != 0 )
return;
Line.Replace( wxT( " " ), wxT( "_" ) );

36
eeschema/edit_component_in_schematic.cpp
View File

@ -332,9 +332,9 @@ void WinEDA_ComponentPropertiesFrame::ComponentPropertiesAccept( wxCommandEvent&
{
if( FindLibPart( newname.GetData(), wxEmptyString, FIND_ALIAS ) == NULL )
{
wxString msg;
msg.Printf( _( "Component [%s] not found!" ), newname.GetData() );
DisplayError( this, msg );
wxString message;
message.Printf( _( "Component [%s] not found!" ), newname.GetData() );
DisplayError( this, message );
}
else // Changement de composant!
{
@ -555,7 +555,7 @@ void WinEDA_SchematicFrame::EditCmpFieldText( SCH_CMP_FIELD* Field, wxDC* DC )
wxString newtext = Field->m_Text;
DrawPanel->m_IgnoreMouseEvents = TRUE;
Get_Message( Field->m_Name, newtext, this );
Get_Message( Field->m_Name, _("Component field text"), newtext, this );
DrawPanel->MouseToCursorSchema();
DrawPanel->m_IgnoreMouseEvents = FALSE;
@ -755,7 +755,7 @@ void WinEDA_SchematicFrame::EditComponentReference( SCH_COMPONENT* Cmp, wxDC* DC
flag = 1;
wxString ref = Cmp->GetRef(GetSheet());
Get_Message( _( "Reference" ), ref, this );
Get_Message( _( "Reference" ), _("Component Reference"), ref, this );
if( !ref.IsEmpty() ) // New text entered
{
@ -780,7 +780,7 @@ void WinEDA_SchematicFrame::EditComponentValue( SCH_COMPONENT* Cmp, wxDC* DC )
/*****************************************************************************************/
/* Routine de changement du texte selectionne */
{
wxString msg;
wxString message;
EDA_LibComponentStruct* Entry;
if( Cmp == NULL )
@ -792,18 +792,18 @@ void WinEDA_SchematicFrame::EditComponentValue( SCH_COMPONENT* Cmp, wxDC* DC )
SCH_CMP_FIELD* TextField = &Cmp->m_Field[VALUE];
msg = TextField->m_Text;
if( Get_Message( _( "Value" ), msg, this ) )
msg.Empty(); //allow the user to remove the value.
message = TextField->m_Text;
if( Get_Message( _( "Value" ), _("Component Value"), message, this ) )
message.Empty(); //allow the user to remove the value.
if( !msg.IsEmpty() && !msg.IsEmpty())
if( !message.IsEmpty() && !message.IsEmpty())
{
/* save old cmp in undo list if not already in edit, or moving ... */
if( Cmp->m_Flags == 0 )
SaveCopyInUndoList( Cmp, IS_CHANGED );
TextField->Draw( DrawPanel, DC, wxPoint(0,0), g_XorMode );
TextField->m_Text = msg;
TextField->m_Text = message;
TextField->Draw( DrawPanel, DC, wxPoint(0,0),
Cmp->m_Flags ? g_XorMode : GR_DEFAULT_DRAWMODE );
GetScreen()->SetModify();
@ -816,7 +816,7 @@ void WinEDA_SchematicFrame::EditComponentValue( SCH_COMPONENT* Cmp, wxDC* DC )
void WinEDA_SchematicFrame::EditComponentFootprint( SCH_COMPONENT* Cmp, wxDC* DC )
/*****************************************************************************************/
{
wxString msg;
wxString message;
EDA_LibComponentStruct* Entry;
bool wasEmpty = false;
@ -829,18 +829,18 @@ void WinEDA_SchematicFrame::EditComponentFootprint( SCH_COMPONENT* Cmp, wxDC* DC
SCH_CMP_FIELD* TextField = &Cmp->m_Field[FOOTPRINT];
msg = TextField->m_Text;
if(msg.IsEmpty() )
message = TextField->m_Text;
if(message.IsEmpty() )
wasEmpty = true;
if( Get_Message( _( "Footprint" ), msg, this ) )
msg.Empty(); //allow the user to remove the value.
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 ... */
if( Cmp->m_Flags == 0 )
SaveCopyInUndoList( Cmp, IS_CHANGED );
Cmp->m_Field[FOOTPRINT].Draw( DrawPanel, DC, wxPoint(0,0), g_XorMode );
//move the field if it was new.
if(wasEmpty && !msg.IsEmpty())
if(wasEmpty && !message.IsEmpty())
{
Cmp->m_Field[FOOTPRINT].m_Pos = Cmp->m_Field[REFERENCE].m_Pos;
//add offset here - ? suitable heuristic below?
@ -853,7 +853,7 @@ void WinEDA_SchematicFrame::EditComponentFootprint( SCH_COMPONENT* Cmp, wxDC* DC
Cmp->m_Field[FOOTPRINT].m_Orient = Cmp->m_Field[REFERENCE].m_Orient;
}
TextField->m_Text = msg;
TextField->m_Text = message;
Cmp->m_Field[FOOTPRINT].Draw( DrawPanel, DC, wxPoint(0,0),
Cmp->m_Flags ? g_XorMode : GR_DEFAULT_DRAWMODE );

6
eeschema/libfield.cpp
View File

@ -177,8 +177,9 @@ void WinEDA_LibeditFrame::EditField(wxDC * DC, LibDrawField *Field)
/******************************************************************/
{
wxString Text;
wxString title;
int color;
wxString title = wxT("Text:");
int LineWidth = MAX(Field->m_Width, g_DrawMinimunLineWidth);
if( Field == NULL) return;
@ -202,11 +203,10 @@ wxString title = wxT("Text:");
if( Field->m_Attributs & TEXT_NO_VISIBLE ) color = DARKGRAY;
Text = Field->m_Text;
Get_Message(title,Text, this);
Get_Message(title, _("Edit field"), Text, this);
Text.Replace( wxT(" ") , wxT("_") );
GRSetDrawMode(DC, g_XorMode);
int LineWidth = MAX(Field->m_Width, g_DrawMinimunLineWidth);
DrawGraphicText(DrawPanel, DC, wxPoint(Field->m_Pos.x, - Field->m_Pos.y),
color, Field->m_Text,
Field->m_Orient ? TEXT_ORIENT_VERT : TEXT_ORIENT_HORIZ,

14
eeschema/menubar.cpp
View File

@ -18,6 +18,7 @@
#include "id.h"
#include "hotkeys.h"
#include "icons.h"
/************************************************/
void WinEDA_SchematicFrame::ReCreateMenuBar()
@ -32,6 +33,11 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
if( menuBar == NULL )
{
wxImage::AddHandler( new wxPNGHandler ); /* Support PNG Images */
initialise_icons();
menuBar = new wxMenuBar();
m_FilesMenu = new wxMenu;
@ -137,7 +143,8 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
item = new wxMenuItem( editMenu, ID_SCHEMATIC_REDO,
msg, _( "Redo the last undo command" ),
wxITEM_NORMAL );
item->SetBitmap( redo_xpm );
extern wxBitmap zoom_in_png;
item->SetBitmap( zoom_in_png );
editMenu->Append( item );
editMenu->AppendSeparator();
@ -153,7 +160,8 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
item = new wxMenuItem( editMenu, ID_FIND_ITEMS,
_( "Find" ), _( "Find components and texts" ),
wxITEM_NORMAL );
item->SetBitmap( find_xpm );
extern wxBitmap edit_find_png;
item->SetBitmap( edit_find_png );
editMenu->Append( item );
editMenu->AppendSeparator();
@ -171,7 +179,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
item = new wxMenuItem( viewMenu, ID_ZOOM_IN_BUTT,
msg, _( "Zoom in" ),
wxITEM_NORMAL );
item->SetBitmap( zoom_in_xpm );
item->SetBitmap( find_xpm );
viewMenu->Append( item );
msg = AddHotkeyName( _( "Zoom out" ), s_Schematic_Hokeys_Descr,

2
eeschema/sheetlab.cpp
View File

@ -325,7 +325,7 @@ Hierarchical_PIN_Sheet_Struct* WinEDA_SchematicFrame::Create_PinSheet(
break;
}
Get_Message( Text, Line, this );
Get_Message( Text, _("PinSheet"), Line, this );
if( Line.IsEmpty() )
return NULL;

4
eeschema/viewlib_frame.cpp
View File

@ -72,7 +72,7 @@ WinEDA_ViewlibFrame::WinEDA_ViewlibFrame( wxWindow* father, WinEDA_App* parent,
if( Library == NULL )
{
m_LibListSize.x = 90;
m_LibListSize.x = 150; // Width of library list
m_LibListSize.y = -1;
m_LibList = new wxListBox( this, ID_LIBVIEW_LIB_LIST, wxPoint( 0, 0 ),
m_LibListSize, 0, NULL, wxLB_HSCROLL );
@ -83,7 +83,7 @@ WinEDA_ViewlibFrame::WinEDA_ViewlibFrame( wxWindow* father, WinEDA_App* parent,
else
g_CurrentViewLibraryName = Library->m_Name;
m_CmpListSize.x = 150;
m_CmpListSize.x = 150; // Width of component list
m_CmpListSize.y = -1;
m_CmpList = new wxListBox( this, ID_LIBVIEW_CMP_LIST, wxPoint( m_LibListSize.x, 0 ),
m_CmpListSize, 0, NULL, wxLB_HSCROLL );

5
include/common.h
View File

@ -437,7 +437,10 @@ bool IsOK( wxWindow* parent, const wxString& msg );
/* Routine affichant la fenetre "CONFIRMATION"
* Retourne 1 ou 0 selon reponse Yes / No */
int Get_Message( const wxString& titre, wxString& buffer, wxWindow* frame );
int Get_Message( const wxString& title,
const wxString& frame_caption,
wxString& buffer,
wxWindow* frame );
/* Fonction d'installation du menu de Dialogue
* entree: titre = titre a afficher

BIN
internat/nl/kicad.mo
View File

Binary file not shown.

15576
internat/nl/kicad.po
View File

File diff suppressed because it is too large Load Diff

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 File Name: " ) + tree_data->m_FileName;
if( Get_Message( msg, 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 ) )

2
pcbnew/edgemod.cpp
View File

@ -243,7 +243,7 @@ void WinEDA_ModuleEditFrame::Enter_Edge_Width( EDGE_MODULE* Edge, wxDC* DC )
long ll;
buffer << ModuleSegmentWidth;
if( Get_Message( _( "New Width (1/10000\"):" ), buffer, this ) )
if( Get_Message( _( "New Width (1/10000\"):" ), _("Edge Width"), buffer, this ) )
return;
if( buffer.ToLong( &ll ) )

4
pcbnew/gen_self.h
View File

@ -214,13 +214,13 @@ MODULE* WinEDA_PcbFrame::Genere_Self( wxDC* DC )
{
fcoeff = 10000.0;
msg.Printf( wxT( "%1.4f" ), Mself.lng / fcoeff );
abort = Get_Message( _( "Length(inch):" ), msg, this );
abort = Get_Message( _( "Length(inch):" ), _("Lenght"), msg, this );
}
else
{
fcoeff = 10000.0 / 25.4;
msg.Printf( wxT( "%2.3f" ), Mself.lng / fcoeff );
abort = Get_Message( _( "Length(mm):" ), msg, this );
abort = Get_Message( _( "Length(mm):" ), _("Lenght"), msg, this );
}
if( abort )
return NULL;

4
pcbnew/librairi.cpp
View File

@ -524,7 +524,7 @@ int WinEDA_BasePcbFrame::Save_1_Module( const wxString& LibName,
if( DisplayDialog )
{
Get_Message( _( "Name:" ), Name_Cmp, this );
Get_Message( _( "Name:" ), _("Save module"), Name_Cmp, this );
if( Name_Cmp.IsEmpty() )
return 0;
Name_Cmp.Trim( TRUE );
@ -720,7 +720,7 @@ MODULE* WinEDA_BasePcbFrame::Create_1_Module( wxDC* DC, const wxString& module_n
/* Demande du nom du nouveau module */
if( module_name.IsEmpty() )
{
if( Get_Message( _( "Module Reference:" ), Line, this ) != 0 )
if( Get_Message( _( "Module Reference:" ), _("Create module"), Line, this ) != 0 )
return NULL;
}
else

2
pcbnew/modules.cpp
View File

@ -78,7 +78,7 @@ MODULE* WinEDA_BasePcbFrame::GetModuleByName()
wxString modulename;
MODULE* module = NULL;
Get_Message( _( "Footprint name:" ), modulename, this );
Get_Message( _( "Footprint name:" ), _("Search Footprint"), modulename, this );
if( !modulename.IsEmpty() )
{
module = m_Pcb->m_Modules;

10
pcbnew/muonde.cpp
View File

@ -173,14 +173,14 @@ MODULE* WinEDA_PcbFrame::Create_MuWaveComponent( wxDC* DC, int shape_type )
fcoeff = 10000.0 / 25.4;
value.Printf( wxT( "%2.4f" ), gap_size / fcoeff );
msg += _( " (mm):" );
abort = Get_Message( msg, value, this );
abort = Get_Message( msg, _("Create microwave module"), value, this );
}
else
{
fcoeff = 10000.0;
value.Printf( wxT( "%2.3f" ), gap_size / fcoeff );
msg += _( " (inch):" );
abort = Get_Message( msg, value, this );
abort = Get_Message( msg, _("Create microwave module"), value, this );
}
double fval;
@ -196,7 +196,7 @@ MODULE* WinEDA_PcbFrame::Create_MuWaveComponent( wxDC* DC, int shape_type )
fcoeff = 10.0;
value.Printf( wxT( "%3.1f" ), angle / fcoeff );
msg = _( "Angle (0.1deg):" );
abort = Get_Message( msg, value, this );
abort = Get_Message( msg, _("Create microwave module"), value, this );
if( !value.ToDouble( &fval ) )
{
DisplayError( this, _( "Incorrect number, abort" ) );
@ -695,13 +695,13 @@ void WinEDA_PcbFrame::Edit_Gap( wxDC* DC, MODULE* Module )
{
fcoeff = 10000.0 / 25.4;
msg.Printf( wxT( "%2.3f" ), gap_size / fcoeff );
Get_Message( _( "Gap (mm):" ), msg, this );
Get_Message( _( "Gap (mm):" ), _("Create Microwave Gap"), msg, this );
}
else
{
fcoeff = 10000.0;
msg.Printf( wxT( "%2.4f" ), gap_size / fcoeff );
Get_Message( _( "Gap (inch):" ), msg, this );
Get_Message( _( "Gap (inch):" ), _("Create Microwave Gap"), msg, this );
}
if( !msg.IsEmpty() )

2
pcbnew/surbrill.cpp
View File

@ -34,7 +34,7 @@ void WinEDA_PcbFrame::Liste_Equipot( wxCommandEvent& event )
int ii, jj;
msg = wxT( "*" );
Get_Message( _( "Filter for net names:" ), msg, this );
Get_Message( _( "Filter for net names:" ), _("Net Filter"), msg, this );
if( msg.IsEmpty() )
return;