X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.document.ui.ontology%2Fgraph%2FDocumentUI.pgraph;h=cb7cd6498d3139072b14268adac3cff8d40ccbcc;hp=914bdca44c3ec39c24bf7760ab8b1df83691614a;hb=25b6c25959c1fb3c60bb41cd0e1f0808e7fc3769;hpb=ccc1271c9d6657fb9dcf4cf3cb115fa0c8cb9589

diff --git a/bundles/org.simantics.document.ui.ontology/graph/DocumentUI.pgraph b/bundles/org.simantics.document.ui.ontology/graph/DocumentUI.pgraph
index 914bdca44..cb7cd6498 100644
--- a/bundles/org.simantics.document.ui.ontology/graph/DocumentUI.pgraph
+++ b/bundles/org.simantics.document.ui.ontology/graph/DocumentUI.pgraph
@@ -38,8 +38,12 @@ UI.WikitextContribution.View : VIEWS.Composite
   SG.Node.children _ : L0.List
     @L0.list
       _ : VIEWS.Composite
-        VIEWS.Composite.layout _ : VIEWS.GridLayout
-          VIEWS.GridLayout.columnCount 19
+        VIEWS.Composite.layout _ : VIEWS.RowLayout
+          //VIEWS.RowLayout.type VIEWS.Control.Style.Constant.Horizontal
+          //VIEWS.RowLayout.spacing 0
+          //VIEWS.RowLayout.justify true
+          //VIEWS.RowLayout.pack true
+          //VIEWS.RowLayout.wrap true
         VIEWS.Control.layoutData _ : VIEWS.GridLayout.GridData
           VIEWS.GridLayout.GridData.horizontalGrab true
         SG.Node.children _ : L0.List
@@ -49,135 +53,102 @@ UI.WikitextContribution.View : VIEWS.Composite
               VIEWS.Button.tooltip "Makes selection bold or inserts some bold text at cursor"
               VIEWS.Button.modifier UI.Functions.boldModifier : L0.Function
               VIEWS.Button.image SILK.text_bold
-              VIEWS.Control.layoutData _ : VIEWS.GridLayout.GridData
-                VIEWS.GridLayout.GridData.horizontalAlignment VIEWS.GridLayout.GridData.BEGINNING
-                VIEWS.GridLayout.GridData.verticalAlignment VIEWS.GridLayout.GridData.BEGINNING
+              VIEWS.Control.layoutData _ : VIEWS.RowLayout.RowData
             _ : VIEWS.Button
               VIEWS.Button.tooltip "Makes selection italic or inserts some italic text at cursor"
               VIEWS.Button.modifier UI.Functions.italicModifier : L0.Function
               VIEWS.Button.image SILK.text_italic
-              VIEWS.Control.layoutData _ : VIEWS.GridLayout.GridData
-                VIEWS.GridLayout.GridData.horizontalAlignment VIEWS.GridLayout.GridData.BEGINNING
-                VIEWS.GridLayout.GridData.verticalAlignment VIEWS.GridLayout.GridData.BEGINNING
+              VIEWS.Control.layoutData _ : VIEWS.RowLayout.RowData
             _ : VIEWS.Button
               VIEWS.Button.tooltip "Makes selection strikethrough or inserts some strikethrough text at cursor"
               VIEWS.Button.modifier UI.Functions.strikethroughModifier : L0.Function
               VIEWS.Button.image SILK.text_strikethrough
-              VIEWS.Control.layoutData _ : VIEWS.GridLayout.GridData
-                VIEWS.GridLayout.GridData.horizontalAlignment VIEWS.GridLayout.GridData.BEGINNING
-                VIEWS.GridLayout.GridData.verticalAlignment VIEWS.GridLayout.GridData.BEGINNING
+              VIEWS.Control.layoutData _ : VIEWS.RowLayout.RowData
             _ : VIEWS.Button
               VIEWS.Button.tooltip "Makes selection underlined or inserts some underlined text at cursor"
               VIEWS.Button.modifier UI.Functions.underlineModifier : L0.Function
               VIEWS.Button.image SILK.text_underline
-              VIEWS.Control.layoutData _ : VIEWS.GridLayout.GridData
-                VIEWS.GridLayout.GridData.horizontalAlignment VIEWS.GridLayout.GridData.BEGINNING
-                VIEWS.GridLayout.GridData.verticalAlignment VIEWS.GridLayout.GridData.BEGINNING
+              VIEWS.Control.layoutData _ : VIEWS.RowLayout.RowData
             _ : VIEWS.Button
               VIEWS.Button.tooltip "Inserts a horizontal ruler at cursor"
               VIEWS.Button.modifier UI.Functions.horizontalRulerModifier : L0.Function
               VIEWS.Button.image SILK.text_horizontalrule
-              VIEWS.Control.layoutData _ : VIEWS.GridLayout.GridData
-                VIEWS.GridLayout.GridData.horizontalAlignment VIEWS.GridLayout.GridData.BEGINNING
-                VIEWS.GridLayout.GridData.verticalAlignment VIEWS.GridLayout.GridData.BEGINNING
+              VIEWS.Control.layoutData _ : VIEWS.RowLayout.RowData
             _ : VIEWS.Button
               VIEWS.Button.tooltip "Indents text"
               VIEWS.Button.modifier UI.Functions.indentModifier : L0.Function
               VIEWS.Button.image SILK.text_indent
-              VIEWS.Control.layoutData _ : VIEWS.GridLayout.GridData
-                VIEWS.GridLayout.GridData.horizontalAlignment VIEWS.GridLayout.GridData.BEGINNING
-                VIEWS.GridLayout.GridData.verticalAlignment VIEWS.GridLayout.GridData.BEGINNING
+              VIEWS.Control.layoutData _ : VIEWS.RowLayout.RowData
             _ : VIEWS.Button
               VIEWS.Button.tooltip "Modifies selection font or inserts text with font settings"
               VIEWS.Button.modifier UI.Functions.fontModifier : L0.Function
               VIEWS.Button.image SILK.font
-              VIEWS.Control.layoutData _ : VIEWS.GridLayout.GridData
-                VIEWS.GridLayout.GridData.horizontalAlignment VIEWS.GridLayout.GridData.BEGINNING
-                VIEWS.GridLayout.GridData.verticalAlignment VIEWS.GridLayout.GridData.BEGINNING
+              VIEWS.Control.layoutData _ : VIEWS.RowLayout.RowData
             _ : VIEWS.Button
               VIEWS.Button.tooltip "Inserts an image"
               VIEWS.Button.modifier UI.Functions.imageModifier : L0.Function
               VIEWS.Button.image SILK.image
-              VIEWS.Control.layoutData _ : VIEWS.GridLayout.GridData
-                VIEWS.GridLayout.GridData.horizontalAlignment VIEWS.GridLayout.GridData.BEGINNING
-                VIEWS.GridLayout.GridData.verticalAlignment VIEWS.GridLayout.GridData.BEGINNING
+              VIEWS.Control.layoutData _ : VIEWS.RowLayout.RowData
+            _ : VIEWS.Button
+              VIEWS.Button.tooltip "Inserts an internal model-specific document link"
+              VIEWS.Button.modifier UI.Functions.internalLinkModifier : L0.Function
+              VIEWS.Button.image SILK.database_link
+              VIEWS.Control.layoutData _ : VIEWS.RowLayout.RowData
+            _ : VIEWS.Button
+              VIEWS.Button.tooltip "Inserts an external website link"
+              VIEWS.Button.modifier UI.Functions.linkModifier : L0.Function
+              VIEWS.Button.image SILK.world_link
+              VIEWS.Control.layoutData _ : VIEWS.RowLayout.RowData
             _ : VIEWS.Button
               VIEWS.Button.tooltip "Inserts a 1st level header"
               VIEWS.Button.modifier UI.Functions.header1Modifier : L0.Function
               VIEWS.Button.image SILK.text_heading_1
-              VIEWS.Control.layoutData _ : VIEWS.GridLayout.GridData
-                VIEWS.GridLayout.GridData.horizontalAlignment VIEWS.GridLayout.GridData.BEGINNING
-                VIEWS.GridLayout.GridData.verticalAlignment VIEWS.GridLayout.GridData.BEGINNING
+              VIEWS.Control.layoutData _ : VIEWS.RowLayout.RowData
             _ : VIEWS.Button
               VIEWS.Button.tooltip "Inserts a 2nd level header"
               VIEWS.Button.modifier UI.Functions.header2Modifier : L0.Function
               VIEWS.Button.image SILK.text_heading_2
-              VIEWS.Control.layoutData _ : VIEWS.GridLayout.GridData
-                VIEWS.GridLayout.GridData.horizontalAlignment VIEWS.GridLayout.GridData.BEGINNING
-                VIEWS.GridLayout.GridData.verticalAlignment VIEWS.GridLayout.GridData.BEGINNING
+              VIEWS.Control.layoutData _ : VIEWS.RowLayout.RowData
             _ : VIEWS.Button
               VIEWS.Button.tooltip "Inserts a 3rd level header"
               VIEWS.Button.modifier UI.Functions.header3Modifier : L0.Function
               VIEWS.Button.image SILK.text_heading_3
-              VIEWS.Control.layoutData _ : VIEWS.GridLayout.GridData
-                VIEWS.GridLayout.GridData.horizontalAlignment VIEWS.GridLayout.GridData.BEGINNING
-                VIEWS.GridLayout.GridData.verticalAlignment VIEWS.GridLayout.GridData.BEGINNING
+              VIEWS.Control.layoutData _ : VIEWS.RowLayout.RowData
             _ : VIEWS.Button
               VIEWS.Button.tooltip "Inserts a 4th level header"
               VIEWS.Button.modifier UI.Functions.header4Modifier : L0.Function
               VIEWS.Button.image SILK.text_heading_4
-              VIEWS.Control.layoutData _ : VIEWS.GridLayout.GridData
-                VIEWS.GridLayout.GridData.horizontalAlignment VIEWS.GridLayout.GridData.BEGINNING
-                VIEWS.GridLayout.GridData.verticalAlignment VIEWS.GridLayout.GridData.BEGINNING
+              VIEWS.Control.layoutData _ : VIEWS.RowLayout.RowData
             _ : VIEWS.Button
               VIEWS.Button.tooltip "Inserts a numbered list"
               VIEWS.Button.modifier UI.Functions.numberedListModifier : L0.Function
               VIEWS.Button.image SILK.text_list_numbers
-              VIEWS.Control.layoutData _ : VIEWS.GridLayout.GridData
-                VIEWS.GridLayout.GridData.horizontalAlignment VIEWS.GridLayout.GridData.BEGINNING
-                VIEWS.GridLayout.GridData.verticalAlignment VIEWS.GridLayout.GridData.BEGINNING
+              VIEWS.Control.layoutData _ : VIEWS.RowLayout.RowData
             _ : VIEWS.Button
               VIEWS.Button.tooltip "Inserts a bullet list"
               VIEWS.Button.modifier UI.Functions.bulletListModifier : L0.Function
               VIEWS.Button.image SILK.text_list_bullets
-              VIEWS.Control.layoutData _ : VIEWS.GridLayout.GridData
-                VIEWS.GridLayout.GridData.horizontalAlignment VIEWS.GridLayout.GridData.BEGINNING
-                VIEWS.GridLayout.GridData.verticalAlignment VIEWS.GridLayout.GridData.BEGINNING
+              VIEWS.Control.layoutData _ : VIEWS.RowLayout.RowData
             _ : VIEWS.Button
               VIEWS.Button.tooltip "Inserts a table"
               VIEWS.Button.modifier UI.Functions.tableModifier : L0.Function
               VIEWS.Button.image SILK.table
-              VIEWS.Control.layoutData _ : VIEWS.GridLayout.GridData
-                VIEWS.GridLayout.GridData.horizontalAlignment VIEWS.GridLayout.GridData.BEGINNING
-                VIEWS.GridLayout.GridData.verticalAlignment VIEWS.GridLayout.GridData.BEGINNING
-            _ : VIEWS.Button
-              VIEWS.Button.tooltip "Inserts an external website link"
-              VIEWS.Button.modifier UI.Functions.linkModifier : L0.Function
-              VIEWS.Button.image SILK.link
-              VIEWS.Control.layoutData _ : VIEWS.GridLayout.GridData
-                VIEWS.GridLayout.GridData.horizontalAlignment VIEWS.GridLayout.GridData.BEGINNING
-                VIEWS.GridLayout.GridData.verticalAlignment VIEWS.GridLayout.GridData.BEGINNING
+              VIEWS.Control.layoutData _ : VIEWS.RowLayout.RowData
             _ : VIEWS.Button
               VIEWS.Button.text "&Styles"
               VIEWS.Button.tooltip "Edits document styles"
               VIEWS.Button.modifier UI.Functions.styleModifier : L0.Function
-              VIEWS.Control.layoutData _ : VIEWS.GridLayout.GridData
-                VIEWS.GridLayout.GridData.horizontalAlignment VIEWS.GridLayout.GridData.BEGINNING
-                VIEWS.GridLayout.GridData.verticalAlignment VIEWS.GridLayout.GridData.BEGINNING
+              VIEWS.Control.layoutData _ : VIEWS.RowLayout.RowData
             _ : VIEWS.Button
               VIEWS.Button.text "&Apply changes"
               VIEWS.Button.tooltip "Applies any changes in the wiki markup into the document"
               VIEWS.Button.modifier UI.Functions.wikitextModifier : L0.Function
-              VIEWS.Control.layoutData _ : VIEWS.GridLayout.GridData
-                VIEWS.GridLayout.GridData.horizontalAlignment VIEWS.GridLayout.GridData.BEGINNING
-                VIEWS.GridLayout.GridData.verticalAlignment VIEWS.GridLayout.GridData.BEGINNING
+              VIEWS.Control.layoutData _ : VIEWS.RowLayout.RowData
             _ : VIEWS.Button
               VIEWS.Button.text "Delete document"
               VIEWS.Button.tooltip "Deletes the document"
               VIEWS.Button.modifier UI.Functions.onDeleteDocumentButton : L0.Function
-              VIEWS.Control.layoutData _ : VIEWS.GridLayout.GridData
-                VIEWS.GridLayout.GridData.horizontalAlignment VIEWS.GridLayout.GridData.BEGINNING
-                VIEWS.GridLayout.GridData.verticalAlignment VIEWS.GridLayout.GridData.BEGINNING
+              VIEWS.Control.layoutData _ : VIEWS.RowLayout.RowData
 
       UI.WikitextContribution.View.TextContainer : VIEWS.Composite
         VIEWS.Control.layoutData _ : VIEWS.GridLayout.GridData
@@ -242,6 +213,8 @@ UI.Sash : VIEWS.SashForm
             VIEWS.GridLayout.GridData.verticalGrab true
         VIEWS.Browser.variable DOC.Functions.documentationRootVariable
         VIEWS.Browser.document DOC.Functions.documentationText
+        VIEWS.Browser.locationChanging UI.Functions.locationChanging : L0.Function
+            L0.HasValueType "a -> Boolean"
       UI.WikitextContribution.View
 
 UI.NoDocument : VIEWS.Composite