Play sounds on connection/disconnection or when messages arrive
This commit is contained in:
parent
d04b8747c7
commit
1ab664564b
|
@ -7,7 +7,7 @@ arch=('i686' 'x86_64')
|
||||||
url="https://github.com/Bitmessage/PyBitmessage"
|
url="https://github.com/Bitmessage/PyBitmessage"
|
||||||
license=('MIT')
|
license=('MIT')
|
||||||
groups=()
|
groups=()
|
||||||
depends=('python2' 'qt4' 'python2-pyqt4' 'sqlite' 'openssl')
|
depends=('python2' 'qt4' 'python2-pyqt4' 'sqlite' 'openssl' 'gst123')
|
||||||
makedepends=()
|
makedepends=()
|
||||||
optdepends=('python2-gevent')
|
optdepends=('python2-gevent')
|
||||||
provides=()
|
provides=()
|
||||||
|
|
2
debian/control
vendored
2
debian/control
vendored
|
@ -9,7 +9,7 @@ Vcs-Git: https://github.com/fuzzgun/fin.git
|
||||||
Package: pybitmessage
|
Package: pybitmessage
|
||||||
Section: mail
|
Section: mail
|
||||||
Architecture: any
|
Architecture: any
|
||||||
Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.7.0), openssl, python-qt4, libqt4-dev (>= 4.8.0), python-qt4-dev, sqlite3, libsqlite3-dev
|
Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.7.0), openssl, python-qt4, libqt4-dev (>= 4.8.0), python-qt4-dev, sqlite3, libsqlite3-dev, gst123
|
||||||
Suggests: libmessaging-menu-dev
|
Suggests: libmessaging-menu-dev
|
||||||
Description: Send encrypted messages
|
Description: Send encrypted messages
|
||||||
Bitmessage is a P2P communications protocol used to send encrypted
|
Bitmessage is a P2P communications protocol used to send encrypted
|
||||||
|
|
|
@ -4,4 +4,4 @@
|
||||||
|
|
||||||
rm -f Makefile rpmpackage/*.spec
|
rm -f Makefile rpmpackage/*.spec
|
||||||
|
|
||||||
packagemonkey -n "PyBitmessage" --version "0.3.4" --dir "." -l "mit" -e "Bob Mottram (4096 bits) <bob@robotics.uk.to>" --brief "Send encrypted messages" --desc "Bitmessage is a P2P communications protocol used to send encrypted messages to another person or to many subscribers. It is decentralized and trustless, meaning that you need-not inherently trust any entities like root certificate authorities. It uses strong authentication which means that the sender of a message cannot be spoofed, and it aims to hide \"non-content\" data, like the sender and receiver of messages, from passive eavesdroppers like those running warrantless wiretapping programs." --homepage "https://github.com/Bitmessage/PyBitmessage" --section "mail" --categories "Office/Email" --dependsdeb "python (>= 2.7.0), openssl, python-qt4, libqt4-dev (>= 4.8.0), python-qt4-dev, sqlite3, libsqlite3-dev" --dependsrpm "python, PyQt4, openssl-compat-bitcoin-libs" --mainscript "bitmessagemain.py" --librarypath "/opt/openssl-compat-bitcoin/lib/" --suggestsdeb "libmessaging-menu-dev" --dependspuppy "openssl, python-qt4, sqlite3, sqlite3-dev, python-openssl, python-sip" --dependsarch "python2, qt4, python2-pyqt4, sqlite, openssl" --suggestsarch "python2-gevent" --pythonversion 2
|
packagemonkey -n "PyBitmessage" --version "0.3.4" --dir "." -l "mit" -e "Bob Mottram (4096 bits) <bob@robotics.uk.to>" --brief "Send encrypted messages" --desc "Bitmessage is a P2P communications protocol used to send encrypted messages to another person or to many subscribers. It is decentralized and trustless, meaning that you need-not inherently trust any entities like root certificate authorities. It uses strong authentication which means that the sender of a message cannot be spoofed, and it aims to hide \"non-content\" data, like the sender and receiver of messages, from passive eavesdroppers like those running warrantless wiretapping programs." --homepage "https://github.com/Bitmessage/PyBitmessage" --section "mail" --categories "Office/Email" --dependsdeb "python (>= 2.7.0), openssl, python-qt4, libqt4-dev (>= 4.8.0), python-qt4-dev, sqlite3, libsqlite3-dev, gst123" --dependsrpm "python, PyQt4, openssl-compat-bitcoin-libs, gst123" --mainscript "bitmessagemain.py" --librarypath "/opt/openssl-compat-bitcoin/lib/" --suggestsdeb "libmessaging-menu-dev" --dependspuppy "openssl, python-qt4, sqlite3, sqlite3-dev, python-openssl, python-sip, gst123" --dependsarch "python2, qt4, python2-pyqt4, sqlite, openssl, gst123" --suggestsarch "python2-gevent" --pythonversion 2
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
pybitmessage-0.3.4-1|PyBitmessage|0.3.4|1|Internet;mailnews;|5.1M||pybitmessage-0.3.4-1.pet|+openssl,+python-qt4,+sqlite3,+sqlite3-dev,+python-openssl,+python-sip|Send encrypted messages|ubuntu|precise|5|
|
pybitmessage-0.3.4-1|PyBitmessage|0.3.4|1|Internet;mailnews;|5.3M||pybitmessage-0.3.4-1.pet|+openssl,+python-qt4,+sqlite3,+sqlite3-dev,+python-openssl,+python-sip,+gst123|Send encrypted messages|ubuntu|precise|5|
|
||||||
|
|
|
@ -8,7 +8,7 @@ Packager: Bob Mottram (4096 bits) <bob@robotics.uk.to>
|
||||||
Source0: http://yourdomainname.com/src/%{name}_%{version}.orig.tar.gz
|
Source0: http://yourdomainname.com/src/%{name}_%{version}.orig.tar.gz
|
||||||
Group: Office/Email
|
Group: Office/Email
|
||||||
|
|
||||||
Requires: python, PyQt4, openssl-compat-bitcoin-libs
|
Requires: python, PyQt4, openssl-compat-bitcoin-libs, gst123
|
||||||
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
|
|
|
@ -34,6 +34,7 @@ try:
|
||||||
from PyQt4 import QtCore, QtGui
|
from PyQt4 import QtCore, QtGui
|
||||||
from PyQt4.QtCore import *
|
from PyQt4.QtCore import *
|
||||||
from PyQt4.QtGui import *
|
from PyQt4.QtGui import *
|
||||||
|
|
||||||
except Exception as err:
|
except Exception as err:
|
||||||
print 'PyBitmessage requires PyQt unless you want to run it as a daemon and interact with it using the API. You can download it from http://www.riverbankcomputing.com/software/pyqt/download or by searching Google for \'PyQt Download\' (without quotes).'
|
print 'PyBitmessage requires PyQt unless you want to run it as a daemon and interact with it using the API. You can download it from http://www.riverbankcomputing.com/software/pyqt/download or by searching Google for \'PyQt Download\' (without quotes).'
|
||||||
print 'Error message:', err
|
print 'Error message:', err
|
||||||
|
@ -50,6 +51,14 @@ def _translate(context, text):
|
||||||
|
|
||||||
class MyForm(QtGui.QMainWindow):
|
class MyForm(QtGui.QMainWindow):
|
||||||
|
|
||||||
|
# sound type constants
|
||||||
|
SOUND_NONE = 0
|
||||||
|
SOUND_KNOWN = 1
|
||||||
|
SOUND_UNKNOWN = 2
|
||||||
|
SOUND_CONNECTED = 3
|
||||||
|
SOUND_DISCONNECTED = 4
|
||||||
|
SOUND_CONNECTION_GREEN = 5
|
||||||
|
|
||||||
str_broadcast_subscribers = '[Broadcast subscribers]'
|
str_broadcast_subscribers = '[Broadcast subscribers]'
|
||||||
|
|
||||||
def __init__(self, parent=None):
|
def __init__(self, parent=None):
|
||||||
|
@ -894,6 +903,47 @@ class MyForm(QtGui.QMainWindow):
|
||||||
# update the menu entries
|
# update the menu entries
|
||||||
self.ubuntuMessagingMenuUnread(drawAttention)
|
self.ubuntuMessagingMenuUnread(drawAttention)
|
||||||
|
|
||||||
|
# play a sound
|
||||||
|
def playSound(self, category, label):
|
||||||
|
soundFilename = None
|
||||||
|
|
||||||
|
if label is not None:
|
||||||
|
# does a sound file exist for this particular contact?
|
||||||
|
if (os.path.isfile(shared.appdata + 'sounds/' + label + '.wav') or
|
||||||
|
os.path.isfile(shared.appdata + 'sounds/' + label + '.mp3')):
|
||||||
|
soundFilename = shared.appdata + 'sounds/' + label
|
||||||
|
|
||||||
|
if soundFilename is None:
|
||||||
|
if category is self.SOUND_KNOWN:
|
||||||
|
soundFilename = shared.appdata + 'sounds/known'
|
||||||
|
elif category is self.SOUND_UNKNOWN:
|
||||||
|
soundFilename = shared.appdata + 'sounds/unknown'
|
||||||
|
elif category is self.SOUND_CONNECTED:
|
||||||
|
soundFilename = shared.appdata + 'sounds/connected'
|
||||||
|
elif category is self.SOUND_DISCONNECTED:
|
||||||
|
soundFilename = shared.appdata + 'sounds/disconnected'
|
||||||
|
elif category is self.SOUND_CONNECTION_GREEN:
|
||||||
|
soundFilename = shared.appdata + 'sounds/green'
|
||||||
|
|
||||||
|
if soundFilename is not None:
|
||||||
|
# if not wav then try mp3 format
|
||||||
|
if not os.path.isfile(soundFilename + '.wav'):
|
||||||
|
soundFilename = soundFilename + '.mp3'
|
||||||
|
else:
|
||||||
|
soundFilename = soundFilename + '.wav'
|
||||||
|
|
||||||
|
if os.path.isfile(soundFilename):
|
||||||
|
if 'linux' in sys.platform:
|
||||||
|
# Note: QSound was a nice idea but it didn't work
|
||||||
|
if '.mp3' in soundFilename:
|
||||||
|
os.popen('gst123 ' + soundFilename)
|
||||||
|
else:
|
||||||
|
os.popen('aplay ' + soundFilename)
|
||||||
|
elif sys.platform[0:3] == 'win':
|
||||||
|
# use winsound on Windows
|
||||||
|
import winsound
|
||||||
|
winsound.PlaySound(soundFilename, winsound.SND_FILENAME)
|
||||||
|
|
||||||
# initialise the message notifier
|
# initialise the message notifier
|
||||||
def notifierInit(self):
|
def notifierInit(self):
|
||||||
global withMessagingMenu
|
global withMessagingMenu
|
||||||
|
@ -901,8 +951,11 @@ class MyForm(QtGui.QMainWindow):
|
||||||
Notify.init('pybitmessage')
|
Notify.init('pybitmessage')
|
||||||
|
|
||||||
# shows a notification
|
# shows a notification
|
||||||
def notifierShow(self, title, subtitle):
|
def notifierShow(self, title, subtitle, fromCategory, label):
|
||||||
global withMessagingMenu
|
global withMessagingMenu
|
||||||
|
|
||||||
|
self.playSound(fromCategory, label);
|
||||||
|
|
||||||
if withMessagingMenu:
|
if withMessagingMenu:
|
||||||
n = Notify.Notification.new(
|
n = Notify.Notification.new(
|
||||||
title, subtitle, 'notification-message-email')
|
title, subtitle, 'notification-message-email')
|
||||||
|
@ -1075,7 +1128,8 @@ class MyForm(QtGui.QMainWindow):
|
||||||
# if the connection is lost then show a notification
|
# if the connection is lost then show a notification
|
||||||
if self.connected:
|
if self.connected:
|
||||||
self.notifierShow('Bitmessage', unicode(_translate(
|
self.notifierShow('Bitmessage', unicode(_translate(
|
||||||
"MainWindow", "Connection lost").toUtf8(),'utf-8'))
|
"MainWindow", "Connection lost").toUtf8(),'utf-8'),
|
||||||
|
self.SOUND_DISCONNECTED, None)
|
||||||
self.connected = False
|
self.connected = False
|
||||||
|
|
||||||
if self.actionStatus is not None:
|
if self.actionStatus is not None:
|
||||||
|
@ -1092,7 +1146,8 @@ class MyForm(QtGui.QMainWindow):
|
||||||
# if a new connection has been established then show a notification
|
# if a new connection has been established then show a notification
|
||||||
if not self.connected:
|
if not self.connected:
|
||||||
self.notifierShow('Bitmessage', unicode(_translate(
|
self.notifierShow('Bitmessage', unicode(_translate(
|
||||||
"MainWindow", "Connected").toUtf8(),'utf-8'))
|
"MainWindow", "Connected").toUtf8(),'utf-8'),
|
||||||
|
self.SOUND_CONNECTED, None)
|
||||||
self.connected = True
|
self.connected = True
|
||||||
|
|
||||||
if self.actionStatus is not None:
|
if self.actionStatus is not None:
|
||||||
|
@ -1108,7 +1163,8 @@ class MyForm(QtGui.QMainWindow):
|
||||||
shared.statusIconColor = 'green'
|
shared.statusIconColor = 'green'
|
||||||
if not self.connected:
|
if not self.connected:
|
||||||
self.notifierShow('Bitmessage', unicode(_translate(
|
self.notifierShow('Bitmessage', unicode(_translate(
|
||||||
"MainWindow", "Connected").toUtf8(),'utf-8'))
|
"MainWindow", "Connected").toUtf8(),'utf-8'),
|
||||||
|
self.SOUND_CONNECTION_GREEN, None)
|
||||||
self.connected = True
|
self.connected = True
|
||||||
|
|
||||||
if self.actionStatus is not None:
|
if self.actionStatus is not None:
|
||||||
|
@ -1580,12 +1636,12 @@ class MyForm(QtGui.QMainWindow):
|
||||||
newItem = QtGui.QTableWidgetItem(unicode(fromAddress, 'utf-8'))
|
newItem = QtGui.QTableWidgetItem(unicode(fromAddress, 'utf-8'))
|
||||||
newItem.setToolTip(unicode(fromAddress, 'utf-8'))
|
newItem.setToolTip(unicode(fromAddress, 'utf-8'))
|
||||||
if shared.config.getboolean('bitmessagesettings', 'showtraynotifications'):
|
if shared.config.getboolean('bitmessagesettings', 'showtraynotifications'):
|
||||||
self.notifierShow(unicode(_translate("MainWindow",'New Message').toUtf8(),'utf-8'), unicode(_translate("MainWindow",'From ').toUtf8(),'utf-8') + unicode(fromAddress, 'utf-8'))
|
self.notifierShow(unicode(_translate("MainWindow",'New Message').toUtf8(),'utf-8'), unicode(_translate("MainWindow",'From ').toUtf8(),'utf-8') + unicode(fromAddress, 'utf-8'), self.SOUND_UNKNOWN, None)
|
||||||
else:
|
else:
|
||||||
newItem = QtGui.QTableWidgetItem(unicode(fromLabel, 'utf-8'))
|
newItem = QtGui.QTableWidgetItem(unicode(fromLabel, 'utf-8'))
|
||||||
newItem.setToolTip(unicode(unicode(fromLabel, 'utf-8')))
|
newItem.setToolTip(unicode(unicode(fromLabel, 'utf-8')))
|
||||||
if shared.config.getboolean('bitmessagesettings', 'showtraynotifications'):
|
if shared.config.getboolean('bitmessagesettings', 'showtraynotifications'):
|
||||||
self.notifierShow(unicode(_translate("MainWindow",'New Message').toUtf8(),'utf-8'), unicode(_translate("MainWindow",'From ').toUtf8(),'utf-8') + unicode(fromLabel, 'utf-8'))
|
self.notifierShow(unicode(_translate("MainWindow",'New Message').toUtf8(),'utf-8'), unicode(_translate("MainWindow",'From ').toUtf8(),'utf-8') + unicode(fromLabel, 'utf-8'), self.SOUND_KNOWN, unicode(fromLabel, 'utf-8'))
|
||||||
newItem.setData(Qt.UserRole, str(fromAddress))
|
newItem.setData(Qt.UserRole, str(fromAddress))
|
||||||
newItem.setFont(font)
|
newItem.setFont(font)
|
||||||
self.ui.tableWidgetInbox.setItem(0, 1, newItem)
|
self.ui.tableWidgetInbox.setItem(0, 1, newItem)
|
||||||
|
|
Reference in New Issue
Block a user