From: Jani Simomaa <jani.simomaa@semantum.fi>
Date: Mon, 30 Jul 2018 05:27:25 +0000 (+0000)
Subject: Merge changes I7cd072f0,I499dc390
X-Git-Tag: v1.43.0~136^2~431
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=0406a4f2330a74fdb4517be525687e01f750da7f;hp=fe216008faa34a8db02d0c53fc97e71cb70f64c0

Merge changes I7cd072f0,I499dc390

* changes:
  Add progress monitoring for DeleteHandler
  Improve performance of CommandMetadata (de)serialization
---

diff --git a/bundles/org.simantics.g2d/src/org/simantics/g2d/participant/PanZoomRotateHandler.java b/bundles/org.simantics.g2d/src/org/simantics/g2d/participant/PanZoomRotateHandler.java
index eeab18069..371ecbf15 100644
--- a/bundles/org.simantics.g2d/src/org/simantics/g2d/participant/PanZoomRotateHandler.java
+++ b/bundles/org.simantics.g2d/src/org/simantics/g2d/participant/PanZoomRotateHandler.java
@@ -185,18 +185,22 @@ public class PanZoomRotateHandler extends AbstractCanvasParticipant {
         super.removedFromContext(ctx);
     }
 
+    protected Class<? extends NavigationNode> getNavigationNodeClass() {
+        return NavigationNode.class;
+    }
+
     @SGInit
     public void initSG(G2DParentNode parent) {
         // Replace old NAVIGATION_NODE with a new one
         INode oldnav = NodeUtil.getRootNode(parent).getNode(SceneGraphConstants.NAVIGATION_NODE_NAME);
         if(oldnav != null) {
-            node = oldnav.appendParent(SceneGraphConstants.NAVIGATION_NODE_NAME, NavigationNode.class);
+            node = oldnav.appendParent(SceneGraphConstants.NAVIGATION_NODE_NAME, getNavigationNodeClass());
             // FIXME : oldnav seems to be the same node as parent (most of the cases).
             // Deleting it will cause plenty of code to fail, since they refer to the node directly.
             // The bug was not shown, since deleting() a Node did not actually wipe its structures (until now).             
             // oldnav.delete();
         } else {
-            node = parent.addNode(SceneGraphConstants.NAVIGATION_NODE_NAME, NavigationNode.class);
+            node = parent.addNode(SceneGraphConstants.NAVIGATION_NODE_NAME, getNavigationNodeClass());
         }
         node.setLookupId(SceneGraphConstants.NAVIGATION_NODE_NAME);
         node.setZIndex(0);
diff --git a/bundles/org.simantics.silk.ontology/graph/Silk.pgraph b/bundles/org.simantics.silk.ontology/graph/Silk.pgraph
index e6fd51b31..b27c7f39b 100644
--- a/bundles/org.simantics.silk.ontology/graph/Silk.pgraph
+++ b/bundles/org.simantics.silk.ontology/graph/Silk.pgraph
@@ -2683,6 +2683,8 @@ Silk."text_inverse" : IMAGE.PngImage
   @L0.loadBytes "images/text_inverse.png"
 Silk."text_italic" : IMAGE.PngImage
   @L0.loadBytes "images/text_italic.png"
+Silk."text_italic_f" : IMAGE.PngImage
+  @L0.loadBytes "images/text_italic_f.png"
 Silk."text_kerning" : IMAGE.PngImage
   @L0.loadBytes "images/text_kerning.png"
 Silk."text_left_to_right" : IMAGE.PngImage
@@ -2765,6 +2767,8 @@ Silk."time_go" : IMAGE.PngImage
   @L0.loadBytes "images/time_go.png"
 Silk."time_green" : IMAGE.PngImage
   @L0.loadBytes "images/time_green.png"
+Silk."time_rainbow" : IMAGE.PngImage
+  @L0.loadBytes "images/time_rainbow.png"
 Silk."time_red" : IMAGE.PngImage
   @L0.loadBytes "images/time_red.png"
 Silk."transmit" : IMAGE.PngImage
diff --git a/bundles/org.simantics.silk.ontology/graph/images/text_italic_f.png b/bundles/org.simantics.silk.ontology/graph/images/text_italic_f.png
new file mode 100644
index 000000000..946f47f1b
Binary files /dev/null and b/bundles/org.simantics.silk.ontology/graph/images/text_italic_f.png differ
diff --git a/bundles/org.simantics.silk.ontology/graph/images/time_rainbow.png b/bundles/org.simantics.silk.ontology/graph/images/time_rainbow.png
new file mode 100644
index 000000000..372c3377d
Binary files /dev/null and b/bundles/org.simantics.silk.ontology/graph/images/time_rainbow.png differ
diff --git a/bundles/org.simantics.viewpoint.ontology/graph/ViewpointActions.pgraph b/bundles/org.simantics.viewpoint.ontology/graph/ViewpointActions.pgraph
index f0b11d63a..704ccf46b 100644
--- a/bundles/org.simantics.viewpoint.ontology/graph/ViewpointActions.pgraph
+++ b/bundles/org.simantics.viewpoint.ontology/graph/ViewpointActions.pgraph
@@ -36,6 +36,9 @@ VP.NewActionCategory : VP.ActionCategory
 VP.ImportActionCategory : VP.ActionCategory
     L0.HasLabel "Import"
     VP.ActionCategory.IsSubmenu L0.True
+VP.ExportActionCategory : VP.ActionCategory
+    L0.HasLabel "Export"
+    VP.ActionCategory.IsSubmenu L0.True
 VP.EditActionCategory : VP.ActionCategory
     L0.HasLabel "Edit"
     VP.ActionCategory.IsSubmenu L0.False