diff --git a/images/empty.svg b/images/empty.svg
new file mode 100644
index 00000000..00f0aa24
--- /dev/null
+++ b/images/empty.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/voyager/cmap_a.png b/images/voyager/color_a.png
similarity index 100%
rename from images/voyager/cmap_a.png
rename to images/voyager/color_a.png
diff --git a/images/voyager/cmap_aips0.png b/images/voyager/color_aips0.png
similarity index 100%
rename from images/voyager/cmap_aips0.png
rename to images/voyager/color_aips0.png
diff --git a/images/voyager/cmap_b.png b/images/voyager/color_b.png
similarity index 100%
rename from images/voyager/cmap_b.png
rename to images/voyager/color_b.png
diff --git a/images/voyager/cmap_bb.png b/images/voyager/color_bb.png
similarity index 100%
rename from images/voyager/cmap_bb.png
rename to images/voyager/color_bb.png
diff --git a/images/voyager/cmap_blue.png b/images/voyager/color_blue.png
similarity index 100%
rename from images/voyager/cmap_blue.png
rename to images/voyager/color_blue.png
diff --git a/images/voyager/cmap_color.png b/images/voyager/color_color.png
similarity index 100%
rename from images/voyager/cmap_color.png
rename to images/voyager/color_color.png
diff --git a/images/voyager/cmap_cool.png b/images/voyager/color_cool.png
similarity index 100%
rename from images/voyager/cmap_cool.png
rename to images/voyager/color_cool.png
diff --git a/images/voyager/cmap_green.png b/images/voyager/color_green.png
similarity index 100%
rename from images/voyager/cmap_green.png
rename to images/voyager/color_green.png
diff --git a/images/voyager/cmap_grey.png b/images/voyager/color_grey.png
similarity index 100%
rename from images/voyager/cmap_grey.png
rename to images/voyager/color_grey.png
diff --git a/images/voyager/cmap_he.png b/images/voyager/color_he.png
similarity index 100%
rename from images/voyager/cmap_he.png
rename to images/voyager/color_he.png
diff --git a/images/voyager/cmap_heat.png b/images/voyager/color_heat.png
similarity index 100%
rename from images/voyager/cmap_heat.png
rename to images/voyager/color_heat.png
diff --git a/images/voyager/cmap_hsv.png b/images/voyager/color_hsv.png
similarity index 100%
rename from images/voyager/cmap_hsv.png
rename to images/voyager/color_hsv.png
diff --git a/images/voyager/cmap_i8.png b/images/voyager/color_i8.png
similarity index 100%
rename from images/voyager/cmap_i8.png
rename to images/voyager/color_i8.png
diff --git a/images/voyager/cmap_inferno.png b/images/voyager/color_inferno.png
similarity index 100%
rename from images/voyager/cmap_inferno.png
rename to images/voyager/color_inferno.png
diff --git a/images/voyager/cmap_magma.png b/images/voyager/color_magma.png
similarity index 100%
rename from images/voyager/cmap_magma.png
rename to images/voyager/color_magma.png
diff --git a/images/voyager/cmap_parula.png b/images/voyager/color_parula.png
similarity index 100%
rename from images/voyager/cmap_parula.png
rename to images/voyager/color_parula.png
diff --git a/images/voyager/cmap_plasma.png b/images/voyager/color_plasma.png
similarity index 100%
rename from images/voyager/cmap_plasma.png
rename to images/voyager/color_plasma.png
diff --git a/images/voyager/cmap_rainbow.png b/images/voyager/color_rainbow.png
similarity index 100%
rename from images/voyager/cmap_rainbow.png
rename to images/voyager/color_rainbow.png
diff --git a/images/voyager/cmap_red.png b/images/voyager/color_red.png
similarity index 100%
rename from images/voyager/cmap_red.png
rename to images/voyager/color_red.png
diff --git a/images/voyager/cmap_sls.png b/images/voyager/color_sls.png
similarity index 100%
rename from images/voyager/cmap_sls.png
rename to images/voyager/color_sls.png
diff --git a/images/voyager/cmap_staircase.png b/images/voyager/color_staircase.png
similarity index 100%
rename from images/voyager/cmap_staircase.png
rename to images/voyager/color_staircase.png
diff --git a/images/voyager/cmap_standard.png b/images/voyager/color_standard.png
similarity index 100%
rename from images/voyager/cmap_standard.png
rename to images/voyager/color_standard.png
diff --git a/images/voyager/cmap_turbo.png b/images/voyager/color_turbo.png
similarity index 100%
rename from images/voyager/cmap_turbo.png
rename to images/voyager/color_turbo.png
diff --git a/images/voyager/cmap_viridis.png b/images/voyager/color_viridis.png
similarity index 100%
rename from images/voyager/cmap_viridis.png
rename to images/voyager/color_viridis.png
diff --git a/images/voyager/zoom_zoom.svg b/images/voyager/zoom_zoom.svg
new file mode 100644
index 00000000..4da9d2b1
--- /dev/null
+++ b/images/voyager/zoom_zoom.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/js9-allinone.css b/js9-allinone.css
index c174ae3d..b6b1d5c7 100644
--- a/js9-allinone.css
+++ b/js9-allinone.css
@@ -1662,6 +1662,10 @@ div.JS9MouseTouchHeader, div.JS9MouseTouchFooter {
padding-left: 2px;
}
+.JS9StatusbarImage {
+ white-space:nowrap;
+}
+
.JS9StatusbarItemNoHighlight {
border: 1px solid #D0D0D0;
}
@@ -1669,6 +1673,16 @@ div.JS9MouseTouchHeader, div.JS9MouseTouchFooter {
.JS9StatusbarItemHighlight {
border: 1px solid #B5B5B5;
}
+
+img.JS9StatusbarImageOption[name*="zoom_"]{
+ height: 12px;
+ width: 12px;
+}
+
+img.JS9StatusbarImageOption[name*="color_"]{
+ height: 12px;
+ width: 40px;
+}
div.JS9SeparateContainer {
padding: 2px;
}
diff --git a/js9-allinone.js b/js9-allinone.js
index c66d4adb..9a46e972 100644
--- a/js9-allinone.js
+++ b/js9-allinone.js
@@ -4447,7 +4447,7 @@ maxMemory:2E9,corsURL:"params/loadcors.html",proxyURL:"params/loadproxy.html",lo
color:"green"},imexamLineHeight:1,copyWcsPosFormat:"$ra $dec $sys",floatPrecision:6,mouseActions:["display value/position","change contrast/bias","pan the image"],touchActions:["display value/position","change contrast/bias","pan the image"],keyboardActions:{b:"toggle selected region: source/background",c:"toggle crosshair",d:"send selected region to back",e:"toggle selected region: include/exclude","M-e":"edit selected region",i:"refresh image",I:"display full image","M-i":"display selected cutouts",
"M-k":"toggle keyboard actions plugin",l:"toggle active shape layers","M-l":"new JS9 light window",m:"pan to mouse position","M-m":"toggle mouse/touch plugin","M-o":"open local file",P:"paste regions from local clipboard",p:"paste regions to current position",u:"undo remove of region(s)","M-,":"toggle preferences plugin","M-p":"toggle preferences plugin",r:"copy selected region to clipboard",R:"copy all regions to clipboard",s:"select region",S:"select all regions","M-s":"toggle shape layers plugin",
x:"flip image around x axis",y:"flip image around y axis",9:"rotate image by 90 degrees","/":"copy wcs position to clipboard","?":"copy value and position to clipboard",0:"reset zoom","=":"zoom in","+":"zoom in","-":"zoom out","^":"raise region layer to top",">":"display next image","<":"display previous image","delete":"remove selected region",leftArrow:"move region/position left",upArrow:"move region/position up",rightArrow:"move region/position right",downArrow:"move region/position down"},mousetouchZoom:!1,
-metaClickPan:!0,statusBar:"zoom: $zoom; scale: $scale/$scaleclipping($scalemin,$scalemax); color: $colormap($contrast,$bias); wcs: $wcssys($wcsunits)",toolbarTooltips:!1,centerDivs:["JS9Menubar"],resizeDivs:["JS9Menubar","JS9Colorbar","JS9Toolbar","JS9Statusbar"],pinchWait:8,pinchThresh:6,xeqPlugins:!0,extendedPlugins:!0,intensivePlugins:!1,dynamicSelect:"click",dynamicHighlight:!0,corsProxy:"https://js9.si.edu/cgi-bin/CORS-proxy.cgi",simbadProxy:"https://js9.si.edu/cgi-bin/simbad-proxy.cgi",catalogs:{ras:["RA",
+metaClickPan:!0,statusBar:"$img(images/voyager/zoom_1.svg) $zoom; $scale($scaleclipping); $img(images/voyager/color_$colormap.png) $colormap; $wcssys",toolbarTooltips:!1,centerDivs:["JS9Menubar"],resizeDivs:["JS9Menubar","JS9Colorbar","JS9Toolbar","JS9Statusbar"],pinchWait:8,pinchThresh:6,xeqPlugins:!0,extendedPlugins:!0,intensivePlugins:!1,dynamicSelect:"click",dynamicHighlight:!0,corsProxy:"https://js9.si.edu/cgi-bin/CORS-proxy.cgi",simbadProxy:"https://js9.si.edu/cgi-bin/simbad-proxy.cgi",catalogs:{ras:["RA",
"_RAJ2000","RAJ2000"],decs:["Dec","_DEJ2000","DEJ2000"],shape:"circle",color:"yellow",width:7,height:7,radius:3.5,r1:5,r2:3.5,wcssys:"ICRS",skip:"#\n",save:!0,tooltip:"$data.ra $data.dec"},topColormaps:"grey heat cool turbo viridis magma sls red green blue".split(" "),infoBox:"file object wcsfov wcscen wcspos impos physpos value regions progress".split(" "),infoBoxResize:!0,menuBar:"file edit view zoom scale color region wcs analysis help".split(" "),menubarStyle:"classic",menuPosition:"right-5 bottom-5",
menuClickEvent:"mouseup",menuSelected:"check",menuImages:!0,userMenus:!1,userMenuDivider:" ",imagesFileSubmenu:5,toolBar:"annulus box circle ellipse line polygon text zoom+ zoom- zoom1 zoomtofit".split(" "),syncOps:"colormap contrastbias flip pan regions rot90 scale wcs zoom".split(" "),syncReciprocate:!0,syncWCS:!0,hiddenPluginDivs:[],separate:{layout:"auto",leftMargin:10,topMargin:10},imageTemplates:".fits,.fts,.png,.jpg,.jpeg,.fz,.ftz",wcsUnits:{FK4:"sexagesimal",FK5:"sexagesimal",
ICRS:"sexagesimal",galactic:"degrees",ecliptic:"degrees",linear:"degrees",physical:"pixels",image:"pixels"},regionTemplates:".reg",sessionTemplates:".ses,.js9ses",colormapTemplates:".cmap",catalogTemplates:".cat,.tab",localTemplates:".fits,.fts",controlsMatchRegion:!1,internalColorPicker:!0,newWindowWidth:530,newWindowHeight:625,debug:0};a.desktopOpts={currentPath:!0,sessionPath:!0};a.imageOpts={inherit:!1,contrast:1,bias:.5,invert:!1,exp:1E3,colormap:"grey",scale:"linear",scaleclipping:"dataminmax",
@@ -11295,7 +11295,6 @@ JS9.RegisterPlugin(JS9.Mef.CLASS, JS9.Mef.NAME, JS9.Mef.init,
winResize: true,
winDims: [JS9.Mef.WIDTH, JS9.Mef.HEIGHT]});
-
/*
* JS9 menubar to manage menubar and its menus
*/
@@ -13265,7 +13264,7 @@ JS9.Menubar.createMenus = function(){
s1 = JS9.globalOpts.topColormaps[i];
s2 = s1;
if( JS9.globalOpts.menuImages ){
- hstr = ``;
+ hstr = ``;
items[s1] = {name: hstr, isHtmlName: true};
} else {
items[s1] = xname(s2);
@@ -13288,7 +13287,7 @@ JS9.Menubar.createMenus = function(){
if( !JS9.globalOpts.topColormaps.includes(s1) ){
s2 = s1;
if( JS9.globalOpts.menuImages ){
- hstr = ``;
+ hstr = ``;
items.morecmaps.items[s1] = {name: hstr, isHtmlName: true};
} else {
items.morecmaps.items[s1] = xname(s2);
@@ -13525,7 +13524,7 @@ JS9.Menubar.createMenus = function(){
if( JS9.globalOpts.menuImages ){
for(i=0; i
` + ` ${s2}
` + ` ${s2}
` + ` ${reg}`,
+ items[reg] = {name: `