From 9250d60e62a28c0653bcd824c1bfd8e5d209cbba Mon Sep 17 00:00:00 2001 From: Pascale Noyret Date: Fri, 10 Oct 2008 12:49:17 +0000 Subject: [PATCH] *** empty log message *** --- Editeur/comploader.py | 4 +-- Editeur/configuration.py | 2 +- InterfaceQT/eficas.py | 68 ---------------------------------------- 3 files changed, 3 insertions(+), 71 deletions(-) delete mode 100644 InterfaceQT/eficas.py diff --git a/Editeur/comploader.py b/Editeur/comploader.py index b20bfa9f..e75d492e 100644 --- a/Editeur/comploader.py +++ b/Editeur/comploader.py @@ -49,8 +49,8 @@ def charger_composants(Ihm="TK"): repertoire=reper+"/../InterfaceTK" package="InterfaceTK" else : - repertoire=reper+"/../InterfaceQT" - package="InterfaceQT" + repertoire=reper+"/../InterfaceQT4" + package="InterfaceQT4" listfich=glob.glob(os.path.join(repertoire, "compo*.py")) for fichier in listfich: m= os.path.basename(fichier)[:-3] diff --git a/Editeur/configuration.py b/Editeur/configuration.py index f0cd647c..252ef213 100644 --- a/Editeur/configuration.py +++ b/Editeur/configuration.py @@ -73,7 +73,7 @@ class CONFIGbase: # les transforme en attribut de l 'objet # utilisation du dictionnaire local pour récuperer style txt = utils.read_file(fic) - from InterfaceTK.styles import style + from styles import style d=locals() try: exec txt in d diff --git a/InterfaceQT/eficas.py b/InterfaceQT/eficas.py deleted file mode 100644 index 9b487468..00000000 --- a/InterfaceQT/eficas.py +++ /dev/null @@ -1,68 +0,0 @@ -# -*- coding: iso-8859-15 -*- - -class UserInterface(Eficas): - """ - Class implementing the main user interface. - - @signal appendStderr(string) emitted to write data to stderr logger - @signal appendStdout(string) emitted to write data to stdout logger - @signal preferencesChanged() emitted after the preferences were changed - """ - def __init__(self): - """ - Constructor - - @param loc locale to be used by the UI (string) - @param splash reference to the splashscreen (UI.SplashScreen.SplashScreen) - """ - Eficas.__init__(self) - - # Generate the debug server object - dbs = DebugServer() - - # Create main layout type 4 (floating windows) - - # Create the view manager depending on the configuration setting - self.viewmanager = MyTabview(self, self, dbs) #MyTabview, MyWorkspace, Listspace - self.setCentralWidget(self.viewmanager) - - - self.connect(self,PYSIGNAL('preferencesChanged'), - self.viewmanager.handlePreferencesChanged) - - self.connect(self.viewmanager,PYSIGNAL('lastEditorClosed'), - self.handleLastEditorClosed) - self.connect(self.viewmanager,PYSIGNAL('editorOpened'), - self.handleEditorOpened) - - - - # Initialise the instance variables. - self.currentProg = None - self.isProg = 0 - self.utEditorOpen = 0 - self.utProjectOpen = 0 - - self.inDragDrop = 0 - self.setAcceptDrops(1) - - - - def handleLastEditorClosed(self): - """ - Public slot to handle the lastEditorClosed signal. - """ - pass - - def handleEditorOpened(self, fn): - """ - Public slot to handle the editorOpened signal. - - @param fn filename of the opened editor (string) - """ - pass - - def fileOpen(self, prog=None): - self.viewmanager.handleOpen(prog) - - -- 2.39.2