Merge pull request #302 from NaturalHistoryMuseum/feature/131-icon

[#131] main window icon
NaturalHistoryMuseum · May 11, 2016 · 92a1a95 · 92a1a95
2 parents 5a83531 + a88b62b
commit 92a1a95
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ Version 0.1.29
 - Fixed #296 - Inconsistent zoom toggling
 - Fixed #295 - Full-resolution scan is mandatory
 - Fixed #293 - Link to files fails with ugly error message on Windows
+- Fixed #131 - Main window icon
 
 Version 0.1.28
 -------------

diff --git a/Releasing.md b/Releasing.md
@@ -6,7 +6,7 @@ git pull
 
 * If necesary, bump the version in `inselect/__init__.py`
 
-* If the toolbar icons in inselect/data change then you need to refresh a Python
+* If the icons in inselect/data change then you need to refresh a Python
   file:
 
 ```

diff --git a/data/inselect128.png b/data/inselect128.png
diff --git a/data/inselect16.png b/data/inselect16.png
diff --git a/data/inselect24.png b/data/inselect24.png
diff --git a/data/inselect256.png b/data/inselect256.png
diff --git a/data/inselect32.png b/data/inselect32.png
diff --git a/data/inselect48.png b/data/inselect48.png
diff --git a/data/inselect512.png b/data/inselect512.png
diff --git a/data/inselect64.png b/data/inselect64.png
diff --git a/icons.qrc b/icons.qrc
@@ -2,6 +2,13 @@
  <RCC version="1.0">
  <qresource prefix="/">
      <file>data/barcode_icon.png</file>
+     <file>data/inselect16.png</file>
+     <file>data/inselect24.png</file>
+     <file>data/inselect32.png</file>
+     <file>data/inselect48.png</file>
+     <file>data/inselect64.png</file>
+     <file>data/inselect128.png</file>
+     <file>data/inselect256.png</file>
      <file>data/segment_icon.png</file>
      <file>data/subsegment_icon.png</file>
  </qresource>

diff --git a/inselect/app.py b/inselect/app.py
@@ -3,7 +3,7 @@
 import sys
 
 from PySide import QtGui
-from PySide.QtCore import QSettings, QLocale, QCoreApplication
+from PySide.QtCore import QSettings, QSize, QLocale, QCoreApplication
 
 import inselect
 
@@ -50,6 +50,13 @@ def main(args):
 
     debug_print(u'Locale is [{0}]'.format(QLocale().name()))
 
+    # Application icon
+    icon = QtGui.QIcon()
+    path = ':/data/inselect{0}.png'
+    for size in (16, 24, 32, 48, 64, 128, 256, 512):
+        icon.addFile(path.format(size), QSize(size, size))
+    app.setWindowIcon(icon)
+
     window = MainWindow(app)
     window.show_from_geometry_settings()
 

diff --git a/inselect/gui/icons.py b/inselect/gui/icons.py
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ git pull @@
     * If necesary, bump the version in `inselect/__init__.py`
-    * If the toolbar icons in inselect/data change then you need to refresh a Python
+    * If the icons in inselect/data change then you need to refresh a Python
       file:
     ```
@@ Expand Down @@