eeschema: minor change to avoid potential problems with power symbols.
This commit is contained in:
charras
parent
0f06d8a136
commit
124074c6f7
|
|
@ -49,7 +49,6 @@ CMP_LIB_ENTRY::CMP_LIB_ENTRY( CMP_LIB_ENTRY& aEntry, CMP_LIBRARY* aLibrary ) :
|
|||
description = aEntry.description;
|
||||
keyWords = aEntry.keyWords;
|
||||
docFileName = aEntry.docFileName;
|
||||
options = aEntry.options;
|
||||
library = aLibrary;
|
||||
}
|
||||
|
||||
|
|
@ -181,7 +180,7 @@ LIB_COMPONENT::LIB_COMPONENT( const wxString& aName, CMP_LIBRARY* aLibrary ) :
|
|||
m_LastDate = 0;
|
||||
unitCount = 1;
|
||||
m_TextInside = 40;
|
||||
options = ENTRY_NORMAL;
|
||||
m_options = ENTRY_NORMAL;
|
||||
m_UnitSelectionLocked = FALSE;
|
||||
m_DrawPinNum = 1;
|
||||
m_DrawPinName = 1;
|
||||
|
|
@ -209,6 +208,7 @@ LIB_COMPONENT::LIB_COMPONENT( LIB_COMPONENT& aComponent, CMP_LIBRARY* aLibrary )
|
|||
m_DrawPinNum = aComponent.m_DrawPinNum;
|
||||
m_DrawPinName = aComponent.m_DrawPinName;
|
||||
m_LastDate = aComponent.m_LastDate;
|
||||
m_options = aComponent.m_options;
|
||||
|
||||
BOOST_FOREACH( LIB_DRAW_ITEM& oldItem, aComponent.GetDrawItemList() )
|
||||
{
|
||||
|
|
@ -497,7 +497,7 @@ bool LIB_COMPONENT::Save( FILE* aFile )
|
|||
m_DrawPinNum ? 'Y' : 'N',
|
||||
m_DrawPinName ? 'Y' : 'N',
|
||||
unitCount, m_UnitSelectionLocked ? 'L' : 'F',
|
||||
options == ENTRY_POWER ? 'P' : 'N' ) < 0 )
|
||||
m_options == ENTRY_POWER ? 'P' : 'N' ) < 0 )
|
||||
return false;
|
||||
|
||||
if( !SaveDateAndTime( aFile ) )
|
||||
|
|
@ -662,7 +662,7 @@ bool LIB_COMPONENT::Load( FILE* aFile, char* aLine, int* aLineNum,
|
|||
if( ( p = strtok( NULL, " \t\n" ) ) != NULL && *p == 'L' )
|
||||
m_UnitSelectionLocked = true;
|
||||
if( ( p = strtok( NULL, " \t\n" ) ) != NULL && *p == 'P' )
|
||||
options = ENTRY_POWER;
|
||||
m_options = ENTRY_POWER;
|
||||
|
||||
/* Read next lines */
|
||||
while( GetLine( aFile, aLine, aLineNum, 1024 ) )
|
||||
|
|
|
|||
|
|
@ -52,7 +52,6 @@ protected:
|
|||
wxString keyWords; /* keyword list (used for search for
|
||||
* components by keyword) */
|
||||
wxString docFileName; /* Associate doc file name */
|
||||
LibrEntryOptions options; // special features (i.e. Entry is a POWER)
|
||||
|
||||
public:
|
||||
CMP_LIB_ENTRY( LibrEntryType aType, const wxString& aName,
|
||||
|
|
@ -78,12 +77,6 @@ public:
|
|||
|
||||
int GetType() { return type; }
|
||||
|
||||
bool isPower() { return options == ENTRY_POWER; }
|
||||
bool isNormal() { return options == ENTRY_NORMAL; }
|
||||
|
||||
void SetPower() { options = ENTRY_POWER; }
|
||||
void SetNormal() { options = ENTRY_NORMAL; }
|
||||
|
||||
void SetDescription( const wxString& aDescription )
|
||||
{
|
||||
description = aDescription;
|
||||
|
|
@ -161,6 +154,7 @@ public:
|
|||
long m_LastDate; // Last change Date
|
||||
|
||||
protected:
|
||||
LibrEntryOptions m_options; // special features (i.e. Entry is a POWER)
|
||||
int unitCount; /* Units (parts) per package */
|
||||
LIB_DRAW_ITEM_LIST drawings; /* How to draw this part */
|
||||
|
||||
|
|
@ -212,6 +206,12 @@ public:
|
|||
bool LoadFootprints( FILE* aFile, char* aLine,
|
||||
int* aLineNum, wxString& aErrorMsg );
|
||||
|
||||
bool isPower() { return m_options == ENTRY_POWER; }
|
||||
bool isNormal() { return m_options == ENTRY_NORMAL; }
|
||||
|
||||
void SetPower() { m_options = ENTRY_POWER; }
|
||||
void SetNormal() { m_options = ENTRY_NORMAL; }
|
||||
|
||||
/**
|
||||
* Initialize fields from a vector of fields.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -319,7 +319,9 @@ bool SCH_PRINTOUT::OnBeginDocument( int startPage, int endPage )
|
|||
if( !wxPrintout::OnBeginDocument( startPage, endPage ) )
|
||||
return false;
|
||||
|
||||
#ifdef __WXDEBUG__
|
||||
WinEDA_SchematicFrame* parent = m_Parent->GetParent();
|
||||
#endif
|
||||
wxLogDebug( wxT( "Printer name: " ) +
|
||||
parent->GetPageSetupData().GetPrintData().GetPrinterName() );
|
||||
wxLogDebug( wxT( "Paper ID: %d" ),
|
||||
|
|
|
|||
|
|
@ -316,7 +316,7 @@ void AddMenusForComponent( wxMenu* PopMenu, SCH_COMPONENT* Component )
|
|||
ADD_MENUITEM( editmenu, ID_POPUP_SCH_EDIT_CMP, msg,
|
||||
edit_component_xpm );
|
||||
|
||||
if( libEntry && libEntry->isNormal() )
|
||||
if( libComponent && libComponent->isNormal() )
|
||||
{
|
||||
msg = AddHotkeyName( _( "Value " ), s_Schematic_Hokeys_Descr,
|
||||
HK_EDIT_COMPONENT_VALUE );
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -2,8 +2,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: kicad\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2010-02-16 11:02+0100\n"
|
||||
"PO-Revision-Date: 2010-02-16 11:04+0100\n"
|
||||
"POT-Creation-Date: 2010-02-16 17:20+0100\n"
|
||||
"PO-Revision-Date: 2010-02-16 17:20+0100\n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -1936,7 +1936,7 @@ msgstr "Grille"
|
|||
msgid "User Grid"
|
||||
msgstr "Grille perso"
|
||||
|
||||
#: pcbnew/tool_pcb.cpp:761
|
||||
#: pcbnew/tool_pcb.cpp:757
|
||||
msgid "+/- to switch"
|
||||
msgstr "+/- pour commuter"
|
||||
|
||||
|
|
@ -8348,66 +8348,66 @@ msgstr "Appel de CvPcb (Gestion des associations composants/modules)"
|
|||
msgid "Run pcbnew"
|
||||
msgstr "Appel de Pcbnew"
|
||||
|
||||
#: eeschema/tool_sch.cpp:115
|
||||
#: eeschema/tool_sch.cpp:117
|
||||
msgid "Netlist generation"
|
||||
msgstr "Génération de la netliste"
|
||||
|
||||
#: eeschema/tool_sch.cpp:119
|
||||
#: eeschema/tool_sch.cpp:121
|
||||
msgid "Annotate schematic"
|
||||
msgstr "Annotation de la schématique"
|
||||
|
||||
#: eeschema/tool_sch.cpp:122
|
||||
#: eeschema/tool_sch.cpp:124
|
||||
msgid "Schematic Electric Rules Check"
|
||||
msgstr "Contrôle des règles électriques"
|
||||
|
||||
#: eeschema/tool_sch.cpp:125
|
||||
#: eeschema/tool_sch.cpp:127
|
||||
msgid "Bill of material and/or Cross references"
|
||||
msgstr "Liste des composants ou/et références croisées"
|
||||
|
||||
#: eeschema/tool_sch.cpp:129
|
||||
#: eeschema/tool_sch.cpp:131
|
||||
msgid "Backannotate footprint"
|
||||
msgstr "Rétroannotation module"
|
||||
|
||||
#: eeschema/tool_sch.cpp:153
|
||||
#: eeschema/tool_sch.cpp:155
|
||||
msgid "Hierarchy Push/Pop"
|
||||
msgstr "Navigation dans la hiérarchie"
|
||||
|
||||
#: eeschema/tool_sch.cpp:158
|
||||
#: eeschema/tool_sch.cpp:160
|
||||
msgid "Place a component"
|
||||
msgstr "Placer un Composant"
|
||||
|
||||
#: eeschema/tool_sch.cpp:162
|
||||
#: eeschema/tool_sch.cpp:164
|
||||
msgid "Place a power port"
|
||||
msgstr "Placer un Symbole Power"
|
||||
|
||||
#: eeschema/tool_sch.cpp:167
|
||||
#: eeschema/tool_sch.cpp:169
|
||||
msgid "Place a wire"
|
||||
msgstr "Placer un fil"
|
||||
|
||||
#: eeschema/tool_sch.cpp:171
|
||||
#: eeschema/tool_sch.cpp:173
|
||||
msgid "Place a bus"
|
||||
msgstr "Placer un bus"
|
||||
|
||||
#: eeschema/tool_sch.cpp:175
|
||||
#: eeschema/tool_sch.cpp:177
|
||||
#: eeschema/menubar.cpp:289
|
||||
msgid "Place a wire to bus entry"
|
||||
msgstr "Placer une Entrée de Bus (type fil vers bus)"
|
||||
|
||||
#: eeschema/tool_sch.cpp:179
|
||||
#: eeschema/tool_sch.cpp:181
|
||||
#: eeschema/menubar.cpp:296
|
||||
msgid "Place a bus to bus entry"
|
||||
msgstr "Placer une Entrée de Bus (type bus vers bus)"
|
||||
|
||||
#: eeschema/tool_sch.cpp:184
|
||||
#: eeschema/tool_sch.cpp:186
|
||||
msgid "Place no connect flag"
|
||||
msgstr "Placer symbole de non connexion"
|
||||
|
||||
#: eeschema/tool_sch.cpp:188
|
||||
#: eeschema/tool_sch.cpp:190
|
||||
#: eeschema/menubar.cpp:308
|
||||
msgid "Place net name"
|
||||
msgstr "Place nom de net"
|
||||
|
||||
#: eeschema/tool_sch.cpp:192
|
||||
#: eeschema/tool_sch.cpp:194
|
||||
msgid ""
|
||||
"Place a global label.\n"
|
||||
"Warning: all global labels with the same name are connected in whole hierarchy"
|
||||
|
|
@ -8415,40 +8415,40 @@ msgstr ""
|
|||
"Placer un label global.\n"
|
||||
"Attention: tous les labels globaux avec le même nom sont connectés dans toute la hiérarchie"
|
||||
|
||||
#: eeschema/tool_sch.cpp:197
|
||||
#: eeschema/tool_sch.cpp:199
|
||||
msgid "Place a junction"
|
||||
msgstr "Placer une jonction"
|
||||
|
||||
#: eeschema/tool_sch.cpp:202
|
||||
#: eeschema/tool_sch.cpp:204
|
||||
#: eeschema/menubar.cpp:331
|
||||
msgid "Place a hierarchical label. This label will be seen as a pin sheet in the sheet symbol"
|
||||
msgstr "Placer un label hiérachique. Ce label sera vu comme une pin dans la feuille mère symbole"
|
||||
|
||||
#: eeschema/tool_sch.cpp:207
|
||||
#: eeschema/tool_sch.cpp:209
|
||||
msgid "Place hierarchical sheet"
|
||||
msgstr "Placer feuille hiérarchique"
|
||||
|
||||
#: eeschema/tool_sch.cpp:211
|
||||
#: eeschema/tool_sch.cpp:213
|
||||
msgid "Place a pin sheet, imported from the corresponding hierarchical label in sheet"
|
||||
msgstr "Placer une pin hiérarchique, importée du label hiérarchique correspondant dans la feuille."
|
||||
|
||||
#: eeschema/tool_sch.cpp:216
|
||||
#: eeschema/tool_sch.cpp:218
|
||||
msgid "Place hierarchical pin to sheet"
|
||||
msgstr "Addition de pins de hiérarchie dans les feuilles symboles de hiérarchie"
|
||||
|
||||
#: eeschema/tool_sch.cpp:221
|
||||
#: eeschema/tool_sch.cpp:223
|
||||
msgid "Place graphic line or polygon"
|
||||
msgstr "Placer ligne ou polygone graphique"
|
||||
|
||||
#: eeschema/tool_sch.cpp:225
|
||||
#: eeschema/tool_sch.cpp:227
|
||||
msgid "Place graphic text (comment)"
|
||||
msgstr "Placer textes graphiques (commentaires)"
|
||||
|
||||
#: eeschema/tool_sch.cpp:249
|
||||
#: eeschema/tool_sch.cpp:251
|
||||
msgid "Turn grid off"
|
||||
msgstr "Ne pas afficher la grille"
|
||||
|
||||
#: eeschema/tool_sch.cpp:271
|
||||
#: eeschema/tool_sch.cpp:273
|
||||
msgid "HV orientation for wires and bus"
|
||||
msgstr "Force direction H, V pour les fils et bus"
|
||||
|
||||
|
|
@ -8485,44 +8485,10 @@ msgid "Insert component in schematic"
|
|||
msgstr "Placer composant en schématique"
|
||||
|
||||
#: eeschema/tool_viewlib.cpp:147
|
||||
#: eeschema/libframe.cpp:420
|
||||
#, c-format
|
||||
msgid "Part %c"
|
||||
msgstr "Composant %c"
|
||||
|
||||
#: eeschema/libframe.cpp:297
|
||||
msgid ""
|
||||
"Component was modified!\n"
|
||||
"Discard changes?"
|
||||
msgstr ""
|
||||
"Le composant a été modifié\n"
|
||||
"Perdre les changements"
|
||||
|
||||
#: eeschema/libframe.cpp:310
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Library \"%s\" was modified!\n"
|
||||
"Discard changes?"
|
||||
msgstr ""
|
||||
"Librairie \"%s\" modifiée!\n"
|
||||
"Perdre les changements ?"
|
||||
|
||||
#: eeschema/libframe.cpp:687
|
||||
msgid "Set pin options"
|
||||
msgstr "Choix options de pin"
|
||||
|
||||
#: eeschema/libframe.cpp:716
|
||||
msgid "Add line"
|
||||
msgstr "Addition de lignes"
|
||||
|
||||
#: eeschema/libframe.cpp:720
|
||||
msgid "Set anchor position"
|
||||
msgstr "Ajuster Position Ancre"
|
||||
|
||||
#: eeschema/libframe.cpp:730
|
||||
msgid "Export"
|
||||
msgstr "Exporter"
|
||||
|
||||
#: eeschema/onrightclick.cpp:108
|
||||
msgid "Leave Sheet"
|
||||
msgstr "Quitter sous-feuille"
|
||||
|
|
@ -9673,6 +9639,39 @@ msgstr ""
|
|||
msgid "User defined search path"
|
||||
msgstr "Chemin de recherche défini par l'utilisateur"
|
||||
|
||||
#: eeschema/libeditframe.cpp:299
|
||||
msgid ""
|
||||
"Component was modified!\n"
|
||||
"Discard changes?"
|
||||
msgstr ""
|
||||
"Le composant a été modifié\n"
|
||||
"Perdre les changements"
|
||||
|
||||
#: eeschema/libeditframe.cpp:312
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Library \"%s\" was modified!\n"
|
||||
"Discard changes?"
|
||||
msgstr ""
|
||||
"Librairie \"%s\" modifiée!\n"
|
||||
"Perdre les changements ?"
|
||||
|
||||
#: eeschema/libeditframe.cpp:689
|
||||
msgid "Set pin options"
|
||||
msgstr "Choix options de pin"
|
||||
|
||||
#: eeschema/libeditframe.cpp:718
|
||||
msgid "Add line"
|
||||
msgstr "Addition de lignes"
|
||||
|
||||
#: eeschema/libeditframe.cpp:722
|
||||
msgid "Set anchor position"
|
||||
msgstr "Ajuster Position Ancre"
|
||||
|
||||
#: eeschema/libeditframe.cpp:732
|
||||
msgid "Export"
|
||||
msgstr "Exporter"
|
||||
|
||||
#: eeschema/netlist_control.cpp:130
|
||||
#: eeschema/netlist_control.cpp:254
|
||||
msgid "Default format"
|
||||
|
|
@ -12477,7 +12476,7 @@ msgstr "Sélection par Viewer"
|
|||
msgid "Load Error!"
|
||||
msgstr "Erreur de Chargement!"
|
||||
|
||||
#: common/hotkeys_basic.cpp:354
|
||||
#: common/hotkeys_basic.cpp:367
|
||||
msgid ""
|
||||
"Current hotkey list:\n"
|
||||
"\n"
|
||||
|
|
@ -12485,87 +12484,87 @@ msgstr ""
|
|||
"Liste des Hotkeys courantes:\n"
|
||||
"\n"
|
||||
|
||||
#: common/hotkeys_basic.cpp:362
|
||||
#: common/hotkeys_basic.cpp:375
|
||||
msgid "key "
|
||||
msgstr "touche: "
|
||||
|
||||
#: common/hotkeys_basic.cpp:415
|
||||
#: common/hotkeys_basic.cpp:428
|
||||
msgid "Save Hotkey Configuration File:"
|
||||
msgstr "Sauver Fichier Configuration des Hotkeys:"
|
||||
|
||||
#: common/hotkeys_basic.cpp:447
|
||||
#: common/hotkeys_basic.cpp:460
|
||||
msgid "Allowed keys:\n"
|
||||
msgstr "Touches autorisées:\n"
|
||||
|
||||
#: common/hotkeys_basic.cpp:532
|
||||
#: common/hotkeys_basic.cpp:545
|
||||
msgid "Open Hotkey Configuration File:"
|
||||
msgstr "Ouvrir Fichier Configuration des Hotkeys:"
|
||||
|
||||
#: common/hotkeys_basic.cpp:550
|
||||
#: common/hotkeys_basic.cpp:563
|
||||
msgid "Unable to read "
|
||||
msgstr "Impossible de lire "
|
||||
|
||||
#: common/hotkeys_basic.cpp:668
|
||||
#: common/hotkeys_basic.cpp:681
|
||||
msgid "List Current Keys"
|
||||
msgstr "Lister Touches Courantes"
|
||||
|
||||
#: common/hotkeys_basic.cpp:669
|
||||
#: common/hotkeys_basic.cpp:682
|
||||
msgid "Displays the current hotkeys list and corresponding commands"
|
||||
msgstr "Afficher la liste des hotkeyc courante et les commandes correspondantes"
|
||||
|
||||
#: common/hotkeys_basic.cpp:675
|
||||
#: common/hotkeys_basic.cpp:688
|
||||
msgid "(Re)create Hotkeys File"
|
||||
msgstr "(Re)créer Fichier Hotkeys"
|
||||
|
||||
#: common/hotkeys_basic.cpp:677
|
||||
#: common/hotkeys_basic.cpp:690
|
||||
msgid "Create or recreate the hotkey configuration file from current hotkey list"
|
||||
msgstr "Créer ou recréer le fichier configuration des Hotkeys à partir de la liste courante"
|
||||
|
||||
#: common/hotkeys_basic.cpp:684
|
||||
#: common/hotkeys_basic.cpp:697
|
||||
msgid "Reload Hotkeys File"
|
||||
msgstr "Relire Fichiers Hotkeys"
|
||||
|
||||
#: common/hotkeys_basic.cpp:685
|
||||
#: common/hotkeys_basic.cpp:698
|
||||
msgid "Reload the hotkey configuration file"
|
||||
msgstr "Relire les fichiers configuration des hotkeys"
|
||||
|
||||
#: common/hotkeys_basic.cpp:691
|
||||
#: common/hotkeys_basic.cpp:704
|
||||
msgid "Edit Hotkeys File"
|
||||
msgstr "Editer Fichier Hotkeys"
|
||||
|
||||
#: common/hotkeys_basic.cpp:692
|
||||
#: common/hotkeys_basic.cpp:705
|
||||
msgid "Edit the hotkey configuration file in a text editor"
|
||||
msgstr "Editer les fichiers configuration des hotkeys"
|
||||
|
||||
#: common/hotkeys_basic.cpp:698
|
||||
#: common/hotkeys_basic.cpp:711
|
||||
msgid "Hotkeys"
|
||||
msgstr "Hotkeys"
|
||||
|
||||
#: common/hotkeys_basic.cpp:699
|
||||
#: common/hotkeys_basic.cpp:712
|
||||
msgid "Hotkeys configuration and preferences"
|
||||
msgstr "Options et préférences générales des hotkeys"
|
||||
|
||||
#: common/hotkeys_basic.cpp:707
|
||||
#: common/hotkeys_basic.cpp:720
|
||||
msgid "Home directory"
|
||||
msgstr "Répertoire d'accueil (home)"
|
||||
|
||||
#: common/hotkeys_basic.cpp:708
|
||||
#: common/hotkeys_basic.cpp:721
|
||||
msgid "Use home directory to load or store Hotkey config files"
|
||||
msgstr "Utiliser le répertoire d'accueil pour charger ou sauver les fichiers de config des Hotkeys"
|
||||
|
||||
#: common/hotkeys_basic.cpp:715
|
||||
#: common/hotkeys_basic.cpp:728
|
||||
msgid "KiCad template directory"
|
||||
msgstr "kicad/template répertoire"
|
||||
|
||||
#: common/hotkeys_basic.cpp:716
|
||||
#: common/hotkeys_basic.cpp:729
|
||||
msgid "Use kicad/template directory to load or store Hotkey config files"
|
||||
msgstr "Utiliser répertoire kicad/template pour charger ou sauver les fichiers de config des Hotkeys"
|
||||
|
||||
#: common/hotkeys_basic.cpp:722
|
||||
#: common/hotkeys_basic.cpp:735
|
||||
msgid "Location"
|
||||
msgstr "Emplacement"
|
||||
|
||||
#: common/hotkeys_basic.cpp:723
|
||||
#: common/hotkeys_basic.cpp:736
|
||||
msgid "Select hotkey configuration file location"
|
||||
msgstr "Sélectionner l'emplacement du fichier fonfiguration des hotkeys:"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue