diff --git a/ULogViewer/Controls/KeyLogAnalysisRuleSetEditorDialog.axaml b/ULogViewer/Controls/KeyLogAnalysisRuleSetEditorDialog.axaml
index dd3fddf2..066552bb 100644
--- a/ULogViewer/Controls/KeyLogAnalysisRuleSetEditorDialog.axaml
+++ b/ULogViewer/Controls/KeyLogAnalysisRuleSetEditorDialog.axaml
@@ -7,6 +7,7 @@
xmlns:asControls="using:CarinaStudio.AppSuite.Controls"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="CarinaStudio.ULogViewer.Controls.KeyLogAnalysisRuleSetEditorDialog"
+ Name="dialog"
CanResize="True"
Classes="Dialog"
Height="{StaticResource Double/KeyLogAnalysisRuleSetEditorDialog.Height}"
@@ -23,10 +24,10 @@
-
+
-
-
+
+
@@ -70,7 +71,7 @@
-
+
@@ -78,25 +79,25 @@
-
-
+
+
-
-
+
diff --git a/ULogViewer/Controls/KeyLogAnalysisRuleSetEditorDialog.axaml.cs b/ULogViewer/Controls/KeyLogAnalysisRuleSetEditorDialog.axaml.cs
index 0cf98711..213e8e2a 100644
--- a/ULogViewer/Controls/KeyLogAnalysisRuleSetEditorDialog.axaml.cs
+++ b/ULogViewer/Controls/KeyLogAnalysisRuleSetEditorDialog.axaml.cs
@@ -20,7 +20,7 @@ namespace CarinaStudio.ULogViewer.Controls;
///
/// Dialog to edit .
///
-class KeyLogAnalysisRuleSetEditorDialog : Window
+class KeyLogAnalysisRuleSetEditorDialog : Dialog
{
// Static fields.
static readonly StyledProperty AreValidParametersProperty = AvaloniaProperty.Register("AreValidParameters");
@@ -277,11 +277,6 @@ protected override void OnOpening(EventArgs e)
}
this.validateParametersAction.Execute();
}
-
-
- ///
- protected override WindowTransparencyLevel OnSelectTransparentLevelHint() =>
- WindowTransparencyLevel.None;
///
diff --git a/ULogViewer/Controls/LogAnalysisScriptSetEditorDialog.axaml b/ULogViewer/Controls/LogAnalysisScriptSetEditorDialog.axaml
index 4f3c3393..002cdc13 100644
--- a/ULogViewer/Controls/LogAnalysisScriptSetEditorDialog.axaml
+++ b/ULogViewer/Controls/LogAnalysisScriptSetEditorDialog.axaml
@@ -25,11 +25,11 @@
-
+
-
-
-
+
+
+
@@ -42,7 +42,7 @@
-
+
@@ -88,7 +88,7 @@
-
+
@@ -102,7 +102,7 @@
-
+
diff --git a/ULogViewer/Controls/LogAnalysisScriptSetEditorDialog.axaml.cs b/ULogViewer/Controls/LogAnalysisScriptSetEditorDialog.axaml.cs
index a5049dac..7ee2a588 100644
--- a/ULogViewer/Controls/LogAnalysisScriptSetEditorDialog.axaml.cs
+++ b/ULogViewer/Controls/LogAnalysisScriptSetEditorDialog.axaml.cs
@@ -20,7 +20,7 @@ namespace CarinaStudio.ULogViewer.Controls;
///
/// Dialog to edit log analysis script set.
///
-class LogAnalysisScriptSetEditorDialog : CarinaStudio.Controls.ApplicationWindow
+class LogAnalysisScriptSetEditorDialog : Dialog
{
// Static fields.
static readonly DirectProperty AnalysisScriptDocumentUriProperty = AvaloniaProperty.RegisterDirect(nameof(AnalysisScriptDocumentUri), d => d.analysisScriptDocumentUri);
diff --git a/ULogViewer/Controls/OperationCountingAnalysisRuleSetEditorDialog.axaml b/ULogViewer/Controls/OperationCountingAnalysisRuleSetEditorDialog.axaml
index 8c288e58..037a7143 100644
--- a/ULogViewer/Controls/OperationCountingAnalysisRuleSetEditorDialog.axaml
+++ b/ULogViewer/Controls/OperationCountingAnalysisRuleSetEditorDialog.axaml
@@ -7,6 +7,7 @@
xmlns:asControls="using:CarinaStudio.AppSuite.Controls"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="CarinaStudio.ULogViewer.Controls.OperationCountingAnalysisRuleSetEditorDialog"
+ Name="dialog"
CanResize="True"
Classes="Dialog"
Height="{StaticResource Double/OperationCountingAnalysisRuleSetEditorDialog.Height}"
@@ -23,10 +24,10 @@
-
+
-
-
+
+
@@ -70,7 +71,7 @@
-
+
@@ -90,21 +91,21 @@
TextTrimming="None"/>
-
+
-
+
-
+
@@ -117,7 +118,7 @@
-
+
diff --git a/ULogViewer/Controls/OperationCountingAnalysisRuleSetEditorDialog.axaml.cs b/ULogViewer/Controls/OperationCountingAnalysisRuleSetEditorDialog.axaml.cs
index 9468d1e7..1e95d8a2 100644
--- a/ULogViewer/Controls/OperationCountingAnalysisRuleSetEditorDialog.axaml.cs
+++ b/ULogViewer/Controls/OperationCountingAnalysisRuleSetEditorDialog.axaml.cs
@@ -19,7 +19,7 @@ namespace CarinaStudio.ULogViewer.Controls
///
/// Dialog to edit .
///
- class OperationCountingAnalysisRuleSetEditorDialog : Window
+ class OperationCountingAnalysisRuleSetEditorDialog : Dialog
{
///
/// Definition set of patterns of rule.
@@ -252,11 +252,6 @@ protected override void OnOpening(EventArgs e)
}
this.validateParametersAction.Schedule();
}
-
-
- ///
- protected override WindowTransparencyLevel OnSelectTransparentLevelHint() =>
- WindowTransparencyLevel.None;
///
@@ -285,7 +280,7 @@ void RemoveRule(OperationCountingAnalysisRuleSet.Rule rule)
///
/// Rules.
///
- public IList Rules { get => this.rules; }
+ public IList Rules => this.rules;
///
@@ -298,7 +293,7 @@ public static void Show(Avalonia.Controls.Window parent, OperationCountingAnalys
// show existing dialog
if (ruleSet != null && DialogWithEditingRuleSets.TryGetValue(ruleSet, out var dialog))
{
- dialog?.ActivateAndBringToFront();
+ dialog.ActivateAndBringToFront();
return;
}
diff --git a/ULogViewer/Controls/OperationDurationAnalysisRuleSetEditorDialog.axaml b/ULogViewer/Controls/OperationDurationAnalysisRuleSetEditorDialog.axaml
index b81367c3..5a1ab74e 100644
--- a/ULogViewer/Controls/OperationDurationAnalysisRuleSetEditorDialog.axaml
+++ b/ULogViewer/Controls/OperationDurationAnalysisRuleSetEditorDialog.axaml
@@ -7,6 +7,7 @@
xmlns:asControls="using:CarinaStudio.AppSuite.Controls"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="CarinaStudio.ULogViewer.Controls.OperationDurationAnalysisRuleSetEditorDialog"
+ Name="dialog"
CanResize="True"
Classes="Dialog"
Height="{StaticResource Double/OperationDurationAnalysisRuleSetEditorDialog.Height}"
@@ -23,10 +24,10 @@
-
+
-
-
+
+
@@ -69,7 +70,7 @@
-
+
@@ -98,35 +99,35 @@
TextTrimming="None"/>
-
+
-
+
-
+
-
+
-
+
@@ -139,7 +140,7 @@
-
+
diff --git a/ULogViewer/Controls/OperationDurationAnalysisRuleSetEditorDialog.axaml.cs b/ULogViewer/Controls/OperationDurationAnalysisRuleSetEditorDialog.axaml.cs
index e0ee20fd..acde3ff1 100644
--- a/ULogViewer/Controls/OperationDurationAnalysisRuleSetEditorDialog.axaml.cs
+++ b/ULogViewer/Controls/OperationDurationAnalysisRuleSetEditorDialog.axaml.cs
@@ -19,7 +19,7 @@ namespace CarinaStudio.ULogViewer.Controls;
///
/// Dialog to edit .
///
-class OperationDurationAnalysisRuleSetEditorDialog : Window
+class OperationDurationAnalysisRuleSetEditorDialog : Dialog
{
///
/// Definition set of patterns of rule.
@@ -317,11 +317,6 @@ protected override void OnOpening(EventArgs e)
}
this.validateParametersAction.Schedule();
}
-
-
- ///
- protected override WindowTransparencyLevel OnSelectTransparentLevelHint() =>
- WindowTransparencyLevel.None;
///
diff --git a/ULogViewer/Controls/PredefinedLogTextFilterEditorDialog.axaml b/ULogViewer/Controls/PredefinedLogTextFilterEditorDialog.axaml
index e6dd0b34..23a7fcbd 100644
--- a/ULogViewer/Controls/PredefinedLogTextFilterEditorDialog.axaml
+++ b/ULogViewer/Controls/PredefinedLogTextFilterEditorDialog.axaml
@@ -38,7 +38,7 @@
-
+
@@ -85,8 +85,8 @@
-
-
+
+
diff --git a/ULogViewer/Controls/PredefinedLogTextFilterEditorDialog.axaml.cs b/ULogViewer/Controls/PredefinedLogTextFilterEditorDialog.axaml.cs
index 8bed7eaa..97e4f00b 100644
--- a/ULogViewer/Controls/PredefinedLogTextFilterEditorDialog.axaml.cs
+++ b/ULogViewer/Controls/PredefinedLogTextFilterEditorDialog.axaml.cs
@@ -20,7 +20,7 @@ namespace CarinaStudio.ULogViewer.Controls;
///
/// Dialog to edit or create .
///
-class PredefinedLogTextFilterEditorDialog : Window
+class PredefinedLogTextFilterEditorDialog : AppSuite.Controls.Dialog
{
///
/// Key of persistent state tp indicate whether tutorial of group name has been shown or not.
@@ -272,11 +272,6 @@ protected override void OnOpening(EventArgs e)
}
- ///
- protected override WindowTransparencyLevel OnSelectTransparentLevelHint() =>
- WindowTransparencyLevel.None;
-
-
// Select group name.
void SelectGroupName(PredefinedLogTextFilterGroup group)
{
diff --git a/ULogViewer/Controls/ScriptLogDataSourceProviderEditorDialog.axaml b/ULogViewer/Controls/ScriptLogDataSourceProviderEditorDialog.axaml
index 750e13d3..84621226 100644
--- a/ULogViewer/Controls/ScriptLogDataSourceProviderEditorDialog.axaml
+++ b/ULogViewer/Controls/ScriptLogDataSourceProviderEditorDialog.axaml
@@ -31,7 +31,7 @@
-
+
diff --git a/ULogViewer/Controls/ScriptLogDataSourceProviderEditorDialog.axaml.cs b/ULogViewer/Controls/ScriptLogDataSourceProviderEditorDialog.axaml.cs
index 71b812f0..db5ec586 100644
--- a/ULogViewer/Controls/ScriptLogDataSourceProviderEditorDialog.axaml.cs
+++ b/ULogViewer/Controls/ScriptLogDataSourceProviderEditorDialog.axaml.cs
@@ -21,7 +21,7 @@ namespace CarinaStudio.ULogViewer.Controls;
///
/// Dialog to edit s.
///
-class ScriptLogDataSourceProviderEditorDialog : CarinaStudio.Controls.Dialog
+class ScriptLogDataSourceProviderEditorDialog : Dialog
{
// Supported source option.
public class SupportedSourceOption