From df5a03b447ffb7d404a64c776591b9004ea411d5 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 2 Apr 2015 09:10:47 -0700
Subject: [PATCH] Update script editor to set icons programatically

---
 interface/src/ui/ScriptEditorWindow.cpp |  7 +++++++
 interface/ui/scriptEditorWindow.ui      | 28 +++++++++----------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/interface/src/ui/ScriptEditorWindow.cpp b/interface/src/ui/ScriptEditorWindow.cpp
index 858f26f843..424b649b02 100644
--- a/interface/src/ui/ScriptEditorWindow.cpp
+++ b/interface/src/ui/ScriptEditorWindow.cpp
@@ -30,6 +30,7 @@
 #include "Application.h"
 #include "FlowLayout.h"
 #include "JSConsole.h"
+#include "PathUtils.h"
 
 ScriptEditorWindow::ScriptEditorWindow(QWidget* parent) :
     QWidget(parent),
@@ -40,6 +41,7 @@ ScriptEditorWindow::ScriptEditorWindow(QWidget* parent) :
     setAttribute(Qt::WA_DeleteOnClose);
 
     _ScriptEditorWindowUI->setupUi(this);
+
     this->setWindowFlags(Qt::Tool);
     addScriptEditorWidget("New script");
     connect(_loadMenu, &QMenu::aboutToShow, this, &ScriptEditorWindow::loadMenuAboutToShow);
@@ -54,6 +56,11 @@ ScriptEditorWindow::ScriptEditorWindow(QWidget* parent) :
     connect(new QShortcut(QKeySequence("Ctrl+O"), this), &QShortcut::activated, this, &ScriptEditorWindow::loadScriptClicked);
     connect(new QShortcut(QKeySequence("F5"), this), &QShortcut::activated, this, &ScriptEditorWindow::toggleRunScriptClicked);
 
+    _ScriptEditorWindowUI->loadButton->setIcon(QIcon(QPixmap(PathUtils::resourcesPath() + "icons/load-script.svg")));
+    _ScriptEditorWindowUI->newButton->setIcon(QIcon(QPixmap(PathUtils::resourcesPath() + "icons/new-script.svg")));
+    _ScriptEditorWindowUI->saveButton->setIcon(QIcon(QPixmap(PathUtils::resourcesPath() + "icons/save-script.svg")));
+    _ScriptEditorWindowUI->toggleRunButton->setIcon(QIcon(QPixmap(PathUtils::resourcesPath() + "icons/start-script.svg")));
+
     QWidget* console = new JSConsole(this);
     console->setFixedHeight(CONSOLE_HEIGHT);
     this->layout()->addWidget(console);
diff --git a/interface/ui/scriptEditorWindow.ui b/interface/ui/scriptEditorWindow.ui
index 0379f51e97..1e50aaef0b 100644
--- a/interface/ui/scriptEditorWindow.ui
+++ b/interface/ui/scriptEditorWindow.ui
@@ -29,7 +29,16 @@
    <property name="spacing">
     <number>0</number>
    </property>
-   <property name="margin">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
@@ -54,11 +63,6 @@
        <property name="text">
         <string>New</string>
        </property>
-       <property name="icon">
-        <iconset>
-         <normaloff>../resources/icons/new-script.svg</normaloff>
-         <normalon>../resources/icons/new-script.svg</normalon>../resources/icons/new-script.svg</iconset>
-       </property>
        <property name="iconSize">
         <size>
          <width>32</width>
@@ -87,10 +91,6 @@
        <property name="text">
         <string>Load</string>
        </property>
-       <property name="icon">
-        <iconset>
-         <normaloff>../resources/icons/load-script.svg</normaloff>../resources/icons/load-script.svg</iconset>
-       </property>
        <property name="iconSize">
         <size>
          <width>32</width>
@@ -134,10 +134,6 @@
        <property name="text">
         <string>Save</string>
        </property>
-       <property name="icon">
-        <iconset>
-         <normaloff>../resources/icons/save-script.svg</normaloff>../resources/icons/save-script.svg</iconset>
-       </property>
        <property name="iconSize">
         <size>
          <width>32</width>
@@ -160,10 +156,6 @@
        <property name="text">
         <string>Run/Stop</string>
        </property>
-       <property name="icon">
-        <iconset>
-         <normaloff>../resources/icons/start-script.svg</normaloff>../resources/icons/start-script.svg</iconset>
-       </property>
        <property name="iconSize">
         <size>
          <width>32</width>