Commit 52dbb13c authored by dickelbeck's avatar dickelbeck

from Florian Delizy

This patch applies on the very last svn  (r2402) and removes all
disfunctionnal python code (including deletion of unused strings)


parent 47bfe663
...@@ -23,9 +23,6 @@ option(USE_WX_ZOOM "Use wxDC to perform zooming (default OFF). Warning, this is ...@@ -23,9 +23,6 @@ option(USE_WX_ZOOM "Use wxDC to perform zooming (default OFF). Warning, this is
option(USE_WX_GRAPHICS_CONTEXT option(USE_WX_GRAPHICS_CONTEXT
"Use wxGraphicsContext for rendering (default OFF). Warning, this is experimental") "Use wxGraphicsContext for rendering (default OFF). Warning, this is experimental")
# Comment this out if you don't want to build with Python support.
# OPTION(KICAD_PYTHON "enable/disable building with Python support (default OFF)")
#================================================ #================================================
# Set flags for GCC. # Set flags for GCC.
......
...@@ -210,8 +210,6 @@ These should be set from command line: ...@@ -210,8 +210,6 @@ These should be set from command line:
KICAD_MINIZIP ON/OFF KICAD_MINIZIP ON/OFF
KICAD_PYTHON ON/OFF
USE_WX_ZOOM ON/OFF (OPTIONAL) USE_WX_ZOOM ON/OFF (OPTIONAL)
Experimental coordinate translation code using wxDC instead of custom Experimental coordinate translation code using wxDC instead of custom
Kicad version. Kicad version.
......
...@@ -163,9 +163,6 @@ configured and builded with "--disable-monolithic --enable-shared" parameters. ...@@ -163,9 +163,6 @@ configured and builded with "--disable-monolithic --enable-shared" parameters.
-DKICAD_MINIZIP=ON -DKICAD_MINIZIP=ON
Build the "minizip" executable. Use OFF to disable it building. Build the "minizip" executable. Use OFF to disable it building.
-DKICAD_PYTHON=ON
Build the KiCad with Python support.
-DwxUSE_UNICODE=ON -DwxUSE_UNICODE=ON
Require on locale utf8 for build the KiCad with cyrillic fonts support. Require on locale utf8 for build the KiCad with cyrillic fonts support.
......
...@@ -4,7 +4,6 @@ KiCad TODO List ...@@ -4,7 +4,6 @@ KiCad TODO List
CMAKE CMAKE
----- -----
* Add install targets for binaries and resources on Mac. * Add install targets for binaries and resources on Mac.
* Add Python.
WXMAC Platform WXMAC Platform
-------------- --------------
......
...@@ -157,8 +157,6 @@ set(BITMAP_SRCS ...@@ -157,8 +157,6 @@ set(BITMAP_SRCS
icon_kicad.xpm icon_kicad.xpm
icon_modedit.xpm icon_modedit.xpm
icon_pcbnew.xpm icon_pcbnew.xpm
icon_python_small.xpm
icon_python.xpm
icon_txt.xpm icon_txt.xpm
import3d.xpm import3d.xpm
import_hierarchical_label.xpm import_hierarchical_label.xpm
...@@ -258,7 +256,6 @@ set(BITMAP_SRCS ...@@ -258,7 +256,6 @@ set(BITMAP_SRCS
New_Module.xpm New_Module.xpm
new_pcb.xpm new_pcb.xpm
New_Project.xpm New_Project.xpm
new_python.xpm
new_sch.xpm new_sch.xpm
new_txt.xpm new_txt.xpm
new.xpm new.xpm
......
...@@ -9,10 +9,6 @@ ...@@ -9,10 +9,6 @@
* (locale handling) * (locale handling)
***/ ***/
#ifdef KICAD_PYTHON
# include <pyhandler.h>
#endif
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "wx/html/htmlwin.h" #include "wx/html/htmlwin.h"
...@@ -334,9 +330,6 @@ void WinEDA_App::InitEDA_Appl( const wxString& aName, id_app_type aId ) ...@@ -334,9 +330,6 @@ void WinEDA_App::InitEDA_Appl( const wxString& aName, id_app_type aId )
/* Set locale option for separator used in float numbers */ /* Set locale option for separator used in float numbers */
SetLocaleTo_Default(); SetLocaleTo_Default();
#ifdef KICAD_PYTHON
PyHandler::GetInstance()->SetAppName( name );
#endif
} }
...@@ -1129,17 +1122,3 @@ void WinEDA_App::InsertLibraryPath( const wxString& aPaths, size_t aIndex ) ...@@ -1129,17 +1122,3 @@ void WinEDA_App::InsertLibraryPath( const wxString& aPaths, size_t aIndex )
} }
} }
/**
* Run Python scripts
*
* @return The default OnRun() value (exit codes not used in kicad, so value
* has no special meaning)
*/
int WinEDA_App::OnRun()
{
#ifdef KICAD_PYTHON
PyHandler::GetInstance()->RunScripts();
#endif
return wxApp::OnRun();
}
...@@ -77,7 +77,6 @@ protected: ...@@ -77,7 +77,6 @@ protected:
public: WinEDA_App(); public: WinEDA_App();
~WinEDA_App(); ~WinEDA_App();
bool OnInit(); bool OnInit();
int OnRun();
bool SetBinDir(); bool SetBinDir();
void SetDefaultSearchPaths( void ); void SetDefaultSearchPaths( void );
......
...@@ -147,8 +147,6 @@ extern const char* icon_eeschema_xpm[]; ...@@ -147,8 +147,6 @@ extern const char* icon_eeschema_xpm[];
extern const char* icon_gerbview_small_xpm[]; extern const char* icon_gerbview_small_xpm[];
extern const char* icon_gerbview_xpm[]; extern const char* icon_gerbview_xpm[];
extern const char* icon_modedit_xpm[]; extern const char* icon_modedit_xpm[];
extern const char* icon_python_small_xpm[];
extern const char* icon_python_xpm[];
extern const char* icon_txt_xpm[]; extern const char* icon_txt_xpm[];
extern const char* icon_w3d_xpm[]; extern const char* icon_w3d_xpm[];
extern const char* import_hierarchical_label_xpm[]; extern const char* import_hierarchical_label_xpm[];
......
...@@ -107,10 +107,6 @@ public: ...@@ -107,10 +107,6 @@ public:
const wxString& title, const wxString& title,
const wxPoint& pos, const wxSize& size, const wxPoint& pos, const wxSize& size,
long style = KICAD_DEFAULT_DRAWFRAME_STYLE ); long style = KICAD_DEFAULT_DRAWFRAME_STYLE );
#ifdef KICAD_PYTHON
WinEDA_BasicFrame( const WinEDA_BasicFrame& ) { } // Should throw!!
WinEDA_BasicFrame() { } // Should throw!!
#endif
~WinEDA_BasicFrame(); ~WinEDA_BasicFrame();
void GetKicadHelp( wxCommandEvent& event ); void GetKicadHelp( wxCommandEvent& event );
......
...@@ -547,10 +547,6 @@ msgstr "Součástka %s %s vývod %s : Rozdílné sítě" ...@@ -547,10 +547,6 @@ msgstr "Součástka %s %s vývod %s : Rozdílné sítě"
msgid "&Run" msgid "&Run"
msgstr "&Spustit" msgstr "&Spustit"
#: /home/martin/kicad/kicad/treeprj_frame.cpp:127
msgid "Run the Python Script"
msgstr "Spustit Python skript"
#: /home/martin/kicad/kicad/treeprj_frame.cpp:136 #: /home/martin/kicad/kicad/treeprj_frame.cpp:136
#: /home/martin/kicad/kicad/treeprj_frame.cpp:211 #: /home/martin/kicad/kicad/treeprj_frame.cpp:211
msgid "&Edit in a text editor" msgid "&Edit in a text editor"
...@@ -572,10 +568,6 @@ msgstr "Vytvořit nový adresář" ...@@ -572,10 +568,6 @@ msgstr "Vytvořit nový adresář"
msgid "New P&ython Script" msgid "New P&ython Script"
msgstr "Nový P&ython skript" msgstr "Nový P&ython skript"
#: /home/martin/kicad/kicad/treeprj_frame.cpp:165
msgid "Create a New Python Script"
msgstr "Vytvořit nový Python skript"
#: /home/martin/kicad/kicad/treeprj_frame.cpp:174 #: /home/martin/kicad/kicad/treeprj_frame.cpp:174
msgid "New &Text File" msgid "New &Text File"
msgstr "Nový &textový soubor" msgstr "Nový &textový soubor"
...@@ -876,14 +868,6 @@ msgstr "" ...@@ -876,14 +868,6 @@ msgstr ""
"Připraven\n" "Připraven\n"
"Pracovní adresář: %s\n" "Pracovní adresář: %s\n"
#: /home/martin/kicad/kicad/mainframe.cpp:307
msgid "Execute Python Script"
msgstr "Spustit Python skript:"
#: /home/martin/kicad/kicad/mainframe.cpp:308
msgid "Python script (*.py)|*.py"
msgstr "Python skript (*.py)|*.py"
#: /home/martin/kicad/kicad/mainframe.cpp:326 #: /home/martin/kicad/kicad/mainframe.cpp:326
msgid "Text file (" msgid "Text file ("
msgstr "Textový soubor (" msgstr "Textový soubor ("
...@@ -908,10 +892,6 @@ msgstr "Pcbnew (editor desek)" ...@@ -908,10 +892,6 @@ msgstr "Pcbnew (editor desek)"
msgid "GerbView (Gerber viewer)" msgid "GerbView (Gerber viewer)"
msgstr "GerbView (prohlížeč Gerber)" msgstr "GerbView (prohlížeč Gerber)"
#: /home/martin/kicad/kicad/commandframe.cpp:74
msgid "Run Python Script"
msgstr "Spustit Python skript"
#: /home/martin/kicad/kicad/preferences.cpp:48 #: /home/martin/kicad/kicad/preferences.cpp:48
msgid "You must choose a PDF viewer before use this option" msgid "You must choose a PDF viewer before use this option"
msgstr "Před použitím musíte zvolit PDF prohlížeč" msgstr "Před použitím musíte zvolit PDF prohlížeč"
......
...@@ -5447,14 +5447,6 @@ msgstr "" ...@@ -5447,14 +5447,6 @@ msgstr ""
"Bereit\n" "Bereit\n"
"Arbeitsverzeichnis: %s\n" "Arbeitsverzeichnis: %s\n"
#: kicad/mainframe.cpp:307
msgid "Execute Python Script"
msgstr "Führe Python Skript aus"
#: kicad/mainframe.cpp:308
msgid "Python script (*.py)|*.py"
msgstr "Python Skript (*.py)|*.py"
#: kicad/mainframe.cpp:326 #: kicad/mainframe.cpp:326
msgid "Text file (" msgid "Text file ("
msgstr "Textdatei (" msgstr "Textdatei ("
...@@ -5694,10 +5686,6 @@ msgstr "" ...@@ -5694,10 +5686,6 @@ msgstr ""
msgid "&Run" msgid "&Run"
msgstr "&Starte" msgstr "&Starte"
#: kicad/treeprj_frame.cpp:125
msgid "Run the Python Script"
msgstr "Starte das Python Skript"
#: kicad/treeprj_frame.cpp:134 #: kicad/treeprj_frame.cpp:134
#: kicad/treeprj_frame.cpp:209 #: kicad/treeprj_frame.cpp:209
msgid "&Edit in a text editor" msgid "&Edit in a text editor"
...@@ -5719,10 +5707,6 @@ msgstr "Erstelle ein neues Verzeichnis" ...@@ -5719,10 +5707,6 @@ msgstr "Erstelle ein neues Verzeichnis"
msgid "New P&ython Script" msgid "New P&ython Script"
msgstr "Neues P&ython Skript" msgstr "Neues P&ython Skript"
#: kicad/treeprj_frame.cpp:163
msgid "Create a New Python Script"
msgstr "Erstelle ein neues Pythonskript"
#: kicad/treeprj_frame.cpp:172 #: kicad/treeprj_frame.cpp:172
msgid "New &Text File" msgid "New &Text File"
msgstr "Neue &Textdatei" msgstr "Neue &Textdatei"
...@@ -5845,10 +5829,6 @@ msgstr "PCBnew (Layouteditor)" ...@@ -5845,10 +5829,6 @@ msgstr "PCBnew (Layouteditor)"
msgid "GerbView (Gerber viewer)" msgid "GerbView (Gerber viewer)"
msgstr "GerbView (Gerber-Betrachter)" msgstr "GerbView (Gerber-Betrachter)"
#: kicad/commandframe.cpp:67
msgid "Run Python Script"
msgstr "Starte Python Skript"
#: pcbnew/edit.cpp:253 #: pcbnew/edit.cpp:253
msgid "Module Editor" msgid "Module Editor"
msgstr "Bauteil Editor" msgstr "Bauteil Editor"
......
...@@ -9077,10 +9077,6 @@ msgstr "Pcbnew (Editor de circuitos impresos)" ...@@ -9077,10 +9077,6 @@ msgstr "Pcbnew (Editor de circuitos impresos)"
msgid "GerbView (Gerber viewer)" msgid "GerbView (Gerber viewer)"
msgstr "GerbView (Visualizador Gerber)" msgstr "GerbView (Visualizador Gerber)"
#: kicad/commandframe.cpp:78
msgid "Run Python Script"
msgstr "Ejecutar Script Python:"
#: kicad/files-io.cpp:70 #: kicad/files-io.cpp:70
msgid "Create Project files:" msgid "Create Project files:"
msgstr "Crear proyecto" msgstr "Crear proyecto"
...@@ -9159,10 +9155,6 @@ msgstr "" ...@@ -9159,10 +9155,6 @@ msgstr ""
"Listo\n" "Listo\n"
"Directorio de trabajo: %s\n" "Directorio de trabajo: %s\n"
#: kicad/mainframe.cpp:338
msgid "Execute Python Script:"
msgstr "Ejecutar Script Python:"
#: kicad/mainframe.cpp:361 #: kicad/mainframe.cpp:361
msgid "Load file:" msgid "Load file:"
msgstr "Cargar Archivo:" msgstr "Cargar Archivo:"
...@@ -9249,10 +9241,6 @@ msgstr "En este directorio no hay archivos kicad" ...@@ -9249,10 +9241,6 @@ msgstr "En este directorio no hay archivos kicad"
msgid "&Run" msgid "&Run"
msgstr "Ejecuta&r" msgstr "Ejecuta&r"
#: kicad/treeprj_frame.cpp:95
msgid "Run the Python Script"
msgstr "Ejecutar el Script de Python"
#: kicad/treeprj_frame.cpp:102 #: kicad/treeprj_frame.cpp:102
#: kicad/treeprj_frame.cpp:156 #: kicad/treeprj_frame.cpp:156
msgid "&Edit in a text editor" msgid "&Edit in a text editor"
...@@ -9274,11 +9262,6 @@ msgstr "Crear Directorio" ...@@ -9274,11 +9262,6 @@ msgstr "Crear Directorio"
msgid "New P&ython Script" msgid "New P&ython Script"
msgstr "Nuevo Script de P&ython" msgstr "Nuevo Script de P&ython"
#: kicad/treeprj_frame.cpp:125
msgid "Create a New Python Script"
msgstr "Crear Script de Python"
#: kicad/treeprj_frame.cpp:131
msgid "New &Text File" msgid "New &Text File"
msgstr "Nuevo Archivo de Texto: " msgstr "Nuevo Archivo de Texto: "
......
...@@ -11168,14 +11168,6 @@ msgstr "" ...@@ -11168,14 +11168,6 @@ msgstr ""
"Valmis\n" "Valmis\n"
"Työhakemisto: %s\n" "Työhakemisto: %s\n"
#: kicad/mainframe.cpp:231
msgid "Execute Python Script"
msgstr "Suorita Python-komentosarja"
#: kicad/mainframe.cpp:232
msgid "Python script (*.py)|*.py"
msgstr "Python-komentosarja (*.py)|*.py"
#: kicad/mainframe.cpp:253 #: kicad/mainframe.cpp:253
msgid "Text file (" msgid "Text file ("
msgstr "Tekstitiedosto (" msgstr "Tekstitiedosto ("
...@@ -11200,18 +11192,10 @@ msgstr "PCBnew (Piirilevyeditori)" ...@@ -11200,18 +11192,10 @@ msgstr "PCBnew (Piirilevyeditori)"
msgid "GerbView (Gerber viewer)" msgid "GerbView (Gerber viewer)"
msgstr "GerbView (Gerber-tiedostojen näytin)" msgstr "GerbView (Gerber-tiedostojen näytin)"
#: kicad/commandframe.cpp:91
msgid "Run Python Script"
msgstr "Suorita Python-komentosarja"
#: kicad/tree_project_frame.cpp:157 #: kicad/tree_project_frame.cpp:157
msgid "&Run" msgid "&Run"
msgstr "&Käynnistä" msgstr "&Käynnistä"
#: kicad/tree_project_frame.cpp:158
msgid "Run the Python Script"
msgstr "Suorita Python-komentosarja"
#: kicad/tree_project_frame.cpp:167 #: kicad/tree_project_frame.cpp:167
#: kicad/tree_project_frame.cpp:224 #: kicad/tree_project_frame.cpp:224
msgid "&Edit in a text editor" msgid "&Edit in a text editor"
...@@ -11229,14 +11213,6 @@ msgstr "Uusi &hakemisto" ...@@ -11229,14 +11213,6 @@ msgstr "Uusi &hakemisto"
msgid "Create a New Directory" msgid "Create a New Directory"
msgstr "Luo uusi hakemisto" msgstr "Luo uusi hakemisto"
#: kicad/tree_project_frame.cpp:195
msgid "New P&ython Script"
msgstr "Uusi &Python-komentosarja"
#: kicad/tree_project_frame.cpp:196
msgid "Create a New Python Script"
msgstr "Luo uusi Python-komentosarja"
#: kicad/tree_project_frame.cpp:211 #: kicad/tree_project_frame.cpp:211
msgid "&Rename file" msgid "&Rename file"
msgstr "&Nimeä tiedosto uudelleen" msgstr "&Nimeä tiedosto uudelleen"
......
...@@ -11517,14 +11517,6 @@ msgstr "" ...@@ -11517,14 +11517,6 @@ msgstr ""
"Prêt\n" "Prêt\n"
"Répertoire de travail: %s\n" "Répertoire de travail: %s\n"
#: kicad/mainframe.cpp:231
msgid "Execute Python Script"
msgstr "Executer un Script Python"
#: kicad/mainframe.cpp:232
msgid "Python script (*.py)|*.py"
msgstr "Script Python (*.py)|*.py"
#: kicad/mainframe.cpp:253 #: kicad/mainframe.cpp:253
msgid "Text file (" msgid "Text file ("
msgstr "Fichier Texte (" msgstr "Fichier Texte ("
...@@ -11549,10 +11541,6 @@ msgstr "PCBnew (Editeur de circuits imprimés)" ...@@ -11549,10 +11541,6 @@ msgstr "PCBnew (Editeur de circuits imprimés)"
msgid "GerbView (Gerber viewer)" msgid "GerbView (Gerber viewer)"
msgstr "GerbView (Visualisateur Gerber)" msgstr "GerbView (Visualisateur Gerber)"
#: kicad/commandframe.cpp:91
msgid "Run Python Script"
msgstr "Exécuter le Script Python"
#: kicad/preferences.cpp:47 #: kicad/preferences.cpp:47
msgid "You must choose a PDF viewer before using this option." msgid "You must choose a PDF viewer before using this option."
msgstr "Vous devez choisir un Visualisateur PDF avant d'utiliser cette option." msgstr "Vous devez choisir un Visualisateur PDF avant d'utiliser cette option."
...@@ -11577,10 +11565,6 @@ msgstr "Sélection Editeur Préféré" ...@@ -11577,10 +11565,6 @@ msgstr "Sélection Editeur Préféré"
msgid "&Run" msgid "&Run"
msgstr "Exécute&r" msgstr "Exécute&r"
#: kicad/tree_project_frame.cpp:158
msgid "Run the Python Script"
msgstr "Exécuter le Script Python"
#: kicad/tree_project_frame.cpp:167 #: kicad/tree_project_frame.cpp:167
#: kicad/tree_project_frame.cpp:224 #: kicad/tree_project_frame.cpp:224
msgid "&Edit in a text editor" msgid "&Edit in a text editor"
...@@ -11602,10 +11586,6 @@ msgstr "Créer un nouveau Répertoire" ...@@ -11602,10 +11586,6 @@ msgstr "Créer un nouveau Répertoire"
msgid "New P&ython Script" msgid "New P&ython Script"
msgstr "Nouveau Script P&ython" msgstr "Nouveau Script P&ython"
#: kicad/tree_project_frame.cpp:196
msgid "Create a New Python Script"
msgstr "Créer un nouveau script Python"
#: kicad/tree_project_frame.cpp:211 #: kicad/tree_project_frame.cpp:211
msgid "&Rename file" msgid "&Rename file"
msgstr "&Renommer fichier" msgstr "&Renommer fichier"
......
...@@ -9304,18 +9304,10 @@ msgstr "사용자 크기" ...@@ -9304,18 +9304,10 @@ msgstr "사용자 크기"
msgid "&Run" msgid "&Run"
msgstr "실행 (&R)" msgstr "실행 (&R)"
#: kicad/treeprj_frame.cpp:64
msgid "Run the Python Script"
msgstr "Python 스크립트 실행"
#: kicad/treeprj_frame.cpp:70 #: kicad/treeprj_frame.cpp:70
msgid "&Edit in a text editor" msgid "&Edit in a text editor"
msgstr "텍스트 에디터로 편집 (&E)" msgstr "텍스트 에디터로 편집 (&E)"
#: kicad/treeprj_frame.cpp:71
msgid "Edit the Python Script in a Text Editor"
msgstr "텍스트 에디터로 Python 스크립트 편집"
#: kicad/treeprj_frame.cpp:84 #: kicad/treeprj_frame.cpp:84
msgid "New D&irectory" msgid "New D&irectory"
msgstr "새 디렉토리 (&I)" msgstr "새 디렉토리 (&I)"
...@@ -9356,14 +9348,6 @@ msgstr "새 네트리스트 (&N)" ...@@ -9356,14 +9348,6 @@ msgstr "새 네트리스트 (&N)"
msgid "Create a New Netlist" msgid "Create a New Netlist"
msgstr "새 네트리스트 만들기" msgstr "새 네트리스트 만들기"
#: kicad/treeprj_frame.cpp:107
msgid "New P&ython Script"
msgstr "새 Python 스크립트 (&Y)"
#: kicad/treeprj_frame.cpp:107
msgid "Create a New Python Script"
msgstr "새 Python 스크립트 만들기"
#: kicad/treeprj_frame.cpp:112 #: kicad/treeprj_frame.cpp:112
msgid "New &Text File" msgid "New &Text File"
msgstr "새 텍스트 파일 (&T)" msgstr "새 텍스트 파일 (&T)"
......
...@@ -10628,10 +10628,6 @@ msgstr "naamloos" ...@@ -10628,10 +10628,6 @@ msgstr "naamloos"
msgid "&Run" msgid "&Run"
msgstr "&Uitvoeren" msgstr "&Uitvoeren"
#: kicad/treeprj_frame.cpp:124
msgid "Run the Python Script"
msgstr "Uitvoeren van Python Script"
#: kicad/treeprj_frame.cpp:133 #: kicad/treeprj_frame.cpp:133
#: kicad/treeprj_frame.cpp:208 #: kicad/treeprj_frame.cpp:208
msgid "&Edit in a text editor" msgid "&Edit in a text editor"
...@@ -10653,10 +10649,6 @@ msgstr "Creëer een Nieuwe Map" ...@@ -10653,10 +10649,6 @@ msgstr "Creëer een Nieuwe Map"
msgid "New P&ython Script" msgid "New P&ython Script"
msgstr "Nieuw P&ython Script" msgstr "Nieuw P&ython Script"
#: kicad/treeprj_frame.cpp:162
msgid "Create a New Python Script"
msgstr "Creëer een Nieuw Python Script"
#: kicad/treeprj_frame.cpp:171 #: kicad/treeprj_frame.cpp:171
msgid "New &Text File" msgid "New &Text File"
msgstr "Nieuw &Tekst Bestand" msgstr "Nieuw &Tekst Bestand"
...@@ -10770,10 +10762,6 @@ msgstr "PCBnew (Printplaat ontwerper)" ...@@ -10770,10 +10762,6 @@ msgstr "PCBnew (Printplaat ontwerper)"
msgid "GerbView (Gerber viewer)" msgid "GerbView (Gerber viewer)"
msgstr "GerbView (Gerber viewer)" msgstr "GerbView (Gerber viewer)"
#: kicad/commandframe.cpp:91
msgid "Run Python Script"
msgstr "Start Python Script"
#: kicad/mainframe.cpp:82 #: kicad/mainframe.cpp:82
#, c-format #, c-format
msgid "" msgid ""
...@@ -10783,14 +10771,6 @@ msgstr "" ...@@ -10783,14 +10771,6 @@ msgstr ""
"Klaar\n" "Klaar\n"
"Huidige map: %s\n" "Huidige map: %s\n"
#: kicad/mainframe.cpp:275
msgid "Execute Python Script"
msgstr "Python Script Uitvoeren"
#: kicad/mainframe.cpp:276
msgid "Python script (*.py)|*.py"
msgstr "Python script (*.py)|*.py"
#: kicad/mainframe.cpp:297 #: kicad/mainframe.cpp:297
msgid "Text file (" msgid "Text file ("
msgstr "Tekst bestand (" msgstr "Tekst bestand ("
......
...@@ -10145,15 +10145,6 @@ msgstr "" ...@@ -10145,15 +10145,6 @@ msgstr ""
"Gotowy\n" "Gotowy\n"
"Katalog roboczy: %s\n" "Katalog roboczy: %s\n"
#: kicad/kicad/mainframe.cpp:307
#, fuzzy
msgid "Execute Python Script"
msgstr "Wykonaj skrypt Pythona:"
#: kicad/kicad/mainframe.cpp:308
msgid "Python script (*.py)|*.py"
msgstr ""
#: kicad/kicad/mainframe.cpp:326 #: kicad/kicad/mainframe.cpp:326
#, fuzzy #, fuzzy
msgid "Text file (" msgid "Text file ("
...@@ -10228,10 +10219,6 @@ msgstr "" ...@@ -10228,10 +10219,6 @@ msgstr ""
msgid "&Run" msgid "&Run"
msgstr "&Uruchom" msgstr "&Uruchom"
#: kicad/kicad/treeprj_frame.cpp:127
msgid "Run the Python Script"
msgstr "Uruchom skrypt Pythona"
#: kicad/kicad/treeprj_frame.cpp:136 #: kicad/kicad/treeprj_frame.cpp:136
#: kicad/kicad/treeprj_frame.cpp:211 #: kicad/kicad/treeprj_frame.cpp:211
msgid "&Edit in a text editor" msgid "&Edit in a text editor"
...@@ -10253,10 +10240,6 @@ msgstr "Utwórz nowy katalog" ...@@ -10253,10 +10240,6 @@ msgstr "Utwórz nowy katalog"
msgid "New P&ython Script" msgid "New P&ython Script"
msgstr "Nowy skrypt P&ythona" msgstr "Nowy skrypt P&ythona"
#: kicad/kicad/treeprj_frame.cpp:165
msgid "Create a New Python Script"
msgstr "Utwórz nowy skrypt Pythona"
#: kicad/kicad/treeprj_frame.cpp:174 #: kicad/kicad/treeprj_frame.cpp:174
msgid "New &Text File" msgid "New &Text File"
msgstr "Nowy plik &tekstowy" msgstr "Nowy plik &tekstowy"
...@@ -10381,10 +10364,6 @@ msgstr "Pcbnew (edytor płytek drukowanych)" ...@@ -10381,10 +10364,6 @@ msgstr "Pcbnew (edytor płytek drukowanych)"
msgid "GerbView (Gerber viewer)" msgid "GerbView (Gerber viewer)"
msgstr "Gerbview (przeglądarka plików Gerbera)" msgstr "Gerbview (przeglądarka plików Gerbera)"
#: kicad/kicad/commandframe.cpp:74
msgid "Run Python Script"
msgstr "Uruchom skrypt Pythona"
#: kicad/kicad/buildmnu.cpp:98 #: kicad/kicad/buildmnu.cpp:98
msgid "&Open\tCtrl+O" msgid "&Open\tCtrl+O"
msgstr "" msgstr ""
......
...@@ -12096,10 +12096,6 @@ msgstr "Pcbnew (Editor de placas de circuito impresso)" ...@@ -12096,10 +12096,6 @@ msgstr "Pcbnew (Editor de placas de circuito impresso)"
msgid "GerbView (Gerber viewer)" msgid "GerbView (Gerber viewer)"
msgstr "GerbView (Visualisador de arquivos Gerber)" msgstr "GerbView (Visualisador de arquivos Gerber)"
#: kicad/commandframe.cpp:91
msgid "Run Python Script"
msgstr "Rodar Script Python"
#: kicad/files-io.cpp:50 #: kicad/files-io.cpp:50
msgid "Unzip Project" msgid "Unzip Project"
msgstr "Descomprimir Projeto" msgstr "Descomprimir Projeto"
...@@ -12176,14 +12172,6 @@ msgstr "" ...@@ -12176,14 +12172,6 @@ msgstr ""
"Pronto\n" "Pronto\n"
"Diretrio de trabalho: %s\n" "Diretrio de trabalho: %s\n"
#: kicad/mainframe.cpp:230
msgid "Execute Python Script"
msgstr "Executar Script Python"
#: kicad/mainframe.cpp:231
msgid "Python script (*.py)|*.py"
msgstr "Script Python (*.py)|*.py"
#: kicad/mainframe.cpp:252 #: kicad/mainframe.cpp:252
msgid "Text file (" msgid "Text file ("
msgstr "Arquivo de texto (" msgstr "Arquivo de texto ("
...@@ -12376,10 +12364,6 @@ msgstr "nenhum arquivo Kicad encontrado neste diret ...@@ -12376,10 +12364,6 @@ msgstr "nenhum arquivo Kicad encontrado neste diret
msgid "&Run" msgid "&Run"
msgstr "&Executar" msgstr "&Executar"
#: kicad/treeprj_frame.cpp:127
msgid "Run the Python Script"
msgstr "Rodar o Script Python"
#: kicad/treeprj_frame.cpp:136 #: kicad/treeprj_frame.cpp:136
#: kicad/treeprj_frame.cpp:211 #: kicad/treeprj_frame.cpp:211
msgid "&Edit in a text editor" msgid "&Edit in a text editor"
...@@ -12401,10 +12385,6 @@ msgstr "Criar Novo Diret ...@@ -12401,10 +12385,6 @@ msgstr "Criar Novo Diret
msgid "New P&ython Script" msgid "New P&ython Script"
msgstr "Novo Script P&ython" msgstr "Novo Script P&ython"
#: kicad/treeprj_frame.cpp:165
msgid "Create a New Python Script"
msgstr "Criar um Novo Script Python"
#: kicad/treeprj_frame.cpp:174 #: kicad/treeprj_frame.cpp:174
msgid "New &Text File" msgid "New &Text File"
msgstr "Novo Arquivo &Texto" msgstr "Novo Arquivo &Texto"
......
...@@ -4975,14 +4975,6 @@ msgstr "" ...@@ -4975,14 +4975,6 @@ msgstr ""
"Готово\n" "Готово\n"
"Рабочая папка: %s\n" "Рабочая папка: %s\n"
#: kicad/mainframe.cpp:231
msgid "Execute Python Script"
msgstr "Выполнить скрипт Python"
#: kicad/mainframe.cpp:232
msgid "Python script (*.py)|*.py"
msgstr "Python script (*.py)|*.py"
#: kicad/mainframe.cpp:253 #: kicad/mainframe.cpp:253
msgid "Text file (" msgid "Text file ("
msgstr "Текстовый файл (" msgstr "Текстовый файл ("
...@@ -5230,18 +5222,10 @@ msgstr "pcbnew (редактор плат)" ...@@ -5230,18 +5222,10 @@ msgstr "pcbnew (редактор плат)"
msgid "GerbView (Gerber viewer)" msgid "GerbView (Gerber viewer)"
msgstr "gerbview (программа просмотра Gerber файлов)" msgstr "gerbview (программа просмотра Gerber файлов)"
#: kicad/commandframe.cpp:91
msgid "Run Python Script"
msgstr "Выполнить скрипт Python"
#: kicad/tree_project_frame.cpp:157 #: kicad/tree_project_frame.cpp:157
msgid "&Run" msgid "&Run"
msgstr "Выполнить" msgstr "Выполнить"
#: kicad/tree_project_frame.cpp:158
msgid "Run the Python Script"
msgstr "Выполнить скрипт Python"
#: kicad/tree_project_frame.cpp:167 #: kicad/tree_project_frame.cpp:167
#: kicad/tree_project_frame.cpp:224 #: kicad/tree_project_frame.cpp:224
msgid "&Edit in a text editor" msgid "&Edit in a text editor"
...@@ -5259,14 +5243,6 @@ msgstr "Новая директория" ...@@ -5259,14 +5243,6 @@ msgstr "Новая директория"
msgid "Create a New Directory" msgid "Create a New Directory"
msgstr "Создать новую директорию" msgstr "Создать новую директорию"
#: kicad/tree_project_frame.cpp:195
msgid "New P&ython Script"
msgstr "Новый скрипт Python"
#: kicad/tree_project_frame.cpp:196
msgid "Create a New Python Script"
msgstr "Создать новый скрипт Python"
#: kicad/tree_project_frame.cpp:211 #: kicad/tree_project_frame.cpp:211
msgid "&Rename file" msgid "&Rename file"
msgstr "Переименовать файл" msgstr "Переименовать файл"
......
...@@ -4893,10 +4893,6 @@ msgstr "Spara projektfil" ...@@ -4893,10 +4893,6 @@ msgstr "Spara projektfil"
msgid "&Run" msgid "&Run"
msgstr "&Kör" msgstr "&Kör"
#: kicad/treeprj_frame.cpp:77
msgid "Run the Python Script"
msgstr ""
#: kicad/treeprj_frame.cpp:84 #: kicad/treeprj_frame.cpp:84
#: kicad/treeprj_frame.cpp:138 #: kicad/treeprj_frame.cpp:138
msgid "&Edit in a text editor" msgid "&Edit in a text editor"
...@@ -4918,10 +4914,6 @@ msgstr "Skapa en ny mapp" ...@@ -4918,10 +4914,6 @@ msgstr "Skapa en ny mapp"
msgid "New P&ython Script" msgid "New P&ython Script"
msgstr "Nyt P&ythons-skript" msgstr "Nyt P&ythons-skript"
#: kicad/treeprj_frame.cpp:107
msgid "Create a New Python Script"
msgstr ""
#: kicad/treeprj_frame.cpp:113 #: kicad/treeprj_frame.cpp:113
msgid "New &Text File" msgid "New &Text File"
msgstr "Ny &textfil" msgstr "Ny &textfil"
...@@ -5036,10 +5028,6 @@ msgid "" ...@@ -5036,10 +5028,6 @@ msgid ""
"Working dir: %s\n" "Working dir: %s\n"
msgstr "" msgstr ""
#: kicad/mainframe.cpp:330
msgid "Execute Python Script:"
msgstr ""
#: kicad/mainframe.cpp:353 #: kicad/mainframe.cpp:353
msgid "Load file:" msgid "Load file:"
msgstr "" msgstr ""
...@@ -5060,10 +5048,6 @@ msgstr "pcbnew (PCB-redigerare)" ...@@ -5060,10 +5048,6 @@ msgstr "pcbnew (PCB-redigerare)"
msgid "gerbview (Gerber viewer)" msgid "gerbview (Gerber viewer)"
msgstr "gerbview (Gerber-visare)" msgstr "gerbview (Gerber-visare)"
#: kicad/commandframe.cpp:78
msgid "Run Python Script"
msgstr ""
#: pcbnew/dialog_track_options.cpp:125 #: pcbnew/dialog_track_options.cpp:125
msgid "Via Size" msgid "Via Size"
msgstr "" msgstr ""
......
...@@ -8831,10 +8831,6 @@ msgstr "打开 cvpcb 手册" ...@@ -8831,10 +8831,6 @@ msgstr "打开 cvpcb 手册"
msgid "&Run" msgid "&Run"
msgstr "运行 (&R)" msgstr "运行 (&R)"
#: kicad/treeprj_frame.cpp:79
msgid "Run the Python Script"
msgstr "运行 Python 脚本"
#: kicad/treeprj_frame.cpp:86 #: kicad/treeprj_frame.cpp:86
#: kicad/treeprj_frame.cpp:140 #: kicad/treeprj_frame.cpp:140
msgid "&Edit in a text editor" msgid "&Edit in a text editor"
...@@ -8856,10 +8852,6 @@ msgstr "建立一个新目录" ...@@ -8856,10 +8852,6 @@ msgstr "建立一个新目录"
msgid "New P&ython Script" msgid "New P&ython Script"
msgstr "新建 P&ython 脚本" msgstr "新建 P&ython 脚本"
#: kicad/treeprj_frame.cpp:109
msgid "Create a New Python Script"
msgstr "建立一个新的 Python 脚本文件"
#: kicad/treeprj_frame.cpp:115 #: kicad/treeprj_frame.cpp:115
msgid "New &Text File" msgid "New &Text File"
msgstr "新建文本文件 (&T)" msgstr "新建文本文件 (&T)"
...@@ -9180,10 +9172,6 @@ msgstr "" ...@@ -9180,10 +9172,6 @@ msgstr ""
"就绪\n" "就绪\n"
"工作目录: %s\n" "工作目录: %s\n"
#: kicad/mainframe.cpp:334
msgid "Execute Python Script:"
msgstr "运行 Python 脚本: "
#: kicad/mainframe.cpp:357 #: kicad/mainframe.cpp:357
msgid "Load file:" msgid "Load file:"
msgstr "加载文件: " msgstr "加载文件: "
...@@ -9212,10 +9200,6 @@ msgstr "" ...@@ -9212,10 +9200,6 @@ msgstr ""
"gerbview\n" "gerbview\n"
"(Gerber 文件查看程序)" "(Gerber 文件查看程序)"
#: kicad/commandframe.cpp:78
msgid "Run Python Script"
msgstr "运行 Python 脚本"
#: kicad/prjconfig.cpp:26 #: kicad/prjconfig.cpp:26
msgid "Project File <" msgid "Project File <"
msgstr "工程文件 <" msgstr "工程文件 <"
......
...@@ -10,7 +10,6 @@ set(KICAD_SRCS ...@@ -10,7 +10,6 @@ set(KICAD_SRCS
commandframe.cpp commandframe.cpp
files-io.cpp files-io.cpp
kicad.cpp kicad.cpp
kicad-python.cpp
mainframe.cpp mainframe.cpp
menubar.cpp menubar.cpp
preferences.cpp preferences.cpp
......
...@@ -5,10 +5,6 @@ ...@@ -5,10 +5,6 @@
* store info about a file or directory shown in the Kicad tree project files * store info about a file or directory shown in the Kicad tree project files
*/ */
#ifdef KICAD_PYTHON
#include <pyhandler.h>
#endif
#include "fctsys.h" #include "fctsys.h"
#include "common.h" #include "common.h"
#include "gestfich.h" #include "gestfich.h"
...@@ -42,22 +38,6 @@ TREEPROJECT_ITEM::TREEPROJECT_ITEM( enum TreeFileType type, const wxString& data ...@@ -42,22 +38,6 @@ TREEPROJECT_ITEM::TREEPROJECT_ITEM( enum TreeFileType type, const wxString& data
m_WasPopulated = false; m_WasPopulated = false;
} }
#ifdef KICAD_PYTHON
using namespace boost::python;
// Convert the data to an id
object TREEPROJECT_ITEM::GetIdPy() const
{
wxTreeItemId* id = new wxTreeItemId();
*id = GetId();
return object( handle<>( borrowed( wxPyConstructObject( id,
wxT( "wxTreeItemId" ),
true ) ) ) );
}
#endif
// Set the state used in the icon list // Set the state used in the icon list
void TREEPROJECT_ITEM::SetState( int state ) void TREEPROJECT_ITEM::SetState( int state )
{ {
...@@ -150,12 +130,6 @@ void TREEPROJECT_ITEM::Move( TREEPROJECT_ITEM* dest ) ...@@ -150,12 +130,6 @@ void TREEPROJECT_ITEM::Move( TREEPROJECT_ITEM* dest )
return; return;
} }
#ifdef KICAD_PYTHON
object param = make_tuple( PyHandler::Convert( m_FileName ),
PyHandler::Convert( destName ) );
PyHandler::GetInstance()->TriggerEvent( wxT( "kicad::MoveFile" ), param );
#endif
SetFileName( destName ); SetFileName( destName );
if( TREE_DIRECTORY != GetType() ) if( TREE_DIRECTORY != GetType() )
...@@ -232,11 +206,6 @@ type.\n Do you want to continue ?" ), ...@@ -232,11 +206,6 @@ type.\n Do you want to continue ?" ),
} }
SetFileName( newFile ); SetFileName( newFile );
#ifdef KICAD_PYTHON
object param = make_tuple( PyHandler::Convert( m_FileName ),
PyHandler::Convert( newFile ) );
PyHandler::GetInstance()->TriggerEvent( wxT( "kicad::RenameFile" ), param );
#endif
return true; return true;
} }
...@@ -269,10 +238,6 @@ bool TREEPROJECT_ITEM::Delete( bool check ) ...@@ -269,10 +238,6 @@ bool TREEPROJECT_ITEM::Delete( bool check )
} }
m_Parent->Delete( GetId() ); m_Parent->Delete( GetId() );
#ifdef KICAD_PYTHON
PyHandler::GetInstance()->TriggerEvent( wxT( "kicad::DeleteFile" ),
PyHandler::Convert( m_FileName ) );
#endif
return true; return true;
} }
return false; return false;
...@@ -304,12 +269,6 @@ void TREEPROJECT_ITEM::Activate( TREE_PROJECT_FRAME* prjframe ) ...@@ -304,12 +269,6 @@ void TREEPROJECT_ITEM::Activate( TREE_PROJECT_FRAME* prjframe )
ExecuteFile( m_Parent, PCBNEW_EXE, FullFileName ); ExecuteFile( m_Parent, PCBNEW_EXE, FullFileName );
break; break;
#ifdef KICAD_PYTHON
case TREE_PY:
PyHandler::GetInstance()->RunScript( FullFileName );
break;
#endif
case TREE_GERBER: case TREE_GERBER:
ExecuteFile( m_Parent, GERBVIEW_EXE, FullFileName ); ExecuteFile( m_Parent, GERBVIEW_EXE, FullFileName );
break; break;
......
...@@ -74,16 +74,4 @@ public: ...@@ -74,16 +74,4 @@ public:
void SetState( int state ); void SetState( int state );
#ifdef KICAD_PYTHON
boost::python::object GetFileNamePy() const;
bool RenamePy( const boost::python::str& newname,
bool check = true );
boost::python::object GetDirPy() const;
boost::python::object GetIdPy() const;
boost::python::object GetMenuPy();
#endif
}; };
...@@ -37,7 +37,6 @@ TREEPROJECTFILES::TREEPROJECTFILES( TREE_PROJECT_FRAME* parent ) : ...@@ -37,7 +37,6 @@ TREEPROJECTFILES::TREEPROJECTFILES( TREE_PROJECT_FRAME* parent ) :
m_ImageList->Add( wxBitmap( kicad_icon_small_xpm ) ); // TREE_PROJECT m_ImageList->Add( wxBitmap( kicad_icon_small_xpm ) ); // TREE_PROJECT
m_ImageList->Add( wxBitmap( eeschema_xpm ) ); // TREE_SCHEMA m_ImageList->Add( wxBitmap( eeschema_xpm ) ); // TREE_SCHEMA
m_ImageList->Add( wxBitmap( pcbnew_xpm ) ); // TREE_PCB m_ImageList->Add( wxBitmap( pcbnew_xpm ) ); // TREE_PCB
m_ImageList->Add( wxBitmap( icon_python_small_xpm ) ); // TREE_PY
m_ImageList->Add( wxBitmap( icon_gerbview_small_xpm ) ); // TREE_GERBER m_ImageList->Add( wxBitmap( icon_gerbview_small_xpm ) ); // TREE_GERBER
m_ImageList->Add( wxBitmap( datasheet_xpm ) ); // TREE_PDF m_ImageList->Add( wxBitmap( datasheet_xpm ) ); // TREE_PDF
m_ImageList->Add( wxBitmap( icon_txt_xpm ) ); // TREE_TXT m_ImageList->Add( wxBitmap( icon_txt_xpm ) ); // TREE_TXT
......
...@@ -84,13 +84,6 @@ void RIGHT_KM_FRAME::CreateCommandToolbar( void ) ...@@ -84,13 +84,6 @@ void RIGHT_KM_FRAME::CreateCommandToolbar( void )
btn->SetToolTip( _( "GerbView (Gerber viewer)" ) ); btn->SetToolTip( _( "GerbView (Gerber viewer)" ) );
AddFastLaunch( btn ); AddFastLaunch( btn );
// Set up toolbar
#ifdef KICAD_PYTHON
btn = new wxBitmapButton( parent, ID_RUN_PYTHON, wxBitmap( icon_python_xpm ) );
btn->SetToolTip( _( "Run Python Script" ) );
AddFastLaunch( btn );
#endif
} }
......
...@@ -24,11 +24,6 @@ ...@@ -24,11 +24,6 @@
#include "build_version.h" #include "build_version.h"
#ifdef KICAD_PYTHON
#include <pyhandler.h>
using namespace boost::python;
#endif
/* Import functions */ /* Import functions */
char* GetFileName( char* FullPathName ); char* GetFileName( char* FullPathName );
...@@ -155,11 +150,5 @@ bool WinEDA_App::OnInit() ...@@ -155,11 +150,5 @@ bool WinEDA_App::OnInit()
frame->Show( TRUE ); frame->Show( TRUE );
frame->Raise(); frame->Raise();
#ifdef KICAD_PYTHON
PyHandler::GetInstance()->AddToModule( wxT( "kicad" ), &py_kicad_init );
PyHandler::GetInstance()->AddToModule( wxT( "common" ), &py_common_init );
#endif
return TRUE; return TRUE;
} }
...@@ -5,10 +5,6 @@ ...@@ -5,10 +5,6 @@
#ifndef KICAD_H #ifndef KICAD_H
#define KICAD_H #define KICAD_H
#ifdef KICAD_PYTHON
#include <pyhandler.h>
#endif
#include <vector> #include <vector>
#include <wx/treectrl.h> #include <wx/treectrl.h>
...@@ -37,8 +33,6 @@ enum id_kicad_frm { ...@@ -37,8 +33,6 @@ enum id_kicad_frm {
ID_PROJECT_TREE, ID_PROJECT_TREE,
ID_PROJECT_TXTEDIT, ID_PROJECT_TXTEDIT,
ID_PROJECT_TREE_REFRESH, ID_PROJECT_TREE_REFRESH,
ID_PROJECT_RUNPY,
ID_PROJECT_NEWPY,
ID_PROJECT_NEWDIR, ID_PROJECT_NEWDIR,
ID_PROJECT_DELETE, ID_PROJECT_DELETE,
ID_PROJECT_RENAME, ID_PROJECT_RENAME,
...@@ -47,7 +41,6 @@ enum id_kicad_frm { ...@@ -47,7 +41,6 @@ enum id_kicad_frm {
ID_TO_EDITOR, ID_TO_EDITOR,
ID_TO_EESCHEMA, ID_TO_EESCHEMA,
ID_TO_GERBVIEW, ID_TO_GERBVIEW,
ID_RUN_PYTHON,
ID_BROWSE_AN_SELECT_FILE, ID_BROWSE_AN_SELECT_FILE,
ID_SELECT_PREFERED_EDITOR, ID_SELECT_PREFERED_EDITOR,
ID_SELECT_PREFERED_PDF_BROWSER_NAME, ID_SELECT_PREFERED_PDF_BROWSER_NAME,
...@@ -63,7 +56,6 @@ enum id_kicad_frm { ...@@ -63,7 +56,6 @@ enum id_kicad_frm {
*/ */
class WinEDA_MainFrame : public WinEDA_BasicFrame class WinEDA_MainFrame : public WinEDA_BasicFrame
{ {
/* This class is the main entry point of the py API */
public: public:
TREE_PROJECT_FRAME* m_LeftWin; TREE_PROJECT_FRAME* m_LeftWin;
RIGHT_KM_FRAME* m_RightWin; RIGHT_KM_FRAME* m_RightWin;
...@@ -97,11 +89,6 @@ public: ...@@ -97,11 +89,6 @@ public:
void OnRunEeschema( wxCommandEvent& event ); void OnRunEeschema( wxCommandEvent& event );
void OnRunGerbview( wxCommandEvent& event ); void OnRunGerbview( wxCommandEvent& event );
#ifdef KICAD_PYTHON
void OnRunPythonScript( wxCommandEvent& event );
#endif
void OnOpenTextEditor( wxCommandEvent& event ); void OnOpenTextEditor( wxCommandEvent& event );
void OnOpenFileInTextEditor( wxCommandEvent& event ); void OnOpenFileInTextEditor( wxCommandEvent& event );
void OnOpenFileInEditor( wxCommandEvent& event ); void OnOpenFileInEditor( wxCommandEvent& event );
...@@ -127,21 +114,6 @@ public: ...@@ -127,21 +114,6 @@ public:
void LoadSettings(); void LoadSettings();
void SaveSettings(); void SaveSettings();
#ifdef KICAD_PYTHON
void OnRefreshPy();
boost::python::object GetPrjName() const;
WinEDA_MainFrame( const WinEDA_MainFrame& ) { }
WinEDA_MainFrame() { }
boost::python::object ToWx();
void AddFastLaunchPy( boost::python::object& button );
TREE_PROJECT_FRAME* GetTree() const;
#endif
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
...@@ -151,7 +123,6 @@ enum TreeFileType { ...@@ -151,7 +123,6 @@ enum TreeFileType {
TREE_PROJECT = 1, TREE_PROJECT = 1,
TREE_SCHEMA, TREE_SCHEMA,
TREE_PCB, TREE_PCB,
TREE_PY,
TREE_GERBER, TREE_GERBER,
TREE_PDF, TREE_PDF,
TREE_TXT, TREE_TXT,
......
...@@ -6,10 +6,6 @@ ...@@ -6,10 +6,6 @@
#pragma implementation #pragma implementation
#endif #endif
#ifdef KICAD_PYTHON
#include <pyhandler.h>
#endif
#include "fctsys.h" #include "fctsys.h"
#include "appl_wxstruct.h" #include "appl_wxstruct.h"
#include "common.h" #include "common.h"
...@@ -72,10 +68,6 @@ WinEDA_MainFrame::WinEDA_MainFrame( wxWindow* parent, ...@@ -72,10 +68,6 @@ WinEDA_MainFrame::WinEDA_MainFrame( wxWindow* parent,
line.Printf( _( "Ready\nWorking dir: %s\n" ), msg.GetData() ); line.Printf( _( "Ready\nWorking dir: %s\n" ), msg.GetData() );
PrintMsg( line ); PrintMsg( line );
#ifdef KICAD_PYTHON
PyHandler::GetInstance()->DeclareEvent( wxT( "kicad::LoadProject" ) );
#endif
RecreateBaseHToolbar(); RecreateBaseHToolbar();
m_auimgr.SetManagedWindow( this ); m_auimgr.SetManagedWindow( this );
...@@ -225,23 +217,6 @@ void WinEDA_MainFrame::OnOpenTextEditor( wxCommandEvent& event ) ...@@ -225,23 +217,6 @@ void WinEDA_MainFrame::OnOpenTextEditor( wxCommandEvent& event )
} }
#ifdef KICAD_PYTHON
void WinEDA_MainFrame::OnRunPythonScript( wxCommandEvent& event )
{
wxFileDialog dlg( this, _( "Execute Python Script" ), wxEmptyString,
wxEmptyString, _( "Python script (*.py)|*.py" ),
wxFD_OPEN | wxFD_FILE_MUST_EXIST );
if( dlg.ShowModal() == wxID_CANCEL )
return;
PyHandler::GetInstance()->RunScript( dlg.GetPath() );
}
#endif
void WinEDA_MainFrame::OnOpenFileInTextEditor( wxCommandEvent& event ) void WinEDA_MainFrame::OnOpenFileInTextEditor( wxCommandEvent& event )
{ {
wxString mask( wxT( "*" ) ); wxString mask( wxT( "*" ) );
...@@ -309,12 +284,3 @@ void WinEDA_MainFrame::SaveSettings() ...@@ -309,12 +284,3 @@ void WinEDA_MainFrame::SaveSettings()
cfg->Write( TreeFrameWidthEntry, m_LeftWin->GetSize().x ); cfg->Write( TreeFrameWidthEntry, m_LeftWin->GetSize().x );
} }
#ifdef KICAD_PYTHON
void WinEDA_MainFrame::OnRefreshPy()
{
m_LeftWin->ReCreateTreePrj();
}
#endif
...@@ -61,10 +61,6 @@ BEGIN_EVENT_TABLE( WinEDA_MainFrame, WinEDA_BasicFrame ) ...@@ -61,10 +61,6 @@ BEGIN_EVENT_TABLE( WinEDA_MainFrame, WinEDA_BasicFrame )
EVT_UPDATE_UI( ID_SELECT_PREFERED_PDF_BROWSER, EVT_UPDATE_UI( ID_SELECT_PREFERED_PDF_BROWSER,
WinEDA_MainFrame::OnUpdatePreferredPdfBrowser ) WinEDA_MainFrame::OnUpdatePreferredPdfBrowser )
#ifdef KICAD_PYTHON
EVT_BUTTON( ID_RUN_PYTHON, WinEDA_MainFrame::OnRunPythonScript )
#endif
END_EVENT_TABLE() END_EVENT_TABLE()
......
...@@ -2,9 +2,6 @@ ...@@ -2,9 +2,6 @@
* @file prjconfig.cpp * @file prjconfig.cpp
* Load and save project configuration files (*.pro) * Load and save project configuration files (*.pro)
*/ */
#ifdef KICAD_PYTHON
#include <pyhandler.h>
#endif
#include "fctsys.h" #include "fctsys.h"
#include "appl_wxstruct.h" #include "appl_wxstruct.h"
...@@ -122,10 +119,6 @@ void WinEDA_MainFrame::OnLoadProject( wxCommandEvent& event ) ...@@ -122,10 +119,6 @@ void WinEDA_MainFrame::OnLoadProject( wxCommandEvent& event )
_( "\nProject: " ) + m_ProjectFileName.GetFullName() + _( "\nProject: " ) + m_ProjectFileName.GetFullName() +
wxT( "\n" ) ); wxT( "\n" ) );
#ifdef KICAD_PYTHON
PyHandler::GetInstance()->TriggerEvent( wxT( "kicad::LoadProject" ),
PyHandler::Convert( m_ProjectFileName.GetFullPath() ) );
#endif
} }
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment