Réorganisation complète des fichiers

.gitignore

@@ -8,17 +8,17 @@ Sync/
 Installeur/
 PaquetDebian/
 Travaux/
-source/Data/*_DATA.dat
-source/Data/*_DOCUMENTS.dat
-source/Data/*_PHOTOS.dat
+Noethys.egg-info/
 SQLiteSpy.exe
 SQLiteSpy.db3
 TODO.xlsx
 nologin.txt
 PackagerLinux.py
 CreateurANNONCES.py
 CreateurMAJ.py
-setup.bat
+setup_source.bat
+setup_wheel.bat
+setup_windows.bat
 gdiplus.dll
 libiconv-2.dll
 libzbar-0.dll
@@ -84,18 +84,18 @@ docs/_build/
 
 # PyBuilder
 target/
-source/Images/128x128/Thumbs.db
-source/Images/128x128/Thumbs.db
-source/Images/128x128/Thumbs.db
-source/Images/128x128/Thumbs.db
-source/Images/16x16/Thumbs.db
-source/Images/22x22/Thumbs.db
-source/Images/32x32/Thumbs.db
-source/Images/48x48/Thumbs.db
-source/Images/80x80/Thumbs.db
-source/Images/Badgeage/Thumbs.db
-source/Images/BoutonsImages/Thumbs.db
-source/Images/Special/Thumbs.db
+noethys/Static/Images/128x128/Thumbs.db
+noethys/Static/Images/128x128/Thumbs.db
+noethys/Static/Images/128x128/Thumbs.db
+noethys/Static/Images/128x128/Thumbs.db
+noethys/Static/Images/16x16/Thumbs.db
+noethys/Static/Images/22x22/Thumbs.db
+noethys/Static/Images/32x32/Thumbs.db
+noethys/Static/Images/48x48/Thumbs.db
+noethys/Static/Images/80x80/Thumbs.db
+noethys/Static/Images/Badgeage/Thumbs.db
+noethys/Static/Images/BoutonsImages/Thumbs.db
+noethys/Static/Images/Special/Thumbs.db
 
 # =========================
 # Operating System Files

MANIFEST.in

@@ -0,0 +1,3 @@
+recursive-include noethys/Static *
+include noethys/*.txt
+include noethys/*.ico

noethys/Chemins.py

@@ -0,0 +1,30 @@
+#!/usr/bin/env python
+# -*- coding: iso-8859-15 -*-
+#------------------------------------------------------------------------
+# Application :    Noethys, gestion multi-activités
+# Site internet :  www.noethys.com
+# Auteur:          Ivan LUCAS
+# Copyright:       (c) 2010-16 Ivan LUCAS
+# Licence:         Licence GNU GPL
+#------------------------------------------------------------------------
+
+import os, sys
+
+frozen = getattr(sys, 'frozen', '')
+if not frozen:
+    REP_COURANT = os.path.dirname(os.path.abspath(__file__))
+else :
+    REP_COURANT = os.path.dirname(sys.executable)
+
+if REP_COURANT not in sys.path :
+    sys.path.insert(1, REP_COURANT)
+
+for rep in os.listdir(REP_COURANT) :
+    chemin = os.path.join(REP_COURANT, rep)
+    if os.path.isdir(chemin) and chemin not in sys.path :
+        sys.path.insert(2, chemin)
+
+def GetStaticPath(fichier=""):
+    """ Retourne le chemin du répertoire Static """
+    chemin = os.path.join(REP_COURANT, "Static")
+    return os.path.join(chemin, fichier)

source/CTRL_Accueil.py → noethys/Ctrl/CTRL_Accueil.py

@@ -8,11 +8,12 @@
 # Licence:         Licence GNU GPL
 #-----------------------------------------------------------
 
+import Chemins
 import wx
 import datetime
 import sqlite3
 import urllib2
-import UTILS_Interface
+from Utils import UTILS_Interface
 from wx.lib.wordwrap import wordwrap
 
 
@@ -55,7 +56,7 @@ def GetAnnonce():
         try :
 
             # Init base de données
-            con = sqlite3.connect("Data/Annonces.dat")
+            con = sqlite3.connect(Chemins.GetStaticPath("Databases/Annonces.dat"))
             cur = con.cursor()
 
             def ListeEnDict(donnees):
@@ -113,7 +114,7 @@ def __init__(self, parent, size=(-1, -1)):
 
         # Récupération des données de l'interface
         theme = UTILS_Interface.GetTheme()
-        self.image_fond = wx.Bitmap("Images/Interface/%s/Fond.jpg" % theme, wx.BITMAP_TYPE_ANY)
+        self.image_fond = wx.Bitmap(Chemins.GetStaticPath("Images/Interface/%s/Fond.jpg" % theme), wx.BITMAP_TYPE_ANY)
 
         # Binds
         self.Bind(wx.EVT_PAINT, self.OnPaint)
@@ -140,7 +141,7 @@ def OnPaint(self, event):
         if dictAnnonce != None :
 
             nomImage = dictAnnonce["image"]
-            bmp = wx.Bitmap("Images/16x16/%s.png" % nomImage, wx.BITMAP_TYPE_ANY)
+            bmp = wx.Bitmap(Chemins.GetStaticPath("Images/16x16/%s.png" % nomImage), wx.BITMAP_TYPE_ANY)
             titre = dictAnnonce["titre"]
             texte_html = dictAnnonce["texte_html"]
 

source/CTRL_Agenda.py → noethys/Ctrl/CTRL_Agenda.py

@@ -9,7 +9,8 @@
 #------------------------------------------------------------------------
 
 
-from UTILS_Traduction import _
+import Chemins
+from Utils.UTILS_Traduction import _
 import wx
 import CTRL_Bouton_image
 import CTRL_Bandeau
@@ -18,10 +19,10 @@
 import datetime
 
 from CTRL_Saisie_transport import DICT_CATEGORIES
-from DATA_Tables import DB_DATA as DICT_TABLES
-import DLG_Saisie_transport
-import UTILS_Schedule
-import UTILS_Transports
+from Data.DATA_Tables import DB_DATA as DICT_TABLES
+from Dlg import DLG_Saisie_transport
+from Utils import UTILS_Schedule
+from Utils import UTILS_Transports
 
 from Outils import wxScheduler
 from Outils import wxReportScheduler
@@ -72,24 +73,24 @@ def __init__(self, parent):
         self.periodCount = 1
 
         # Boutons
-        self.AddLabelTool(ID_OUTIL_JOUR, _(u"Jour"), wx.Bitmap("Images/32x32/Calendrier_jour.png", wx.BITMAP_TYPE_ANY), wx.NullBitmap, wx.ITEM_RADIO, _(u"Affichage quotidien"), "")
-        self.AddLabelTool(ID_OUTIL_SEMAINE, _(u"Semaine"), wx.Bitmap("Images/32x32/Calendrier_semaine.png", wx.BITMAP_TYPE_ANY), wx.NullBitmap, wx.ITEM_RADIO, _(u"Affichage hebdomadaire"), "")
-        self.AddLabelTool(ID_OUTIL_MOIS, _(u"Mois"), wx.Bitmap("Images/32x32/Calendrier_mois.png", wx.BITMAP_TYPE_ANY), wx.NullBitmap, wx.ITEM_RADIO, _(u"Affichage mensuel"), "")
+        self.AddLabelTool(ID_OUTIL_JOUR, _(u"Jour"), wx.Bitmap(Chemins.GetStaticPath("Images/32x32/Calendrier_jour.png"), wx.BITMAP_TYPE_ANY), wx.NullBitmap, wx.ITEM_RADIO, _(u"Affichage quotidien"), "")
+        self.AddLabelTool(ID_OUTIL_SEMAINE, _(u"Semaine"), wx.Bitmap(Chemins.GetStaticPath("Images/32x32/Calendrier_semaine.png"), wx.BITMAP_TYPE_ANY), wx.NullBitmap, wx.ITEM_RADIO, _(u"Affichage hebdomadaire"), "")
+        self.AddLabelTool(ID_OUTIL_MOIS, _(u"Mois"), wx.Bitmap(Chemins.GetStaticPath("Images/32x32/Calendrier_mois.png"), wx.BITMAP_TYPE_ANY), wx.NullBitmap, wx.ITEM_RADIO, _(u"Affichage mensuel"), "")
         self.AddSeparator()
-        self.AddLabelTool(ID_OUTIL_HORIZONTAL, _(u"Horizontal"), wx.Bitmap("Images/32x32/Calendrier_horizontal.png", wx.BITMAP_TYPE_ANY), wx.NullBitmap, wx.ITEM_RADIO, _(u"Affichage horizontal"), "")
-        self.AddLabelTool(ID_OUTIL_VERTICAL, _(u"Vertical"), wx.Bitmap("Images/32x32/Calendrier_vertical.png", wx.BITMAP_TYPE_ANY), wx.NullBitmap, wx.ITEM_RADIO, _(u"Affichage vertical"), "")
+        self.AddLabelTool(ID_OUTIL_HORIZONTAL, _(u"Horizontal"), wx.Bitmap(Chemins.GetStaticPath("Images/32x32/Calendrier_horizontal.png"), wx.BITMAP_TYPE_ANY), wx.NullBitmap, wx.ITEM_RADIO, _(u"Affichage horizontal"), "")
+        self.AddLabelTool(ID_OUTIL_VERTICAL, _(u"Vertical"), wx.Bitmap(Chemins.GetStaticPath("Images/32x32/Calendrier_vertical.png"), wx.BITMAP_TYPE_ANY), wx.NullBitmap, wx.ITEM_RADIO, _(u"Affichage vertical"), "")
         self.ToggleTool(ID_OUTIL_VERTICAL, True)
         self.AddSeparator()
-        self.AddLabelTool(ID_OUTIL_RECULER, _(u"Reculer"), wx.Bitmap("Images/32x32/Precedent.png", wx.BITMAP_TYPE_ANY), wx.NullBitmap, wx.ITEM_NORMAL, _(u"Reculer"), "")
-        self.AddLabelTool(ID_OUTIL_AVANCER, _(u"Avancer"), wx.Bitmap("Images/32x32/Suivant.png", wx.BITMAP_TYPE_ANY), wx.NullBitmap, wx.ITEM_NORMAL, _(u"Avancer"), "")
+        self.AddLabelTool(ID_OUTIL_RECULER, _(u"Reculer"), wx.Bitmap(Chemins.GetStaticPath("Images/32x32/Precedent.png"), wx.BITMAP_TYPE_ANY), wx.NullBitmap, wx.ITEM_NORMAL, _(u"Reculer"), "")
+        self.AddLabelTool(ID_OUTIL_AVANCER, _(u"Avancer"), wx.Bitmap(Chemins.GetStaticPath("Images/32x32/Suivant.png"), wx.BITMAP_TYPE_ANY), wx.NullBitmap, wx.ITEM_NORMAL, _(u"Avancer"), "")
         self.AddSeparator()
-        self.AddLabelTool(ID_OUTIL_MOINS, _(u"Moins"), wx.Bitmap("Images/32x32/zoom_moins.png", wx.BITMAP_TYPE_ANY), wx.NullBitmap, wx.ITEM_NORMAL, _(u"Afficher moins"), "")
+        self.AddLabelTool(ID_OUTIL_MOINS, _(u"Moins"), wx.Bitmap(Chemins.GetStaticPath("Images/32x32/zoom_moins.png"), wx.BITMAP_TYPE_ANY), wx.NullBitmap, wx.ITEM_NORMAL, _(u"Afficher moins"), "")
         self.EnableTool(ID_OUTIL_MOINS, False)
-        self.AddLabelTool(ID_OUTIL_PLUS, _(u"Plus"), wx.Bitmap("Images/32x32/zoom_plus.png", wx.BITMAP_TYPE_ANY), wx.NullBitmap, wx.ITEM_NORMAL, _(u"Afficher plus"), "")
+        self.AddLabelTool(ID_OUTIL_PLUS, _(u"Plus"), wx.Bitmap(Chemins.GetStaticPath("Images/32x32/zoom_plus.png"), wx.BITMAP_TYPE_ANY), wx.NullBitmap, wx.ITEM_NORMAL, _(u"Afficher plus"), "")
         self.AddSeparator()
-        self.AddLabelTool(ID_OUTIL_AUJOURDHUI, _(u"Aujourd'hui"), wx.Bitmap("Images/32x32/Jour.png", wx.BITMAP_TYPE_ANY), wx.NullBitmap, wx.ITEM_NORMAL, _(u"Aujourd'hui"), "")
-        self.AddLabelTool(ID_OUTIL_CHERCHER, _(u"Chercher"), wx.Bitmap("Images/32x32/Calendrier_zoom.png", wx.BITMAP_TYPE_ANY), wx.NullBitmap, wx.ITEM_NORMAL, _(u"Chercher une date"), "")
-        self.AddLabelTool(ID_OUTIL_APERCU, _(u"Aperçu"), wx.Bitmap("Images/32x32/Apercu.png", wx.BITMAP_TYPE_ANY), wx.NullBitmap, wx.ITEM_NORMAL, _(u"Aperçu avant impression"), "")
+        self.AddLabelTool(ID_OUTIL_AUJOURDHUI, _(u"Aujourd'hui"), wx.Bitmap(Chemins.GetStaticPath("Images/32x32/Jour.png"), wx.BITMAP_TYPE_ANY), wx.NullBitmap, wx.ITEM_NORMAL, _(u"Aujourd'hui"), "")
+        self.AddLabelTool(ID_OUTIL_CHERCHER, _(u"Chercher"), wx.Bitmap(Chemins.GetStaticPath("Images/32x32/Calendrier_zoom.png"), wx.BITMAP_TYPE_ANY), wx.NullBitmap, wx.ITEM_NORMAL, _(u"Chercher une date"), "")
+        self.AddLabelTool(ID_OUTIL_APERCU, _(u"Aperçu"), wx.Bitmap(Chemins.GetStaticPath("Images/32x32/Apercu.png"), wx.BITMAP_TYPE_ANY), wx.NullBitmap, wx.ITEM_NORMAL, _(u"Aperçu avant impression"), "")
 
         # Binds
         self.Bind(wx.EVT_TOOL, self.OnAffichageJour, id=ID_OUTIL_JOUR)
@@ -216,7 +217,7 @@ def OnApercu(self, event):
 ##            frame.Initialize()
 ##            frame.Show( True )
 
-##        import UTILS_Printer
+##        from Utils import UTILS_Printer
 ##        preview_window = UTILS_Printer.PreviewFrame(preview, None, _(u"Aperçu avant impression"), reglages["orientation"])
 ##        preview_window.Initialize()
 ##        preview_window.MakeModal(False)
@@ -348,17 +349,17 @@ def Supprimer(evt):
 
         if schedule == None :
             item = wx.MenuItem(menuPop, 10, _(u"Ajouter"))
-            item.SetBitmap(wx.Bitmap("Images/16x16/Ajouter.png", wx.BITMAP_TYPE_PNG))
+            item.SetBitmap(wx.Bitmap(Chemins.GetStaticPath("Images/16x16/Ajouter.png"), wx.BITMAP_TYPE_PNG))
             menuPop.AppendItem(item)
             self.Bind(wx.EVT_MENU, Ajouter, id=10)
         else :
             item = wx.MenuItem(menuPop, 20, _(u"Modifier"))
-            item.SetBitmap(wx.Bitmap("Images/16x16/Modifier.png", wx.BITMAP_TYPE_PNG))
+            item.SetBitmap(wx.Bitmap(Chemins.GetStaticPath("Images/16x16/Modifier.png"), wx.BITMAP_TYPE_PNG))
             menuPop.AppendItem(item)
             self.Bind(wx.EVT_MENU, Modifier, id=20)
 
             item = wx.MenuItem(menuPop, 30, _(u"Supprimer"))
-            item.SetBitmap(wx.Bitmap("Images/16x16/Supprimer.png", wx.BITMAP_TYPE_PNG))
+            item.SetBitmap(wx.Bitmap(Chemins.GetStaticPath("Images/16x16/Supprimer.png"), wx.BITMAP_TYPE_PNG))
             menuPop.AppendItem(item)
             self.Bind(wx.EVT_MENU, Supprimer, id=30)
 
@@ -407,7 +408,7 @@ def AjouterLot(self):
 ##        schedule.foreground = wx.Color(255, 0, 0)
 ##        # schedule.foreground.font = wx.Font()
 ##        # schedule.color = wx.Color(200, 200, 200)
-##        schedule.icons = [wx.Bitmap("Images/16x16/Avion.png", wx.BITMAP_TYPE_ANY),]
+##        schedule.icons = [wx.Bitmap(Chemins.GetStaticPath("Images/16x16/Avion.png"), wx.BITMAP_TYPE_ANY),]
 ##        self.ctrl_planning.Add(schedule)
 
     def Modifier(self, schedule=None):
@@ -497,7 +498,7 @@ def ModificationSchedule(self, dictDonnees={}, schedule=None):
 
     def RemplitSchedule(self, dictDonnees={}, schedule=None):
         # Icone
-        schedule.icons = [wx.Bitmap("Images/16x16/%s.png" % dictDonnees["image"], wx.BITMAP_TYPE_ANY),]
+        schedule.icons = [wx.Bitmap(Chemins.GetStaticPath("Images/16x16/%s.png" % dictDonnees["image"]), wx.BITMAP_TYPE_ANY),]
 
         # Date et heure de début
         schedule.start = ConvertDateDTenWX(date=dictDonnees["depart_date"], heure=dictDonnees["depart_heure"])
@@ -541,7 +542,7 @@ def __init__(self, parent, IDindividu=None):
 
         # Boutons
         self.bouton_aide = CTRL_Bouton_image.CTRL(self, texte=_(u"Aide"), cheminImage="Images/32x32/Aide.png")
-        self.bouton_saisie_lot = wx.BitmapButton(self, -1, wx.Bitmap("Images/BoutonsImages/Saisie_lot_transports.png", wx.BITMAP_TYPE_ANY))
+        self.bouton_saisie_lot = wx.BitmapButton(self, -1, wx.Bitmap(Chemins.GetStaticPath("Images/BoutonsImages/Saisie_lot_transports.png"), wx.BITMAP_TYPE_ANY))
         self.bouton_ok = CTRL_Bouton_image.CTRL(self, texte=_(u"Fermer"), cheminImage="Images/32x32/Fermer.png")
 ##        self.bouton_annuler = CTRL_Bouton_image.CTRL(self, id=wx.ID_CANCEL, texte=_(u"Annuler"), cheminImage="Images/32x32/Annuler.png")
 
@@ -590,7 +591,7 @@ def OnBoutonSaisieLot(self, event):
         self.ctrl_planning.AjouterLot() 
 
     def OnBoutonAide(self, event): 
-        import UTILS_Aide
+        from Utils import UTILS_Aide
         UTILS_Aide.Aide("Transports1")
 
 

source/CTRL_Attente.py → noethys/Ctrl/CTRL_Attente.py

@@ -9,7 +9,8 @@
 #-----------------------------------------------------------
 
 
-from UTILS_Traduction import _
+import Chemins
+from Utils.UTILS_Traduction import _
 import wx
 import CTRL_Bouton_image
 import wx.lib.agw.hypertreelist as HTL
@@ -20,8 +21,8 @@
 import GestionDB
 import CTRL_Saisie_euros
 import FonctionsPerso
-import UTILS_Organisateur
-import UTILS_Utilisateurs
+from Utils import UTILS_Organisateur
+from Utils import UTILS_Utilisateurs
 
 COULEUR_FOND_REGROUPEMENT = (200, 200, 200)
 COULEUR_TEXTE_REGROUPEMENT = (140, 140, 140)
@@ -53,7 +54,7 @@ def __init__(self, parent, dictDonnees={}, dictEtatPlaces={}, dictUnitesRempliss
         self.parent = parent
 
         # Adapte taille Police pour Linux
-        import UTILS_Linux
+        from Utils import UTILS_Linux
         UTILS_Linux.AdaptePolice(self)
 
         self.dictDonnees = dictDonnees
@@ -79,8 +80,8 @@ def __init__(self, parent, dictDonnees={}, dictEtatPlaces={}, dictUnitesRempliss
 
         # Création de l'ImageList
         il = wx.ImageList(16, 16)
-        self.img_ok = il.Add(wx.Bitmap('Images/16x16/Ok.png', wx.BITMAP_TYPE_PNG))
-        self.img_pasok = il.Add(wx.Bitmap('Images/16x16/Interdit.png', wx.BITMAP_TYPE_PNG))
+        self.img_ok = il.Add(wx.Bitmap(Chemins.GetStaticPath('Images/16x16/Ok.png'), wx.BITMAP_TYPE_PNG))
+        self.img_pasok = il.Add(wx.Bitmap(Chemins.GetStaticPath('Images/16x16/Interdit.png'), wx.BITMAP_TYPE_PNG))
         self.AssignImageList(il)
 
         # wx.TR_COLUMN_LINES |  | wx.TR_HAS_BUTTONS
@@ -338,7 +339,7 @@ def OnContextMenu(self, event):
 
         # Item Ouvrir fiche famille
         item = wx.MenuItem(menuPop, 10, _(u"Ouvrir la fiche famille de %s") % nomIndividu)
-        bmp = wx.Bitmap("Images/16x16/Famille.png", wx.BITMAP_TYPE_PNG)
+        bmp = wx.Bitmap(Chemins.GetStaticPath("Images/16x16/Famille.png"), wx.BITMAP_TYPE_PNG)
         item.SetBitmap(bmp)
         menuPop.AppendItem(item)
         self.Bind(wx.EVT_MENU, self.OuvrirFicheFamille, id=10)
@@ -365,7 +366,7 @@ def OuvrirFicheFamille(self, event):
         IDindividu = dictItem["IDindividu"]
         IDfamille = dictItem["IDfamille"]
 
-        import DLG_Famille
+        from Dlg import DLG_Famille
         dlg = DLG_Famille.Dialog(self, IDfamille=IDfamille)
         dlg.ShowModal()
         dlg.Destroy()

source/CTRL_Attestations_options.py → noethys/Ctrl/CTRL_Attestations_options.py

@@ -9,17 +9,18 @@
 #------------------------------------------------------------------------
 
 
-from UTILS_Traduction import _
+import Chemins
+from Utils.UTILS_Traduction import _
 import wx
 import CTRL_Bouton_image
 import GestionDB
 import os
 
-import UTILS_Identification
-import UTILS_Config
-import UTILS_Parametres
+from Utils import UTILS_Identification
+from Utils import UTILS_Config
+from Utils import UTILS_Parametres
 
-import DLG_Filtres_factures
+from Dlg import DLG_Filtres_factures
 import CTRL_Propertygrid
 import wx.propgrid as wxpg
 import copy
@@ -424,7 +425,7 @@ def GetInfosSignataire(self):
     def OnBoutonParametres(self, propriete=None):
         ancienneValeur = propriete.GetValue()
         if propriete.GetName() == "IDmodele" :
-            import DLG_Modeles_docs
+            from Dlg import DLG_Modeles_docs
             dlg = DLG_Modeles_docs.Dialog(self, categorie="attestation")
             dlg.ShowModal() 
             dlg.Destroy()