updated resources

brendanwong · Sep 18, 2017 · 1b72fa2 · 1b72fa2
1 parent 993c944
commit 1b72fa2
Show file tree

Hide file tree

Showing 67 changed files with 21 additions and 9,604 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/gcg-gui.pro.user b/gcg-gui.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.3.1, 2017-09-16T04:49:20. -->
+<!-- Written by QtCreator 4.3.1, 2017-09-18T12:51:48. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

diff --git a/pageone.cpp b/pageone.cpp
@@ -142,19 +142,19 @@ void PageOne::templateTab(QTabWidget *tabWidget)
 
     //paths to be changed once icons are finalized
     buildCustomTemplate(firstRowLayout, "Custom" ,
-                        "/Users/brendanwong/Documents/Qt projects/gcg-gui/temp resources/custom-template.png");
+                        "://resources/custom-template.png");
 
     buildTemplateItem(firstRowLayout, "Row Print" ,
-                      "/Users/brendanwong/Documents/Qt projects/gcg-gui/temp resources/template-1.png", SLOT(onRowTemplateClicked()));
+                      "://resources/template-1.png", SLOT(onRowTemplateClicked()));
     buildTemplateItem(firstRowLayout, "3x3 Petri Dish" ,
-                      "/Users/brendanwong/Documents/Qt projects/gcg-gui/temp resources/template-2.png", SLOT(gridPetriClicked()));
+                      "://resources/template-2.png", SLOT(gridPetriClicked()));
 
     buildTemplateItem(secondRowLayout, "3x3 Well Plate" ,
-                      "/Users/brendanwong/Documents/Qt projects/gcg-gui/temp resources/template-3.png", SLOT(gridPlateClicked()));
+                      "://resources/template-3.png", SLOT(gridPlateClicked()));
     buildTemplateItem(secondRowLayout, "Well Plate Column" ,
-                      "/Users/brendanwong/Documents/Qt projects/gcg-gui/temp resources/template-4.png", SLOT(wellPlateColumnClicked()));
+                      "://resources/template-4.png", SLOT(wellPlateColumnClicked()));
     buildTemplateItem(secondRowLayout, "Fill Well Plate" ,
-                      "/Users/brendanwong/Documents/Qt projects/gcg-gui/temp resources/template-5.png", SLOT(fillWellClicked()));
+                      "://resources/template5.png", SLOT(fillWellClicked()));
 
     //put together each row
     QVBoxLayout *vlayout = new QVBoxLayout;
@@ -305,14 +305,14 @@ void PageOne::positionHoverSlot()
 
     if(petriRadio->isChecked())
     {
-        QPixmap icon("://temp resources/petri-template.png");
+        QPixmap icon("://resources/petri-template.png");
         icon.setDevicePixelRatio(devicePixelRatio());
         positionGraphic->setPixmap(icon.scaled(200, 200, Qt::KeepAspectRatio, Qt::SmoothTransformation));
     }
 
     if(wellPlateRadio->isChecked())
     {
-        QPixmap icon("://temp resources/well-plate-template.png");
+        QPixmap icon("://resources/well-plate-template.png");
         icon.setDevicePixelRatio(devicePixelRatio());
         positionGraphic->setPixmap(icon.scaled(200, 200, Qt::KeepAspectRatio, Qt::SmoothTransformation));
     }

diff --git a/resources.qrc b/resources.qrc
@@ -4,7 +4,14 @@
         <file>Resources/se3d-circle-logo.svg</file>
         <file>resources/rebel-logo-normal.svg</file>
         <file>resources/science-logo.svg</file>
-        <file>temp resources/well-plate-template.png</file>
-        <file>temp resources/petri-template.png</file>
+        <file>resources/eye.svg</file>
+        <file>resources/template-1.png</file>
+        <file>resources/template-2.png</file>
+        <file>resources/template-3.png</file>
+        <file>resources/template-4.png</file>
+        <file>resources/template5.png</file>
+        <file>resources/custom-template.png</file>
+        <file>resources/petri-template.png</file>
+        <file>resources/well-plate-template.png</file>
     </qresource>
 </RCC>
diff --git a/temp resources/.DS_Store → resources/.DS_Store b/temp resources/.DS_Store → resources/.DS_Store
diff --git a/temp resources/custom-template.png → resources/custom-template.png b/temp resources/custom-template.png → resources/custom-template.png
diff --git a/resources/gcg-gui.iconset/icon_128x128.png b/resources/gcg-gui.iconset/icon_128x128.png
diff --git a/resources/gcg-gui.iconset/[email protected] b/resources/gcg-gui.iconset/[email protected]
diff --git a/resources/gcg-gui.iconset/icon_16x16.png b/resources/gcg-gui.iconset/icon_16x16.png
diff --git a/resources/gcg-gui.iconset/[email protected] b/resources/gcg-gui.iconset/[email protected]
diff --git a/resources/gcg-gui.iconset/icon_256x256.png b/resources/gcg-gui.iconset/icon_256x256.png
diff --git a/resources/gcg-gui.iconset/[email protected] b/resources/gcg-gui.iconset/[email protected]
diff --git a/resources/gcg-gui.iconset/icon_32x32.png b/resources/gcg-gui.iconset/icon_32x32.png
diff --git a/resources/gcg-gui.iconset/[email protected] b/resources/gcg-gui.iconset/[email protected]
diff --git a/resources/gcg-gui.iconset/icon_512x512.png b/resources/gcg-gui.iconset/icon_512x512.png
diff --git a/resources/gcg-gui.iconset/[email protected] b/resources/gcg-gui.iconset/[email protected]
diff --git a/resources/icon.icns b/resources/icon.icns
diff --git a/temp resources/petri-template.png → resources/petri-template.png b/temp resources/petri-template.png → resources/petri-template.png
diff --git a/resources/template-1.png b/resources/template-1.png
diff --git a/resources/template-2.png b/resources/template-2.png
diff --git a/resources/template-3.png b/resources/template-3.png
diff --git a/resources/template-4.png b/resources/template-4.png
diff --git a/resources/template5.png b/resources/template5.png
diff --git a/temp resources/well-plate-template.png → resources/well-plate-template.png b/temp resources/well-plate-template.png → resources/well-plate-template.png
diff --git a/temp resources/SE3D Logos/.DS_Store b/temp resources/SE3D Logos/.DS_Store
diff --git a/temp resources/SE3D Logos/Icons and logo.ai b/temp resources/SE3D Logos/Icons and logo.ai
diff --git a/temp resources/SE3D Logos/Icons and logo.svg b/temp resources/SE3D Logos/Icons and logo.svg
diff --git a/temp resources/SE3D Logos/r3bel2.ai b/temp resources/SE3D Logos/r3bel2.ai
diff --git a/temp resources/SE3D Logos/se3d_large.jpg b/temp resources/SE3D Logos/se3d_large.jpg
diff --git a/temp resources/SE3D Logos/se3d_largeweb.gif b/temp resources/SE3D Logos/se3d_largeweb.gif
diff --git a/temp resources/SE3D Logos/se3d_small.jpg b/temp resources/SE3D Logos/se3d_small.jpg
diff --git a/temp resources/SE3D Logos/se3d_worklogo.ai b/temp resources/SE3D Logos/se3d_worklogo.ai
diff --git a/temp resources/bed.png b/temp resources/bed.png
diff --git a/temp resources/old template pics/.DS_Store b/temp resources/old template pics/.DS_Store
diff --git a/temp resources/old template pics/raws/.DS_Store b/temp resources/old template pics/raws/.DS_Store
diff --git a/temp resources/old template pics/raws/template-1.png b/temp resources/old template pics/raws/template-1.png
diff --git a/temp resources/old template pics/raws/template-2.png b/temp resources/old template pics/raws/template-2.png
diff --git a/temp resources/old template pics/raws/template-3.png b/temp resources/old template pics/raws/template-3.png
diff --git a/temp resources/old template pics/raws/template-4.png b/temp resources/old template pics/raws/template-4.png
diff --git a/temp resources/old template pics/raws/template-5.png b/temp resources/old template pics/raws/template-5.png
diff --git a/temp resources/old template pics/ss/.DS_Store b/temp resources/old template pics/ss/.DS_Store
diff --git a/temp resources/old template pics/ss/template-1.png b/temp resources/old template pics/ss/template-1.png
diff --git a/temp resources/old template pics/ss/template-2.png b/temp resources/old template pics/ss/template-2.png
diff --git a/temp resources/old template pics/ss/template-3.png b/temp resources/old template pics/ss/template-3.png
diff --git a/temp resources/old template pics/ss/template-4.png b/temp resources/old template pics/ss/template-4.png
diff --git a/temp resources/old template pics/ss/template-5.png b/temp resources/old template pics/ss/template-5.png
diff --git a/temp resources/oliver logos/.DS_Store b/temp resources/oliver logos/.DS_Store
diff --git a/temp resources/oliver logos/3x3-petri-big.svg b/temp resources/oliver logos/3x3-petri-big.svg
diff --git a/temp resources/oliver logos/3x3-petri-medium.svg b/temp resources/oliver logos/3x3-petri-medium.svg