MAj

2015-01-12 16:06:44 +01:00
parent cef87901a4
commit 1b34dd5c6a
42 changed files with 1392 additions and 744 deletions
--- a/ui/borne.py
+++ b/ui/borne.py
@ -2,7 +2,7 @@

 # Form implementation generated from reading ui file 'borne.ui'
 #
-# Created: Fri Dec 26 17:48:52 2014
+# Created: Mon Jan 12 14:40:36 2015
 #      by: PyQt4 UI code generator 4.11.3
 #
 # WARNING! All changes made in this file will be lost!
@ -23,21 +23,21 @@ except AttributeError:
    def _translate(context, text, disambig):
        return QtGui.QApplication.translate(context, text, disambig)

-class Ui_Form(object):
-    def setupUi(self, Form):
-        Form.setObjectName(_fromUtf8("Form"))
-        Form.resize(400, 412)
-        self.btn_Voiture = QtGui.QPushButton(Form)
-        self.btn_Voiture.setGeometry(QtCore.QRect(90, 40, 211, 27))
+class Ui_Borne(object):
+    def setupUi(self, Borne):
+        Borne.setObjectName(_fromUtf8("Borne"))
+        Borne.resize(669, 579)
+        self.btn_Voiture = QtGui.QPushButton(Borne)
+        self.btn_Voiture.setGeometry(QtCore.QRect(140, 40, 211, 27))
        self.btn_Voiture.setObjectName(_fromUtf8("btn_Voiture"))
-        self.lcdNumber = QtGui.QLCDNumber(Form)
-        self.lcdNumber.setGeometry(QtCore.QRect(20, 80, 351, 31))
-        self.lcdNumber.setObjectName(_fromUtf8("lcdNumber"))
-        self.nomParking = QtGui.QLabel(Form)
-        self.nomParking.setGeometry(QtCore.QRect(170, 10, 151, 20))
+        self.nomParking = QtGui.QLabel(Borne)
+        self.nomParking.setGeometry(QtCore.QRect(300, 10, 151, 20))
        self.nomParking.setObjectName(_fromUtf8("nomParking"))
-        self.layoutWidget = QtGui.QWidget(Form)
-        self.layoutWidget.setGeometry(QtCore.QRect(60, 300, 272, 85))
+        self.box_id = QtGui.QGroupBox(Borne)
+        self.box_id.setGeometry(QtCore.QRect(20, 150, 331, 171))
+        self.box_id.setObjectName(_fromUtf8("box_id"))
+        self.layoutWidget = QtGui.QWidget(self.box_id)
+        self.layoutWidget.setGeometry(QtCore.QRect(30, 60, 272, 85))
        self.layoutWidget.setObjectName(_fromUtf8("layoutWidget"))
        self.horizontalLayout = QtGui.QHBoxLayout(self.layoutWidget)
        self.horizontalLayout.setMargin(0)
@ -56,55 +56,104 @@ class Ui_Form(object):
        self.horizontalLayout.addLayout(self.verticalLayout_2)
        self.verticalLayout = QtGui.QVBoxLayout()
        self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
-        self.label_2 = QtGui.QLabel(self.layoutWidget)
-        self.label_2.setObjectName(_fromUtf8("label_2"))
-        self.verticalLayout.addWidget(self.label_2)
-        self.btn_validerNonMembre = QtGui.QPushButton(self.layoutWidget)
-        self.btn_validerNonMembre.setObjectName(_fromUtf8("btn_validerNonMembre"))
-        self.verticalLayout.addWidget(self.btn_validerNonMembre)
-        self.btn_cb = QtGui.QPushButton(self.layoutWidget)
-        self.btn_cb.setObjectName(_fromUtf8("btn_cb"))
-        self.verticalLayout.addWidget(self.btn_cb)
        self.horizontalLayout.addLayout(self.verticalLayout)
-        self.layoutWidget1 = QtGui.QWidget(Form)
-        self.layoutWidget1.setGeometry(QtCore.QRect(70, 130, 261, 91))
-        self.layoutWidget1.setObjectName(_fromUtf8("layoutWidget1"))
-        self.horizontalLayout_2 = QtGui.QHBoxLayout(self.layoutWidget1)
-        self.horizontalLayout_2.setMargin(0)
-        self.horizontalLayout_2.setObjectName(_fromUtf8("horizontalLayout_2"))
-        self.verticalLayout_5 = QtGui.QVBoxLayout()
-        self.verticalLayout_5.setObjectName(_fromUtf8("verticalLayout_5"))
-        self.btn_precedent = QtGui.QPushButton(self.layoutWidget1)
-        self.btn_precedent.setObjectName(_fromUtf8("btn_precedent"))
-        self.verticalLayout_5.addWidget(self.btn_precedent)
-        self.btn_annuler = QtGui.QPushButton(self.layoutWidget1)
+        self.labIdClient = QtGui.QLabel(self.box_id)
+        self.labIdClient.setGeometry(QtCore.QRect(130, 31, 91, 16))
+        self.labIdClient.setObjectName(_fromUtf8("labIdClient"))
+        self.box_abo = QtGui.QGroupBox(Borne)
+        self.box_abo.setGeometry(QtCore.QRect(20, 350, 331, 201))
+        self.box_abo.setObjectName(_fromUtf8("box_abo"))
+        self.formLayoutWidget = QtGui.QWidget(self.box_abo)
+        self.formLayoutWidget.setGeometry(QtCore.QRect(-1, 40, 291, 91))
+        self.formLayoutWidget.setObjectName(_fromUtf8("formLayoutWidget"))
+        self.formLayout = QtGui.QFormLayout(self.formLayoutWidget)
+        self.formLayout.setMargin(0)
+        self.formLayout.setObjectName(_fromUtf8("formLayout"))
+        self.nomLabel = QtGui.QLabel(self.formLayoutWidget)
+        self.nomLabel.setObjectName(_fromUtf8("nomLabel"))
+        self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.nomLabel)
+        self.nomLineEdit = QtGui.QLineEdit(self.formLayoutWidget)
+        self.nomLineEdit.setObjectName(_fromUtf8("nomLineEdit"))
+        self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.nomLineEdit)
+        self.prenomLabel = QtGui.QLabel(self.formLayoutWidget)
+        self.prenomLabel.setObjectName(_fromUtf8("prenomLabel"))
+        self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.prenomLabel)
+        self.numeroCarteLabel = QtGui.QLabel(self.formLayoutWidget)
+        self.numeroCarteLabel.setObjectName(_fromUtf8("numeroCarteLabel"))
+        self.formLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.numeroCarteLabel)
+        self.numeroCarteLineEdit = QtGui.QLineEdit(self.formLayoutWidget)
+        self.numeroCarteLineEdit.setObjectName(_fromUtf8("numeroCarteLineEdit"))
+        self.formLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.numeroCarteLineEdit)
+        self.prenomLineEdit = QtGui.QLineEdit(self.formLayoutWidget)
+        self.prenomLineEdit.setObjectName(_fromUtf8("prenomLineEdit"))
+        self.formLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.prenomLineEdit)
+        self.checkBox = QtGui.QCheckBox(self.box_abo)
+        self.checkBox.setGeometry(QtCore.QRect(0, 140, 121, 20))
+        self.checkBox.setObjectName(_fromUtf8("checkBox"))
+        self.btn_valider_abo = QtGui.QPushButton(self.box_abo)
+        self.btn_valider_abo.setGeometry(QtCore.QRect(210, 160, 87, 27))
+        self.btn_valider_abo.setObjectName(_fromUtf8("btn_valider_abo"))
+        self.btn_desabo = QtGui.QPushButton(self.box_abo)
+        self.btn_desabo.setGeometry(QtCore.QRect(120, 160, 87, 27))
+        self.btn_desabo.setObjectName(_fromUtf8("btn_desabo"))
+        self.box_recup = QtGui.QGroupBox(Borne)
+        self.box_recup.setGeometry(QtCore.QRect(380, 350, 271, 121))
+        self.box_recup.setObjectName(_fromUtf8("box_recup"))
+        self.formLayoutWidget_2 = QtGui.QWidget(self.box_recup)
+        self.formLayoutWidget_2.setGeometry(QtCore.QRect(0, 40, 261, 80))
+        self.formLayoutWidget_2.setObjectName(_fromUtf8("formLayoutWidget_2"))
+        self.formLayout_2 = QtGui.QFormLayout(self.formLayoutWidget_2)
+        self.formLayout_2.setMargin(0)
+        self.formLayout_2.setObjectName(_fromUtf8("formLayout_2"))
+        self.numeroTicketLabel = QtGui.QLabel(self.formLayoutWidget_2)
+        self.numeroTicketLabel.setObjectName(_fromUtf8("numeroTicketLabel"))
+        self.formLayout_2.setWidget(0, QtGui.QFormLayout.LabelRole, self.numeroTicketLabel)
+        self.numeroTicketLineEdit = QtGui.QLineEdit(self.formLayoutWidget_2)
+        self.numeroTicketLineEdit.setObjectName(_fromUtf8("numeroTicketLineEdit"))
+        self.formLayout_2.setWidget(0, QtGui.QFormLayout.FieldRole, self.numeroTicketLineEdit)
+        self.btn_recuperer = QtGui.QPushButton(self.formLayoutWidget_2)
+        self.btn_recuperer.setObjectName(_fromUtf8("btn_recuperer"))
+        self.formLayout_2.setWidget(1, QtGui.QFormLayout.FieldRole, self.btn_recuperer)
+        self.label_aff = QtGui.QLabel(Borne)
+        self.label_aff.setGeometry(QtCore.QRect(10, 90, 641, 31))
+        self.label_aff.setObjectName(_fromUtf8("label_aff"))
+        self.box_garer = QtGui.QGroupBox(Borne)
+        self.box_garer.setGeometry(QtCore.QRect(390, 150, 231, 131))
+        self.box_garer.setObjectName(_fromUtf8("box_garer"))
+        self.btn_garer = QtGui.QPushButton(self.box_garer)
+        self.btn_garer.setGeometry(QtCore.QRect(50, 60, 131, 27))
+        self.btn_garer.setObjectName(_fromUtf8("btn_garer"))
+        self.btn_annuler = QtGui.QPushButton(Borne)
+        self.btn_annuler.setGeometry(QtCore.QRect(390, 40, 87, 27))
        self.btn_annuler.setObjectName(_fromUtf8("btn_annuler"))
-        self.verticalLayout_5.addWidget(self.btn_annuler)
-        self.horizontalLayout_2.addLayout(self.verticalLayout_5)
-        self.verticalLayout_4 = QtGui.QVBoxLayout()
-        self.verticalLayout_4.setObjectName(_fromUtf8("verticalLayout_4"))
-        self.btn_suivant = QtGui.QPushButton(self.layoutWidget1)
-        self.btn_suivant.setObjectName(_fromUtf8("btn_suivant"))
-        self.verticalLayout_4.addWidget(self.btn_suivant)
-        self.btn_valider = QtGui.QPushButton(self.layoutWidget1)
-        self.btn_valider.setObjectName(_fromUtf8("btn_valider"))
-        self.verticalLayout_4.addWidget(self.btn_valider)
-        self.horizontalLayout_2.addLayout(self.verticalLayout_4)
+        self.btn_quitter = QtGui.QPushButton(Borne)
+        self.btn_quitter.setGeometry(QtCore.QRect(520, 540, 87, 27))
+        self.btn_quitter.setObjectName(_fromUtf8("btn_quitter"))

-        self.retranslateUi(Form)
-        QtCore.QMetaObject.connectSlotsByName(Form)
+        self.retranslateUi(Borne)
+        QtCore.QMetaObject.connectSlotsByName(Borne)

-    def retranslateUi(self, Form):
-        Form.setWindowTitle(_translate("Form", "Borne", None))
-        self.btn_Voiture.setText(_translate("Form", "Detection Arrivee Voiture", None))
-        self.nomParking.setText(_translate("Form", "NomParking", None))
-        self.label.setText(_translate("Form", "Carte Membre ID ", None))
-        self.btn_validerID.setText(_translate("Form", "Valider", None))
-        self.label_2.setText(_translate("Form", "Non membre", None))
-        self.btn_validerNonMembre.setText(_translate("Form", "Valider", None))
-        self.btn_cb.setText(_translate("Form", "PayerAvecCarte", None))
-        self.btn_precedent.setText(_translate("Form", "<", None))
-        self.btn_annuler.setText(_translate("Form", "Annuler", None))
-        self.btn_suivant.setText(_translate("Form", ">", None))
-        self.btn_valider.setText(_translate("Form", "Valider", None))
+    def retranslateUi(self, Borne):
+        Borne.setWindowTitle(_translate("Borne", "Borne", None))
+        self.btn_Voiture.setText(_translate("Borne", "Detection Arrivee Voiture", None))
+        self.nomParking.setText(_translate("Borne", "NomParking", None))
+        self.box_id.setTitle(_translate("Borne", "Identification", None))
+        self.label.setText(_translate("Borne", "Carte Membre ID ", None))
+        self.btn_validerID.setText(_translate("Borne", "Valider", None))
+        self.labIdClient.setText(_translate("Borne", "Non identifier", None))
+        self.box_abo.setTitle(_translate("Borne", "S\'abonner", None))
+        self.nomLabel.setText(_translate("Borne", "Nom", None))
+        self.prenomLabel.setText(_translate("Borne", "Prenom", None))
+        self.numeroCarteLabel.setText(_translate("Borne", "Numero carte", None))
+        self.checkBox.setText(_translate("Borne", "PackGarantie", None))
+        self.btn_valider_abo.setText(_translate("Borne", "Valider", None))
+        self.btn_desabo.setText(_translate("Borne", "Désabonner", None))
+        self.box_recup.setTitle(_translate("Borne", "Récuperer", None))
+        self.numeroTicketLabel.setText(_translate("Borne", "Numero Ticket :", None))
+        self.btn_recuperer.setText(_translate("Borne", "Récupérer Véhicule", None))
+        self.label_aff.setText(_translate("Borne", "<html><head/><body><p align=\"center\">TextLabel</p></body></html>", None))
+        self.box_garer.setTitle(_translate("Borne", "Se garer", None))
+        self.btn_garer.setText(_translate("Borne", "Garer Véhicule", None))
+        self.btn_annuler.setText(_translate("Borne", "Annuler", None))
+        self.btn_quitter.setText(_translate("Borne", "Quitter", None))

--- a/ui/borne.ui
+++ b/ui/borne.ui
@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
+ <class>Borne</class>
+ <widget class="QWidget" name="Borne">
  <property name="geometry">
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>400</width>
-    <height>412</height>
+    <width>669</width>
+    <height>579</height>
   </rect>
  </property>
  <property name="windowTitle">
@ -16,7 +16,7 @@
  <widget class="QPushButton" name="btn_Voiture">
   <property name="geometry">
    <rect>
-     <x>90</x>
+     <x>140</x>
     <y>40</y>
     <width>211</width>
     <height>27</height>
@ -26,20 +26,10 @@
    <string>Detection Arrivee Voiture</string>
   </property>
  </widget>
-  <widget class="QLCDNumber" name="lcdNumber">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>80</y>
-     <width>351</width>
-     <height>31</height>
-    </rect>
-   </property>
-  </widget>
  <widget class="QLabel" name="nomParking">
   <property name="geometry">
    <rect>
-     <x>170</x>
+     <x>300</x>
     <y>10</y>
     <width>151</width>
     <height>20</height>
@ -49,117 +39,284 @@
    <string>NomParking</string>
   </property>
  </widget>
-  <widget class="QWidget" name="layoutWidget">
+  <widget class="QGroupBox" name="box_id">
   <property name="geometry">
    <rect>
-     <x>60</x>
-     <y>300</y>
-     <width>272</width>
-     <height>85</height>
+     <x>20</x>
+     <y>150</y>
+     <width>331</width>
+     <height>171</height>
    </rect>
   </property>
-   <layout class="QHBoxLayout" name="horizontalLayout">
-    <item>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <widget class="QLabel" name="label">
-        <property name="text">
-         <string>Carte Membre ID </string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLineEdit" name="lineEdit_id"/>
-      </item>
-      <item>
-       <widget class="QPushButton" name="btn_validerID">
-        <property name="text">
-         <string>Valider</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </item>
-    <item>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <widget class="QLabel" name="label_2">
-        <property name="text">
-         <string>Non membre</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="btn_validerNonMembre">
-        <property name="text">
-         <string>Valider</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="btn_cb">
-        <property name="text">
-         <string>PayerAvecCarte</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </item>
-   </layout>
+   <property name="title">
+    <string>Identification</string>
+   </property>
+   <widget class="QWidget" name="layoutWidget">
+    <property name="geometry">
+     <rect>
+      <x>30</x>
+      <y>60</y>
+      <width>272</width>
+      <height>85</height>
+     </rect>
+    </property>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <widget class="QLabel" name="label">
+         <property name="text">
+          <string>Carte Membre ID </string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="lineEdit_id"/>
+       </item>
+       <item>
+        <widget class="QPushButton" name="btn_validerID">
+         <property name="text">
+          <string>Valider</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout"/>
+     </item>
+    </layout>
+   </widget>
+   <widget class="QLabel" name="labIdClient">
+    <property name="geometry">
+     <rect>
+      <x>130</x>
+      <y>31</y>
+      <width>91</width>
+      <height>16</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>Non identifier</string>
+    </property>
+   </widget>
  </widget>
-  <widget class="QWidget" name="layoutWidget">
+  <widget class="QGroupBox" name="box_abo">
   <property name="geometry">
    <rect>
-     <x>70</x>
-     <y>130</y>
-     <width>261</width>
-     <height>91</height>
+     <x>20</x>
+     <y>350</y>
+     <width>331</width>
+     <height>201</height>
    </rect>
   </property>
-   <layout class="QHBoxLayout" name="horizontalLayout_2">
-    <item>
-     <layout class="QVBoxLayout" name="verticalLayout_5">
-      <item>
-       <widget class="QPushButton" name="btn_precedent">
-        <property name="text">
-         <string>&lt;</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="btn_annuler">
-        <property name="text">
-         <string>Annuler</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </item>
-    <item>
-     <layout class="QVBoxLayout" name="verticalLayout_4">
-      <item>
-       <widget class="QPushButton" name="btn_suivant">
-        <property name="text">
-         <string>&gt;</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="btn_valider">
-        <property name="text">
-         <string>Valider</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </item>
-   </layout>
+   <property name="title">
+    <string>S'abonner</string>
+   </property>
+   <widget class="QWidget" name="formLayoutWidget">
+    <property name="geometry">
+     <rect>
+      <x>-1</x>
+      <y>40</y>
+      <width>291</width>
+      <height>91</height>
+     </rect>
+    </property>
+    <layout class="QFormLayout" name="formLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="nomLabel">
+       <property name="text">
+        <string>Nom</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QLineEdit" name="nomLineEdit"/>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="prenomLabel">
+       <property name="text">
+        <string>Prenom</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="numeroCarteLabel">
+       <property name="text">
+        <string>Numero carte</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QLineEdit" name="numeroCarteLineEdit"/>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLineEdit" name="prenomLineEdit"/>
+     </item>
+    </layout>
+   </widget>
+   <widget class="QCheckBox" name="checkBox">
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>140</y>
+      <width>121</width>
+      <height>20</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>PackGarantie</string>
+    </property>
+   </widget>
+   <widget class="QPushButton" name="btn_valider_abo">
+    <property name="geometry">
+     <rect>
+      <x>210</x>
+      <y>160</y>
+      <width>87</width>
+      <height>27</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>Valider</string>
+    </property>
+   </widget>
+   <widget class="QPushButton" name="btn_desabo">
+    <property name="geometry">
+     <rect>
+      <x>120</x>
+      <y>160</y>
+      <width>87</width>
+      <height>27</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>Désabonner</string>
+    </property>
+   </widget>
+   <zorder>formLayoutWidget</zorder>
+   <zorder>checkBox</zorder>
+   <zorder>btn_valider_abo</zorder>
+   <zorder>btn_desabo</zorder>
+   <zorder>prenomLineEdit</zorder>
+  </widget>
+  <widget class="QGroupBox" name="box_recup">
+   <property name="geometry">
+    <rect>
+     <x>380</x>
+     <y>350</y>
+     <width>271</width>
+     <height>121</height>
+    </rect>
+   </property>
+   <property name="title">
+    <string>Récuperer</string>
+   </property>
+   <widget class="QWidget" name="formLayoutWidget_2">
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>40</y>
+      <width>261</width>
+      <height>80</height>
+     </rect>
+    </property>
+    <layout class="QFormLayout" name="formLayout_2">
+     <item row="0" column="0">
+      <widget class="QLabel" name="numeroTicketLabel">
+       <property name="text">
+        <string>Numero Ticket :</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QLineEdit" name="numeroTicketLineEdit"/>
+     </item>
+     <item row="1" column="1">
+      <widget class="QPushButton" name="btn_recuperer">
+       <property name="text">
+        <string>Récupérer Véhicule</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <widget class="QLabel" name="label_aff">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>90</y>
+     <width>641</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;TextLabel&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+   </property>
+  </widget>
+  <widget class="QGroupBox" name="box_garer">
+   <property name="geometry">
+    <rect>
+     <x>390</x>
+     <y>150</y>
+     <width>231</width>
+     <height>131</height>
+    </rect>
+   </property>
+   <property name="title">
+    <string>Se garer</string>
+   </property>
+   <widget class="QPushButton" name="btn_garer">
+    <property name="geometry">
+     <rect>
+      <x>50</x>
+      <y>60</y>
+      <width>131</width>
+      <height>27</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>Garer Véhicule</string>
+    </property>
+   </widget>
+  </widget>
+  <widget class="QPushButton" name="btn_annuler">
+   <property name="geometry">
+    <rect>
+     <x>390</x>
+     <y>40</y>
+     <width>87</width>
+     <height>27</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Annuler</string>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="btn_quitter">
+   <property name="geometry">
+    <rect>
+     <x>520</x>
+     <y>540</y>
+     <width>87</width>
+     <height>27</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Quitter</string>
+   </property>
  </widget>
-  <zorder>layoutWidget</zorder>
  <zorder>btn_Voiture</zorder>
-  <zorder>lcdNumber</zorder>
-  <zorder>layoutWidget</zorder>
  <zorder>nomParking</zorder>
+  <zorder></zorder>
+  <zorder>box_id</zorder>
+  <zorder>box_abo</zorder>
+  <zorder>box_recup</zorder>
+  <zorder>label_aff</zorder>
+  <zorder>box_garer</zorder>
+  <zorder>btn_annuler</zorder>
+  <zorder>btn_quitter</zorder>
 </widget>
 <resources/>
 <connections/>
--- a/ui/creaParking.py
+++ b/ui/creaParking.py
@ -2,7 +2,7 @@

 # Form implementation generated from reading ui file 'creationParking.ui'
 #
-# Created: Fri Dec 26 21:22:48 2014
+# Created: Mon Jan  5 16:57:56 2015
 #      by: PyQt4 UI code generator 4.11.3
 #
 # WARNING! All changes made in this file will be lost!
@ -52,7 +52,7 @@ class Ui_CreaParking(object):
        self.nbPlacesTotal.setObjectName(_fromUtf8("nbPlacesTotal"))
        self.horizontalLayout_3.addWidget(self.nbPlacesTotal)
        self.tableWidget = QtGui.QTableWidget(CreaParking)
-        self.tableWidget.setGeometry(QtCore.QRect(10, 100, 301, 121))
+        self.tableWidget.setGeometry(QtCore.QRect(10, 90, 321, 121))
        self.tableWidget.setObjectName(_fromUtf8("tableWidget"))
        self.tableWidget.setColumnCount(3)
        self.tableWidget.setRowCount(0)
@ -63,41 +63,37 @@ class Ui_CreaParking(object):
        item = QtGui.QTableWidgetItem()
        self.tableWidget.setHorizontalHeaderItem(2, item)
        self.btn_addRow = QtGui.QPushButton(CreaParking)
-        self.btn_addRow.setGeometry(QtCore.QRect(330, 120, 41, 27))
+        self.btn_addRow.setGeometry(QtCore.QRect(350, 120, 41, 27))
        self.btn_addRow.setObjectName(_fromUtf8("btn_addRow"))
-        self.label_3 = QtGui.QLabel(CreaParking)
-        self.label_3.setGeometry(QtCore.QRect(50, 70, 135, 24))
-        self.label_3.setObjectName(_fromUtf8("label_3"))
        self.btn_rmRow = QtGui.QPushButton(CreaParking)
-        self.btn_rmRow.setGeometry(QtCore.QRect(330, 160, 41, 27))
+        self.btn_rmRow.setGeometry(QtCore.QRect(350, 160, 41, 27))
        self.btn_rmRow.setObjectName(_fromUtf8("btn_rmRow"))
-        self.widget = QtGui.QWidget(CreaParking)
-        self.widget.setGeometry(QtCore.QRect(52, 12, 291, 56))
-        self.widget.setObjectName(_fromUtf8("widget"))
-        self.horizontalLayout = QtGui.QHBoxLayout(self.widget)
+        self.layoutWidget2 = QtGui.QWidget(CreaParking)
+        self.layoutWidget2.setGeometry(QtCore.QRect(52, 12, 291, 56))
+        self.layoutWidget2.setObjectName(_fromUtf8("layoutWidget2"))
+        self.horizontalLayout = QtGui.QHBoxLayout(self.layoutWidget2)
        self.horizontalLayout.setMargin(0)
        self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
        self.verticalLayout = QtGui.QVBoxLayout()
        self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
-        self.label = QtGui.QLabel(self.widget)
+        self.label = QtGui.QLabel(self.layoutWidget2)
        self.label.setObjectName(_fromUtf8("label"))
        self.verticalLayout.addWidget(self.label)
-        self.label_2 = QtGui.QLabel(self.widget)
-        self.label_2.setObjectName(_fromUtf8("label_2"))
-        self.verticalLayout.addWidget(self.label_2)
        self.horizontalLayout.addLayout(self.verticalLayout)
        self.verticalLayout_2 = QtGui.QVBoxLayout()
        self.verticalLayout_2.setObjectName(_fromUtf8("verticalLayout_2"))
-        self.lineEdit_nom = QtGui.QLineEdit(self.widget)
+        self.lineEdit_nom = QtGui.QLineEdit(self.layoutWidget2)
        self.lineEdit_nom.setObjectName(_fromUtf8("lineEdit_nom"))
        self.verticalLayout_2.addWidget(self.lineEdit_nom)
-        self.lineEdit_nbNiv = QtGui.QLineEdit(self.widget)
-        self.lineEdit_nbNiv.setObjectName(_fromUtf8("lineEdit_nbNiv"))
-        self.verticalLayout_2.addWidget(self.lineEdit_nbNiv)
        self.horizontalLayout.addLayout(self.verticalLayout_2)

        self.retranslateUi(CreaParking)
        QtCore.QMetaObject.connectSlotsByName(CreaParking)
+        CreaParking.setTabOrder(self.lineEdit_nom, self.tableWidget)
+        CreaParking.setTabOrder(self.tableWidget, self.btn_addRow)
+        CreaParking.setTabOrder(self.btn_addRow, self.btn_rmRow)
+        CreaParking.setTabOrder(self.btn_rmRow, self.btn_annuler)
+        CreaParking.setTabOrder(self.btn_annuler, self.btn_valider)

    def retranslateUi(self, CreaParking):
        CreaParking.setWindowTitle(_translate("CreaParking", "Creation Parking", None))
@ -112,8 +108,6 @@ class Ui_CreaParking(object):
        item = self.tableWidget.horizontalHeaderItem(2)
        item.setText(_translate("CreaParking", "Nombre", None))
        self.btn_addRow.setText(_translate("CreaParking", "+", None))
-        self.label_3.setText(_translate("CreaParking", "Places par niveau :", None))
        self.btn_rmRow.setText(_translate("CreaParking", "-", None))
        self.label.setText(_translate("CreaParking", "Nom :", None))
-        self.label_2.setText(_translate("CreaParking", "Nombre de niveaux :", None))

--- a/ui/creationParking.ui
+++ b/ui/creationParking.ui
@ -68,10 +68,10 @@
  <widget class="QTableWidget" name="tableWidget">
   <property name="geometry">
    <rect>
-     <x>10</x>
-     <y>100</y>
-     <width>301</width>
-     <height>121</height>
+     <x>30</x>
+     <y>130</y>
+     <width>311</width>
+     <height>91</height>
    </rect>
   </property>
   <column>
@ -93,7 +93,7 @@
  <widget class="QPushButton" name="btn_addRow">
   <property name="geometry">
    <rect>
-     <x>330</x>
+     <x>350</x>
     <y>120</y>
     <width>41</width>
     <height>27</height>
@ -103,23 +103,10 @@
    <string>+</string>
   </property>
  </widget>
-  <widget class="QLabel" name="label_3">
-   <property name="geometry">
-    <rect>
-     <x>50</x>
-     <y>70</y>
-     <width>135</width>
-     <height>24</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Places par niveau :</string>
-   </property>
-  </widget>
  <widget class="QPushButton" name="btn_rmRow">
   <property name="geometry">
    <rect>
-     <x>330</x>
+     <x>350</x>
     <y>160</y>
     <width>41</width>
     <height>27</height>
@ -129,7 +116,7 @@
    <string>-</string>
   </property>
  </widget>
-  <widget class="QWidget" name="">
+  <widget class="QWidget" name="layoutWidget">
   <property name="geometry">
    <rect>
     <x>52</x>
@ -148,13 +135,6 @@
        </property>
       </widget>
      </item>
-      <item>
-       <widget class="QLabel" name="label_2">
-        <property name="text">
-         <string>Nombre de niveaux :</string>
-        </property>
-       </widget>
-      </item>
     </layout>
    </item>
    <item>
@ -162,14 +142,19 @@
      <item>
       <widget class="QLineEdit" name="lineEdit_nom"/>
      </item>
-      <item>
-       <widget class="QLineEdit" name="lineEdit_nbNiv"/>
-      </item>
     </layout>
    </item>
   </layout>
  </widget>
 </widget>
+ <tabstops>
+  <tabstop>lineEdit_nom</tabstop>
+  <tabstop>tableWidget</tabstop>
+  <tabstop>btn_addRow</tabstop>
+  <tabstop>btn_rmRow</tabstop>
+  <tabstop>btn_annuler</tabstop>
+  <tabstop>btn_valider</tabstop>
+ </tabstops>
 <resources/>
 <connections/>
 </ui>
--- a/ui/main.py
+++ b/ui/main.py
@ -2,7 +2,7 @@

 # Form implementation generated from reading ui file 'main.ui'
 #
-# Created: Fri Dec 26 17:32:35 2014
+# Created: Mon Jan 12 15:29:56 2015
 #      by: PyQt4 UI code generator 4.11.3
 #
 # WARNING! All changes made in this file will be lost!
@ -26,7 +26,7 @@ except AttributeError:
 class Ui_MainWindow(object):
    def setupUi(self, MainWindow):
        MainWindow.setObjectName(_fromUtf8("MainWindow"))
-        MainWindow.resize(561, 479)
+        MainWindow.resize(561, 509)
        self.centralwidget = QtGui.QWidget(MainWindow)
        self.centralwidget.setObjectName(_fromUtf8("centralwidget"))
        self.tabWidget = QtGui.QTabWidget(self.centralwidget)
@ -49,37 +49,32 @@ class Ui_MainWindow(object):
        self.comboBox.setObjectName(_fromUtf8("comboBox"))
        self.verticalLayout.addWidget(self.comboBox)
        self.formLayout_3 = QtGui.QFormLayout()
+        self.formLayout_3.setFieldGrowthPolicy(QtGui.QFormLayout.AllNonFixedFieldsGrow)
        self.formLayout_3.setObjectName(_fromUtf8("formLayout_3"))
        self.label_13 = QtGui.QLabel(self.tab_2)
        self.label_13.setObjectName(_fromUtf8("label_13"))
        self.formLayout_3.setWidget(0, QtGui.QFormLayout.LabelRole, self.label_13)
-        self.label_14 = QtGui.QLabel(self.tab_2)
-        self.label_14.setObjectName(_fromUtf8("label_14"))
-        self.formLayout_3.setWidget(1, QtGui.QFormLayout.LabelRole, self.label_14)
-        self.label_15 = QtGui.QLabel(self.tab_2)
-        self.label_15.setObjectName(_fromUtf8("label_15"))
-        self.formLayout_3.setWidget(2, QtGui.QFormLayout.LabelRole, self.label_15)
-        self.label_16 = QtGui.QLabel(self.tab_2)
-        self.label_16.setObjectName(_fromUtf8("label_16"))
-        self.formLayout_3.setWidget(3, QtGui.QFormLayout.LabelRole, self.label_16)
-        self.label_17 = QtGui.QLabel(self.tab_2)
-        self.label_17.setObjectName(_fromUtf8("label_17"))
-        self.formLayout_3.setWidget(4, QtGui.QFormLayout.LabelRole, self.label_17)
        self.nom = QtGui.QLabel(self.tab_2)
        self.nom.setObjectName(_fromUtf8("nom"))
        self.formLayout_3.setWidget(0, QtGui.QFormLayout.FieldRole, self.nom)
-        self.niveau = QtGui.QLabel(self.tab_2)
-        self.niveau.setObjectName(_fromUtf8("niveau"))
-        self.formLayout_3.setWidget(1, QtGui.QFormLayout.FieldRole, self.niveau)
+        self.label_15 = QtGui.QLabel(self.tab_2)
+        self.label_15.setObjectName(_fromUtf8("label_15"))
+        self.formLayout_3.setWidget(1, QtGui.QFormLayout.LabelRole, self.label_15)
        self.placesParNiveau = QtGui.QLabel(self.tab_2)
        self.placesParNiveau.setObjectName(_fromUtf8("placesParNiveau"))
-        self.formLayout_3.setWidget(2, QtGui.QFormLayout.FieldRole, self.placesParNiveau)
+        self.formLayout_3.setWidget(1, QtGui.QFormLayout.FieldRole, self.placesParNiveau)
+        self.label_16 = QtGui.QLabel(self.tab_2)
+        self.label_16.setObjectName(_fromUtf8("label_16"))
+        self.formLayout_3.setWidget(2, QtGui.QFormLayout.LabelRole, self.label_16)
        self.placesDispo = QtGui.QLabel(self.tab_2)
        self.placesDispo.setObjectName(_fromUtf8("placesDispo"))
-        self.formLayout_3.setWidget(3, QtGui.QFormLayout.FieldRole, self.placesDispo)
+        self.formLayout_3.setWidget(2, QtGui.QFormLayout.FieldRole, self.placesDispo)
+        self.label_17 = QtGui.QLabel(self.tab_2)
+        self.label_17.setObjectName(_fromUtf8("label_17"))
+        self.formLayout_3.setWidget(3, QtGui.QFormLayout.LabelRole, self.label_17)
        self.placesSuperAbo = QtGui.QLabel(self.tab_2)
        self.placesSuperAbo.setObjectName(_fromUtf8("placesSuperAbo"))
-        self.formLayout_3.setWidget(4, QtGui.QFormLayout.FieldRole, self.placesSuperAbo)
+        self.formLayout_3.setWidget(3, QtGui.QFormLayout.FieldRole, self.placesSuperAbo)
        self.verticalLayout.addLayout(self.formLayout_3)
        self.horizontalLayout = QtGui.QHBoxLayout()
        self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
@ -93,9 +88,6 @@ class Ui_MainWindow(object):
        self.btn_creer = QtGui.QPushButton(self.tab_2)
        self.btn_creer.setObjectName(_fromUtf8("btn_creer"))
        self.verticalLayout.addWidget(self.btn_creer)
-        self.btn_modifier = QtGui.QPushButton(self.tab_2)
-        self.btn_modifier.setObjectName(_fromUtf8("btn_modifier"))
-        self.verticalLayout.addWidget(self.btn_modifier)
        self.btn_supprimer = QtGui.QPushButton(self.tab_2)
        self.btn_supprimer.setObjectName(_fromUtf8("btn_supprimer"))
        self.verticalLayout.addWidget(self.btn_supprimer)
@ -105,8 +97,10 @@ class Ui_MainWindow(object):
        self.tableWidget = QtGui.QTableWidget(self.tab_5)
        self.tableWidget.setGeometry(QtCore.QRect(60, 20, 431, 351))
        self.tableWidget.setObjectName(_fromUtf8("tableWidget"))
-        self.tableWidget.setColumnCount(0)
+        self.tableWidget.setColumnCount(1)
        self.tableWidget.setRowCount(0)
+        item = QtGui.QTableWidgetItem()
+        self.tableWidget.setHorizontalHeaderItem(0, item)
        self.tabWidget.addTab(self.tab_5, _fromUtf8(""))
        self.tab_3 = QtGui.QWidget()
        self.tab_3.setObjectName(_fromUtf8("tab_3"))
@ -158,21 +152,20 @@ class Ui_MainWindow(object):
        self.label.setText(_translate("MainWindow", "Activité :", None))
        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("MainWindow", "Activite", None))
        self.label_13.setText(_translate("MainWindow", "Nom :", None))
-        self.label_14.setText(_translate("MainWindow", "Niveau :", None))
-        self.label_15.setText(_translate("MainWindow", "Places / niveau :", None))
-        self.label_16.setText(_translate("MainWindow", "Places disponible :", None))
-        self.label_17.setText(_translate("MainWindow", "Places Reserve Super Abo : ", None))
        self.nom.setText(_translate("MainWindow", "TextLabel", None))
-        self.niveau.setText(_translate("MainWindow", "TextLabel", None))
+        self.label_15.setText(_translate("MainWindow", "Places total:", None))
        self.placesParNiveau.setText(_translate("MainWindow", "TextLabel", None))
+        self.label_16.setText(_translate("MainWindow", "Places disponible :", None))
        self.placesDispo.setText(_translate("MainWindow", "TextLabel", None))
+        self.label_17.setText(_translate("MainWindow", "Places Reserve Super Abo : ", None))
        self.placesSuperAbo.setText(_translate("MainWindow", "TextLabel", None))
        self.btn_details.setText(_translate("MainWindow", "Details Places", None))
        self.btn_borne.setText(_translate("MainWindow", "Borne", None))
        self.btn_creer.setText(_translate("MainWindow", "Créer", None))
-        self.btn_modifier.setText(_translate("MainWindow", "Modifier", None))
        self.btn_supprimer.setText(_translate("MainWindow", "Supprimer", None))
        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), _translate("MainWindow", "Parkings", None))
+        item = self.tableWidget.horizontalHeaderItem(0)
+        item.setText(_translate("MainWindow", "Nouvelle colonne", None))
        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_5), _translate("MainWindow", "Membres", None))
        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_3), _translate("MainWindow", "Services", None))
        self.menuFichier.setTitle(_translate("MainWindow", "Fichier", None))
--- a/ui/main.ui
+++ b/ui/main.ui
@ -7,7 +7,7 @@
    <x>0</x>
    <y>0</y>
    <width>561</width>
-    <height>479</height>
+    <height>509</height>
   </rect>
  </property>
  <property name="windowTitle">
@ -24,7 +24,7 @@
     </rect>
    </property>
    <property name="currentIndex">
-     <number>0</number>
+     <number>1</number>
    </property>
    <widget class="QWidget" name="tab">
     <attribute name="title">
@ -64,6 +64,9 @@
      </item>
      <item>
       <layout class="QFormLayout" name="formLayout_3">
+        <property name="fieldGrowthPolicy">
+         <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+        </property>
        <item row="0" column="0">
         <widget class="QLabel" name="label_13">
          <property name="text">
@ -71,34 +74,6 @@
          </property>
         </widget>
        </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="label_14">
-          <property name="text">
-           <string>Niveau :</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="label_15">
-          <property name="text">
-           <string>Places / niveau :</string>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="0">
-         <widget class="QLabel" name="label_16">
-          <property name="text">
-           <string>Places disponible :</string>
-          </property>
-         </widget>
-        </item>
-        <item row="4" column="0">
-         <widget class="QLabel" name="label_17">
-          <property name="text">
-           <string>Places Reserve Super Abo : </string>
-          </property>
-         </widget>
-        </item>
        <item row="0" column="1">
         <widget class="QLabel" name="nom">
          <property name="text">
@ -106,28 +81,42 @@
          </property>
         </widget>
        </item>
-        <item row="1" column="1">
-         <widget class="QLabel" name="niveau">
+        <item row="1" column="0">
+         <widget class="QLabel" name="label_15">
          <property name="text">
-           <string>TextLabel</string>
+           <string>Places total:</string>
          </property>
         </widget>
        </item>
-        <item row="2" column="1">
+        <item row="1" column="1">
         <widget class="QLabel" name="placesParNiveau">
          <property name="text">
           <string>TextLabel</string>
          </property>
         </widget>
        </item>
-        <item row="3" column="1">
+        <item row="2" column="0">
+         <widget class="QLabel" name="label_16">
+          <property name="text">
+           <string>Places disponible :</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
         <widget class="QLabel" name="placesDispo">
          <property name="text">
           <string>TextLabel</string>
          </property>
         </widget>
        </item>
-        <item row="4" column="1">
+        <item row="3" column="0">
+         <widget class="QLabel" name="label_17">
+          <property name="text">
+           <string>Places Reserve Super Abo : </string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="1">
         <widget class="QLabel" name="placesSuperAbo">
          <property name="text">
           <string>TextLabel</string>
@ -161,13 +150,6 @@
        </property>
       </widget>
      </item>
-      <item>
-       <widget class="QPushButton" name="btn_modifier">
-        <property name="text">
-         <string>Modifier</string>
-        </property>
-       </widget>
-      </item>
      <item>
       <widget class="QPushButton" name="btn_supprimer">
        <property name="text">