Merge pull request #327 from Atheros1/master

Sounds

Makefile

@@ -9,6 +9,7 @@ debug:
 source:
 	tar -cvzf ../${APP}_${VERSION}.orig.tar.gz ../${APP}-${VERSION} --exclude-vcs
 install:
+	mkdir -p ${DESTDIR}/usr
 	mkdir -p ${DESTDIR}${PREFIX}
 	mkdir -p ${DESTDIR}${PREFIX}/bin
 	mkdir -m 755 -p ${DESTDIR}${PREFIX}/share
@@ -37,7 +38,7 @@ uninstall:
 	rm -f ${PREFIX}/bin/${APP}
 	rm -f ${PREFIX}/share/applications/${APP}.desktop
 	rm -f ${PREFIX}/share/icons/hicolor/scalable/apps/${APP}.svg
-	rm -f ${PREFIX}/share/pixmaps/${APP}.svg
+	${PREFIX}/share/pixmaps/${APP}.svg
 clean:
 	rm -f ${APP} \#* \.#* gnuplot* *.png debian/*.substvars debian/*.log
 	rm -fr deb.* debian/${APP} rpmpackage/${ARCH_TYPE}

archpackage/PKGBUILD

@@ -7,7 +7,7 @@ arch=('i686' 'x86_64')
 url="https://github.com/Bitmessage/PyBitmessage"
 license=('MIT')
 groups=()
-depends=('python2' 'qt4' 'python2-pyqt4' 'sqlite' 'openssl')
+depends=('python2' 'qt4' 'python2-pyqt4' 'sqlite' 'openssl' 'gst123')
 makedepends=()
 optdepends=('python2-gevent')
 provides=()
@@ -27,5 +27,5 @@ build() {
 }
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR="$pkgdir/" PREFIX="/usr" install
 }

debian/control

@@ -4,12 +4,12 @@ Maintainer: Bob Mottram (4096 bits) <bob@robotics.uk.to>
 Build-Depends: debhelper (>= 9.0.0)
 Standards-Version: 3.9.4
 Homepage: https://github.com/Bitmessage/PyBitmessage
-Vcs-Git: https://github.com/fuzzgun/fin.git
+Vcs-Git: https://github.com/fuzzgun/packagemonkey.git
 
 Package: pybitmessage
 Section: mail
 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
 Description: Send encrypted messages
  Bitmessage is a P2P communications protocol used to send encrypted

debian/rules

@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 APP=pybitmessage
+PREFIX=/usr
 build: build-stamp
 	make
 build-arch: build-stamp
@@ -20,7 +21,7 @@ install: build clean
 		 dh_testroot
 		 dh_prep
 		 dh_installdirs
-		 ${MAKE} install -B DESTDIR=${CURDIR}/debian/${APP}
+		 ${MAKE} install -B DESTDIR=${CURDIR}/debian/${APP} PREFIX=/usr
 binary-indep: build install
 			  dh_testdir
 			  dh_testroot

ebuildpackage/pybitmessage-0.3.4-1.ebuild

@@ -1,22 +1,32 @@
 # $Header: $
 
-EAPI=4
+EAPI=5
 
+inherit git-2 python-r1
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DESCRIPTION="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"
-SRC_URI="${PN}/${P}.tar.gz"
+EGIT_REPO_URI="https://github.com/fuzzgun/packagemonkey.git"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="x86"
-RDEPEND="dev-libs/popt"
+DEPEND="dev-libs/popt
-DEPEND="${RDEPEND}"
+    ${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+    dev-libs/openssl
+    dev-python/PyQt4[]"
 
 src_configure() {
     econf --with-popt
 }
 
+src_compile() { :; }
+
 src_install() {
-    emake DESTDIR="${D}" install
+    emake DESTDIR="${D}" PREFIX="/usr" install
     # Install README and (Debian) changelog
     dodoc README.md debian/changelog
 }

generate.sh

@@ -4,4 +4,4 @@
 
 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 --dependsebuild "dev-libs/openssl, dev-python/PyQt4[${PYTHON_USEDEP}]" --buildebuild "\${PYTHON_DEPS}" --pythonreq "sqlite"

puppy.sh

@@ -27,7 +27,7 @@ mkdir -p ${PROJECTDIR}
 # Build the project
 make clean
 make
-make install -B DESTDIR=${PROJECTDIR}
+make install -B DESTDIR=${PROJECTDIR} PREFIX=/usr
 
 # Alter the desktop file categories
 sed -i "s/Categories=Office;Email;/Categories=Internet;mailnews;/g" ${PROJECTDIR}/usr/share/applications/${APP}.desktop

puppypackage/pybitmessage-0.3.4.pet.specs

@@ -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;|3.9M||pybitmessage-0.3.4-1.pet|+openssl,+python-qt4,+sqlite3,+sqlite3-dev,+python-openssl,+python-sip,+gst123|Send encrypted messages|ubuntu|precise|5|

rpmpackage/pybitmessage.spec

@@ -8,7 +8,7 @@ Packager: Bob Mottram (4096 bits) <bob@robotics.uk.to>
 Source0: http://yourdomainname.com/src/%{name}_%{version}.orig.tar.gz
 Group: Office/Email
 
-Requires: python, PyQt4, openssl-compat-bitcoin-libs
+Requires: python, PyQt4, openssl-compat-bitcoin-libs, gst123
 
 
 %description
@@ -48,7 +48,7 @@ mkdir -p %{buildroot}/usr/share/pixmaps
 mkdir -p %{buildroot}/usr/share/icons/hicolor/scalable
 mkdir -p %{buildroot}/usr/share/icons/hicolor/scalable/apps
 # Make install but to the RPM BUILDROOT directory
-make install -B DESTDIR=%{buildroot}
+make install -B DESTDIR=%{buildroot} PREFIX=/usr
 
 %files
 %doc README.md LICENSE

slack.sh

@@ -28,7 +28,7 @@ mkdir -p ${PROJECTDIR}
 # Build the project
 make clean
 make
-make install -B DESTDIR=${PROJECTDIR}
+make install -B DESTDIR=${PROJECTDIR} PREFIX=/usr
 
 # Copy the slack-desc and doinst.sh files into the build install directory
 mkdir ${PROJECTDIR}/install

src/bitmessageqt/__init__.py

@@ -30,13 +30,18 @@ import os
 from pyelliptic.openssl import OpenSSL
 import pickle
 import platform
+<<<<<<< HEAD
 import debug
 from debug import logger
+=======
+import subprocess
+>>>>>>> 2af86c8296e0c577f8ac48a56e9a3582ddd87473
 
 try:
     from PyQt4 import QtCore, QtGui
     from PyQt4.QtCore import *
     from PyQt4.QtGui import *
+
 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 'Error message:', err
@@ -53,6 +58,14 @@ def _translate(context, text):
 
 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_chan = '[chan]'
 
@@ -965,6 +978,57 @@ class MyForm(QtGui.QMainWindow):
         # update the menu entries
         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:
+                        try:
+                            subprocess.call(["gst123", soundFilename],
+                                            stdin=subprocess.PIPE, 
+                                            stdout=subprocess.PIPE)
+                        except:
+                            print "WARNING: gst123 must be installed in order to play mp3 sounds"
+                    else:
+                        try:
+                            subprocess.call(["aplay", soundFilename],
+                                            stdin=subprocess.PIPE, 
+                                            stdout=subprocess.PIPE)
+                        except:
+                            print "WARNING: aplay must be installed in order to play WAV sounds"
+                elif sys.platform[0:3] == 'win':
+                    # use winsound on Windows
+                    import winsound
+                    winsound.PlaySound(soundFilename, winsound.SND_FILENAME)
+
     # initialise the message notifier
     def notifierInit(self):
         global withMessagingMenu
@@ -972,8 +1036,11 @@ class MyForm(QtGui.QMainWindow):
             Notify.init('pybitmessage')
 
     # shows a notification
-    def notifierShow(self, title, subtitle):
+    def notifierShow(self, title, subtitle, fromCategory, label):
         global withMessagingMenu
+
+        self.playSound(fromCategory, label);
+
         if withMessagingMenu:
             n = Notify.Notification.new(
                 title, subtitle, 'notification-message-email')
@@ -1198,7 +1265,8 @@ class MyForm(QtGui.QMainWindow):
             # if the connection is lost then show a notification
             if self.connected:
                 self.notifierShow('Bitmessage', unicode(_translate(
-                    "MainWindow", "Connection lost").toUtf8(),'utf-8'))
+                            "MainWindow", "Connection lost").toUtf8(),'utf-8'),
+                                  self.SOUND_DISCONNECTED, None)
             self.connected = False
 
             if self.actionStatus is not None:
@@ -1215,7 +1283,8 @@ class MyForm(QtGui.QMainWindow):
             # if a new connection has been established then show a notification
             if not self.connected:
                 self.notifierShow('Bitmessage', unicode(_translate(
-                    "MainWindow", "Connected").toUtf8(),'utf-8'))
+                            "MainWindow", "Connected").toUtf8(),'utf-8'),
+                                  self.SOUND_CONNECTED, None)
             self.connected = True
 
             if self.actionStatus is not None:
@@ -1231,7 +1300,8 @@ class MyForm(QtGui.QMainWindow):
             shared.statusIconColor = 'green'
             if not self.connected:
                 self.notifierShow('Bitmessage', unicode(_translate(
-                    "MainWindow", "Connected").toUtf8(),'utf-8'))
+                            "MainWindow", "Connected").toUtf8(),'utf-8'),
+                                  self.SOUND_CONNECTION_GREEN, None)
             self.connected = True
 
             if self.actionStatus is not None:
@@ -1714,12 +1784,12 @@ class MyForm(QtGui.QMainWindow):
             newItem = QtGui.QTableWidgetItem(unicode(fromAddress, 'utf-8'))
             newItem.setToolTip(unicode(fromAddress, 'utf-8'))
             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:
             newItem = QtGui.QTableWidgetItem(unicode(fromLabel, 'utf-8'))
             newItem.setToolTip(unicode(unicode(fromLabel, 'utf-8')))
             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.setFont(font)
         self.ui.tableWidgetInbox.setItem(0, 1, newItem)