Merge pull request #313 from NaturalHistoryMuseum/feature/210-ui-over…

…haul Feature/210 ui overhaul
NaturalHistoryMuseum · May 20, 2016 · a22262d · a22262d
2 parents 985473d + 83bc4f4
commit a22262d
Show file tree

Hide file tree

Showing 61 changed files with 5,062 additions and 290 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@ Version 0.1.31
 -------------
 - Fixed #307 - Test performance
 - Fixed #305 - Remove references to 'scanned image'
+- Fixed #210 - Improve UI design
 
 Version 0.1.30
 -------------

diff --git a/build.sh b/build.sh
@@ -44,8 +44,8 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
     # Add a few items to the PropertyList file generated by PyInstaller
     python -m bin.plist dist/inselect.app/Contents/Info.plist
     # Example document
-    install -c -m 644 data/Plecoptera_Accession_Drawer_4.jpg dist/
-    install -c -m 644 data/Plecoptera_Accession_Drawer_4.inselect dist/
+    install -c -m 644 examples/Plecoptera_Accession_Drawer_4.jpg dist/
+    install -c -m 644 examples/Plecoptera_Accession_Drawer_4.inselect dist/
     # Remove the directory containing the console app (the windowed app is in inselect.app)
     rm -rf dist/inselect
     rm -rf inselect-$VERSION.dmg

diff --git a/data/barcode_icon.png b/data/barcode_icon.png
diff --git a/data/segment_icon.png b/data/segment_icon.png
diff --git a/data/subsegment_icon.png b/data/subsegment_icon.png