diff --git a/Project/Sources/Forms/WP_Palette_Alignments/ObjectMethods/btn_insertContinousSectionBreak.4dm b/Project/Sources/Forms/WP_Palette_Alignments/ObjectMethods/btn_insertContinousSectionBreak.4dm
new file mode 100644
index 00000000..aa45c446
--- /dev/null
+++ b/Project/Sources/Forms/WP_Palette_Alignments/ObjectMethods/btn_insertContinousSectionBreak.4dm
@@ -0,0 +1,4 @@
+Case of
+ : (Form event code:C388=On Clicked:K2:4)
+ MENU_Display("ContinuousSections")
+End case
diff --git a/Project/Sources/Forms/WP_Palette_Alignments/ObjectMethods/btn_insertSectionBreak.4dm b/Project/Sources/Forms/WP_Palette_Alignments/ObjectMethods/btn_insertSectionBreak.4dm
new file mode 100644
index 00000000..f6b1170c
--- /dev/null
+++ b/Project/Sources/Forms/WP_Palette_Alignments/ObjectMethods/btn_insertSectionBreak.4dm
@@ -0,0 +1,5 @@
+
+Case of
+ : (Form event code:C388=On Clicked:K2:4)
+ MENU_Display("Sections")
+End case
diff --git a/Project/Sources/Forms/WP_Palette_Alignments/form.4DForm b/Project/Sources/Forms/WP_Palette_Alignments/form.4DForm
index 8c6e639d..615703f3 100644
--- a/Project/Sources/Forms/WP_Palette_Alignments/form.4DForm
+++ b/Project/Sources/Forms/WP_Palette_Alignments/form.4DForm
@@ -587,18 +587,23 @@
"iconFrames": 4,
"style": "toolbar"
},
- "btn_insertSectiobBreak": {
+ "btn_insertSectionBreak": {
"type": "button",
"top": 502,
"left": 208,
"width": 29,
"height": 24,
"tooltip": ":xliff:insertSectionbreak",
- "action": "insertSectionBreak",
+ "action": "",
"focusable": false,
"icon": "/RESOURCES/Images/Sidebar/SectionBreak_24.png",
"iconFrames": 4,
- "style": "toolbar"
+ "style": "toolbar",
+ "popupPlacement": "separated",
+ "events": [
+ "onClick"
+ ],
+ "method": "ObjectMethods/btn_insertSectionBreak.4dm"
},
"btn_insertColumnBreak": {
"type": "button",
@@ -613,18 +618,23 @@
"iconFrames": 4,
"style": "toolbar"
},
- "btn_insertPageBreak1": {
+ "btn_insertContinousSectionBreak": {
"type": "button",
"top": 502,
"left": 148,
"width": 29,
"height": 24,
"tooltip": ":xliff:insertContinuousSectionBreak",
- "action": "insertContinuousSectionBreak",
+ "action": "",
"focusable": false,
"icon": "/RESOURCES/Images/Sidebar/ContinuousSectionBreak_24.png",
"iconFrames": 4,
- "style": "toolbar"
+ "style": "toolbar",
+ "events": [
+ "onClick"
+ ],
+ "method": "ObjectMethods/btn_insertContinousSectionBreak.4dm",
+ "popupPlacement": "linked"
},
"Separator3": {
"type": "rectangle",
@@ -1126,9 +1136,9 @@
"textLineHeightInput",
"btn_etc",
"btn_insertPageBreak",
- "btn_insertSectiobBreak",
+ "btn_insertSectionBreak",
"btn_insertColumnBreak",
- "btn_insertPageBreak1",
+ "btn_insertContinousSectionBreak",
"Popup_columnCount",
"btn_etc1",
"Popup Dropdown List2",
@@ -1207,5 +1217,5 @@
"version": "1",
"kind": "form"
},
- "geometryStamp": 3373
+ "geometryStamp": 3379
}
\ No newline at end of file
diff --git a/Project/Sources/Forms/WP_Toolbar/ObjectMethods/btn_insertContinuousSectionBreak.4dm b/Project/Sources/Forms/WP_Toolbar/ObjectMethods/btn_insertContinuousSectionBreak.4dm
new file mode 100644
index 00000000..ff933835
--- /dev/null
+++ b/Project/Sources/Forms/WP_Toolbar/ObjectMethods/btn_insertContinuousSectionBreak.4dm
@@ -0,0 +1,6 @@
+
+Case of
+ : (Form event code:C388=On Clicked:K2:4)
+ MENU_Display("ContinuousSections")
+
+End case
diff --git a/Project/Sources/Forms/WP_Toolbar/ObjectMethods/btn_insertSectionBreak.4dm b/Project/Sources/Forms/WP_Toolbar/ObjectMethods/btn_insertSectionBreak.4dm
new file mode 100644
index 00000000..4d317986
--- /dev/null
+++ b/Project/Sources/Forms/WP_Toolbar/ObjectMethods/btn_insertSectionBreak.4dm
@@ -0,0 +1,6 @@
+
+Case of
+ : (Form event code:C388=On Clicked:K2:4)
+ MENU_Display("Sections")
+
+End case
diff --git a/Project/Sources/Forms/WP_Toolbar/form.4DForm b/Project/Sources/Forms/WP_Toolbar/form.4DForm
index b844b55b..cae13520 100644
--- a/Project/Sources/Forms/WP_Toolbar/form.4DForm
+++ b/Project/Sources/Forms/WP_Toolbar/form.4DForm
@@ -1447,7 +1447,7 @@
},
"btn_insertPageBreak": {
"type": "button",
- "top": 40,
+ "top": 30,
"left": 385,
"width": 40,
"height": 40,
@@ -1458,18 +1458,23 @@
"iconFrames": 4,
"style": "toolbar"
},
- "btn_insertSectiobBreak": {
+ "btn_insertSectionBreak": {
"type": "button",
- "top": 40,
+ "top": 30,
"left": 465,
"width": 40,
"height": 40,
"tooltip": ":xliff:insertSectionbreak",
- "action": "insertSectionBreak",
+ "action": "",
"focusable": false,
"icon": "/RESOURCES/Images/Toolbar1/Insert/SectionBreak_32.png",
"iconFrames": 4,
- "style": "toolbar"
+ "style": "toolbar",
+ "popupPlacement": "separated",
+ "events": [
+ "onClick"
+ ],
+ "method": "ObjectMethods/btn_insertSectionBreak.4dm"
},
"btn_insertImage": {
"type": "button",
@@ -1774,7 +1779,7 @@
},
"btn_insertColumnBreak": {
"type": "button",
- "top": 40,
+ "top": 30,
"left": 345,
"width": 40,
"height": 40,
@@ -1930,18 +1935,23 @@
"tooltip": ":xliff:RemoveSoftHyphen",
"action": "removeSoftHyphens"
},
- "btn_insertPageBreak1": {
+ "btn_insertContinuousSectionBreak": {
"type": "button",
- "top": 40,
+ "top": 30,
"left": 425,
"width": 40,
"height": 40,
"tooltip": ":xliff:insertContinuousSectionBreak",
- "action": "insertContinuousSectionBreak",
+ "action": "",
"focusable": false,
"icon": "/RESOURCES/Images/Toolbar1/Insert/ContinuousSectionBreak_32.png",
"iconFrames": 4,
- "style": "toolbar"
+ "style": "toolbar",
+ "events": [
+ "onClick"
+ ],
+ "method": "ObjectMethods/btn_insertContinuousSectionBreak.4dm",
+ "popupPlacement": "linked"
},
"btn_insertTime3": {
"type": "button",
@@ -2024,6 +2034,32 @@
"popupPlacement": "separated",
"icon": "/RESOURCES/Images/TBcommon/Insert/InsertTextBox_32.png",
"method": "ObjectMethods/btn_insertTextArea.4dm"
+ },
+ "cb_distinctFirstPage": {
+ "type": "checkbox",
+ "text": "differentFirstPage",
+ "top": 345,
+ "left": 452,
+ "width": 158,
+ "height": 11,
+ "events": [
+ "onClick"
+ ],
+ "action": "section/differentFirstPage",
+ "dataSourceTypeHint": "boolean"
+ },
+ "cb_distinctLeftRightPage": {
+ "type": "checkbox",
+ "text": "differentLeftRightPages",
+ "top": 358,
+ "left": 452,
+ "width": 158,
+ "height": 11,
+ "events": [
+ "onClick"
+ ],
+ "action": "section/differentLeftRightPages",
+ "dataSourceTypeHint": "boolean"
}
},
"entryOrder": [
@@ -2035,7 +2071,7 @@
"VirtualExpression",
"TrueExpression",
"btn_insertPageBreak",
- "btn_insertSectiobBreak",
+ "btn_insertSectionBreak",
"btn_insertImage",
"btn_insertPageCount",
"btn_insertPageNumber",
@@ -2055,11 +2091,13 @@
"btn_showHide4Dexpressions",
"btn_insertColumnBreak",
"btn_visibleVerticalRuler",
- "btn_insertPageBreak1",
+ "btn_insertContinuousSectionBreak",
"btn_insertTime3",
"btn_visibleEmptyImages",
"btn_displayAsSymbol",
- "btn_insertTextArea"
+ "btn_insertTextArea",
+ "cb_distinctFirstPage",
+ "cb_distinctLeftRightPage"
]
},
{
@@ -4557,5 +4595,5 @@
"View 9": {}
}
},
- "geometryStamp": 6926
+ "geometryStamp": 7042
}
\ No newline at end of file
diff --git a/Project/Sources/Forms/WP_Toolbar/method.4dm b/Project/Sources/Forms/WP_Toolbar/method.4dm
index 41452cca..1865c629 100644
--- a/Project/Sources/Forms/WP_Toolbar/method.4dm
+++ b/Project/Sources/Forms/WP_Toolbar/method.4dm
@@ -102,6 +102,8 @@ Case of
OBJECT SET HELP TIP:C1181(*; "btn_ImageWrapSquareRight"; Get action info:C1442("anchorLayout?value=wrapSquareRight").title)
OBJECT SET HELP TIP:C1181(*; "btn_ImageWrapSquareLargest"; Get action info:C1442("anchorLayout?value=wrapSquareLargest").title)
+ OBJECT SET TITLE:C194(*; "cb_distinctFirstPage"; Get action info:C1442("section/differentFirstPage").title)
+ OBJECT SET TITLE:C194(*; "cb_distinctLeftRightPage"; Get action info:C1442("section/differentLeftRightPages").title)
If (Form:C1466#Null:C1517)
SET TIMER:C645(-1) // IF events are NOT managed in the area, then Form will be null (ACI0102661)
diff --git a/Project/Sources/Methods/MENU_Display.4dm b/Project/Sources/Methods/MENU_Display.4dm
index 71fbbe7c..f54dcc53 100644
--- a/Project/Sources/Methods/MENU_Display.4dm
+++ b/Project/Sources/Methods/MENU_Display.4dm
@@ -243,6 +243,32 @@ Case of
End if
End if
+ : ($content="Sections")
+
+ APPEND MENU ITEM:C411($menu; ak standard action title:K76:83)
+ SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action:K56:1; "insertSectionBreak")
+
+ APPEND MENU ITEM:C411($menu; "-")
+
+ APPEND MENU ITEM:C411($menu; ak standard action title:K76:83)
+ SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action:K56:1; "section/differentFirstPage")
+
+ APPEND MENU ITEM:C411($menu; ak standard action title:K76:83)
+ SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action:K56:1; "section/differentLeftRightPages")
+
+ : ($content="ContinuousSections")
+
+ APPEND MENU ITEM:C411($menu; ak standard action title:K76:83)
+ SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action:K56:1; "insertContinuousSectionBreak")
+
+ APPEND MENU ITEM:C411($menu; "-")
+
+ APPEND MENU ITEM:C411($menu; ak standard action title:K76:83)
+ SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action:K56:1; "section/differentFirstPage")
+
+ APPEND MENU ITEM:C411($menu; ak standard action title:K76:83)
+ SET MENU ITEM PROPERTY:C973($menu; -1; Associated standard action:K56:1; "section/differentLeftRightPages")
+
End case
diff --git a/Project/Sources/catalog.4DCatalog b/Project/Sources/catalog.4DCatalog
index d9eb0b99..bd21f13b 100644
--- a/Project/Sources/catalog.4DCatalog
+++ b/Project/Sources/catalog.4DCatalog
@@ -1,6 +1,6 @@
-