11.2.0 release

ChangeLog

@@ -1,3 +1,7 @@
+20-AUG-2019: 11.2.0
+
+- Adds ruler and units
+
 19-AUG-2019: 11.1.5
 
 - Fixes ignored background for multipage PDF export

VERSION

@@ -1 +1 @@
-11.1.5
+11.2.0

src/main/webapp/cache.manifest

@@ -1,7 +1,7 @@
 CACHE MANIFEST
 
 # THIS FILE WAS GENERATED. DO NOT MODIFY!
-# 08/19/2019 05:05 PM
+# 08/20/2019 05:20 PM
 
 app.html
 index.html?offline=1

src/main/webapp/export3.html

@@ -48,13 +48,16 @@
 			{
 				extras = JSON.parse(data.extras);
 			} 
-			catch(e)
+			catch (e)
 			{
 				try 
 				{
 					extras = JSON.parse(decodeURIComponent(data.extras));
 				}
-				catch(e){}
+				catch (e)
+				{
+					// ignore
+				}
 			}
 
 			var gridColor = null;

src/main/webapp/index.html

@@ -105,7 +105,7 @@
 				else if (!mxIsElectron5)
 				{
 					// It's electron, but v3 or lower
-					window.location.href = 'https://github.com/jgraph/drawio-desktop/releases';
+					window.location.href = 'https://about.draw.io/updates-to-draw-io-desktop/';
 				}
 			})();
 		}

src/main/webapp/js/diagramly/EditorUi.js

@@ -1799,8 +1799,7 @@
 			bg = '#ffffff';
 		}
 		
-		var extras = {};
-		extras.globalVars = graph.getExportVariables();
+		var extras = {globalVars: graph.getExportVariables()};
 		
 		if (grid)
 		{
@@ -1808,7 +1807,7 @@
 				size: graph.gridSize,
 				steps: graph.view.gridSteps,
 				color: graph.view.gridColor
-			}
+			};
 		}		
 		
 		return new mxXmlRequest(EXPORT_URL, 'format=' + format + range + allPages +
@@ -8721,11 +8720,18 @@
 			}));
 		}
 		
-		//Add ruler with url only
-		if (urlParams['ruler'] == '1' && typeof mxRuler !== 'undefined')
+		//Adding mxRuler to editor
+		var view = this.editor.graph.view;
+		
+		view.setUnit(mxSettings.getUnit());
+		
+		view.addListener('unitChanged', function(sender, evt)
 		{
-			this.ruler = new mxDualRuler(this, this.editor.graph.view.unit);
-		}
+			mxSettings.setUnit(evt.getProperty('unit'));
+			mxSettings.save();		
+		});
+		
+		this.ruler = mxSettings.isRulerOn()? new mxDualRuler(this, view.unit) : null;
 		
 		// Adds an element to edit the style in the footer in test mode
 		if (urlParams['styledev'] == '1')
@@ -12230,9 +12236,7 @@
 					}
 					else 
 					{
-						var extras = {
-							globalVars: graph.getExportVariables()
-						};
+						var extras = {globalVars: graph.getExportVariables()};
 						
 						editorUi.saveRequest(name, format,
 							function(newTitle, base64)

src/main/webapp/js/diagramly/Menus.js

@@ -131,6 +131,53 @@
 
 			editorUi.showDialog(dlg.container, 620, 440, true, true);
 		})).isEnabled = isGraphEnabled;
+		
+		var pointAction = editorUi.actions.addAction('points', function()
+		{
+			editorUi.editor.graph.view.setUnit(mxConstants.POINTS);
+		});
+		
+		pointAction.setToggleAction(true);
+		pointAction.setSelectedCallback(function() { return editorUi.editor.graph.view.unit == mxConstants.POINTS; });
+		
+		var inchAction = editorUi.actions.addAction('inches', function()
+		{
+			editorUi.editor.graph.view.setUnit(mxConstants.INCHES);
+		});
+		
+		inchAction.setToggleAction(true);
+		inchAction.setSelectedCallback(function() { return editorUi.editor.graph.view.unit == mxConstants.INCHES; });
+		
+		var mmAction = editorUi.actions.addAction('millimeters', function()
+		{
+			editorUi.editor.graph.view.setUnit(mxConstants.MILLIMETERS);
+		});
+		
+		mmAction.setToggleAction(true);
+		mmAction.setSelectedCallback(function() { return editorUi.editor.graph.view.unit == mxConstants.MILLIMETERS; });
+
+		this.put('units', new Menu(mxUtils.bind(this, function(menu, parent)
+		{
+			this.addMenuItems(menu, ['points', /*'inches',*/ 'millimeters'], parent);
+		})));
+		
+		var rulerAction = editorUi.actions.addAction('ruler', function()
+		{
+			mxSettings.setRulerOn(!mxSettings.isRulerOn());
+			mxSettings.save();
+			
+			if (editorUi.ruler != null)
+			{
+				editorUi.ruler.destroy();
+				editorUi.ruler = null;
+			}
+			else
+			{
+				editorUi.ruler = new mxDualRuler(editorUi, editorUi.editor.graph.view.unit);
+			}
+		});
+		rulerAction.setToggleAction(true);
+		rulerAction.setSelectedCallback(function() { return editorUi.ruler != null; });
 
 		if (window.mxFreehand)
 		{
@@ -2952,31 +2999,10 @@
 				}
 			}
 			
-			this.addMenuItems(menu, ['shapes', '-', 'pageView', 'pageScale', '-',
-			                         'scrollbars', 'tooltips', '-',
-			                         'grid', 'guides'], parent);
-			
-			if (urlParams['ruler'] == '1')
-			{
-				mxResources.parse('ruler=Ruler');
-				
-				var rulerAction = editorUi.actions.addAction('ruler', function()
-				{
-					if (editorUi.ruler != null)
-					{
-						editorUi.ruler.destroy();
-						editorUi.ruler = null;
-					}
-					else
-					{
-						editorUi.ruler = new mxDualRuler(editorUi, editorUi.editor.graph.view.unit);
-					}
-				});
-				rulerAction.setToggleAction(true);
-				rulerAction.setSelectedCallback(function() { return editorUi.ruler != null; });
-						
-				this.addMenuItem(menu, 'ruler', parent);
-			}
+			this.addMenuItems(menu, ['shapes', '-', 'pageView', 'pageScale']);
+			this.addSubmenu('units', menu, parent);				
+			this.addMenuItems(menu, ['-', 'scrollbars', 'tooltips', 'ruler', '-',
+                'grid', 'guides'], parent);
 			
 			if (mxClient.IS_SVG && (document.documentMode == null || document.documentMode > 9))
 			{

src/main/webapp/js/diagramly/Minimal.js

@@ -854,8 +854,9 @@ EditorUi.initMinimalTheme = function()
 				ui.menus.addSubmenu('language', menu, parent);
 			}
 			
+			ui.menus.addSubmenu('units', menu, parent);
 			menu.addSeparator(parent);
-			ui.menus.addMenuItems(menu, ['scrollbars', 'tooltips'], parent);
+			ui.menus.addMenuItems(menu, ['scrollbars', 'tooltips', 'ruler'], parent);
             
 			if (urlParams['embed'] != '1' && (isLocalStorage || mxClient.IS_CHROMEAPP))
 			{

src/main/webapp/js/diagramly/Settings.js

@@ -160,6 +160,22 @@ var mxSettings =
 	{
 		mxSettings.settings.pageFormat = value;
 	},
+	getUnit: function()
+	{
+		return mxSettings.settings.unit || mxConstants.POINTS;
+	},
+	setUnit: function(value)
+	{
+		mxSettings.settings.unit = value;
+	},
+	isRulerOn: function()
+	{
+		return mxSettings.settings.isRulerOn;
+	},
+	setRulerOn: function(value)
+	{
+		mxSettings.settings.isRulerOn = value;
+	},
 	init: function()
 	{
 		mxSettings.settings = 
@@ -182,7 +198,9 @@ var mxSettings =
 			openCounter: 0,
 			version: mxSettings.currentVersion,
 			// Only defined and true for new settings which haven't been saved
-			isNew: true
+			isNew: true,
+			unit: mxConstants.POINTS,
+			isRulerOn: false
 		};
 	},
 	save: function()

src/main/webapp/js/diagramly/mxRuler.js

@@ -22,10 +22,21 @@ function mxRuler(editorUi, unit, isVertical, isSecondery)
 	var RULER_THIKNESS = 30;
     var ruler = this;
     this.unit = unit;
+    var style = window.uiTheme == 'dark'? {
+    	bkgClr: '#2a2a2a',
+    	strokeClr: '#BBBBBB',
+    	fontClr: '#BBBBBB',
+    	guideClr: '#0088cf'
+    } : {
+    	bkgClr: 'whiteSmoke',
+    	strokeClr: '#BBBBBB',
+    	fontClr: '#BBBBBB',
+    	guideClr: '#0000BB'
+    };
     //create the container
     var container = document.createElement('div');
     container.style.position = 'absolute';
-    container.style.background = 'whiteSmoke';
+    container.style.background = style.bkgClr;
 	document.body.appendChild(container);
 	mxEvent.disableContextMenu(container);
     	
@@ -69,6 +80,7 @@ function mxRuler(editorUi, unit, isVertical, isSecondery)
 		}
 	};
 
+	editorUi.refresh(true);
 	resizeRulerContainer();
     	
     var canvas = document.createElement("canvas");
@@ -78,8 +90,8 @@ function mxRuler(editorUi, unit, isVertical, isSecondery)
     container.style.overflow = 'hidden';
     canvas.style.position = "relative";
     container.appendChild(canvas);
-    //Disable alpha to improve performance as we don't need it
-    var ctx = canvas.getContext("2d", window.uiTheme == 'dark'? {alpha: false} : null);
+    //Disable alpha to improve performance as we don't need it?
+    var ctx = canvas.getContext('2d');
     this.ui = editorUi;
     var graph = editorUi.editor.graph;
     this.graph = graph;
@@ -132,11 +144,11 @@ function mxRuler(editorUi, unit, isVertical, isSecondery)
     	
         ctx.beginPath();
         ctx.lineWidth = 0.7;
-        ctx.strokeStyle = "#BBBBBB";
+        ctx.strokeStyle = style.strokeClr;
         ctx.setLineDash([]);
         ctx.font = "9px Arial";
-        ctx.fillStyle = '#BBBBBB';
-
+        ctx.fillStyle = style.fontClr;
+        
         ctx.beginPath();
         ctx.moveTo(0, 0);
         ctx.lineTo(RULER_THIKNESS, RULER_THIKNESS);
@@ -175,14 +187,14 @@ function mxRuler(editorUi, unit, isVertical, isSecondery)
 
         switch(ruler.unit) 
         {
-            case mxConstants.PIXELS:
+            case mxConstants.POINTS:
                 len = 10;
                 tickStep = 10;
                 tickSize = [25,5,5,5,5,10,5,5,5,5];
                 break;
-            case mxConstants.CENTIMETERS:
+            case mxConstants.MILLIMETERS:
                 len = 10;
-                tickStep = mxConstants.PIXELS_PER_CM / len;
+                tickStep = mxConstants.PIXELS_PER_MM;
                 tickSize = [25,5,5,5,5,10,5,5,5,5];
                 break;
             case mxConstants.INCHES:
@@ -199,11 +211,22 @@ function mxRuler(editorUi, unit, isVertical, isSecondery)
         var step = tickStep;
         
         if (ruler.unit != mxConstants.INCHES || (scale > 2 || scale < 0.25))
-            step = scale>= 1 ? (tickStep / Math.floor(scale)) : Math.floor(10 / scale / 10) * 10;
-
+        {
+            step = scale >= 1 ? tickStep / scale : Math.floor(10 / scale / 10) * 10;
+        }
+        
+        var lastTick = null;
+            
         for (var i = RULER_THIKNESS + rStart % (step * scale); i <= (isVertical? canvas.height : canvas.width); i += step * scale) 
         {
             var current = Math.round((i - rStart) / scale / step);
+            
+            if (current == lastTick)
+        	{
+            	continue;
+        	}
+            
+            lastTick = current;
             var text = null;
             
             if (current % len == 0) 
@@ -292,6 +315,13 @@ function mxRuler(editorUi, unit, isVertical, isSecondery)
         };
     };
     
+    this.setStyle = function(newStyle)
+    {
+    	style = newStyle;
+    	container.style.background = style.bkgClr;
+    	drawRuler();
+    }
+    
     //Showing guides on cell move
     this.origGuideMove = mxGuide.prototype.move;
 	
@@ -299,37 +329,61 @@ function mxRuler(editorUi, unit, isVertical, isSecondery)
 	{
 		if (ruler.guidePart != null)
 		{
-			ctx.putImageData(ruler.guidePart.imgData, ruler.guidePart.x, ruler.guidePart.y);	
+			ctx.putImageData(ruler.guidePart.imgData1, ruler.guidePart.x1, ruler.guidePart.y1);	
+			ctx.putImageData(ruler.guidePart.imgData2, ruler.guidePart.x2, ruler.guidePart.y2);	
+			ctx.putImageData(ruler.guidePart.imgData3, ruler.guidePart.x3, ruler.guidePart.y3);	
 		}
 		
 		var ret = ruler.origGuideMove.apply(this, arguments);
 
-		var x, y, imgData;
+		var x1, y1, imgData1, x2, y2, imgData2, x3, y3, imgData3;
 		ctx.lineWidth = 0.5;
-        ctx.strokeStyle = "#0000BB";
+        ctx.strokeStyle = style.guideClr;
         ctx.setLineDash([2]);
 
         if (isVertical)
 		{
-			y = bounds.y + ret.y + RULER_THIKNESS - this.graph.container.scrollTop;
-			x = 0;
-			imgData = ctx.getImageData(x, y, RULER_THIKNESS, 5);
-			drawLine(x, y, RULER_THIKNESS, y);
+			y1 = bounds.y + ret.y + RULER_THIKNESS - this.graph.container.scrollTop;
+			x1 = 0;
+			y2 = y1 + bounds.height / 2;
+			x2 = RULER_THIKNESS / 2;
+			y3 = y1 + bounds.height;
+			x3 = 0;
+			imgData1 = ctx.getImageData(x1, y1, RULER_THIKNESS, 5);
+			drawLine(x1, y1, RULER_THIKNESS, y1);
+			imgData2 = ctx.getImageData(x2, y2, RULER_THIKNESS, 5);
+			drawLine(x2, y2, RULER_THIKNESS, y2);
+			imgData3 = ctx.getImageData(x3, y3, RULER_THIKNESS, 5);
+			drawLine(x3, y3, RULER_THIKNESS, y3);
 		}
 		else
 		{
-			var y = 0;
-			var x = bounds.x + ret.x + RULER_THIKNESS - this.graph.container.scrollLeft;
-			imgData = ctx.getImageData(x , y, 5, RULER_THIKNESS);
-			drawLine(x, y, x, RULER_THIKNESS);
+			y1 = 0;
+			x1 = bounds.x + ret.x + RULER_THIKNESS - this.graph.container.scrollLeft;
+			y2 = RULER_THIKNESS / 2;
+			x2 = x1 + bounds.width / 2;
+			y3 = 0;
+			x3 = x1 + bounds.width;
+			imgData1 = ctx.getImageData(x1 , y1, 5, RULER_THIKNESS);
+			drawLine(x1, y1, x1, RULER_THIKNESS);
+			imgData2 = ctx.getImageData(x2 , y2, 5, RULER_THIKNESS);
+			drawLine(x2, y2, x2, RULER_THIKNESS);
+			imgData3 = ctx.getImageData(x3 , y3, 5, RULER_THIKNESS);
+			drawLine(x3, y3, x3, RULER_THIKNESS);
 		}
 		
-		if (ruler.guidePart == null || ruler.guidePart.x != x || ruler.guidePart.y != y)
+		if (ruler.guidePart == null || ruler.guidePart.x1 != x1 || ruler.guidePart.y1 != y1)
 		{
 			ruler.guidePart = { 
-				imgData: imgData,
-				x: x,
-				y: y
+				imgData1: imgData1,
+				x1: x1,
+				y1: y1,
+				imgData2: imgData2,
+				x2: x2,
+				y2: y2,
+				imgData3: imgData3,
+				x3: x3,
+				y3: y3
 			}	
 		}
 		
@@ -344,17 +398,17 @@ function mxRuler(editorUi, unit, isVertical, isSecondery)
 		
 		if (ruler.guidePart != null)
 		{
-			ctx.putImageData(ruler.guidePart.imgData, ruler.guidePart.x, ruler.guidePart.y);	
+			ctx.putImageData(ruler.guidePart.imgData1, ruler.guidePart.x1, ruler.guidePart.y1);	
+			ctx.putImageData(ruler.guidePart.imgData2, ruler.guidePart.x2, ruler.guidePart.y2);	
+			ctx.putImageData(ruler.guidePart.imgData3, ruler.guidePart.x3, ruler.guidePart.y3);
+			ruler.guidePart = null;
 		}
 		
 		return ret;
 	};
-	
-	drawRuler();
-	editorUi.refresh(true);
 };
 
-mxRuler.prototype.unit = mxConstants.PIXELS;
+mxRuler.prototype.unit = mxConstants.POINTS;
 
 mxRuler.prototype.setUnit = function(unit) 
 {
@@ -366,10 +420,10 @@ mxRuler.prototype.formatText = function(pixels)
 {
     switch(this.unit) 
     {
-        case mxConstants.PIXELS:
+        case mxConstants.POINTS:
             return Math.round(pixels);
-        case mxConstants.CENTIMETERS:
-            return (pixels / mxConstants.PIXELS_PER_CM).toFixed(2);
+        case mxConstants.MILLIMETERS:
+            return (pixels / mxConstants.PIXELS_PER_MM).toFixed(1);
         case mxConstants.INCHES:
             return (pixels / mxConstants.PIXELS_PER_INCH).toFixed(2);
     }
@@ -402,6 +456,9 @@ function mxDualRuler(editorUi, unit)
 	
 	this.vRuler = new mxRuler(editorUi, unit, true);
 	this.hRuler = new mxRuler(editorUi, unit, false, true);
+	
+	this.vRuler.drawRuler();
+	this.hRuler.drawRuler();
 };
 
 mxDualRuler.prototype.setUnit = function(unit) 
@@ -410,6 +467,12 @@ mxDualRuler.prototype.setUnit = function(unit)
 	this.hRuler.setUnit(unit);
 };
 
+mxDualRuler.prototype.setStyle = function(newStyle)
+{
+	this.vRuler.setStyle(newStyle);
+	this.hRuler.setStyle(newStyle);
+}
+
 mxDualRuler.prototype.destroy = function() 
 {
 	this.vRuler.destroy();

src/main/webapp/js/mxgraph/Actions.js

@@ -65,7 +65,7 @@ Actions.prototype.init = function()
 	}).isEnabled = isGraphEnabled;
 	this.addAction('save', function() { ui.saveFile(false); }, null, null, Editor.ctrlKey + '+S').isEnabled = isGraphEnabled;
 	this.addAction('saveAs...', function() { ui.saveFile(true); }, null, null, Editor.ctrlKey + '+Shift+S').isEnabled = isGraphEnabled;
-	this.addAction('export...', function() { ui.showDialog(new ExportDialog(ui).container, 300, 260, true, true); });
+	this.addAction('export...', function() { ui.showDialog(new ExportDialog(ui).container, 300, 296, true, true); });
 	this.addAction('editDiagram...', function()
 	{
 		var dlg = new EditDiagramDialog(ui);

src/main/webapp/js/mxgraph/Dialogs.js

@@ -1080,7 +1080,7 @@ var ExportDialog = function(editorUi)
 	
 	td = document.createElement('td');
 	td.style.fontSize = '10pt';
-	mxUtils.write(td, mxResources.get('dpi', null, 'DPI') + ':');
+	mxUtils.write(td, mxResources.get('dpi') + ':');
 	
 	row.appendChild(td);
 	

src/main/webapp/js/mxgraph/Editor.js

@@ -1429,27 +1429,6 @@ var PageSetupDialog = function(editorUi)
 	row.appendChild(td);
 	tbody.appendChild(row);
 	
-	if (urlParams['ruler'] == '1')
-	{
-		row = document.createElement('tr');
-		
-		td = document.createElement('td');
-		td.style.verticalAlign = 'top';
-		td.style.fontSize = '10pt';
-		mxUtils.write(td, mxResources.get('unit', null, 'Unit') + ':');
-		
-		row.appendChild(td);
-		
-		td = document.createElement('td');
-		td.style.verticalAlign = 'top';
-		td.style.fontSize = '10pt';
-		
-		var unitSelect = PageSetupDialog.addUnitPanel(td, graph.view.unit);
-		
-		row.appendChild(td);
-		tbody.appendChild(row);
-	}
-	
 	row = document.createElement('tr');
 	
 	td = document.createElement('td');
@@ -1960,9 +1939,9 @@ PageSetupDialog.addUnitPanel = function(div, unit, unitListener)
 
 PageSetupDialog.getUnits = function()
 {
-	return [{key: 'pixel', title: 'Pixel', unit: mxConstants.PIXELS},
+	return [{key: 'point', title: 'Point', unit: mxConstants.POINTS},
 	        {key: 'inch', title: 'Inch', unit: mxConstants.INCHES},
-	        {key: 'cm', title: 'CM', unit: mxConstants.CENTIMETERS}];
+	        {key: 'mm', title: 'MM', unit: mxConstants.MILLIMETERS}];
 };
 
 /**

src/main/webapp/js/mxgraph/Format.js

@@ -1909,58 +1909,58 @@ ArrangePanel.prototype.addAngle = function(div)
 	return div;
 };
 
-ArrangePanel.prototype.getUnit = function()
+BaseFormatPanel.prototype.getUnit = function()
 {
 	var unit = this.editorUi.editor.graph.view.unit;
 	
 	switch(unit)
 	{
-		case mxConstants.PIXELS:
+		case mxConstants.POINTS:
 			return 'pt';
 		case mxConstants.INCHES:
 			return '"';
-		case mxConstants.CENTIMETERS:
-			return 'cm';
+		case mxConstants.MILLIMETERS:
+			return 'mm';
 	}
 };
 
-ArrangePanel.prototype.inUnit = function(pixels)
+BaseFormatPanel.prototype.inUnit = function(pixels)
 {
 	return this.editorUi.editor.graph.view.formatUnitText(pixels);
 };
 
-ArrangePanel.prototype.fromUnit = function(value)
+BaseFormatPanel.prototype.fromUnit = function(value)
 {
 	var unit = this.editorUi.editor.graph.view.unit;
 	
 	switch(unit)
 	{
-		case mxConstants.PIXELS:
+		case mxConstants.POINTS:
 			return value;
 		case mxConstants.INCHES:
 			return value * mxConstants.PIXELS_PER_INCH;
-		case mxConstants.CENTIMETERS:
-			return value * mxConstants.PIXELS_PER_CM;
+		case mxConstants.MILLIMETERS:
+			return value * mxConstants.PIXELS_PER_MM;
 	}
 };
 
-ArrangePanel.prototype.isFloatUnit = function()
+BaseFormatPanel.prototype.isFloatUnit = function()
 {
-	return this.editorUi.editor.graph.view.unit != mxConstants.PIXELS;
+	return this.editorUi.editor.graph.view.unit != mxConstants.POINTS;
 };
 
-ArrangePanel.prototype.getUnitStep = function()
+BaseFormatPanel.prototype.getUnitStep = function()
 {
 	var unit = this.editorUi.editor.graph.view.unit;
 	
 	switch(unit)
 	{
-		case mxConstants.PIXELS:
+		case mxConstants.POINTS:
 			return 1;
 		case mxConstants.INCHES:
 			return 0.1;
-		case mxConstants.CENTIMETERS:
-			return 0.1;
+		case mxConstants.MILLIMETERS:
+			return 0.5;
 	}
 };
 
@@ -5513,6 +5513,7 @@ DiagramFormatPanel.prototype.addOptions = function(div)
  */
 DiagramFormatPanel.prototype.addGridOption = function(container)
 {
+	var fPanel = this;
 	var ui = this.editorUi;
 	var graph = ui.editor.graph;
 	
@@ -5520,9 +5521,9 @@ DiagramFormatPanel.prototype.addGridOption = function(container)
 	input.style.position = 'absolute';
 	input.style.textAlign = 'right';
 	input.style.width = '38px';
-	input.value = graph.getGridSize() + ' pt';
+	input.value = this.inUnit(graph.getGridSize()) + ' ' + this.getUnit(); 
 	
-	var stepper = this.createStepper(input, update);
+	var stepper = this.createStepper(input, update, this.getUnitStep(), null, null, null, this.isFloatUnit());
 	input.style.display = (graph.isGridEnabled()) ? '' : 'none';
 	stepper.style.display = input.style.display;
 
@@ -5543,21 +5544,30 @@ DiagramFormatPanel.prototype.addGridOption = function(container)
 	
 	function update(evt)
 	{
-		var value = parseInt(input.value);
-		value = Math.max(1, (isNaN(value)) ? 10 : value);
+		var value = fPanel.isFloatUnit()? parseFloat(input.value) : parseInt(input.value);
+		value = fPanel.fromUnit(Math.max(fPanel.inUnit(1), (isNaN(value)) ? fPanel.inUnit(10) : value));
 		
 		if (value != graph.getGridSize())
 		{
 			graph.setGridSize(value)
 		}
 
-		input.value = value + ' pt';
+		input.value = fPanel.inUnit(value) + ' ' + fPanel.getUnit();
 		mxEvent.consume(evt);
 	};
 
 	mxEvent.addListener(input, 'blur', update);
 	mxEvent.addListener(input, 'change', update);
 	
+	var unitChangeListener = function(sender, evt)
+	{
+		input.value = fPanel.inUnit(graph.getGridSize()) + ' ' + fPanel.getUnit();
+		fPanel.format.refresh();
+	};
+	
+	graph.view.addListener('unitChanged', unitChangeListener);
+	this.listeners.push({destroy: function() { graph.view.removeListener(unitChangeListener); }});
+	
 	if (mxClient.IS_SVG)
 	{
 		input.style.marginTop = '-2px';
@@ -5711,24 +5721,6 @@ DiagramFormatPanel.prototype.addPaperSize = function(div)
 	graph.getModel().addListener(mxEvent.CHANGE, listener);
 	this.listeners.push({destroy: function() { graph.getModel().removeListener(listener); }});
 	
-	if (urlParams['ruler'] == '1')
-	{
-		div.appendChild(this.createTitle(mxResources.get('unit', null, 'Unit')));
-		
-		var unitSelect = PageSetupDialog.addUnitPanel(div, graph.view.unit, function(unit)
-		{
-			graph.view.setUnit(unit);
-		});
-		
-		var unitChangeListener = function(sender, evt)
-		{
-			unitSelect.value = evt.getProperty('unit');
-		};
-		
-		graph.view.addListener('unitChanged', unitChangeListener);
-		this.listeners.push({destroy: function() { graph.view.removeListener(unitChangeListener); }});
-	}
-	
 	return div;
 };
 

src/main/webapp/js/mxgraph/Graph.js

@@ -55,6 +55,18 @@ if (!Date.now)
 }
 
 // Changes default colors
+/**
+ * Measurements Units
+ */
+mxConstants.POINTS = 1;
+mxConstants.MILLIMETERS = 2;
+mxConstants.INCHES = 3;
+/**
+ * This ratio is with page scale 1
+ */
+mxConstants.PIXELS_PER_MM = 3.937;
+mxConstants.PIXELS_PER_INCH = 100;
+
 mxConstants.SHADOW_OPACITY = 0.25;
 mxConstants.SHADOWCOLOR = '#000000';
 mxConstants.VML_SHADOWCOLOR = '#d0d0d0';
@@ -96,7 +108,7 @@ mxGraphView.prototype.minGridSize = 4;
 mxGraphView.prototype.gridColor = '#e0e0e0';
 
 //Units
-mxGraphView.prototype.unit = mxConstants.PIXELS;
+mxGraphView.prototype.unit = mxConstants.POINTS;
 
 mxGraphView.prototype.setUnit = function(unit) 
 {
@@ -7735,10 +7747,10 @@ if (typeof mxVertexHandler != 'undefined')
 		{
 		    switch(unit) 
 		    {
-		        case mxConstants.PIXELS:
+		        case mxConstants.POINTS:
 		            return pixels;
-		        case mxConstants.CENTIMETERS:
-		            return (pixels / mxConstants.PIXELS_PER_CM).toFixed(2);
+		        case mxConstants.MILLIMETERS:
+		            return (pixels / mxConstants.PIXELS_PER_MM).toFixed(1);
 		        case mxConstants.INCHES:
 		            return (pixels / mxConstants.PIXELS_PER_INCH).toFixed(2);
 		    }

src/main/webapp/mxgraph/css/common.css

@@ -29,7 +29,8 @@ div.mxWindow {
 	-webkit-box-shadow: 3px 3px 12px #C0C0C0;
 	-moz-box-shadow: 3px 3px 12px #C0C0C0;
 	box-shadow: 3px 3px 12px #C0C0C0;
-	background: url('../images/window.gif');
+	background: url(data:image/gif;base64,R0lGODlhGgAUAIAAAOzs7PDw8CH5BAAAAAAALAAAAAAaABQAAAIijI+py70Ao5y02lud3lzhD4ZUR5aPiKajyZbqq7YyB9dhAQA7);
+	_background: url('../images/window.gif');
 	border:1px solid #c3c3c3;
 	position: absolute;
 	overflow: hidden;
@@ -42,7 +43,8 @@ table.mxWindow {
 	font-size: 8pt;
 }
 td.mxWindowTitle {
-	background: url('../images/window-title.gif') repeat-x;
+	background: url(data:image/gif;base64,R0lGODlhFwAXAMQAANfX18rKyuHh4c7OzsDAwMHBwc/Pz+Li4uTk5NHR0dvb2+jo6O/v79/f3/n5+dnZ2dbW1uPj44yMjNPT0+Dg4N3d3ebm5szMzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAAAXABcAAAWQICESxWiW5Ck6bOu+MMvMdG3f86LvfO/rlqBwSCwaj8ikUohoOp/QaDNCrVqvWKpgezhsv+AwmEIum89ocmPNbrvf64p8Tq/b5Yq8fs/v5x+AgYKDhIAAh4iJiouHEI6PkJGSjhOVlpeYmZUJnJ2en6CcBqMDpaanqKgXq6ytrq+rAbKztLW2shK5uru8vbkhADs=)  repeat-x;
+	_background: url('../images/window-title.gif') repeat-x;
 	text-overflow: ellipsis;
 	white-space: nowrap;
  	text-align: center;
@@ -75,7 +77,8 @@ td.mxWindowPane input, td.mxWindowPane select, td.mxWindowPane textarea, td.mxWi
  	padding: 1px;
 }
 td.mxWindowPane button {
-	background: url('../images/button.gif') repeat-x;
+	background: url(data:image/gif;base64,R0lGODlhCgATALMAAP7+/t7e3vj4+Ojo6OXl5e/v7/n5+fb29vPz8/39/e3t7fHx8e7u7v///wAAAAAAACH5BAAAAAAALAAAAAAKABMAAAQ2MMlJhb0Y6c2X/2AhjiRjnqiirizqMkEsz0Rt30Ou7y8K/ouDcEg0GI9IgHLJbDif0Kh06owAADs=) repeat-x;
+	_background: url('../images/button.gif') repeat-x;
   	font-family: Arial;
   	font-size: 8pt;
   	padding: 2px;
@@ -126,7 +129,8 @@ div.mxPopupMenu {
 	-webkit-box-shadow: 3px 3px 12px #C0C0C0;
 	-moz-box-shadow: 3px 3px 12px #C0C0C0;
 	box-shadow: 3px 3px 12px #C0C0C0;
-	background: url('../images/window.gif');
+	background: url(data:image/gif;base64,R0lGODlhGgAUAIAAAOzs7PDw8CH5BAAAAAAALAAAAAAaABQAAAIijI+py70Ao5y02lud3lzhD4ZUR5aPiKajyZbqq7YyB9dhAQA7);
+	_background: url('../images/window.gif');
 	position: absolute;
 	border-style: solid;
 	border-width: 1px;

src/main/webapp/plugins/p1.js

@@ -46,8 +46,7 @@ Draw.loadPlugin(function(ui) {
 	
 	Graph.prototype.getExportVariables = function()
 	{
-		var vars = graphGetExportVariables;
-		
+		var vars = graphGetExportVariables.apply(this, arguments);
 		var file = ui.getCurrentFile();
 		
 		vars['today'] = new Date().toLocaleString();

src/main/webapp/resources/dia.txt

@@ -182,6 +182,7 @@ download=Download
 downloadDesktop=Download draw.io Desktop
 downloadAs=Download as
 clickHereToSave=Click here to save.
+dpi=DPI
 draftDiscarded=Draft discarded
 draftSaved=Draft saved
 dragElementsHere=Drag elements here
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_am.txt

@@ -182,6 +182,7 @@ download=Download
 downloadDesktop=Download draw.io Desktop
 downloadAs=Download as
 clickHereToSave=Click here to save.
+dpi=DPI
 draftDiscarded=Draft discarded
 draftSaved=Draft saved
 dragElementsHere=Drag elements here
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_ar.txt

@@ -182,6 +182,7 @@ download=‫تحميل‬
 downloadDesktop=Download draw.io Desktop
 downloadAs=‫تحميل ك‬
 clickHereToSave=Click here to save.
+dpi=DPI
 draftDiscarded=Draft discarded
 draftSaved=Draft saved
 dragElementsHere=Drag elements here
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_bg.txt

@@ -182,6 +182,7 @@ download=Изтегляне
 downloadDesktop=Download draw.io Desktop
 downloadAs=Изтегляне като
 clickHereToSave=Кликнете тук за запазване
+dpi=DPI
 draftDiscarded=Черновата е отказана
 draftSaved=Черновата е запазена
 dragElementsHere=Плъзнете елементи тук
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_bn.txt

@@ -182,6 +182,7 @@ download=Download
 downloadDesktop=Download draw.io Desktop
 downloadAs=Download as
 clickHereToSave=Click here to save.
+dpi=DPI
 draftDiscarded=Draft discarded
 draftSaved=Draft saved
 dragElementsHere=Drag elements here
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_bs.txt

@@ -182,6 +182,7 @@ download=Preuzmi
 downloadDesktop=Download draw.io Desktop
 downloadAs=Preuzmi kao
 clickHereToSave=Kliknite ovdje kako biste spasili.
+dpi=DPI
 draftDiscarded=Nacrt odbačen
 draftSaved=Nacrt spašen
 dragElementsHere=Povucite elemente ovdje
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_ca.txt

@@ -182,6 +182,7 @@ download=Descarregar
 downloadDesktop=Download draw.io Desktop
 downloadAs=Descarregar com
 clickHereToSave=Clica aquí per desar.
+dpi=DPI
 draftDiscarded=Esborrany descartat
 draftSaved=Esborrany desat
 dragElementsHere=Arrossega elements aquí
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_cs.txt

@@ -182,6 +182,7 @@ download=Stáhnout
 downloadDesktop=Download draw.io Desktop
 downloadAs=Stáhnout jako
 clickHereToSave=Uložíte klepnutím zde.
+dpi=DPI
 draftDiscarded=Koncept zahozen
 draftSaved=Koncept uložen
 dragElementsHere=Přetáhněte prvky sem
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_da.txt

@@ -182,6 +182,7 @@ download=Download
 downloadDesktop=Download draw.io Desktop
 downloadAs=Download som
 clickHereToSave=Klik her for at gemme
+dpi=DPI
 draftDiscarded=Udkast annulleret
 draftSaved=Udkast gemt
 dragElementsHere=Træk elementer hertil
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_de.txt

@@ -182,6 +182,7 @@ download=Herunterladen
 downloadDesktop=draw.io Desktop herunterladen
 downloadAs=Herunterladen als
 clickHereToSave=Hier klicken um zu speichern.
+dpi=DPI
 draftDiscarded=Entwurf gelöscht
 draftSaved=Entwurf gespeichert
 dragElementsHere=Elemente hierher ziehen
@@ -940,4 +941,9 @@ officePopupInfo=Bitte fahren Sie im Popup Fenster fort.
 pickODFile=OneDrive Datei auswählen
 pickGDriveFile=Google Drive Datei auswählen
 pickDeviceFile=Gerätedatei auswählen
-vsdNoConfig="vsdurl" is not configured
+vsdNoConfig="vsdurl" nicht konfiguriert
+ruler=Lineal
+units=Einheiten
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_el.txt

@@ -182,6 +182,7 @@ download=Λήψη
 downloadDesktop=Download draw.io Desktop
 downloadAs=Λήψη ως
 clickHereToSave=Πατήστε εδώ για αποθήκευση
+dpi=DPI
 draftDiscarded=Το σχέδιο απορρίφθηκε
 draftSaved=Το σχέδιο αποθηκεύτηκε
 dragElementsHere=Σύρετε τα στοιχεία εδώ
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_eo.txt

@@ -182,6 +182,7 @@ download=Elŝuti
 downloadDesktop=Download draw.io Desktop
 downloadAs=Elŝuti kiel
 clickHereToSave=Click here to save.
+dpi=DPI
 draftDiscarded=Draft discarded
 draftSaved=Draft saved
 dragElementsHere=Drag elements here
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_es.txt

@@ -182,6 +182,7 @@ download=Descargar
 downloadDesktop=Download draw.io Desktop
 downloadAs=Descargar como
 clickHereToSave=Haga clic aquí para guardar.
+dpi=DPI
 draftDiscarded=Borrador descartado
 draftSaved=Borrador guardado
 dragElementsHere=Arrastrar elementos aquí
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_et.txt

@@ -182,6 +182,7 @@ download=Lae alla
 downloadDesktop=Lae draw.io töölaua programmina
 downloadAs=Lae alla nimega
 clickHereToSave=Kliki siia salvestamiseks
+dpi=DPI
 draftDiscarded=Mustand tühistatud
 draftSaved=Mustand salvestatud
 dragElementsHere=Pukseeri elemendid siia
@@ -941,3 +942,8 @@ pickODFile=Vali OneDrive fail
 pickGDriveFile=Vali Google Drive fail
 pickDeviceFile=Vali fail seadmelt
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_fa.txt

@@ -182,6 +182,7 @@ download=‫دانلود‬
 downloadDesktop=Download draw.io Desktop
 downloadAs=‫دانلود به‌صورت‬
 clickHereToSave=‫برای ذخیره اینجا کلیک نمایید.‬
+dpi=DPI
 draftDiscarded=‫پیش‌نویس باطل شد‬
 draftSaved=‫پیش‌نویس ذخیره شد‬
 dragElementsHere=‫اِلِمان‌ها را اینجا بیندازید‬
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_fi.txt

@@ -182,6 +182,7 @@ download=Lataa
 downloadDesktop=Download draw.io Desktop
 downloadAs=Lataa nimellä
 clickHereToSave=Klikkaa tästä tallentaaksesi.
+dpi=DPI
 draftDiscarded=Vedos hylätty
 draftSaved=Vedos tallennettu
 dragElementsHere=Vedä elementit tähän
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_fil.txt

@@ -182,6 +182,7 @@ download=I-download
 downloadDesktop=Download draw.io Desktop
 downloadAs=I-download bilang
 clickHereToSave=Pindutin dito para i-save
+dpi=DPI
 draftDiscarded=Naisantabi ang draft
 draftSaved=Nai-save ang draft
 dragElementsHere=Hilahin ang mga elemento dito
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_fr.txt

@@ -182,6 +182,7 @@ download=Télécharger
 downloadDesktop=Download draw.io Desktop
 downloadAs=Télécharger en tant que
 clickHereToSave=Cliquer ici pour sauvegarder
+dpi=DPI
 draftDiscarded=Brouillon abandonné
 draftSaved=Brouillon enregistré
 dragElementsHere=Glisser des éléments ici
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_gu.txt

@@ -182,6 +182,7 @@ download=Download
 downloadDesktop=Download draw.io Desktop
 downloadAs=Download as
 clickHereToSave=Click here to save.
+dpi=DPI
 draftDiscarded=Draft discarded
 draftSaved=Draft saved
 dragElementsHere=Drag elements here
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_he.txt

@@ -182,6 +182,7 @@ download=‫הורד‬
 downloadDesktop=Download draw.io Desktop
 downloadAs=‫הורד בתור‬
 clickHereToSave=‫לחץ כאן כדי לשמור‬
+dpi=DPI
 draftDiscarded=‫הטיוטה נמחקה‬
 draftSaved=‫הטיוטה נשמרה‬
 dragElementsHere=‫גרור רכיבים לכאן‬
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_hi.txt

@@ -182,6 +182,7 @@ download=Download
 downloadDesktop=Download draw.io Desktop
 downloadAs=Download as
 clickHereToSave=Click here to save.
+dpi=DPI
 draftDiscarded=Draft discarded
 draftSaved=Draft saved
 dragElementsHere=Drag elements here
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_hr.txt

@@ -182,6 +182,7 @@ download=Download
 downloadDesktop=Download draw.io Desktop
 downloadAs=Download as
 clickHereToSave=Click here to save.
+dpi=DPI
 draftDiscarded=Draft discarded
 draftSaved=Draft saved
 dragElementsHere=Drag elements here
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_hu.txt

@@ -182,6 +182,7 @@ download=Letölt
 downloadDesktop=Download draw.io Desktop
 downloadAs=Letölt mint
 clickHereToSave=Kattints ide mentéshez
+dpi=DPI
 draftDiscarded=Vázlat elvetve
 draftSaved=Vázlat mentve
 dragElementsHere=Elemeket ide húzni
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_i18n.txt

@@ -182,6 +182,7 @@ download=download
 downloadDesktop=downloadDesktop
 downloadAs=downloadAs
 clickHereToSave=clickHereToSave
+dpi=dpi
 draftDiscarded=draftDiscarded
 draftSaved=draftSaved
 dragElementsHere=dragElementsHere
@@ -941,3 +942,8 @@ pickODFile=pickODFile
 pickGDriveFile=pickGDriveFile
 pickDeviceFile=pickDeviceFile
 vsdNoConfig=vsdNoConfig
+ruler=ruler
+units=units
+points=points
+inches=inches
+millimeters=millimeters

src/main/webapp/resources/dia_id.txt

@@ -182,6 +182,7 @@ download=Unduh
 downloadDesktop=Download draw.io Desktop
 downloadAs=Unduh sebagai
 clickHereToSave=Klik di sini untuk menyimpan.
+dpi=DPI
 draftDiscarded=Draf dibuang
 draftSaved=Draf disimpan
 dragElementsHere=Seret elemen ke arah ini
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_it.txt

@@ -182,6 +182,7 @@ download=Scarica
 downloadDesktop=Download draw.io Desktop
 downloadAs=Scarica come
 clickHereToSave=Clicca qui per salvare.
+dpi=DPI
 draftDiscarded=Bozza scartata
 draftSaved=Bozza salvata
 dragElementsHere=Trascina qui gli elementi
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_ja.txt

@@ -182,6 +182,7 @@ download=ダウンロードする
 downloadDesktop=Download draw.io Desktop
 downloadAs=という形式でダウンロードする
 clickHereToSave=ここをクリックして保存してください
+dpi=DPI
 draftDiscarded=ドラフトは廃棄されました
 draftSaved=ドラフトは保存されました
 dragElementsHere=内容をここにドラッグする
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_kn.txt

@@ -182,6 +182,7 @@ download=Download
 downloadDesktop=Download draw.io Desktop
 downloadAs=Download as
 clickHereToSave=Click here to save.
+dpi=DPI
 draftDiscarded=Draft discarded
 draftSaved=Draft saved
 dragElementsHere=Drag elements here
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_ko.txt

@@ -182,6 +182,7 @@ download=다운로드
 downloadDesktop=Download draw.io Desktop
 downloadAs=다른 파일 형식으로 다운로드
 clickHereToSave=저장하시려면 여기를 클릭해 주시기 바랍니다.
+dpi=DPI
 draftDiscarded=임시저장 삭제
 draftSaved=임시저장
 dragElementsHere=요소들을 여기로 드래그해 주시기 바랍니다.
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_lt.txt

@@ -182,6 +182,7 @@ download=Download
 downloadDesktop=Download draw.io Desktop
 downloadAs=Download as
 clickHereToSave=Click here to save.
+dpi=DPI
 draftDiscarded=Draft discarded
 draftSaved=Draft saved
 dragElementsHere=Drag elements here
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_lv.txt

@@ -182,6 +182,7 @@ download=Download
 downloadDesktop=Download draw.io Desktop
 downloadAs=Download as
 clickHereToSave=Click here to save.
+dpi=DPI
 draftDiscarded=Draft discarded
 draftSaved=Draft saved
 dragElementsHere=Drag elements here
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_ml.txt

@@ -182,6 +182,7 @@ download=Download
 downloadDesktop=Download draw.io Desktop
 downloadAs=Download as
 clickHereToSave=Click here to save.
+dpi=DPI
 draftDiscarded=Draft discarded
 draftSaved=Draft saved
 dragElementsHere=Drag elements here
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_mr.txt

@@ -182,6 +182,7 @@ download=Download
 downloadDesktop=Download draw.io Desktop
 downloadAs=Download as
 clickHereToSave=Click here to save.
+dpi=DPI
 draftDiscarded=Draft discarded
 draftSaved=Draft saved
 dragElementsHere=Drag elements here
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_ms.txt

@@ -182,6 +182,7 @@ download=Muat turun
 downloadDesktop=Download draw.io Desktop
 downloadAs=Muat turun sebagai
 clickHereToSave=Klik di sini untuk menyimpan.
+dpi=DPI
 draftDiscarded=Draf dibuang.
 draftSaved=Draf disimpan.
 dragElementsHere=Seret elemen ke sini
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_nl.txt

@@ -182,6 +182,7 @@ download=Downloaden
 downloadDesktop=draw.io Bureaublad-app downloaden
 downloadAs=Downloaden als
 clickHereToSave=Klik hier om op te slaan.
+dpi=DPI
 draftDiscarded=Concept genegeerd
 draftSaved=Concept opgeslagen
 dragElementsHere=Sleep elementen hierheen
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_no.txt

@@ -182,6 +182,7 @@ download=Last ned
 downloadDesktop=Download draw.io Desktop
 downloadAs=Last ned som
 clickHereToSave=Klikk her for å lagre.
+dpi=DPI
 draftDiscarded=Utkast forkastet
 draftSaved=Utkast lagret
 dragElementsHere=Dra elementene hit
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_pl.txt

@@ -182,6 +182,7 @@ download=Pobierz
 downloadDesktop=Download draw.io Desktop
 downloadAs=Pobierz jako
 clickHereToSave=Kliknij tutaj, aby zapisać
+dpi=DPI
 draftDiscarded=Wersja robocza została odrzucona
 draftSaved=Wersja robocza została zapisana
 dragElementsHere=Przeciągnij elementy tutaj
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_pt-br.txt

@@ -182,6 +182,7 @@ download=Baixar
 downloadDesktop=Download draw.io Desktop
 downloadAs=Baixar como
 clickHereToSave=Clique aqui para salvar.
+dpi=DPI
 draftDiscarded=Rascunho descartado
 draftSaved=Rascunho salvo
 dragElementsHere=Arraste elementos aqui
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_pt.txt

@@ -182,6 +182,7 @@ download=Descarregar
 downloadDesktop=Download draw.io Desktop
 downloadAs=Descarregar como
 clickHereToSave=Carregar aqui para salvar.
+dpi=DPI
 draftDiscarded=Projeto descartado.
 draftSaved=Projeto salvo
 dragElementsHere=Arraste elementos aqui
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_ro.txt

@@ -182,6 +182,7 @@ download=Descarcă
 downloadDesktop=Download draw.io Desktop
 downloadAs=Descarcă ca şi
 clickHereToSave=Apasă aici pentru a salva.
+dpi=DPI
 draftDiscarded=Schiță inlăturată.
 draftSaved=Schiță salvată.
 dragElementsHere=Trage elementele aici.
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_ru.txt

@@ -182,6 +182,7 @@ download=Загрузить
 downloadDesktop=Загрузить Draw.io Desktop
 downloadAs=Загрузить как
 clickHereToSave=Щелкните здесь, чтобы сохранить.
+dpi=DPI
 draftDiscarded=Черновик удален
 draftSaved=Черновик сохранен
 dragElementsHere=Перетащите сюда элементы
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_sk.txt

@@ -182,6 +182,7 @@ download=Download
 downloadDesktop=Download draw.io Desktop
 downloadAs=Download as
 clickHereToSave=Click here to save.
+dpi=DPI
 draftDiscarded=Draft discarded
 draftSaved=Draft saved
 dragElementsHere=Drag elements here
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_sl.txt

@@ -182,6 +182,7 @@ download=Download
 downloadDesktop=Download draw.io Desktop
 downloadAs=Download as
 clickHereToSave=Click here to save.
+dpi=DPI
 draftDiscarded=Draft discarded
 draftSaved=Draft saved
 dragElementsHere=Drag elements here
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_sr.txt

@@ -182,6 +182,7 @@ download=Download
 downloadDesktop=Download draw.io Desktop
 downloadAs=Sačuvaj kao
 clickHereToSave=Klikni ovde za snimanje
+dpi=DPI
 draftDiscarded=Nacrt je odbačen
 draftSaved=Nacrt je sačuvan
 dragElementsHere=Prevuci elemente ovde
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_sv.txt

@@ -182,6 +182,7 @@ download=Ladda ner
 downloadDesktop=Download draw.io Desktop
 downloadAs=Ladda ner som
 clickHereToSave=Klicka här för att spara.
+dpi=DPI
 draftDiscarded=Utkast raderat
 draftSaved=Utkast sparat
 dragElementsHere=Dra hit element
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_sw.txt

@@ -182,6 +182,7 @@ download=Download
 downloadDesktop=Download draw.io Desktop
 downloadAs=Download as
 clickHereToSave=Click here to save.
+dpi=DPI
 draftDiscarded=Draft discarded
 draftSaved=Draft saved
 dragElementsHere=Drag elements here
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_ta.txt

@@ -182,6 +182,7 @@ download=Download
 downloadDesktop=Download draw.io Desktop
 downloadAs=Download as
 clickHereToSave=Click here to save.
+dpi=DPI
 draftDiscarded=Draft discarded
 draftSaved=Draft saved
 dragElementsHere=Drag elements here
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_te.txt

@@ -182,6 +182,7 @@ download=Download
 downloadDesktop=Download draw.io Desktop
 downloadAs=Download as
 clickHereToSave=Click here to save.
+dpi=DPI
 draftDiscarded=Draft discarded
 draftSaved=Draft saved
 dragElementsHere=Drag elements here
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_th.txt

@@ -182,6 +182,7 @@ download=ดาวน์โหลด
 downloadDesktop=Download draw.io Desktop
 downloadAs=ดาวน์โหลดเป็น
 clickHereToSave=คลิกที่นี่เพื่อบันทึก
+dpi=DPI
 draftDiscarded=ยกเลิกร่าง
 draftSaved=บันทึกร่างแล้ว
 dragElementsHere=ลากองค์ประกอบที่นี่
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_tr.txt

@@ -182,6 +182,7 @@ download=İndir
 downloadDesktop=Download draw.io Desktop
 downloadAs=Farklı indir
 clickHereToSave=Kaydetmek için burayı tıklayınız
+dpi=DPI
 draftDiscarded=Taslak yoksayıldı
 draftSaved=Taslak kaydedildi
 dragElementsHere=Ögeleri buraya sürükle
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_uk.txt

@@ -182,6 +182,7 @@ download=Скачати
 downloadDesktop=Download draw.io Desktop
 downloadAs=Скачати як
 clickHereToSave=Натисніть тут, щоб зберегти.
+dpi=DPI
 draftDiscarded=Чернетку видалено
 draftSaved=Чернетку збережено
 dragElementsHere=Перетягнути елементи сюди
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_vi.txt

@@ -182,6 +182,7 @@ download=Tải xuống
 downloadDesktop=Download draw.io Desktop
 downloadAs=Tải xuống dưới dạng
 clickHereToSave=Nhấn vào đây để lưu
+dpi=DPI
 draftDiscarded=Bản nháp đã bị loại bỏ
 draftSaved=Bản nháp đã được lưu
 dragElementsHere=Kéo các đối tượng đến đây
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_zh-tw.txt

@@ -182,6 +182,7 @@ download=下載
 downloadDesktop=Download draw.io Desktop
 downloadAs=下載為
 clickHereToSave=點擊此處存檔。
+dpi=DPI
 draftDiscarded=草槁已丟棄
 draftSaved=草槁已儲存
 dragElementsHere=把元件拖到這裏
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters

src/main/webapp/resources/dia_zh.txt

@@ -182,6 +182,7 @@ download=下载
 downloadDesktop=Download draw.io Desktop
 downloadAs=下载为
 clickHereToSave=点击此处保存。
+dpi=DPI
 draftDiscarded=草稿已丢弃
 draftSaved=草稿已保存
 dragElementsHere=把元素拖至此处
@@ -941,3 +942,8 @@ pickODFile=Pick OneDrive File
 pickGDriveFile=Pick Google Drive File
 pickDeviceFile=Pick Device File
 vsdNoConfig="vsdurl" is not configured
+ruler=Ruler
+units=Units
+points=Points
+inches=Inches
+millimeters=Millimeters