small tweaks, icon pixmaps fix

Author: Matteljay

CONTACT.md

@@ -15,6 +15,6 @@ Donate if you find this app useful, educational or you like to motivate more pro
 
 ## Other methods
 
-Please contact me if you want to use PayPal, bank transfer or other methods.
+Please contact me for other channels.
 
 

data/labelpush.desktop

@@ -4,7 +4,7 @@ Name=LabelPush
 Comment=Lightweight label printing app
 Exec=labelpush.py
 Terminal=false
-Icon=/usr/share/icons/hicolor/256x256/apps/labelpush.png
+Icon=labelpush
 Categories=Office;
 Encoding=UTF-8
 

labelpush.py

@@ -24,7 +24,7 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# Release version: 2018.10.26
+# Release version: 2018.10.27
 # Donate if you find this app useful, educational or you like to motivate more projects like this.
 #
 # XMR:  4B6YQvbL9jqY3r1cD3ZvrDgGrRpKvifuLVb5cQnYZtapWUNovde7K5rc1LVGw3HhmTiijX21zHKSqjQtwxesBEe6FhufRGS
@@ -70,7 +70,12 @@
 import shutil
 
 name = 'labelpush'
-def_iconfiles = [ os.path.join(sys.prefix, 'share/icons/hicolor/256x256/apps/labelpush.png'), 'data/labelpush.png', 'labelpush.png' ]
+def_iconfiles = [
+    os.path.join(sys.prefix, 'local/share/pixmaps/labelpush.png'),
+    os.path.join(sys.prefix, 'share/pixmaps/labelpush.png'),
+    'data/labelpush.png',
+    'labelpush.png',
+]
 def_defaultcfg = {
     'lpname': 'default', # printer name
     'labw': 637, # labelwidth

setup.py

@@ -2,12 +2,12 @@
 # requirements Mint/Ubuntu/Debian: sudo apt-get install python3-pip python3-dev libgl1-mesa-dev xsel
 # to build packages, invoke this script: ./setup.py bdist bdist_wheel
 # to install directly, invoke via pip: sudo pip3 install .
+# to generate a whl file: ./setup.py bdist_wheel
 #
 
 import setuptools
 import re
 import sys
-import os
 mainscript = 'labelpush.py'
 
 with open('requirements.txt') as fh:
@@ -27,8 +27,6 @@
         print('ERROR: Could not extract version from ' + mainscript, file=sys.stderr)
         sys.exit(1)
 
-os.environ['PYTHONUSERBASE'] = '/usr'
-
 setuptools.setup(
     name = 'labelpush',
     version = extracted_version,
@@ -47,7 +45,7 @@
         'Operating System :: OS Independent',
     ],
     data_files = [
-        ('share/icons/hicolor/256x256/apps', ['data/labelpush.png']),
+        ('share/pixmaps', ['data/labelpush.png']),
         ('share/applications', ['data/labelpush.desktop']),
     ],
 )