(confirm.cpp) Get_Message frame caption added (26af2661) · Commits · Elphel / kicad-source-mirror

common/about_kicad.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -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>" ) );

common/confirm.cpp

+5 −2

Original line number	Diff line number	Diff line
		@@ -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() )
		{

eeschema/edit_component_in_lib.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -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( "_" ) );

eeschema/edit_component_in_schematic.cpp

+18 −18

Original line number	Diff line number	Diff line
		@@ -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 );

eeschema/libfield.cpp

+9 −9

Original line number	Diff line number	Diff line
		@@ -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,

Admin message