minor update

common/about_kicad.cpp

@@ -122,13 +122,13 @@ void InitKiCadAbout( wxAboutDialogInfo& info )
 	/* Add translators */
 	info.AddTranslator( wxT( "Czech (CZ) Martin Kratoška <martin@ok1rr.com>" ) );
 	info.AddTranslator( SetMsg( wxT( "Dutch (NL) Jerry Jacobs <jerkejacobs@gmail.com>" ) ) );
-	info.AddTranslator( SetMsg( wxT( "French (FR) Jean-Pierre Charras <jean-pierre.charras@inpg.fr>" ) ) );
+	info.AddTranslator( SetMsg( wxT( "French (FR) Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>" ) ) );
 	info.AddTranslator( SetMsg( wxT( "Polish (PL) Mateusz Skowroński <skowri@gmail.com>" ) ) );
 	info.AddTranslator( SetMsg( wxT( "Portuguese (PT) Renie Marquet <reniemarquet@uol.com.br>" ) ) );
 	info.AddTranslator( SetMsg( wxT( "Russian (RU) Igor Plyatov <plyatov@gmail.com>" ) ) );
 	info.AddTranslator( SetMsg( wxT( "Spanish (ES) Pedro Martin del Valle <pkicad@yahoo.es>" ) ) );
 	info.AddTranslator( SetMsg( wxT( "Spanish (ES) Iñigo Zuluaga <inigo_zuluaga@yahoo.es>" ) ) );
-	info.AddTranslator( SetMsg( wxT( "German (DE) Rafael.Sokolowski <Rafael.Sokolowski@web.de>" ) ) );
+	info.AddTranslator( SetMsg( wxT( "German (DE) Rafael.Sokolowski <rafael.sokolowski@web.de>" ) ) );
 
 	/* TODO are these all russian translators, placed them here now              TODO
 		TODO or else align them below other language maintainer with mail adres   TODO*/

common/confirm.cpp

@@ -29,9 +29,8 @@ enum id_dialog {
  */
 class WinEDA_MessageDialog : public wxMessageDialog
 {
-public:
-    int     m_LifeTime;
 private:
+    int     m_LifeTime;
     wxTimer m_Timer;
 
 public:
@@ -65,7 +64,8 @@ WinEDA_MessageDialog::WinEDA_MessageDialog( wxWindow* parent, const wxString& ms
 void WinEDA_MessageDialog::OnTimeOut( wxTimerEvent& event )
 /********************************************************/
 {
-    //	TODO : EndModal() request
+    m_Timer.Stop();
+    EndModal( wxID_YES );   // Does not work, I do not know why (this function is correctly called after time out)
 }
 
 
@@ -74,19 +74,18 @@ void DisplayError( wxWindow* parent, const wxString& text, int displaytime )
 /*****************************************************************************/
 
 /*  Affiche un Message d'Erreur ou d'avertissement.
- *  si warn > 0 le dialogue disparait apres warn 0.1 secondes
+ *  si warn > 0 le dialogue disparait apres displaytime * 0.1 secondes
  */
 {
     wxMessageDialog* dialog;
 
     if( displaytime > 0 )
-        dialog = new    WinEDA_MessageDialog( parent, text, _(
-                                                  "Warning" ),
-                                              wxOK | wxICON_INFORMATION | wxSTAY_ON_TOP,
+        dialog = new    WinEDA_MessageDialog( parent, text, _( "Warning" ),
+                                              wxOK | wxICON_INFORMATION,
                                               displaytime );
     else
         dialog = new    WinEDA_MessageDialog( parent, text, _( "Error" ),
-                                              wxOK | wxICON_EXCLAMATION | wxSTAY_ON_TOP, 0 );
+                                              wxOK | wxICON_ERROR, 0 );
 
     dialog->ShowModal();
     dialog->Destroy();
@@ -103,8 +102,8 @@ void DisplayInfo( wxWindow* parent, const wxString& text, int displaytime )
 {
     wxMessageDialog* dialog;
 
-    dialog = new WinEDA_MessageDialog( parent, text, _( "Infos:" ),
-                                       wxOK | wxICON_INFORMATION | wxSTAY_ON_TOP, displaytime );
+    dialog = new WinEDA_MessageDialog( parent, text, _( "Info:" ),
+                                       wxOK | wxICON_INFORMATION, displaytime );
 
     dialog->ShowModal(); dialog->Destroy();
 }

eeschema/class_text-label.cpp

@@ -606,7 +606,7 @@ void SCH_GLOBALLABEL::CreateGraphicShape( int* corner_list, const wxPoint& Pos )
 
     *corner_list = 7; corner_list++;	// 7 corners in list
 
-    int symb_len = Len_Size() + (TXTMARGE * 2);   // Real text len + text margin
+    int symb_len = ( Pitch(width) * GetLength() ) + (TXTMARGE * 2);
     // Create outline shape : 6 points
     int x = symb_len + width + 3;
     int y = HalfSize + width + 3;

eeschema/dialog_edit_label.cpp

@@ -60,6 +60,7 @@ void DialogLabelEditor::init()
 
     case TYPE_SCH_HIERLABEL:
         SetTitle( _( "Hierarchal Label Properties" ) );
+        m_TextShape->SetLabel( _("Hlabel Shape") );
         break;
 
     case TYPE_SCH_LABEL: