From eae3b2c36d8d0fe843e20573f2e3679d729eac89 Mon Sep 17 00:00:00 2001
From: "Francois B (Makoto)" <shakasan@sirenacorp.be>
Date: Fri, 29 Sep 2017 18:58:55 +0200
Subject: [PATCH] paths modified for apps landing in /opt/mozdefrag

---
 .gitignore             | 1 +
 mozDefrag.py           | 7 ++-----
 mozDefragMainWindow.py | 2 +-
 mozDefragMainWindow.ui | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 699b2aa..88db808 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 backup/*
 deb/*
 __pycache__/*
+cp2opt.sh
 .remote-sync.json
diff --git a/mozDefrag.py b/mozDefrag.py
index a628430..7d58b3e 100644
--- a/mozDefrag.py
+++ b/mozDefrag.py
@@ -19,7 +19,7 @@ from PyQt5.QtGui import *
 from PyQt5.QtWidgets import *
 
 __appVer__ = "0.1 alpha"
-__currentDir__ = os.path.dirname(os.path.abspath(__file__))
+__appDir__ = "/opt/mozdefrag/"
 
 
 class Ui_mozDefragAboutWindow(QtWidgets.QMainWindow,  # --- About -------------
@@ -67,11 +67,8 @@ class Ui_mozDefragMainWindow(QtWidgets.QMainWindow,  # --- Main ---------------
 
     def main(self):
         self.show()
-        self.logo_header.setPixmap(QtGui.QPixmap(__currentDir__
-                                                 + os.path.sep + "pic"
-                                                 + os.path.sep + "logo_header.jpg"))
         icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap(__currentDir__
+        icon.addPixmap(QtGui.QPixmap(__appDir__
                                      + os.path.sep + "pic"
                                      + os.path.sep + "icon.svg"),
                                      QtGui.QIcon.Normal,
diff --git a/mozDefragMainWindow.py b/mozDefragMainWindow.py
index 174e260..a16d071 100644
--- a/mozDefragMainWindow.py
+++ b/mozDefragMainWindow.py
@@ -20,7 +20,7 @@ class Ui_MainWindow(object):
         self.logo_header = QtWidgets.QLabel(self.centralwidget)
         self.logo_header.setGeometry(QtCore.QRect(0, 0, 400, 115))
         self.logo_header.setText("")
-        self.logo_header.setPixmap(QtGui.QPixmap("pic/logo_header.jpg"))
+        self.logo_header.setPixmap(QtGui.QPixmap("/opt/mozdefrag/pic/logo_header.jpg"))
         self.logo_header.setObjectName("logo_header")
         self.aboutButton = QtWidgets.QPushButton(self.centralwidget)
         self.aboutButton.setGeometry(QtCore.QRect(10, 330, 112, 31))
diff --git a/mozDefragMainWindow.ui b/mozDefragMainWindow.ui
index bbd7975..e805e7f 100644
--- a/mozDefragMainWindow.ui
+++ b/mozDefragMainWindow.ui
@@ -36,7 +36,7 @@
      <string/>
     </property>
     <property name="pixmap">
-     <pixmap>pic/logo_header.jpg</pixmap>
+     <pixmap>/opt/mozdefrag/pic/logo_header.jpg</pixmap>
     </property>
    </widget>
    <widget class="QPushButton" name="aboutButton">