From 7a56365aae95073c5e55283c68eec152ce757f05 Mon Sep 17 00:00:00 2001 From: Pascale Noyret Date: Tue, 3 Jun 2008 08:47:41 +0000 Subject: [PATCH] *** empty log message *** --- InterfaceQT/viewManager.py | 4 +- Ui/OptionsEditeur.py | 24 ++-- Ui/OptionsEditeur.ui | 70 +++++----- Ui/desMacro.py | 16 +-- Ui/desRacine.py | 107 ++++++++------- Ui/desRacine.ui | 268 ++++++++++++++++++++----------------- Ui/myMain.py | 14 +- Ui/myMain.ui | 8 +- 8 files changed, 266 insertions(+), 245 deletions(-) diff --git a/InterfaceQT/viewManager.py b/InterfaceQT/viewManager.py index cf9f2d37..c4542f10 100644 --- a/InterfaceQT/viewManager.py +++ b/InterfaceQT/viewManager.py @@ -638,7 +638,7 @@ class ViewManager: self.trUtf8("Fichier Duplique"), self.trUtf8("Le fichier ne sera pas sauvegarde."), self.trUtf8("&Quitter"), - self.trUtf8("&Abandonner")) + self.trUtf8("&Annuler")) if res == 0 : return 1 return 0 if editor.modified: @@ -1035,7 +1035,7 @@ class ViewManager: None, self.trUtf8("Fichier Duplique"), self.trUtf8("Le fichier ne sera pas sauvegarde."), - self.trUtf8("&Abandonner")) + self.trUtf8("&Annuler")) return if aw: ok, newName = aw.saveFile() diff --git a/Ui/OptionsEditeur.py b/Ui/OptionsEditeur.py index 69ae4f2c..8bd23b62 100644 --- a/Ui/OptionsEditeur.py +++ b/Ui/OptionsEditeur.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'OptionsEditeur.ui' # -# Created: ven mai 16 13:30:39 2008 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Mon Jun 2 16:08:31 2008 +# by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! @@ -57,25 +57,25 @@ class desOptions(QDialog): self.PBajout = QPushButton(self.groupBox2,"PBajout") self.PBajout.setGeometry(QRect(10,20,101,41)) + self.PBQuit = QPushButton(self,"PBQuit") + self.PBQuit.setGeometry(QRect(400,420,151,31)) + self.PBQuit.setMinimumSize(QSize(0,30)) + self.groupBox3 = QGroupBox(self,"groupBox3") self.groupBox3.setGeometry(QRect(10,310,548,90)) - self.textLabel1 = QLabel(self.groupBox3,"textLabel1") - self.textLabel1.setGeometry(QRect(20,10,280,40)) - self.LERepDoc = QLineEdit(self.groupBox3,"LERepDoc") self.LERepDoc.setGeometry(QRect(20,50,520,31)) + self.textLabel1 = QLabel(self.groupBox3,"textLabel1") + self.textLabel1.setGeometry(QRect(20,20,280,30)) + self.Bdefaut = QCheckBox(self,"Bdefaut") - self.Bdefaut.setGeometry(QRect(10,430,280,20)) + self.Bdefaut.setGeometry(QRect(10,430,340,20)) Bdefaut_font = QFont(self.Bdefaut.font()) Bdefaut_font.setPointSize(12) self.Bdefaut.setFont(Bdefaut_font) - self.PBQuit = QPushButton(self,"PBQuit") - self.PBQuit.setGeometry(QRect(400,420,151,31)) - self.PBQuit.setMinimumSize(QSize(0,30)) - self.languageChange() self.resize(QSize(570,474).expandedTo(self.minimumSizeHint())) @@ -105,11 +105,11 @@ class desOptions(QDialog): "Version :")) self.PBajout.setText(self.__tr("Ajouter\n" "Version :")) + self.PBQuit.setText(self.__tr("Quitter")) self.groupBox3.setTitle(self.__tr("Doc")) - self.textLabel1.setText(self.__trUtf8("\x52\x65\x70\x65\x72\x74\x6f\x69\x72\x65\x20\x64\x27\x61\x63\x63\x65\x73\x20\xc3\xa0\x20\x6c\x61\x20\x64\x6f\x63\x75\x6d\x65\x6e\x74\x61\x74\x69\x6f\x6e\x20\x3a")) self.LERepDoc.setText(QString.null) + self.textLabel1.setText(self.__trUtf8("\x52\x65\x70\x65\x72\x74\x6f\x69\x72\x65\x20\x64\x27\x61\x63\x63\x65\x73\x20\xc3\xa0\x20\x6c\x61\x20\x64\x6f\x63\x75\x6d\x65\x6e\x74\x61\x74\x69\x6f\x6e\x20\x3a")) self.Bdefaut.setText(self.__tr("Reinitialiser avec les valeurs par defaut")) - self.PBQuit.setText(self.__tr("Quitter")) def VersionChoisie(self): diff --git a/Ui/OptionsEditeur.ui b/Ui/OptionsEditeur.ui index ced2a9bc..7cebf8a3 100644 --- a/Ui/OptionsEditeur.ui +++ b/Ui/OptionsEditeur.ui @@ -203,6 +203,28 @@ Version : + + + PBQuit + + + + 400 + 420 + 151 + 31 + + + + + 0 + 30 + + + + Quitter + + groupBox3 @@ -218,36 +240,36 @@ Version : Doc - + - textLabel1 + LERepDoc 20 - 10 - 280 - 40 + 50 + 520 + 31 - Repertoire d'acces à la documentation : + - + - LERepDoc + textLabel1 20 - 50 - 520 - 31 + 20 + 280 + 30 - + Repertoire d'acces à la documentation : @@ -259,7 +281,7 @@ Version : 10 430 - 280 + 340 20 @@ -272,28 +294,6 @@ Version : Reinitialiser avec les valeurs par defaut - - - PBQuit - - - - 400 - 420 - 151 - 31 - - - - - 0 - 30 - - - - Quitter - - diff --git a/Ui/desMacro.py b/Ui/desMacro.py index 79b8a083..4850e072 100644 --- a/Ui/desMacro.py +++ b/Ui/desMacro.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'desMacro.ui' # -# Created: ven mai 16 13:30:38 2008 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Mon Jun 2 15:35:12 2008 +# by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! @@ -48,7 +48,7 @@ class DMacro(QWidget): self.textLabel1.setMinimumSize(QSize(0,0)) MotClefLayout.addWidget(self.textLabel1,0,0) - self.TWChoix.insertTab(self.MotClef,QString("")) + self.TWChoix.insertTab(self.MotClef,QString.fromLatin1("")) self.Commande = QWidget(self.TWChoix,"Commande") CommandeLayout = QGridLayout(self.Commande,1,1,11,6,"CommandeLayout") @@ -91,7 +91,7 @@ class DMacro(QWidget): self.LEFiltre.setMinimumSize(QSize(160,30)) CommandeLayout.addWidget(self.LEFiltre,1,1) - self.TWChoix.insertTab(self.Commande,QString("")) + self.TWChoix.insertTab(self.Commande,QString.fromLatin1("")) self.TabPage = QWidget(self.TWChoix,"TabPage") @@ -112,7 +112,7 @@ class DMacro(QWidget): self.LENomConcept = QLineEdit(self.groupBox1_2,"LENomConcept") self.LENomConcept.setGeometry(QRect(20,80,440,30)) - self.TWChoix.insertTab(self.TabPage,QString("")) + self.TWChoix.insertTab(self.TabPage,QString.fromLatin1("")) DMacroLayout.addMultiCellWidget(self.TWChoix,0,0,0,2) @@ -184,13 +184,13 @@ class DMacro(QWidget): self.textLabel1_3_3.setText(self.__tr("Nom du concept :")) self.TWChoix.changeTab(self.TabPage,self.__tr("Nommer Concept")) self.bSup.setText(self.__tr("&Supprimer")) - self.bSup.setAccel(self.__tr("Alt+S")) + self.bSup.setAccel(QKeySequence(self.__tr("Alt+S"))) QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) self.bHelp.setText(self.__tr("&Documentation")) - self.bHelp.setAccel(self.__tr("Alt+D")) + self.bHelp.setAccel(QKeySequence(self.__tr("Alt+D"))) QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) self.bOk.setText(self.__tr("&Valider")) - self.bOk.setAccel(self.__tr("Shift+A, Alt+A, Alt+A, Alt+A")) + self.bOk.setAccel(QKeySequence(self.__tr("Shift+A, Alt+A, Alt+A, Alt+A"))) QToolTip.add(self.bOk,self.__tr("validation de la saisie")) diff --git a/Ui/desRacine.py b/Ui/desRacine.py index 81d6eaf6..39382eb2 100644 --- a/Ui/desRacine.py +++ b/Ui/desRacine.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'desRacine.ui' # -# Created: ven mai 16 13:30:38 2008 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Mon Jun 2 16:02:17 2008 +# by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! @@ -22,73 +22,78 @@ class DRac(QWidget): DRacLayout = QGridLayout(self,1,1,11,6,"DRacLayout") - self.bSup = QPushButton(self,"bSup") - self.bSup.setMinimumSize(QSize(0,30)) - self.bSup.setAutoDefault(1) + self.textLabel1_4 = QLabel(self,"textLabel1_4") + self.textLabel1_4.setMinimumSize(QSize(291,21)) - DRacLayout.addMultiCellWidget(self.bSup,4,4,0,1) + DRacLayout.addMultiCellWidget(self.textLabel1_4,0,0,0,1) - self.bOk = QPushButton(self,"bOk") - self.bOk.setMinimumSize(QSize(0,30)) - self.bOk.setAutoDefault(1) - self.bOk.setDefault(1) + self.textLabel1_4_2 = QLabel(self,"textLabel1_4_2") - DRacLayout.addMultiCellWidget(self.bOk,4,4,2,3) + DRacLayout.addMultiCellWidget(self.textLabel1_4_2,0,1,2,3) - self.bHelp = QPushButton(self,"bHelp") - self.bHelp.setMinimumSize(QSize(0,30)) - self.bHelp.setAutoDefault(1) + self.buttonGroup1 = QButtonGroup(self,"buttonGroup1") + self.buttonGroup1.setMinimumSize(QSize(0,60)) - DRacLayout.addWidget(self.bHelp,4,4) + self.RBGroupe = QRadioButton(self.buttonGroup1,"RBGroupe") + self.RBGroupe.setGeometry(QRect(10,20,90,20)) - self.textLabel1_4 = QLabel(self,"textLabel1_4") + self.RBalpha = QRadioButton(self.buttonGroup1,"RBalpha") + self.RBalpha.setGeometry(QRect(110,20,120,20)) + self.RBalpha.setChecked(1) - DRacLayout.addMultiCellWidget(self.textLabel1_4,0,0,1,2) + DRacLayout.addMultiCellWidget(self.buttonGroup1,1,1,0,1) - self.textLabel1_4_2 = QLabel(self,"textLabel1_4_2") + self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setMinimumSize(QSize(160,30)) + self.bHelp.setAutoDefault(1) - DRacLayout.addMultiCellWidget(self.textLabel1_4_2,0,1,3,4) + DRacLayout.addWidget(self.bHelp,3,3) - self.LEFiltre = QLineEdit(self,"LEFiltre") - self.LEFiltre.setMinimumSize(QSize(0,30)) + self.bSup = QPushButton(self,"bSup") + self.bSup.setMinimumSize(QSize(160,30)) + self.bSup.setAutoDefault(1) - DRacLayout.addWidget(self.LEFiltre,2,1) + DRacLayout.addWidget(self.bSup,3,0) - self.textLabel6 = QLabel(self,"textLabel6") - self.textLabel6.setMinimumSize(QSize(40,0)) + self.bOk = QPushButton(self,"bOk") + self.bOk.setMinimumSize(QSize(160,30)) + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) + + DRacLayout.addMultiCellWidget(self.bOk,3,3,1,2) - DRacLayout.addWidget(self.textLabel6,2,0) + layout2 = QGridLayout(None,1,1,0,6,"layout2") self.BNext = QToolButton(self,"BNext") self.BNext.setMinimumSize(QSize(60,30)) self.BNext.setIconSet(QIconSet()) - DRacLayout.addWidget(self.BNext,2,2) + layout2.addWidget(self.BNext,0,2) - self.buttonGroup1 = QButtonGroup(self,"buttonGroup1") - self.buttonGroup1.setMinimumSize(QSize(0,60)) + self.LEFiltre = QLineEdit(self,"LEFiltre") + self.LEFiltre.setMinimumSize(QSize(0,30)) - self.RBGroupe = QRadioButton(self.buttonGroup1,"RBGroupe") - self.RBGroupe.setGeometry(QRect(10,20,90,20)) + layout2.addWidget(self.LEFiltre,0,1) - self.RBalpha = QRadioButton(self.buttonGroup1,"RBalpha") - self.RBalpha.setGeometry(QRect(110,20,100,20)) - self.RBalpha.setChecked(1) + self.LBRegles = QListBox(self,"LBRegles") + self.LBRegles.setMinimumSize(QSize(240,350)) - DRacLayout.addMultiCellWidget(self.buttonGroup1,1,1,0,2) + layout2.addMultiCellWidget(self.LBRegles,0,1,3,3) - self.LBNouvCommande = QListBox(self,"LBNouvCommande") + self.textLabel6 = QLabel(self,"textLabel6") + self.textLabel6.setMinimumSize(QSize(40,0)) - DRacLayout.addMultiCellWidget(self.LBNouvCommande,3,3,0,2) + layout2.addWidget(self.textLabel6,0,0) - self.LBRegles = QListBox(self,"LBRegles") - self.LBRegles.setMinimumSize(QSize(250,350)) + self.LBNouvCommande = QListBox(self,"LBNouvCommande") + + layout2.addMultiCellWidget(self.LBNouvCommande,1,1,0,2) - DRacLayout.addMultiCellWidget(self.LBRegles,2,3,3,4) + DRacLayout.addMultiCellLayout(layout2,2,2,0,3) self.languageChange() - self.resize(QSize(519,513).expandedTo(self.minimumSizeHint())) + self.resize(QSize(509,513).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked) @@ -111,23 +116,23 @@ class DRac(QWidget): def languageChange(self): self.setCaption(self.__tr("DMacro")) + self.textLabel1_4.setText(self.__tr("Commandes :")) + self.textLabel1_4_2.setText(self.__trUtf8("\x3c\x70\x20\x61\x6c\x69\x67\x6e\x3d\x22\x63\x65\x6e\x74\x65\x72\x22\x3e\x3c\x62\x3e\x3c\x75\x3e\x52\xc3\xa9\x67\x6c\x65\x73\x20\x3a\x3c\x2f\x75\x3e\x3c\x2f\x62\x3e\x3c\x2f\x70\x3e")) + self.buttonGroup1.setTitle(self.__tr("Affichage")) + self.RBGroupe.setText(self.__tr("par groupe")) + self.RBalpha.setText(self.__trUtf8("\x61\x6c\x70\x68\x61\x62\xc3\xa9\x74\x69\x71\x75\x65")) + self.bHelp.setText(self.__tr("&Documentation")) + self.bHelp.setAccel(QKeySequence(self.__tr("Alt+D"))) + QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) self.bSup.setText(self.__tr("&Supprimer")) - self.bSup.setAccel(self.__tr("Alt+S")) + self.bSup.setAccel(QKeySequence(self.__tr("Alt+S"))) QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) self.bOk.setText(self.__tr("&Valider")) - self.bOk.setAccel(self.__tr("Shift+A, Alt+A, Alt+A, Alt+A")) + self.bOk.setAccel(QKeySequence(self.__tr("Shift+A, Alt+A, Alt+A, Alt+A"))) QToolTip.add(self.bOk,self.__tr("validation de la saisie")) - self.bHelp.setText(self.__tr("&Documentation")) - self.bHelp.setAccel(self.__tr("Alt+D")) - QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) - self.textLabel1_4.setText(self.__tr("Commandes :")) - self.textLabel1_4_2.setText(self.__trUtf8("\x3c\x62\x3e\x3c\x75\x3e\x52\xc3\xa9\x67\x6c\x65\x73\x20\x3a\x3c\x2f\x75\x3e\x3c\x2f\x62\x3e")) - self.textLabel6.setText(self.__tr("Filtre")) self.BNext.setText(self.__tr("Suivant")) QToolTip.add(self.BNext,self.__tr("affiche la prochaine occurence")) - self.buttonGroup1.setTitle(self.__tr("Affichage")) - self.RBGroupe.setText(self.__tr("par groupe")) - self.RBalpha.setText(self.__trUtf8("\x61\x6c\x70\x68\x61\x62\xc3\xa9\x74\x69\x71\x75\x65")) + self.textLabel6.setText(self.__tr("Filtre")) def LBNouvCommandeClicked(self): diff --git a/Ui/desRacine.ui b/Ui/desRacine.ui index 2f5ba8cf..b4ee15d2 100644 --- a/Ui/desRacine.ui +++ b/Ui/desRacine.ui @@ -8,7 +8,7 @@ 0 0 - 519 + 509 513 @@ -25,140 +25,29 @@ unnamed - + - bSup - - - - 0 - 30 - - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - - - - - bOk - - - - 0 - 30 - - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - - - - - bHelp + textLabel1_4 - 0 - 30 + 291 + 21 - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - - - - - textLabel1_4 - <b><u>Commandes :</u></b> - + textLabel1_4_2 - <b><u>Régles :</u></b> - - - - - LEFiltre - - - - 0 - 30 - + <p align="center"><b><u>Régles :</u></b></p> - - - textLabel6 - - - - 40 - 0 - - - - Filtre - - - - - BNext - - - - 60 - 30 - - - - Suivant - - - - - - affiche la prochaine occurence - - - + buttonGroup1 @@ -195,7 +84,7 @@ 110 20 - 100 + 120 20 @@ -207,21 +96,148 @@ - + - LBNouvCommande + bHelp + + + + 160 + 30 + + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster - + - LBRegles + bSup - 250 - 350 + 160 + 30 + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + bOk + + + + 160 + 30 + + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + layout2 + + + + unnamed + + + + BNext + + + + 60 + 30 + + + + Suivant + + + + + + affiche la prochaine occurence + + + + + LEFiltre + + + + 0 + 30 + + + + + + LBRegles + + + + 240 + 350 + + + + + + textLabel6 + + + + 40 + 0 + + + + Filtre + + + + + LBNouvCommande + + + diff --git a/Ui/myMain.py b/Ui/myMain.py index b36b65b8..1de67dd7 100644 --- a/Ui/myMain.py +++ b/Ui/myMain.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'myMain.ui' # -# Created: ven mai 16 12:44:22 2008 -# by: The PyQt User Interface Compiler (pyuic) 3.13 +# Created: Mon Jun 2 15:38:21 2008 +# by: The PyQt User Interface Compiler (pyuic) 3.16 # # WARNING! All changes made in this file will be lost! @@ -245,8 +245,8 @@ class Eficas(QMainWindow): self.setName("Eficas") self.setEnabled(1) - self.setSizePolicy(QSizePolicy(1,1,0,0,self.sizePolicy().hasHeightForWidth())) - self.setMinimumSize(QSize(21,323)) + self.setSizePolicy(QSizePolicy(QSizePolicy.Minimum,QSizePolicy.Minimum,0,0,self.sizePolicy().hasHeightForWidth())) + self.setMinimumSize(QSize(21,336)) self.setBackgroundOrigin(QMainWindow.WidgetOrigin) f = QFont(self.font()) self.setFont(f) @@ -402,10 +402,10 @@ class Eficas(QMainWindow): self.fileOpenAction.setMenuText(self.__tr("&Ouvrir")) self.fileOpenAction.setAccel(self.__tr("Ctrl+O")) self.fileSaveAction.setText(self.__tr("Enregistrer")) - self.fileSaveAction.setMenuText(self.__tr("&Enregister")) + self.fileSaveAction.setMenuText(self.__tr("&Enregistrer")) self.fileSaveAction.setAccel(self.__tr("Ctrl+E")) - self.fileSaveAsAction.setText(self.__tr("Enregister Sous")) - self.fileSaveAsAction.setMenuText(self.__tr("Enregister Sous")) + self.fileSaveAsAction.setText(self.__tr("Enregistrer Sous")) + self.fileSaveAsAction.setMenuText(self.__tr("Enregistrer Sous")) self.fileSaveAsAction.setAccel(QString.null) self.fileExitAction.setText(self.__tr("Quitter")) self.fileExitAction.setMenuText(self.__tr("Q&uitter")) diff --git a/Ui/myMain.ui b/Ui/myMain.ui index a636a0ea..955c4b2d 100644 --- a/Ui/myMain.ui +++ b/Ui/myMain.ui @@ -26,7 +26,7 @@ 21 - 323 + 336 @@ -176,7 +176,7 @@ Enregistrer - &Enregister + &Enregistrer Ctrl+E @@ -187,10 +187,10 @@ fileSaveAsAction - Enregister Sous + Enregistrer Sous - Enregister Sous + Enregistrer Sous -- 2.39.2