rearrange toolbar images to prep for statusbar

freethoughtdesign · Feb 23, 2020 · 889c213 · 889c213
1 parent aad2ddf
commit 889c213
Show file tree

Hide file tree

Showing 36 changed files with 41 additions and 40 deletions.
diff --git a/images/toolbar/svg b/images/toolbar/svg
@@ -0,0 +1 @@
+../voyager
diff --git a/images/toolbar/svg/annulus.svg → images/voyager/annulus.svg b/images/toolbar/svg/annulus.svg → images/voyager/annulus.svg
diff --git a/images/toolbar/svg/box.svg → images/voyager/box.svg b/images/toolbar/svg/box.svg → images/voyager/box.svg
diff --git a/images/toolbar/svg/circle.svg → images/voyager/circle.svg b/images/toolbar/svg/circle.svg → images/voyager/circle.svg
diff --git a/images/voyager/cmap_a.png b/images/voyager/cmap_a.png
diff --git a/images/voyager/cmap_aips0.png b/images/voyager/cmap_aips0.png
diff --git a/images/voyager/cmap_b.png b/images/voyager/cmap_b.png
diff --git a/images/voyager/cmap_bb.png b/images/voyager/cmap_bb.png
diff --git a/images/voyager/cmap_blue.png b/images/voyager/cmap_blue.png
diff --git a/images/voyager/cmap_color.png b/images/voyager/cmap_color.png
diff --git a/images/voyager/cmap_cool.png b/images/voyager/cmap_cool.png
diff --git a/images/voyager/cmap_green.png b/images/voyager/cmap_green.png
diff --git a/images/voyager/cmap_grey.png b/images/voyager/cmap_grey.png
diff --git a/images/voyager/cmap_he.png b/images/voyager/cmap_he.png
diff --git a/images/voyager/cmap_heat.png b/images/voyager/cmap_heat.png
diff --git a/images/voyager/cmap_hsv.png b/images/voyager/cmap_hsv.png
diff --git a/images/voyager/cmap_i8.png b/images/voyager/cmap_i8.png
diff --git a/images/voyager/cmap_inferno.png b/images/voyager/cmap_inferno.png
diff --git a/images/voyager/cmap_magma.png b/images/voyager/cmap_magma.png
diff --git a/images/voyager/cmap_parula.png b/images/voyager/cmap_parula.png
diff --git a/images/voyager/cmap_plasma.png b/images/voyager/cmap_plasma.png
diff --git a/images/voyager/cmap_rainbow.png b/images/voyager/cmap_rainbow.png
diff --git a/images/voyager/cmap_red.png b/images/voyager/cmap_red.png
diff --git a/images/voyager/cmap_sls.png b/images/voyager/cmap_sls.png
diff --git a/images/voyager/cmap_staircase.png b/images/voyager/cmap_staircase.png
diff --git a/images/voyager/cmap_standard.png b/images/voyager/cmap_standard.png
diff --git a/images/voyager/cmap_viridis.png b/images/voyager/cmap_viridis.png
diff --git a/images/toolbar/svg/dot.svg → images/voyager/dot.svg b/images/toolbar/svg/dot.svg → images/voyager/dot.svg
diff --git a/images/toolbar/svg/ellipse.svg → images/voyager/ellipse.svg b/images/toolbar/svg/ellipse.svg → images/voyager/ellipse.svg
diff --git a/images/toolbar/svg/line.svg → images/voyager/line.svg b/images/toolbar/svg/line.svg → images/voyager/line.svg
diff --git a/images/toolbar/svg/polygon.svg → images/voyager/polygon.svg b/images/toolbar/svg/polygon.svg → images/voyager/polygon.svg
diff --git a/images/toolbar/svg/txt.svg → images/voyager/txt.svg b/images/toolbar/svg/txt.svg → images/voyager/txt.svg
diff --git a/js9-allinone.js b/js9-allinone.js
diff --git a/js9plugins.js b/js9plugins.js
@@ -12855,49 +12855,49 @@ JS9.Toolbar.tools = [
   {
     "name": "annulus",
     "tip": "annulus region",
-    "image": "images/toolbar/svg/annulus.svg",
+    "image": "images/toolbar/voyager/annulus.svg",
     "cmd": "AddRegions",
     "args": ["annulus"]
   },
   {
     "name": "box",
     "tip": "box region",
-    "image": "images/toolbar/svg/box.svg",
+    "image": "images/toolbar/voyager/box.svg",
     "cmd": "AddRegions",
     "args": ["box"]
   },
   {
     "name": "circle",
     "tip": "circle region",
-    "image": "images/toolbar/svg/circle.svg",
+    "image": "images/toolbar/voyager/circle.svg",
     "cmd": "AddRegions",
     "args": ["circle"]
   },
   {
     "name": "ellipse",
     "tip": "ellipse region",
-    "image": "images/toolbar/svg/ellipse.svg",
+    "image": "images/toolbar/voyager/ellipse.svg",
     "cmd": "AddRegions",
     "args": ["ellipse"]
   },
   {
     "name": "line",
     "tip": "line region",
-    "image": "images/toolbar/svg/line.svg",
+    "image": "images/toolbar/voyager/line.svg",
     "cmd": "AddRegions",
     "args": ["line"]
   },
   {
     "name": "polygon",
     "tip": "polygon region",
-    "image": "images/toolbar/svg/polygon.svg",
+    "image": "images/toolbar/voyager/polygon.svg",
     "cmd": "AddRegions",
     "args": ["polygon"]
   },
   {
     "name": "text",
     "tip": "text region",
-    "image": "images/toolbar/svg/txt.svg",
+    "image": "images/toolbar/voyager/txt.svg",
     "cmd": "AddRegions",
     "args": ["text"]
   },

diff --git a/js9usermenus.js b/js9usermenus.js
@@ -111,60 +111,60 @@ JS9.globalOpts.userMenuBar = [
     {
 	"name": "colormap",
 	"title": "myColormaps",
-	"imageTitle": "images/toolbar/dax_images/cmap_viridis.png",
+	"imageTitle": "images/voyager/cmap_viridis.png",
 	"updateTitle": "image",
 	"options": [
 	    {
 		"name": "grey",
-		"image": "images/toolbar/dax_images/cmap_grey.png",
+		"image": "images/voyager/cmap_grey.png",
 		"cmd": "SetColormap",
 		"args": ["grey"]
 	    },
 	    {
 		"name": "cool",
-		"image": "images/toolbar/dax_images/cmap_cool.png",
+		"image": "images/voyager/cmap_cool.png",
 		"cmd": "SetColormap",
 		"args": ["cool"]
 	    },
 	    {
 		"name": "heat",
-		"image": "images/toolbar/dax_images/cmap_heat.png",
+		"image": "images/voyager/cmap_heat.png",
 		"cmd": "SetColormap",
 		"args": ["heat"]
 	    },
 	    {
 		"name": "viridis",
-		"image": "images/toolbar/dax_images/cmap_viridis.png",
+		"image": "images/voyager/cmap_viridis.png",
 		"cmd": "SetColormap",
 		"args": ["viridis"]
 	    },
 	    {
 		"name": "magma",
-		"image": "images/toolbar/dax_images/cmap_magma.png",
+		"image": "images/voyager/cmap_magma.png",
 		"cmd": "SetColormap",
 		"args": ["magma"]
 	    },
 	    {
 		"name": "sls",
-		"image": "images/toolbar/dax_images/cmap_sls.png",
+		"image": "images/voyager/cmap_sls.png",
 		"cmd": "SetColormap",
 		"args": ["sls"]
 	    },
 	    {
 		"name": "red",
-		"image": "images/toolbar/dax_images/cmap_red.png",
+		"image": "images/voyager/cmap_red.png",
 		"cmd": "SetColormap",
 		"args": ["red"]
 	    },
 	    {
 		"name": "green",
-		"image": "images/toolbar/dax_images/cmap_green.png",
+		"image": "images/voyager/cmap_green.png",
 		"cmd": "SetColormap",
 		"args": ["green"]
 	    },
 	    {
 		"name": "blue",
-		"image": "images/toolbar/dax_images/cmap_blue.png",
+		"image": "images/voyager/cmap_blue.png",
 		"cmd": "SetColormap",
 		"args": ["blue"]
 	    },
@@ -173,55 +173,55 @@ JS9.globalOpts.userMenuBar = [
     {
 	"name": "regions",
 	"title": "myRegions",
-	"imageTitle": "images/toolbar/svg/circle.svg",
+	"imageTitle": "images/voyager/circle.svg",
 	"updateTitle": "image",
 	"options": [
 	    {
 		"name": "annulus",
 		"cmd": "AddRegions",
-		"image": "images/toolbar/svg/annulus.svg",
+		"image": "images/voyager/annulus.svg",
 		"args": ["annulus"]
 	    },
 	    {
 		"name": "box",
 		"cmd": "AddRegions",
-		"image": "images/toolbar/svg/box.svg",
+		"image": "images/voyager/box.svg",
 		"args": ["box"]
 	    },
 	    {
 		"name": "circle",
 		"cmd": "AddRegions",
-		"image": "images/toolbar/svg/circle.svg",
+		"image": "images/voyager/circle.svg",
 		"args": ["circle"]
 	    },
 	    {
 		"name": "ellipse",
 		"cmd": "AddRegions",
-		"image": "images/toolbar/svg/ellipse.svg",
+		"image": "images/voyager/ellipse.svg",
 		"args": ["ellipse"]
 	    },
 	    {
 		"name": "line",
 		"cmd": "AddRegions",
-		"image": "images/toolbar/svg/line.svg",
+		"image": "images/voyager/line.svg",
 		"args": ["line"]
 	    },
 	    {
 		"name": "point",
 		"cmd": "AddRegions",
-		"image": "images/toolbar/svg/dot.svg",
+		"image": "images/voyager/dot.svg",
 		"args": ["point"]
 	    },
 	    {
 		"name": "polygon",
 		"cmd": "AddRegions",
-		"image": "images/toolbar/svg/polygon.svg",
+		"image": "images/voyager/polygon.svg",
 		"args": ["polygon"]
 	    },
 	    {
 		"name": "text",
 		"cmd": "AddRegions",
-		"image": "images/toolbar/svg/txt.svg",
+		"image": "images/voyager/txt.svg",
 		"args": ["text"]
 	    }
 	]

diff --git a/plugins/core/toolbar.js b/plugins/core/toolbar.js
@@ -75,49 +75,49 @@ JS9.Toolbar.tools = [
   {
     "name": "annulus",
     "tip": "annulus region",
-    "image": "images/toolbar/svg/annulus.svg",
+    "image": "images/toolbar/voyager/annulus.svg",
     "cmd": "AddRegions",
     "args": ["annulus"]
   },
   {
     "name": "box",
     "tip": "box region",
-    "image": "images/toolbar/svg/box.svg",
+    "image": "images/toolbar/voyager/box.svg",
     "cmd": "AddRegions",
     "args": ["box"]
   },
   {
     "name": "circle",
     "tip": "circle region",
-    "image": "images/toolbar/svg/circle.svg",
+    "image": "images/toolbar/voyager/circle.svg",
     "cmd": "AddRegions",
     "args": ["circle"]
   },
   {
     "name": "ellipse",
     "tip": "ellipse region",
-    "image": "images/toolbar/svg/ellipse.svg",
+    "image": "images/toolbar/voyager/ellipse.svg",
     "cmd": "AddRegions",
     "args": ["ellipse"]
   },
   {
     "name": "line",
     "tip": "line region",
-    "image": "images/toolbar/svg/line.svg",
+    "image": "images/toolbar/voyager/line.svg",
     "cmd": "AddRegions",
     "args": ["line"]
   },
   {
     "name": "polygon",
     "tip": "polygon region",
-    "image": "images/toolbar/svg/polygon.svg",
+    "image": "images/toolbar/voyager/polygon.svg",
     "cmd": "AddRegions",
     "args": ["polygon"]
   },
   {
     "name": "text",
     "tip": "text region",
-    "image": "images/toolbar/svg/txt.svg",
+    "image": "images/toolbar/voyager/txt.svg",
     "cmd": "AddRegions",
     "args": ["text"]
   },