Merge remote-tracking branch 'upstream/master'

Author: jessdtate

src/Interface/Application/NetworkEditor.cc

@@ -712,15 +712,16 @@ void NetworkEditor::mouseReleaseEvent(QMouseEvent *event)
 
 void NetworkEditor::mouseDoubleClickEvent(QMouseEvent* event)
 {
+#if 0
   if (!search_)
   {
     search_ = scene_->addWidget(new NetworkSearchWidget(this));
     search_->setOpacity(0.9);
   }
   search_->setPos(mapToScene(event->pos()));
   search_->setVisible(true);
-
-  QGraphicsView::mouseDoubleClickEvent(event);
+#endif
+  QGraphicsView::mouseDoubleClickEvent(event);  
 }
 
 void NetworkEditor::hideSearchBox()

src/Interface/Application/scirun5.qrc

@@ -32,9 +32,9 @@
     <file>Resources/copy.png</file>
     <file>Resources/paste.png</file>
     <file>Resources/download.png</file>
-    <file>Resources/cubic.png</file>
-    <file>Resources/euclidean.png</file>
-    <file>Resources/manhattan.png</file>
+    <file>Resources/cubic.PNG</file>
+    <file>Resources/euclidean.PNG</file>
+    <file>Resources/manhattan.PNG</file>
     <file>Resources/timepiece-512.png</file>
     <file>Resources/new/general/folder.png</file>
     <file>Resources/new/general/header-divider.png</file>