changed license loading method

This commit is contained in:
2016-03-23 13:51:54 +03:00
parent c069562b18
commit 127bbebe72
5 changed files with 2578 additions and 2470 deletions

View File

@@ -20,7 +20,6 @@ import time
#variables
programTitle = "Mail Notifier"
programVersion = "2.0"
programDir=os.path.dirname(__file__)
settings = QSettings(os.path.expanduser("~")+"/.config/mail-notifier/settings.conf", QSettings.NativeFormat)
def GlobalSettingsExist():
if ((settings.contains("CheckInterval") and settings.value("CheckInterval") != "") and
@@ -226,8 +225,11 @@ class About(QDialog):
self.ui.lblNameVersion.setText(programTitle + " " + programVersion)
f = open(os.path.join(programDir,'LICENSE.txt'), 'r')
self.ui.txtLicense.setPlainText(f.read())
f = QtCore.QFile(":/LICENSE.txt")
if f.open(QtCore.QIODevice.ReadOnly | QtCore.QFile.Text):
text = QtCore.QTextStream(f).readAll()
f.close()
self.ui.txtLicense.setPlainText(text)
def closeEvent(self, event):
event.ignore()