Merge pull request getavalon#11 from pypeclub/feature/PYPE-310_launch…

…er_update Feature/pype 310 launcher update
tokejepsen · May 7, 2019 · 397146e · 397146e
2 parents 09ed7be + 56f12c5
commit 397146e
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 14 deletions.
diff --git a/launcher/app.py b/launcher/app.py
@@ -40,8 +40,8 @@ def __init__(self, root, source):
         install()
 
         terminal.init()
-        app_root = os.environ['PYPE_APP_ROOT'].replace('\\', '/')
-        res_path = "file:///{}/resources/".format(app_root)
+        app_root = os.path.dirname(__file__).replace('\\', '/')
+        res_path = "file:///{}/res/".format(app_root)
 
         controller = control.Controller(root, self)
         engine.rootContext().setContextProperty("controller", controller)

diff --git a/launcher/launcher_widget.py b/launcher/launcher_widget.py
@@ -39,8 +39,8 @@ def __init__(self, root, source):
         install()
 
         terminal.init()
-        app_root = os.environ['PYPE_APP_ROOT'].replace('\\', '/')
-        res_path = "file:///{}/resources/".format(app_root)
+        app_root = os.path.dirname(__file__).replace('\\', '/')
+        res_path = "file:///{}/res/".format(app_root)
 
         controller = control.Controller(root, self)
         engine.rootContext().setContextProperty("controller", controller)

diff --git a/launcher/res/action_icons/clockify-white.png b/launcher/res/action_icons/clockify-white.png
diff --git a/launcher/res/action_icons/clockify.png b/launcher/res/action_icons/clockify.png
diff --git a/launcher/res/action_icons/houdini.png b/launcher/res/action_icons/houdini.png
diff --git a/launcher/res/action_icons/maya.png b/launcher/res/action_icons/maya.png
diff --git a/launcher/res/action_icons/nuke.png b/launcher/res/action_icons/nuke.png
diff --git a/launcher/res/action_icons/premiere.png b/launcher/res/action_icons/premiere.png
diff --git a/launcher/res/action_icons/python.png b/launcher/res/action_icons/python.png
diff --git a/launcher/res/qml/Breadcrumbs.qml b/launcher/res/qml/Breadcrumbs.qml
@@ -15,7 +15,7 @@ Item {
                 name: "home"
                 size: 18
             }
-
+            background: Item { }  // Hide background
             height: parent.height
             width: parent.height
             onClicked: controller.pop(-1)

diff --git a/launcher/res/qml/MyButton.qml b/launcher/res/qml/MyButton.qml
@@ -5,15 +5,15 @@ import QtQuick.Controls 2.0
 Button {
     id: control
 
-    property var icon: "adjust"
+    property var cust_icon: "adjust"
 
 	background: Rectangle {
         color: "transparent"
     }
 
     AwesomeIcon {
         anchors.fill: parent
-        name: control.icon
+        name: control.cust_icon
         opacity: !control.checkable ? 1.0 : control.checked ? 1.0 : 0.4
     }
 }
diff --git a/launcher/res/qml/icons.js b/launcher/res/qml/icons.js
@@ -1,8 +1,8 @@
 .pragma library
 
 var map = {
-    "nuke_icon": "icons/nuke.png",
-    "maya_icon": "icons/maya.png",
-    "houdini_icon": "icons/houdini.png",
-    "python_icon": "icons/python.png",
+    "nuke_icon": "action_icons/nuke.png",
+    "maya_icon": "action_icons/maya.png",
+    "houdini_icon": "action_icons/houdini.png",
+    "python_icon": "action_icons/python.png",
 }
diff --git a/launcher/res/qml/main.qml b/launcher/res/qml/main.qml
@@ -87,7 +87,7 @@ ApplicationWindow {
                     id: launchExplorerButton
                     implicitWidth: parent.height
                     implicitHeight: parent.height
-                    icon: "folder-open"
+                    cust_icon: "folder-open"
                     Layout.alignment: Qt.AlignLeft
 
                     onClicked: controller.launch_explorer()
@@ -99,7 +99,7 @@ ApplicationWindow {
                  */
                 MyButton {
                     id: terminalButton
-                    icon: "terminal"
+                    cust_icon: "terminal"
                     checkable: true
                     implicitHeight: parent.height
                     implicitWidth: parent.height
@@ -115,7 +115,7 @@ ApplicationWindow {
                     implicitWidth: parent.height
                     implicitHeight: parent.height
                     checkable: true
-                    icon: "adjust"
+                    cust_icon: "adjust"
                     Layout.alignment: Qt.AlignRight
                 }
             }