Fixed: Cvpcb: Open net list command not working (aceb988a) · Commits · Elphel / kicad-source-mirror

cvpcb/cvframe.cpp

+17 −11

Original line number	Diff line number	Diff line
		@@ -129,6 +129,8 @@ BEGIN_EVENT_TABLE( WinEDA_CvpcbFrame, wxFrame )
		EVT_MENU_RANGE( wxID_FILE1, wxID_FILE9, WinEDA_CvpcbFrame::LoadNetList )

		// Menu events
		EVT_MENU( ID_LOAD_PROJECT,
		WinEDA_CvpcbFrame::LoadNetList )
		EVT_MENU( ID_SAVE_PROJECT,
		WinEDA_CvpcbFrame::SaveQuitCvpcb )
		EVT_MENU( ID_CVPCB_QUIT,
		@@ -386,30 +388,34 @@ void WinEDA_CvpcbFrame::DelAssociations( wxCommandEvent& event )
		void WinEDA_CvpcbFrame::LoadNetList( wxCommandEvent& event )
		/***********************************************************/

		/* Fonction liee au boutton "Load"
		* Lit la netliste
		/* Called when click on Load Netlist button or by menu files
		* Read a netlist slected by user
		*/
		{
		bool newfile;
		wxString oldfilename;
		wxString fn;
		wxString fullfilename;
		int id = event.GetId();

		fn = GetFileFromHistory( event.GetId(), _( "Gerber" ) );
		// Get a filename from history. if fullfilename is void,
		// a name will be asked to user, later.
		if ( id >= wxID_FILE1 && id <= wxID_FILE9 ) // Called by clicking on an old filename in file history
		fullfilename = GetFileFromHistory( event.GetId(), _( "Netlist" ) );

		if( !NetInNameBuffer.IsEmpty() )
		{
		oldfilename = NetInNameBuffer;
		}

		if( fn != wxEmptyString )
		{
		newfile = ReadInputNetList( fn );
		// Read the file fullfilename. If fullfilename is void,
		// The user will be prompted for a filename.
		// newfile = true if a file is read.
		newfile = ReadInputNetList( fullfilename );

		if( newfile && !oldfilename.IsEmpty() )
		{
		SetLastProject( NetInNameBuffer );
		}
		}

		ReCreateMenuBar();
		}

cvpcb/init.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -207,7 +207,7 @@ bool WinEDA_CvpcbFrame::ReadInputNetList( const wxString& FullFileName )
		Mask = wxT( "*" ) + NetInExtBuffer;
		else
		Mask = wxT( "*.net" );
		Line = EDA_FileSelector( _( "Load Net List" ),
		Line = EDA_FileSelector( _( "Open NetList File:" ),
		NetDirBuffer, /* Chemin par defaut */
		NetInNameBuffer, /* nom fichier par defaut */
		NetInExtBuffer, /* extension par defaut */

internat/fr/kicad.mo

−15 B (171 KiB)

File changed.

No diff preview for this file type.

View original file

View changed file

internat/fr/kicad.po

+16 −16

Original line number	Diff line number	Diff line
		@@ -2,8 +2,8 @@ msgid ""
		msgstr ""
		"Project-Id-Version: kicad\n"
		"Report-Msgid-Bugs-To: \n"
		"POT-Creation-Date: 2009-02-21 20:41+0100\n"
		"PO-Revision-Date: 2009-02-21 20:41+0100\n"
		"POT-Creation-Date: 2009-02-22 11:36+0100\n"
		"PO-Revision-Date: 2009-02-22 11:37+0100\n"
		"Last-Translator: \n"
		"Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n"
		"MIME-Version: 1.0\n"
		@@ -8998,8 +8998,8 @@ msgid "Unable to create netlist file"
		msgstr "Impossible de créer le fichier netliste "

		#: cvpcb/init.cpp:210
		msgid "Load Net List"
		msgstr "Lire Netliste"
		msgid "Open NetList File:"
		msgstr "Ouvrir Fichier Netliste:"

		#: cvpcb/autosel.cpp:70
		#, c-format
		@@ -9037,7 +9037,7 @@ msgstr "Redessin (F3)"
		msgid "1:1 zoom"
		msgstr "1:1 zoom"

		#: cvpcb/cvframe.cpp:213
		#: cvpcb/cvframe.cpp:215
		msgid ""
		"Net and component list modified.\n"
		" Save before exit ?"
		@@ -9045,35 +9045,31 @@ msgstr ""
		"Netlist et liste composants modifiés,\n"
		"Sauver avant de quitter ?"

		#: cvpcb/cvframe.cpp:236
		#: cvpcb/cvframe.cpp:238
		msgid "Problem when saving files, exit anyway ?"
		msgstr "Problème en sauvant les fichiers, quitter quand même"

		#: cvpcb/cvframe.cpp:365
		#: cvpcb/cvframe.cpp:367
		msgid "Delete selections"
		msgstr "Effacement des associations existantes"

		#: cvpcb/cvframe.cpp:397
		msgid "Gerber"
		msgstr "Gerber "

		#: cvpcb/cvframe.cpp:455
		#: cvpcb/cvframe.cpp:461
		msgid "Dialog boxes"
		msgstr "Fenêtres de dialogue"

		#: cvpcb/cvframe.cpp:460
		#: cvpcb/cvframe.cpp:466
		msgid "Lists"
		msgstr "Listes"

		#: cvpcb/cvframe.cpp:465
		#: cvpcb/cvframe.cpp:471
		msgid "Status box"
		msgstr "Fenêtre d'état"

		#: cvpcb/cvframe.cpp:471
		#: cvpcb/cvframe.cpp:477
		msgid "&Font"
		msgstr "&Fonte"

		#: cvpcb/cvframe.cpp:472
		#: cvpcb/cvframe.cpp:478
		msgid "Choose font type and size for dialogs, information and status box"
		msgstr "Choisir les fontes et leur taille pour les dialogues, infos et ligne d'état"

		@@ -11037,6 +11033,10 @@ msgstr "DCodes id."
		msgid "Page Settings"
		msgstr "Ajustage opt Page"

		#~ msgid "Load Net List"
		#~ msgstr "Lire Netliste"
		#~ msgid "Gerber"
		#~ msgstr "Gerber "
		#~ msgid "&Delete layer"
		#~ msgstr "&Effacer couche"
		#~ msgid "Export this Via Hole to Alt Value"

Admin message