Resolve merge conflict

Author: epolevikov

dashboard-for-desktop/articles/dashboard-designer/dashboard-layout.md

@@ -4,9 +4,46 @@ author: Natalia Kazakova
 legacyId: 16518
 ---
 # Dashboard Layout
-This section describes the features related to the Dashboard layout.
 
-The section consists of the following topics.
-* [Dashboard Title](dashboard-layout/dashboard-title.md)
-* [Dashboard Item Caption](dashboard-layout/dashboard-item-caption.md)
-* [Dashboard Items Layout](dashboard-layout/dashboard-items-layout.md)
+This topic describes the features related to the dashboard layout in the WinForms Designer.
+
+## Dashboard Width and Height
+
+The control automatically stretches or shrinks content (dashboard items) in a dashboard to fit available screen space. You can adjust the layout options and specify the width and height of content.
+
+In the Ribbon menu, click the **Layout Options** button:
+
+![|layout-options-button-in-ribbon](../../images/layout-options-button-ribbon.png)
+
+This invokes the **Dashboard Layout Options** dialog that allows you to specify the width and height of the dashboard:
+
+![layout-options-dialog](../../images/layout-options-dialog.png)
+
+* _Auto_
+
+    The height or width of a dashboard surface fits to content.
+* _Fixed_
+
+    The height or width of a dashboard surface is set in pixels.
+
+## Dashboard Title
+The Dashboard Title is at the top of the dashboard surface and can contain text, images, and command buttons.
+
+![DashboardTitleArea](../../images/img19734.png)
+
+See the following article for more information: [Dashboard Title](dashboard-layout/dashboard-title.md).
+## Dashboard Items Layout
+
+The Dashboard Designer allows users to arrange and resize dashboard items and groups using drag-and-drop operations.
+
+![Layout_ItemsLayoutMain](../../images/img20477.png)
+
+See the following article for more information: [Dashboard Items Layout](dashboard-layout/dashboard-items-layout.md).
+## Dashboard Item Caption
+Dashboard Item Caption is located on the dashboard surface and contains relevant up-to-date information and command buttons. 
+
+![DashboardItem_Caption](../../images/img18278.png)
+
+Refer to the following article for details: [Dashboard Item Caption](dashboard-layout/dashboard-item-caption.md).
+
+

dashboard-for-desktop/articles/dashboard-designer/data-analysis/aggregations/summary-level-aggregations.md

@@ -4,15 +4,15 @@ author: Natalia Kazakova
 legacyId: 116588
 ---
 # Summary Level Aggregations
-The Dashboard Designer allows you to perform aggregations when constructing a [calculated field expression](../../work-with-data/creating-calculated-fields.md). This allows you to evaluate calculated fields on a summary level.
+The Dashboard Designer aggregates data when you construct a [calculated field expression](../../work-with-data/creating-calculated-fields.md). This allows you to evaluate calculated fields on a summary level.
 
-In the Dashboard Designer, you can use the following set of predefined aggregate functions.
+In the Dashboard Designer, you can use the following set of predefined aggregate functions:
 
 ![BlogDashboard_SummaryCalculatedField_Functions](../../../../images/img118142.png)
 
 | Function | Description |
 |---|---|
-| Aggr(SummaryExpression, Dimensions) | Aggregates underlying data using the detail level specified by a predefined set of dimensions and a specified summary function. To learn more, see [Intermediate Level Aggregations](intermediate-level-aggregations.md). |
+| Aggr(SummaryExpression, Dimensions) | Aggregates underlying data using the detail level specified by a predefined set of dimensions and a specified summary function. For more information, see [Intermediate Level Aggregations](intermediate-level-aggregations.md). |
 | Avg(Value) | Returns the average of all the values in the expression. |
 | Count() | Returns the number of values. |
 | CountDistinct(Value) | Returns the number of distinct values. |
@@ -25,4 +25,17 @@ In the Dashboard Designer, you can use the following set of predefined aggregate
 | StdDev(Value) | Returns an estimate of the standard deviation of a population where the sample is a subset of the entire population. |
 | StdDevp(Value) | Returns the standard deviation of a population where the population is the entire data to be summarized. |
 
-These functions can be used for all types of numeric fields. After creating such calculated fields, you can use them as measures contained in an OLAP cube.
+These functions can be used for all types of numeric fields. After creating such calculated fields, you can use them as measures in an OLAP cube.
+
+## Custom Aggregate Functions
+
+Along with the predefined aggregations (like Min, Max, Sum, Avg), the Dashboard supports custom aggregation functions. A custom aggregate function appears in the [Expression Editor](../../../../../interface-elements-for-desktop\articles\expression-editor.md)'s categories if the function was registered in your application.
+
+The following image illustrates the custom _StringConcat_ function in the **Aggregate** function’s category:
+
+![win-custom-aggr-function-in-expression-editor](../../../../images/win-custom-aggr-function-in-expression-editor.png)
+
+Names of custom aggregate functions are stored in the **Custom Aggregate Names** category and can be used as arguments when you create window calculations as _WindowAggregate_ and _RunningAggregate_.
+
+Refer to the following topic for detains: [Calculation Functions Reference](../window-calculations/calculation-functions-reference.md).
+

dashboard-for-desktop/articles/dashboard-designer/data-analysis/window-calculations/calculation-functions-reference.md

@@ -19,10 +19,12 @@ This topic contains the descriptions of window functions that can be used to spe
 | RankModified(SummaryExpression, [ 'asc' | 'desc' ]) | Returns the modified competition rank for the current row in the window. | RankModified(Sum([Sales]), 'asc') | - |
 | RankPercentile(SummaryExpression, [ 'asc' | 'desc' ]) | Returns the percentile rank for the current row in the window. | RankPercentile(Sum([Sales]), 'desc') | - |
 | RunningAvg(SummaryExpression) | Returns the running average of the specified expression from the first row in the window to the current row. | RunningAvg(Sum([Sales])) | ![CalculationFunction_RunningAvg](../../../../images/img123020.png) |
+| RunningAggregate(SummaryExpression, CustomAggregateName) | Returns the cumulative result of the custom function applied to specified expression from the first row in the window to the current row.| RunningAggregate(Min([City]), 'StringConcat') | ![RunningAggregateFunction](../../../../images/RunningAggregateFunction.png)|
 | RunningCount(SummaryExpression) | Returns the running count of the specified expression from the first row in the window to the current row. | RunningCount(Sum([Sales])) | - |
 | RunningMax(SummaryExpression) | Returns the running maximum of the specified expression from the first row in the window to the current row. | RunningMax(Sum([Sales])) | ![CalculationFunction_RunningMax](../../../../images/img123021.png) |
 | RunningMin(SummaryExpression) | Returns the running minimum of the specified expression from the first row in the window to the current row. | RunningMin(Sum([Sales])) | ![CalculationFunction_RunningMin](../../../../images/img123026.png) |
 | RunningSum(SummaryExpression) | Returns the running sum of the specified expression from the first row in the window to the current row. | RunningSum(Sum([Sales])) | ![CalculationFunction_RunningSum](../../../../images/img123027.png) |
+| WindowAggregate(SummaryExpression, StartOffset, EndOffset, CustomAggregateName)| Returns the result of the custom function applied to the specified expression in the window.| WindowAggregate(Min([CompanyName]), -1, 1, 'StringConcat')|![windowAggregateFunction](../../../../images/windowAggregateFunction.png) |
 | WindowAvg(SummaryExpression, StartOffset, EndOffset) | Returns the average of the expression within the window, which is defined using offsets from the current row. | WindowAvg(Sum([Sales]), First(), Last()) | ![CalculationFunction_WindowAvg](../../../../images/img123031.png) |
 | WindowCount(SummaryExpression, StartOffset, EndOffset) | Returns the count of the expression within the window. | WindowCount(Sum([Sales]), First()+2, Last()) | ![CalculationFunction_WindowCount_plus2](../../../../images/img123032.png) |
 | WindowCountDistinct(SummaryExpression, StartOffset, EndOffset) | Returns the distinct count of the expression within the window. | WindowCountDistinct(Sum([Sales]), First(), Last()) | - |

dashboard-for-desktop/articles/dashboard-designer/ui-elements.md

@@ -6,7 +6,8 @@ legacyId: 17251
 # UI Elements
 The topics in this section describe the main elements of a **Dashboard Designer** application.
 
-This section consists of the following topics.
+This section consists of the following topics:
 * [Data Source Browser](ui-elements/data-source-browser.md)
 * [Data Items Pane](ui-elements/data-items-pane.md)
-* [Print Preview](ui-elements/print-preview.md)
+* [Print Preview](ui-elements/print-preview.md)
+* [Dashboard Surface](ui-elements/dashboard-surface.md)

dashboard-for-desktop/articles/dashboard-designer/ui-elements/dashboard-surface.md

@@ -0,0 +1,15 @@
+---
+title: Dashboard Surface
+author: Margarita Zakhodyaeva
+---
+
+# Dashboard Surface
+
+The **Dashboard Surface** is the rectangular area that displays the dashboard that you are designing. This area includes [dashboard items](../dashboard-item-settings.md) and the [dashboard title](../dashboard-layout/dashboard-title.md).
+
+![EUDesigner_DashboardSurface](../../../images/eudesigner_dashboardsurface26155.png)
+
+You can configure a dashboard layout in the UI:
+
+* [Dashboard Items Layout](../dashboard-layout/dashboard-items-layout.md) 
+* [Dashboard Layout](../dashboard-layout.md)