Compare commits

...

6 Commits
3.01 ... master

1 changed files with 28 additions and 11 deletions

View File

@ -22,7 +22,7 @@ from datetime import datetime, date, time
#variables #variables
programTitle = "Mail Notifier" programTitle = "Mail Notifier"
programVersion = "3.01" programVersion = "3.01-dev"
settings = QSettings(os.path.expanduser("~")+"/.config/mail-notifier/settings.conf", QSettings.NativeFormat) settings = QSettings(os.path.expanduser("~")+"/.config/mail-notifier/settings.conf", QSettings.NativeFormat)
def GlobalSettingsExist(): def GlobalSettingsExist():
if ((settings.contains("CheckInterval") and settings.value("CheckInterval") != "") and if ((settings.contains("CheckInterval") and settings.value("CheckInterval") != "") and
@ -87,6 +87,12 @@ class Window(QDialog):
self.ui.btnSaveAccount.clicked.connect(self.btnSaveAccount_clicked) self.ui.btnSaveAccount.clicked.connect(self.btnSaveAccount_clicked)
self.ui.btnRemoveAccount.clicked.connect(self.btnRemoveAccount_clicked) self.ui.btnRemoveAccount.clicked.connect(self.btnRemoveAccount_clicked)
# Check if account doesn't exist, it creates default one
if (AccountExist() == False):
self.ui.comboAccounts.addItem("Default")
self.ui.comboAccounts.setCurrentText("Default")
# Main timer # Main timer
self.timer = QTimer(self) self.timer = QTimer(self)
self.timer.timeout.connect(mail_check) self.timer.timeout.connect(mail_check)
@ -208,6 +214,10 @@ class Window(QDialog):
GroupName = self.ui.comboAccounts.currentText() GroupName = self.ui.comboAccounts.currentText()
self.ui.comboAccounts.removeItem(Index) self.ui.comboAccounts.removeItem(Index)
self.SettingsRemove(GroupName) self.SettingsRemove(GroupName)
# Check if account doesn't exist, it creates default one
if (AccountExist() == False):
self.ui.comboAccounts.addItem("Default")
self.ui.comboAccounts.setCurrentText("Default")
def comboAccounts_changed(self): def comboAccounts_changed(self):
self.ui.lblTestOutput.setText("") self.ui.lblTestOutput.setText("")
@ -420,13 +430,17 @@ def mail_check():
details.ui.tableWidget.setRowCount(len(AllFroms)) details.ui.tableWidget.setRowCount(len(AllFroms))
details.ui.tableWidget.setColumnCount(3) details.ui.tableWidget.setColumnCount(3)
#Enter data onto Table #Enter data onto Table
horHeaders = [] try:
for n, key in enumerate(sorted(data.keys())): horHeaders = []
#print(data.keys()) for n, key in enumerate(sorted(data.keys())):
horHeaders.append(key) #print(data.keys())
for m, item in enumerate(data[key]): horHeaders.append(key)
newitem = QtWidgets.QTableWidgetItem(item) for m, item in enumerate(data[key]):
details.ui.tableWidget.setItem(m, n, newitem) newitem = QtWidgets.QTableWidgetItem(item)
details.ui.tableWidget.setItem(m, n, newitem)
except:
print("Unable to load some data")
pass
#Add Header #Add Header
details.ui.tableWidget.setHorizontalHeaderLabels(horHeaders) details.ui.tableWidget.setHorizontalHeaderLabels(horHeaders)
@ -438,9 +452,12 @@ def mail_check():
# check was successfull, lastCheckCount is updating # check was successfull, lastCheckCount is updating
window.lastCheckCount = mail_count window.lastCheckCount = mail_count
def notify(message): def notify(message):
if settings.value("Notify"): try:
subprocess.Popen(['notify-send', programTitle, message]) if settings.value("Notify"):
return subprocess.Popen(['notify-send', programTitle, message])
return
except:
print(message)