Index: Core/Common/src/Core.Common.Controls.Swf/Charting/Chart.cs
===================================================================
diff -u -r622c20f6fc0b693b67a3e57b2ece939823002c62 -r79d36eef280b0a5cbb64ab4b20df234dece1df4a
--- Core/Common/src/Core.Common.Controls.Swf/Charting/Chart.cs (.../Chart.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62)
+++ Core/Common/src/Core.Common.Controls.Swf/Charting/Chart.cs (.../Chart.cs) (revision 79d36eef280b0a5cbb64ab4b20df234dece1df4a)
@@ -209,15 +209,15 @@
public bool AllowSeriesTypeChange { get; set; }
- public void ExportAsImage()
+ public void ExportAsImage(IWin32Window owner)
{
var dialog = new SaveFileDialog
{
Filter = GetSupportedFormatsFilter(),
FilterIndex = 2,
};
- var dialogResult = dialog.ShowDialog();
+ var dialogResult = dialog.ShowDialog(owner);
if (dialogResult == DialogResult.OK)
{
ExportAsImage(dialog.FileName, null, null);
Index: Core/Common/src/Core.Common.Controls.Swf/Charting/ChartView.cs
===================================================================
diff -u -r23981d00366f6ee42b7b3c2b776a687c1dc70d07 -r79d36eef280b0a5cbb64ab4b20df234dece1df4a
--- Core/Common/src/Core.Common.Controls.Swf/Charting/ChartView.cs (.../ChartView.cs) (revision 23981d00366f6ee42b7b3c2b776a687c1dc70d07)
+++ Core/Common/src/Core.Common.Controls.Swf/Charting/ChartView.cs (.../ChartView.cs) (revision 79d36eef280b0a5cbb64ab4b20df234dece1df4a)
@@ -87,6 +87,8 @@
});
}
+ public IWin32Window Owner { get; set; }
+
public bool IsMouseDown { get; private set; }
[Browsable(false)]
@@ -283,7 +285,7 @@
///
public void ExportAsImage()
{
- Chart.ExportAsImage();
+ Chart.ExportAsImage(Owner);
}
public void EnableDelete(bool enable)
Index: Core/Common/src/Core.Common.Controls.Swf/Charting/IChart.cs
===================================================================
diff -u -ree0b95b2a1a34d8e81a21c8d05ef1354169af50c -r79d36eef280b0a5cbb64ab4b20df234dece1df4a
--- Core/Common/src/Core.Common.Controls.Swf/Charting/IChart.cs (.../IChart.cs) (revision ee0b95b2a1a34d8e81a21c8d05ef1354169af50c)
+++ Core/Common/src/Core.Common.Controls.Swf/Charting/IChart.cs (.../IChart.cs) (revision 79d36eef280b0a5cbb64ab4b20df234dece1df4a)
@@ -87,7 +87,7 @@
///
/// Opens export dialog
///
- void ExportAsImage();
+ void ExportAsImage(IWin32Window owner);
///
/// Exports a chart without dialog to the specified location.
Index: Core/Common/src/Core.Common.Controls.Swf/Charting/IChartView.cs
===================================================================
diff -u -r8a9a2efad299327b082088189b9a37c32c55a890 -r79d36eef280b0a5cbb64ab4b20df234dece1df4a
--- Core/Common/src/Core.Common.Controls.Swf/Charting/IChartView.cs (.../IChartView.cs) (revision 8a9a2efad299327b082088189b9a37c32c55a890)
+++ Core/Common/src/Core.Common.Controls.Swf/Charting/IChartView.cs (.../IChartView.cs) (revision 79d36eef280b0a5cbb64ab4b20df234dece1df4a)
@@ -1,4 +1,5 @@
using System;
+using System.Windows.Forms;
using Core.Common.Utils.Collections.Generic;
namespace Core.Common.Controls.Swf.Charting
@@ -8,6 +9,8 @@
///
public interface IChartView : IView
{
+ IWin32Window Owner { get; set; }
+
///
/// Selected point of the active series has been changed
///
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/CommonToolsGuiPlugin.cs
===================================================================
diff -u -r12c5ceb5471938a64061362a809cab802f00eb30 -r79d36eef280b0a5cbb64ab4b20df234dece1df4a
--- Core/Plugins/src/Core.Plugins.CommonTools.Gui/CommonToolsGuiPlugin.cs (.../CommonToolsGuiPlugin.cs) (revision 12c5ceb5471938a64061362a809cab802f00eb30)
+++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/CommonToolsGuiPlugin.cs (.../CommonToolsGuiPlugin.cs) (revision 79d36eef280b0a5cbb64ab4b20df234dece1df4a)
@@ -97,7 +97,8 @@
};
yield return new ViewInfo
{
- Description = Resources.CommonToolsGuiPlugin_GetViewInfoObjects_Chart_View
+ Description = Resources.CommonToolsGuiPlugin_GetViewInfoObjects_Chart_View,
+ AfterCreate = (view, chart) => view.Owner = Gui.MainWindow
};
}