meta: packaging changes

4 files changed, 15 insertions, 9 deletions

diff --git a/Lib/defconQt/__main__.py b/Lib/defconQt/__main__.py
index 128b827..843a4fb 100644
--- a/Lib/defconQt/__main__.py
+++ b/Lib/defconQt/__main__.py
@@ -1,5 +1,5 @@
 from defconQt.objects.defcon import TFont
-from defconQt import representationFactories
+from defconQt import icons_db, representationFactories
 from defconQt.fontView import Application, MainWindow
 import sys
 import os
@@ -18,7 +18,7 @@ app = Application(sys.argv)
 # TODO: http://stackoverflow.com/a/21330349/2037879
 app.setOrganizationName("A. Tétar & Co.")
 app.setApplicationName("TruFont")
-app.setWindowIcon(QIcon("defconQt/resources/app.png"))
+app.setWindowIcon(QIcon(":/resources/app.png"))
 window = MainWindow(font)
 window.show()
 sys.exit(app.exec_())
diff --git a/Lib/defconQt/glyphView.py b/Lib/defconQt/glyphView.py
index a3a6d46..0c80ddd 100644
--- a/Lib/defconQt/glyphView.py
+++ b/Lib/defconQt/glyphView.py
@@ -2,6 +2,7 @@ from enum import Enum
 from math import copysign
 import pickle
 from defcon import Anchor, Component
+from defconQt import icons_db
 from defconQt.objects.defcon import TContour, TGlyph
 from defconQt.pens.copySelectionPen import CopySelectionPen
 from fontTools.misc import bezierTools
@@ -191,16 +192,16 @@ class MainGfxWindow(QMainWindow):
         selectionToolButton = toolBar.addAction("Selection", self.view.setSceneSelection)
         selectionToolButton.setCheckable(True)
         selectionToolButton.setChecked(True)
-        selectionToolButton.setIcon(QIcon("defconQt/resources/cursor.svg"))
+        selectionToolButton.setIcon(QIcon(":/resources/cursor.svg"))
         penToolButton = toolBar.addAction("Pen", self.view.setSceneDrawing)
         penToolButton.setCheckable(True)
-        penToolButton.setIcon(QIcon("defconQt/resources/curve.svg"))
+        penToolButton.setIcon(QIcon(":/resources/curve.svg"))
         rulerToolButton = toolBar.addAction("Ruler", self.view.setSceneRuler)
         rulerToolButton.setCheckable(True)
-        rulerToolButton.setIcon(QIcon("defconQt/resources/ruler.svg"))
+        rulerToolButton.setIcon(QIcon(":/resources/ruler.svg"))
         knifeToolButton = toolBar.addAction("Knife", self.view.setSceneKnife)
         knifeToolButton.setCheckable(True)
-        knifeToolButton.setIcon(QIcon("defconQt/resources/cut.svg"))
+        knifeToolButton.setIcon(QIcon(":/resources/cut.svg"))
         # http://www.setnode.com/blog/right-aligning-a-button-in-a-qtoolbar/
         spacer = QWidget()
         spacer.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
diff --git a/Lib/defconQt/icons_db.qrc b/Lib/defconQt/icons_db.qrc
index 5973849..5fea427 100644
--- a/Lib/defconQt/icons_db.qrc
+++ b/Lib/defconQt/icons_db.qrc
@@ -1,7 +1,11 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource prefix="/">
-	<file>resources/icon.png</file>
-    <file>resources/ic_settings_24px.svg</file>
+	<file>resources/app.png</file>
+	<file>resources/cursor.svg</file>
+	<file>resources/curve.svg</file>
+	<file>resources/cut.svg</file>
+	<file>resources/ruler.svg</file>
+    <file>resources/settings.svg</file>
 </qresource>
 </RCC>
 
diff --git a/Lib/defconQt/spaceCenter.py b/Lib/defconQt/spaceCenter.py
index 72fcfef..2b7157e 100644
--- a/Lib/defconQt/spaceCenter.py
+++ b/Lib/defconQt/spaceCenter.py
@@ -1,3 +1,4 @@
+from defconQt import icons_db
 from defconQt.glyphCollectionView import cellSelectionColor
 from defconQt.glyphView import MainGfxWindow
 from getpass import getuser
@@ -204,7 +205,7 @@ class FontToolBar(QToolBar):
 
         self.configBar = QPushButton(self)
         self.configBar.setFlat(True)
-        self.configBar.setIcon(QIcon("defconQt/resources/settings.svg"))
+        self.configBar.setIcon(QIcon(":/resources/settings.svg"))
         self.configBar.setStyleSheet("padding: 2px 0px; padding-right: 10px");
         self.toolsMenu = QMenu(self)
         showKerning = self.toolsMenu.addAction("Show Kerning", self.showKerning)