8.4.1 release

ChangeLog

@@ -1,3 +1,8 @@
+09-MAR-2018: 8.4.1
+
+- Adds Alt+Shift+T keyboard shortcut to edit tooltips
+- Minor improvements for Gliffy import
+
 08-MAR-2018: 8.4.0
 
 - Uses mxGraph 3.9.2 beta 11

VERSION

@@ -1 +1 @@
-8.4.0
+8.4.1

src/main/java/com/mxgraph/io/gliffy/importer/gliffyTranslation.properties

@@ -324,7 +324,7 @@ com.gliffy.shape.bpmn.bpmn_v1.events.compensation_intermediate=mxgraph.bpmn.shap
 com.gliffy.shape.bpmn.bpmn_v1.events.compensation_end=mxgraph.bpmn.shape;perimeter=ellipsePerimeter;outline=end;symbol=compensation;strokeWidth=1
 com.gliffy.shape.bpmn.bpmn_v1.events.rule_start=mxgraph.bpmn.shape;perimeter=ellipsePerimeter;outline=standard;symbol=conditional;strokeWidth=1
 com.gliffy.shape.bpmn.bpmn_v1.events.rule_intermediate=mxgraph.bpmn.shape;perimeter=ellipsePerimeter;outline=catching;symbol=conditional;strokeWidth=1
-com.gliffy.shape.bpmn.bpmn_v1.events.multiple_start=mxgraph.bpmn.shape;perimeter=ellipsePerimeter;outline=standard;symbol=multiple;strokeWidth=1
+com.gliffy.shape.bpmn.bpmn_v1.events.multiple_start=mxgraph.bpmn.shape;perimeter=ellipsePerimeter;outline=standard;symbol=star;strokeWidth=1
 com.gliffy.shape.bpmn.bpmn_v1.events.multiple_intermediate=mxgraph.bpmn.shape;perimeter=ellipsePerimeter;outline=throwing;symbol=multiple;strokeWidth=1
 com.gliffy.shape.bpmn.bpmn_v1.events.multiple_end=mxgraph.bpmn.shape;perimeter=ellipsePerimeter;outline=end;symbol=multiple;strokeWidth=1
 # BPMN v1 ACTIVITIES
@@ -531,7 +531,7 @@ com.gliffy.shape.android.android_v1.icons.globe=mxgraph.citrix.globe
 com.gliffy.shape.android.android_v1.icons.group=mxgraph.office.users.users
 com.gliffy.shape.android.android_v1.icons.laptop=mxgraph.azure.laptop
 com.gliffy.shape.android.android_v1.icons.location=mxgraph.gmdl.gps
-com.gliffy.shape.android.android_v1.icons.lock=mxgraph.ios7.icons.locked
+com.gliffy.shape.android.android_v1.icons.lock=mxgraph.office.security.lock_protected
 #com.gliffy.shape.android.android_v1.icons.lock_landscape=
 #com.gliffy.shape.android.android_v1.icons.lock_portrait=
 com.gliffy.shape.android.android_v1.icons.mic=mxgraph.ios7.icons.microphone
@@ -540,7 +540,7 @@ com.gliffy.shape.android.android_v1.icons.next=mxgraph.ios7.misc.right
 com.gliffy.shape.android.android_v1.icons.paste=mxgraph.office.concepts.clipboard
 com.gliffy.shape.android.android_v1.icons.person=mxgraph.azure.user
 com.gliffy.shape.android.android_v1.icons.phone=mxgraph.office.devices.cell_phone_android_standalone
-#com.gliffy.shape.android.android_v1.icons.picture=
+com.gliffy.shape.android.android_v1.icons.picture=stencil(pZPBEoIgFEW/hj3BmLlsrNb9AiolI4oDqPX3qWgNKpXjjJt3n4f7Lj4BDlVKSgoQLEhOAT4BhK4s1pVsNdTKqdF2EJq6mdRElTTWRqyJZCTiA6m0FBltWKKHM1iRUsl018VnAI/tO92Dw4jE2V2KqkisxtguSXfCrDG2ZeeP4MOYDGM9rWo69CTUZdG21WfOveoYF4c3IemXHOZCXHY/Uuaipp+UOztm4M4x8pwVbt5fy2Ob99by3kZ/3+b3a/nA5g8b+T/uP+ZCOb/90qq9l4pxvrw5PTfbuV41P3UvvAA=)
 com.gliffy.shape.android.android_v1.icons.place_pin=mxgraph.office.concepts.pin
 com.gliffy.shape.android.android_v1.icons.plane=mxgraph.signs.transportation.airplane_3
 com.gliffy.shape.android.android_v1.icons.previous=mxgraph.ios7.misc.left

src/main/java/com/mxgraph/io/gliffy/model/GliffyText.java

@@ -101,7 +101,6 @@ public class GliffyText implements PostDeserializer.PostDeserializable
 			if (halign != null)
 			{
 				sb.append("align=").append(halign).append(";");
-				
 
 				if (halign.equalsIgnoreCase("right"))
 				{
@@ -110,10 +109,16 @@ public class GliffyText implements PostDeserializer.PostDeserializable
 					x = 0;
 				}
 			}
-			else 
+			else
+			{
 				sb.append("align=center;");
+			}
 		}
 
+		// Removes default global spacing (workaround for unwanted line wrapping)
+		paddingLeft = Math.max(0, paddingLeft - 2);
+		paddingRight = Math.max(0, paddingRight - 2);
+
 		sb.append("spacingLeft=").append(paddingLeft + x).append(";");
 		sb.append("spacingRight=").append(paddingRight).append(";");
 		

src/main/webapp/cache.manifest

@@ -1,7 +1,7 @@
 CACHE MANIFEST
 
 # THIS FILE WAS GENERATED. DO NOT MODIFY!
-# 03/08/2018 04:46 PM
+# 03/09/2018 12:53 PM
 
 app.html
 index.html?offline=1

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

@@ -3799,7 +3799,7 @@
 				linkSection.getColor(), fit.checked, allPages.checked, layers.checked, lightbox.checked,
 				editSection.getLink());
 		}), null, btnLabel, helpLink);
-		this.showDialog(dlg.container, 340, 360, true, true);
+		this.showDialog(dlg.container, 340, 384, true, true);
 		copyRadio.focus();
 	};
 	
@@ -3948,7 +3948,7 @@
 				layers.checked, (widthInput != null) ? widthInput.value : null,
 				(heightInput != null) ? heightInput.value : null);
 		}), null, mxResources.get('create'), helpLink);
-		this.showDialog(dlg.container, 340, 246 + dy, true, true);
+		this.showDialog(dlg.container, 340, 254 + dy, true, true);
 		
 		if (widthInput != null)
 		{
@@ -4009,7 +4009,7 @@
 		var div = document.createElement('div');
 		div.style.whiteSpace = 'nowrap';
 		var graph = this.editor.graph;
-		var height = (format == 'jpeg') ? 170 : 280;
+		var height = (format == 'jpeg') ? 196 : 300;
 		
 		var hd = document.createElement('h3');
 		mxUtils.write(hd, title);
@@ -4132,7 +4132,7 @@
 			callback(zoomInput.value, transparent.checked, !selection.checked, shadow.checked,
 				include.checked, cb5.checked, borderInput.value, cb6.checked, !allPages.checked);
 		}), null, btnLabel, helpLink);
-		this.showDialog(dlg.container, 320, height, true, true);
+		this.showDialog(dlg.container, 340, height, true, true);
 		zoomInput.focus();
 		
 		if (mxClient.IS_GC || mxClient.IS_FF || document.documentMode >= 5 || mxClient.IS_QUIRKS)

src/main/webapp/js/diagramly/sidebar/Sidebar-BPMN.js

@@ -88,6 +88,8 @@
 			this.createVertexTemplateEntry(s + 'outline=throwing;symbol=multiple;', w, h, '', 'Multiple Throwing Gateway', null, null, dt + 'multiple throwing'),
 			this.createVertexTemplateEntry(s + 'outline=end;symbol=multiple;', w, h, '', 'Multiple End Gateway', null, null, dt + 'multiple end'),
 
+			this.createVertexTemplateEntry(s + 'outline=standard;symbol=star;', w, h, '', 'Multiple Start Gateway', null, null, dt + 'multiple end'),
+			
 			this.createVertexTemplateEntry(s + 'outline=standard;symbol=parallelMultiple;', w, h, '', 'Parallel Multiple Standard Gateway', null, null, dt + 'parallel multiple standard'),
 			this.createVertexTemplateEntry(s + 'outline=eventInt;symbol=parallelMultiple;', w, h, '', 'Parallel Multiple Interrupting Gateway', null, null, dt + 'parallel multiple interrupting'),
 			this.createVertexTemplateEntry(s + 'outline=eventNonint;symbol=parallelMultiple;', w, h, '', 'Parallel Multiple Non-Interrupting Gateway', null, null, dt + 'parallel multiple non interrupting noninterrupting'),
@@ -170,6 +172,8 @@
 			this.createVertexTemplateEntry(s + 'outline=throwing;symbol=multiple;', w, h, '', 'Multiple Throwing', null, null, dt + 'multiple throwing'),
 			this.createVertexTemplateEntry(s + 'outline=end;symbol=multiple;', w, h, '', 'Multiple End', null, null, dt + 'multiple end'),
 
+			this.createVertexTemplateEntry(s + 'outline=standard;symbol=star;', w, h, '', 'Multiple Start', null, null, dt + 'multiple start'),
+			
 			this.createVertexTemplateEntry(s + 'outline=standard;symbol=parallelMultiple;', w, h, '', 'Parallel Multiple Standard', null, null, dt + 'parallel multiple standard'),
 			this.createVertexTemplateEntry(s + 'outline=eventInt;symbol=parallelMultiple;', w, h, '', 'Parallel Multiple Interrupting', null, null, dt + 'parallel multiple interrupting'),
 			this.createVertexTemplateEntry(s + 'outline=eventNonint;symbol=parallelMultiple;', w, h, '', 'Parallel Multiple Non-Interrupting', null, null, dt + 'parallel multiple non interrupting noninterrupting'),

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

@@ -291,7 +291,7 @@ Actions.prototype.init = function()
 			ui.showDialog(dlg.container, 320, 200, true, true);
 			dlg.init();
 		}
-	});
+	}, null, null, 'Alt+Shift+T');
 	this.addAction('openLink', function()
 	{
 		var link = graph.getLinkForCell(graph.getSelectionCell());

src/main/webapp/js/mxgraph/EditorUi.js

@@ -3864,7 +3864,8 @@ EditorUi.prototype.createKeyHandler = function(editor)
 	// Alt+Shift+Keycode mapping to action
 	var altShiftActions = {67: this.actions.get('clearWaypoints'), // Alt+Shift+C
 						  65: this.actions.get('connectionArrows'), // Alt+Shift+A
-						  80: this.actions.get('connectionPoints') // Alt+Shift+P
+						  80: this.actions.get('connectionPoints'), // Alt+Shift+P
+						  84: this.actions.get('editTooltip') // Alt+Shift+T
 	};
 	
 	mxKeyHandler.prototype.getFunction = function(evt)

src/main/webapp/shapes/bpmn/mxBpmnShape2.js

@@ -265,16 +265,24 @@ mxBpmnShape.prototype.redrawPath = function(c, x, y, w, h, layer)
 				else if (s === mxBpmnShape.prototype.eventEnum.GW_COMPLEX)
 				{
 				}
-
-				if (o === mxBpmnShape.prototype.eventTypeEnum.THROWING || o === mxBpmnShape.prototype.eventTypeEnum.END)
+				
+				if (s === 'star')
+				{
+					c.setFillColor(strokeColor);
+				}
+				else if (o === mxBpmnShape.prototype.eventTypeEnum.THROWING || o === mxBpmnShape.prototype.eventTypeEnum.END)
 				{
 					c.setStrokeColor(fillColor);
 					c.setFillColor(strokeColor);
 				}
 
 				f.call(this, c, x, y, w, h, layer);
-
-				if (o === mxBpmnShape.prototype.eventTypeEnum.THROWING || o === mxBpmnShape.prototype.eventTypeEnum.END)
+				
+				if (s === 'star')
+				{
+					c.setFillColor(fillColor);
+				}
+				else if (o === mxBpmnShape.prototype.eventTypeEnum.THROWING || o === mxBpmnShape.prototype.eventTypeEnum.END)
 				{
 					c.setStrokeColor(strokeColor);
 					c.setFillColor(fillColor);
@@ -682,6 +690,28 @@ mxBpmnShape.prototype.symbols = {
 
 			c.setStrokeColor(strokeColor);
 			c.setFillColor(fillColor);
+		},
+		'star': function(c, x, y, w, h)
+		{
+			c.translate(w / 5, h / 6);
+			h *= 2 / 3;
+			w *= 3 / 5;
+			
+			c.begin();
+			c.moveTo(0, h / 4);
+			c.lineTo(w / 3, h / 4);
+			c.lineTo(w / 2, 0);
+			c.lineTo(2 * w / 3, h / 4);
+			c.lineTo(w, h / 4);
+			c.lineTo(5 * w / 6, h / 2);
+			c.lineTo(w, 3 * h / 4);
+			c.lineTo(2 * w / 3, 3 * h / 4);
+			c.lineTo(w / 2, h);
+			c.lineTo(w / 3, 3 * h / 4);
+			c.lineTo(0, 3 * h / 4);
+			c.lineTo(w / 6, h / 2);
+			c.close();
+			c.fillAndStroke();
 		}
 };
 

src/main/webapp/styles/grapheditor.css

@@ -436,6 +436,7 @@ div.mxWindow .geButton {
 .geDialog {
 	position:absolute;
 	background:white;
+	line-height:1em;
 	overflow:hidden;
 	padding:30px;
 	border:1px solid #acacac;