modified code source to make it compatible with linux installed versi…

…on to avoid customizing source for each distro
j4321 · Jan 14, 2017 · fdc752a · fdc752a
1 parent 7ecf41d
commit fdc752a
Show file tree

Hide file tree

Showing 303 changed files with 193 additions and 12,378 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ MANIFEST
 dist
 build
 *.egg-info
+deb_dist
diff --git a/BraceletGenerator/bracelet.py b/BraceletGenerator/bracelet.py
@@ -1273,7 +1273,7 @@ def del_recent_file(self, file):
             self.menu_file.entryconfigure(3, state="disabled")
 
         if file in RECENT_BICOLOR:
-            RECENT_BICOLOR.delete(file)
+            RECENT_BICOLOR.remove(file)
 
     def _importe(self, fils, g_out, fil_noeud):
         """ importe les informations sur le motif et actualise le bracelet """

diff --git a/BraceletGenerator/constantes.py b/BraceletGenerator/constantes.py
@@ -44,27 +44,32 @@
 APP_NAME = "BraceletGenerator"
 
 # Get the local directory
-PATH = os.path.split(__file__)[0]
+if platform == 'linux' and os.path.exists("/usr/share/bracelet-generator"):
+    # the app has been installed
+    IMAGES_LOCATION = '/usr/share/bracelet-generator/images'
+    PATH_LOCALE = "/usr/share/locale"
+    PATH_DOC = '/usr/share/doc/bracelet-generator'
+else:
+    PATH = os.path.split(__file__)[0]
+    IMAGES_LOCATION = os.path.join(PATH, 'images')
+    PATH_LOCALE = os.path.join(PATH, "locale")
+    PATH_DOC = os.path.join(PATH, "doc")
+
 LOCAL_PATH = os.path.expanduser("~")
 LOCAL_PATH = os.path.join(LOCAL_PATH, "BraceletGenerator")
 if not os.path.exists(LOCAL_PATH):
     os.mkdir(LOCAL_PATH)
 
 PATH_CONFIG = os.path.join(LOCAL_PATH, 'BraceletGenerator.ini')
 
-IMAGES_LOCATION = os.path.join(PATH, 'images')
-
-PATH_LOCALE = os.path.join(PATH, "locale")
-
-PATH_DOC = os.path.join(PATH, "doc")
-
-# lecture du fichier de configuration
+# configuration file 
 CONFIG = ConfigParser()
 if os.path.exists(PATH_CONFIG):
     CONFIG.read(PATH_CONFIG)
     LANGUE = CONFIG.get("General","language")
 else:
     LANGUE = ""
+
     CONFIG.add_section("General")
     CONFIG.set("General", "last_path", LOCAL_PATH)
     CONFIG.set("General", "recent_files", "")
@@ -94,15 +99,15 @@
                            languages=[LANGUE], fallback=True)
 LANG.install()
 
-
+# get recent files
 RECENT_FILES = CONFIG.get("General", "recent_files").split(",")
 if RECENT_FILES == [""]:
     RECENT_FILES = []
 RECENT_BICOLOR = CONFIG.get("General", "recent_bicolor").split(",")
 if RECENT_BICOLOR == [""]:
     RECENT_BICOLOR = []
 
-# chemins des images
+# pictures
 IM_EXIT_M = os.path.join(IMAGES_LOCATION, "exit_m.png")
 IM_EXIT = os.path.join(IMAGES_LOCATION, "exit.png")
 IM_EXPORT_M = os.path.join(IMAGES_LOCATION, "export_m.png")
@@ -160,7 +165,7 @@
 IM_SYM_HORIZ_M = os.path.join(IMAGES_LOCATION, "sym_horizontal_m.png")
 IM_SYM_VERT_M = os.path.join(IMAGES_LOCATION, "sym_vertical_m.png")
 
-
+# colors
 if platform == 'darwin' or PL == 'nt':
     BG_COLOR = '#F0F0F0'
     CANVAS_COLOR = "#ffffff"

diff --git a/BraceletGenerator/doc/doc.html b/BraceletGenerator/doc/doc.html
diff --git a/BraceletGenerator/doc/doc_fr.html b/BraceletGenerator/doc/doc_fr.html
diff --git a/BraceletGenerator/doc/style.css b/BraceletGenerator/doc/style.css
diff --git a/BraceletGenerator/images/about.png b/BraceletGenerator/images/about.png
diff --git a/BraceletGenerator/images/aide.png b/BraceletGenerator/images/aide.png
diff --git a/BraceletGenerator/images/bg.png b/BraceletGenerator/images/bg.png
diff --git a/BraceletGenerator/images/bicolore.png b/BraceletGenerator/images/bicolore.png
diff --git a/BraceletGenerator/images/bicolore_en.png b/BraceletGenerator/images/bicolore_en.png
diff --git a/BraceletGenerator/images/bicolore_fr.png b/BraceletGenerator/images/bicolore_fr.png
diff --git a/BraceletGenerator/images/bicolore_m.png b/BraceletGenerator/images/bicolore_m.png
diff --git a/BraceletGenerator/images/chevrons.png b/BraceletGenerator/images/chevrons.png
diff --git a/BraceletGenerator/images/color.png b/BraceletGenerator/images/color.png
diff --git a/BraceletGenerator/images/color_m.png b/BraceletGenerator/images/color_m.png
diff --git a/BraceletGenerator/images/couleurs_en.png b/BraceletGenerator/images/couleurs_en.png
diff --git a/BraceletGenerator/images/couleurs_fr.png b/BraceletGenerator/images/couleurs_fr.png
diff --git a/BraceletGenerator/images/efface.png b/BraceletGenerator/images/efface.png
diff --git a/BraceletGenerator/images/efface_m.png b/BraceletGenerator/images/efface_m.png
diff --git a/BraceletGenerator/images/exit.png b/BraceletGenerator/images/exit.png
diff --git a/BraceletGenerator/images/exit_m.png b/BraceletGenerator/images/exit_m.png
diff --git a/BraceletGenerator/images/export.png b/BraceletGenerator/images/export.png
diff --git a/BraceletGenerator/images/export_m.png b/BraceletGenerator/images/export_m.png
diff --git a/BraceletGenerator/images/favicon.ico b/BraceletGenerator/images/favicon.ico
diff --git a/BraceletGenerator/images/fg.png b/BraceletGenerator/images/fg.png
diff --git a/BraceletGenerator/images/icon.ico b/BraceletGenerator/images/icon.ico
diff --git a/BraceletGenerator/images/icon128.png b/BraceletGenerator/images/icon128.png
diff --git a/BraceletGenerator/images/icon16.png b/BraceletGenerator/images/icon16.png
diff --git a/BraceletGenerator/images/icon22.png b/BraceletGenerator/images/icon22.png
diff --git a/BraceletGenerator/images/icon24.png b/BraceletGenerator/images/icon24.png
diff --git a/BraceletGenerator/images/icon32.png b/BraceletGenerator/images/icon32.png
diff --git a/BraceletGenerator/images/icon48.png b/BraceletGenerator/images/icon48.png
diff --git a/BraceletGenerator/images/icon64.png b/BraceletGenerator/images/icon64.png
diff --git a/BraceletGenerator/images/main_en.png b/BraceletGenerator/images/main_en.png
diff --git a/BraceletGenerator/images/main_fr.png b/BraceletGenerator/images/main_fr.png
diff --git a/BraceletGenerator/images/moins.png b/BraceletGenerator/images/moins.png
diff --git a/BraceletGenerator/images/moins_m.png b/BraceletGenerator/images/moins_m.png
diff --git a/BraceletGenerator/images/move.png b/BraceletGenerator/images/move.png
diff --git a/BraceletGenerator/images/move_e.png b/BraceletGenerator/images/move_e.png
diff --git a/BraceletGenerator/images/move_e_m.png b/BraceletGenerator/images/move_e_m.png
diff --git a/BraceletGenerator/images/move_m.png b/BraceletGenerator/images/move_m.png
diff --git a/BraceletGenerator/images/move_n.png b/BraceletGenerator/images/move_n.png
diff --git a/BraceletGenerator/images/move_n_m.png b/BraceletGenerator/images/move_n_m.png
diff --git a/BraceletGenerator/images/move_ne.png b/BraceletGenerator/images/move_ne.png
diff --git a/BraceletGenerator/images/move_ne_m.png b/BraceletGenerator/images/move_ne_m.png
diff --git a/BraceletGenerator/images/move_nw.png b/BraceletGenerator/images/move_nw.png
diff --git a/BraceletGenerator/images/move_nw_m.png b/BraceletGenerator/images/move_nw_m.png
diff --git a/BraceletGenerator/images/move_s.png b/BraceletGenerator/images/move_s.png
diff --git a/BraceletGenerator/images/move_s_m.png b/BraceletGenerator/images/move_s_m.png
diff --git a/BraceletGenerator/images/move_se.png b/BraceletGenerator/images/move_se.png
diff --git a/BraceletGenerator/images/move_se_m.png b/BraceletGenerator/images/move_se_m.png
diff --git a/BraceletGenerator/images/move_sw.png b/BraceletGenerator/images/move_sw.png
diff --git a/BraceletGenerator/images/move_sw_m.png b/BraceletGenerator/images/move_sw_m.png
diff --git a/BraceletGenerator/images/move_w.png b/BraceletGenerator/images/move_w.png
diff --git a/BraceletGenerator/images/move_w_m.png b/BraceletGenerator/images/move_w_m.png
diff --git a/BraceletGenerator/images/new.png b/BraceletGenerator/images/new.png
diff --git a/BraceletGenerator/images/new_m.png b/BraceletGenerator/images/new_m.png
diff --git a/BraceletGenerator/images/ouvrir.png b/BraceletGenerator/images/ouvrir.png
diff --git a/BraceletGenerator/images/ouvrir_m.png b/BraceletGenerator/images/ouvrir_m.png
diff --git a/BraceletGenerator/images/plus.png b/BraceletGenerator/images/plus.png
diff --git a/BraceletGenerator/images/plus_m.png b/BraceletGenerator/images/plus_m.png
diff --git a/BraceletGenerator/images/redo.png b/BraceletGenerator/images/redo.png
diff --git a/BraceletGenerator/images/rotation_dte.png b/BraceletGenerator/images/rotation_dte.png
diff --git a/BraceletGenerator/images/rotation_dte_m.png b/BraceletGenerator/images/rotation_dte_m.png
diff --git a/BraceletGenerator/images/rotation_gche.png b/BraceletGenerator/images/rotation_gche.png
diff --git a/BraceletGenerator/images/rotation_gche_m.png b/BraceletGenerator/images/rotation_gche_m.png
diff --git a/BraceletGenerator/images/sauver.png b/BraceletGenerator/images/sauver.png
diff --git a/BraceletGenerator/images/sauver_m.png b/BraceletGenerator/images/sauver_m.png
diff --git a/BraceletGenerator/images/saveas.png b/BraceletGenerator/images/saveas.png
diff --git a/BraceletGenerator/images/saveas_m.png b/BraceletGenerator/images/saveas_m.png
diff --git a/BraceletGenerator/images/shifts.png b/BraceletGenerator/images/shifts.png
diff --git a/BraceletGenerator/images/sym_horizontal.png b/BraceletGenerator/images/sym_horizontal.png
diff --git a/BraceletGenerator/images/sym_horizontal_m.png b/BraceletGenerator/images/sym_horizontal_m.png
diff --git a/BraceletGenerator/images/sym_vertical.png b/BraceletGenerator/images/sym_vertical.png
diff --git a/BraceletGenerator/images/sym_vertical_m.png b/BraceletGenerator/images/sym_vertical_m.png
diff --git a/BraceletGenerator/images/undo.png b/BraceletGenerator/images/undo.png
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
diff --git a/COPYING.txt b/COPYING.txt
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,5 +1,7 @@
-include bracelet-generator *.txt *.rst bracelet-generator.desktop *.py bracelet-generator.svg
-recursive-include BraceletGenerator/*
-recursive-include documentation *
+include *.txt *.rst *.py bracelet-generator.* 
+include BraceletGenerator/locale/fr_FR/LC_MESSAGES/BraceletGenerator.mo
+include BraceletGenerator/locale/en_US/LC_MESSAGES/BraceletGenerator.mo
 recursive-include examples *
+recursive-include BraceletGenerator/images *
+recursive-include BraceletGenerator/doc *
 recursive-include po *
diff --git a/archlinux/BraceletGenerator-1.4.0/BraceletGenerator/__init__.py b/archlinux/BraceletGenerator-1.4.0/BraceletGenerator/__init__.py
diff --git a/archlinux/BraceletGenerator-1.4.0/BraceletGenerator/about.py b/archlinux/BraceletGenerator-1.4.0/BraceletGenerator/about.py
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,3 +3,4 @@ MANIFEST @@
     dist
     build
     *.egg-info
+    deb_dist