Merge pull request #502 from hroncok/pngicons

Use and install PNG icons instead of ICO, rename P-face to pronterface

plater.desktop

@@ -3,7 +3,7 @@ Type=Application
 Name=Plater
 GenericName=Plate building tool
 Comment=Prepares plates for 3D printing
-Icon=/usr/share/pixmaps/plater.ico
+Icon=/usr/share/pixmaps/plater.png
 Exec=/usr/bin/plater.py
 StartupNotify=true
 Terminal=false

printrun/objectplater.py

@@ -34,7 +34,7 @@ class Plater(wx.Frame):
     def __init__(self, filenames = [], size = (800, 580), callback = None, parent = None, build_dimensions = None):
         super(Plater, self).__init__(parent, title = _("Plate building tool"), size = size)
         self.filenames = filenames
-        self.SetIcon(wx.Icon(iconfile("plater.ico"), wx.BITMAP_TYPE_ICO))
+        self.SetIcon(wx.Icon(iconfile("plater.png"), wx.BITMAP_TYPE_PNG))
         self.mainsizer = wx.BoxSizer(wx.HORIZONTAL)
         panel = wx.Panel(self, -1)
         sizer = wx.GridBagSizer()

printrun/pronterface.py

@@ -211,7 +211,7 @@ class PronterWindow(MainWindow, pronsole.pronsole):
             self.Maximize()
         self.Bind(wx.EVT_SIZE, self.on_resize)
         self.Bind(wx.EVT_MAXIMIZE, self.on_maximize)
-        self.SetIcon(wx.Icon(iconfile("P-face.ico"), wx.BITMAP_TYPE_ICO))
+        self.SetIcon(wx.Icon(iconfile("pronterface.png"), wx.BITMAP_TYPE_PNG))
 
         self.display_graph = self.settings.tempgraph
         self.display_gauges = self.settings.tempgauges
@@ -616,7 +616,7 @@ class PronterWindow(MainWindow, pronsole.pronsole):
 
         info = wx.AboutDialogInfo()
 
-        info.SetIcon(wx.Icon(iconfile("P-face.ico"), wx.BITMAP_TYPE_ICO))
+        info.SetIcon(wx.Icon(iconfile("pronterface.png"), wx.BITMAP_TYPE_PNG))
         info.SetName('Printrun')
         info.SetVersion(printcore.__version__)
 

printrun/zscaper.py

@@ -63,7 +63,7 @@ class scapewin(wx.Frame):
     def __init__(self, size = (400, 530)):
         wx.Frame.__init__(self, None,
                           title = "Right-click to load an image", size = size)
-        self.SetIcon(wx.Icon("plater.ico", wx.BITMAP_TYPE_ICO))
+        self.SetIcon(wx.Icon("plater.png", wx.BITMAP_TYPE_PNG))
         self.SetClientSize(size)
         self.panel = wx.Panel(self, size = size)
 

pronsole.desktop

@@ -3,7 +3,7 @@ Type=Application
 Name=Pronsole
 GenericName=Printer console
 Comment=Controls your 3D printer form console
-Icon=/usr/share/pixmaps/pronsole.ico
+Icon=/usr/share/pixmaps/pronsole.png
 Exec=/usr/bin/pronsole.py
 StartupNotify=true
 Terminal=true

pronterface.desktop

@@ -3,7 +3,7 @@ Type=Application
 Name=Pronterface
 GenericName=Printer Interface
 Comment=Controls your 3D printer
-Icon=/usr/share/pixmaps/P-face.ico
+Icon=/usr/share/pixmaps/pronterface.png
 Exec=/usr/bin/pronterface.py %f
 Path=/usr/share/pronterface/
 StartupNotify=true

setup.py

@@ -121,7 +121,7 @@ if sys.argv[1] in("install", "uninstall") and len(prefix):
     sys.argv += ["--prefix", prefix]
 
 target_images_path = "share/pronterface/images/"
-data_files = [('share/pixmaps/', ['P-face.ico', 'plater.ico', 'pronsole.ico']),
+data_files = [('share/pixmaps/', ['pronterface.png', 'plater.png', 'pronsole.png']),
               ('share/applications', ['pronterface.desktop','pronsole.desktop','plater.desktop']),
               ('share/appdata', ['pronterface.appdata.xml','pronsole.appdata.xml','plater.appdata.xml'])]