paths modified for apps landing in /opt/mozdefrag

This commit is contained in:
Francois B (Makoto) 2017-09-29 18:58:55 +02:00
parent ee612c44b1
commit eae3b2c36d
4 changed files with 5 additions and 7 deletions

1
.gitignore vendored
View file

@ -2,4 +2,5 @@
backup/* backup/*
deb/* deb/*
__pycache__/* __pycache__/*
cp2opt.sh
.remote-sync.json .remote-sync.json

View file

@ -19,7 +19,7 @@ from PyQt5.QtGui import *
from PyQt5.QtWidgets import * from PyQt5.QtWidgets import *
__appVer__ = "0.1 alpha" __appVer__ = "0.1 alpha"
__currentDir__ = os.path.dirname(os.path.abspath(__file__)) __appDir__ = "/opt/mozdefrag/"
class Ui_mozDefragAboutWindow(QtWidgets.QMainWindow, # --- About ------------- class Ui_mozDefragAboutWindow(QtWidgets.QMainWindow, # --- About -------------
@ -67,11 +67,8 @@ class Ui_mozDefragMainWindow(QtWidgets.QMainWindow, # --- Main ---------------
def main(self): def main(self):
self.show() self.show()
self.logo_header.setPixmap(QtGui.QPixmap(__currentDir__
+ os.path.sep + "pic"
+ os.path.sep + "logo_header.jpg"))
icon = QtGui.QIcon() icon = QtGui.QIcon()
icon.addPixmap(QtGui.QPixmap(__currentDir__ icon.addPixmap(QtGui.QPixmap(__appDir__
+ os.path.sep + "pic" + os.path.sep + "pic"
+ os.path.sep + "icon.svg"), + os.path.sep + "icon.svg"),
QtGui.QIcon.Normal, QtGui.QIcon.Normal,

View file

@ -20,7 +20,7 @@ class Ui_MainWindow(object):
self.logo_header = QtWidgets.QLabel(self.centralwidget) self.logo_header = QtWidgets.QLabel(self.centralwidget)
self.logo_header.setGeometry(QtCore.QRect(0, 0, 400, 115)) self.logo_header.setGeometry(QtCore.QRect(0, 0, 400, 115))
self.logo_header.setText("") 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.logo_header.setObjectName("logo_header")
self.aboutButton = QtWidgets.QPushButton(self.centralwidget) self.aboutButton = QtWidgets.QPushButton(self.centralwidget)
self.aboutButton.setGeometry(QtCore.QRect(10, 330, 112, 31)) self.aboutButton.setGeometry(QtCore.QRect(10, 330, 112, 31))

View file

@ -36,7 +36,7 @@
<string/> <string/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap>pic/logo_header.jpg</pixmap> <pixmap>/opt/mozdefrag/pic/logo_header.jpg</pixmap>
</property> </property>
</widget> </widget>
<widget class="QPushButton" name="aboutButton"> <widget class="QPushButton" name="aboutButton">