Skip to content

Commit ccd5966

Browse files
skraikovskraikov
committed
3.5.21.1135
1 parent 247fd1f commit ccd5966

File tree

185 files changed

+13869
-3930
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

185 files changed

+13869
-3930
lines changed

‎AdvantageDemo/AdvantageDemo.csproj

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@
4141
</PropertyGroup>
4242
<ItemGroup>
4343
<Reference Include="ActiveQueryBuilder.AdvantageMetadataProvider">
44-
<HintPath>..\packages\ActiveQueryBuilder.AdvantageMetadataProvider.3.5.20.1133\lib\net\ActiveQueryBuilder.AdvantageMetadataProvider.dll</HintPath>
44+
<HintPath>..\packages\ActiveQueryBuilder.AdvantageMetadataProvider.3.5.21.1135\lib\net\ActiveQueryBuilder.AdvantageMetadataProvider.dll</HintPath>
4545
</Reference>
4646
<Reference Include="ActiveQueryBuilder.Core">
47-
<HintPath>..\packages\ActiveQueryBuilder.Core.3.5.20.1133\lib\net\ActiveQueryBuilder.Core.dll</HintPath>
47+
<HintPath>..\packages\ActiveQueryBuilder.Core.3.5.21.1135\lib\net\ActiveQueryBuilder.Core.dll</HintPath>
4848
</Reference>
4949
<Reference Include="ActiveQueryBuilder.View">
50-
<HintPath>..\packages\ActiveQueryBuilder.View.WinForms.3.5.20.1133\lib\net\ActiveQueryBuilder.View.dll</HintPath>
50+
<HintPath>..\packages\ActiveQueryBuilder.View.WinForms.3.5.21.1135\lib\net\ActiveQueryBuilder.View.dll</HintPath>
5151
</Reference>
5252
<Reference Include="ActiveQueryBuilder.View.WinForms">
53-
<HintPath>..\packages\ActiveQueryBuilder.View.WinForms.3.5.20.1133\lib\net\ActiveQueryBuilder.View.WinForms.dll</HintPath>
53+
<HintPath>..\packages\ActiveQueryBuilder.View.WinForms.3.5.21.1135\lib\net\ActiveQueryBuilder.View.WinForms.dll</HintPath>
5454
</Reference>
5555
<Reference Include="Advantage.Data.Provider">
5656
<HintPath>..\third-party\Advantage.Data.Provider.dll</HintPath>
@@ -62,6 +62,12 @@
6262
<Reference Include="System.Xml" />
6363
</ItemGroup>
6464
<ItemGroup>
65+
<Compile Include="Common\ErrorBox.cs">
66+
<SubType>UserControl</SubType>
67+
</Compile>
68+
<Compile Include="Common\ErrorBox.Designer.cs">
69+
<DependentUpon>ErrorBox.cs</DependentUpon>
70+
</Compile>
6571
<Compile Include="Form1.cs">
6672
<SubType>Form</SubType>
6773
</Compile>
@@ -70,6 +76,9 @@
7076
</Compile>
7177
<Compile Include="Program.cs" />
7278
<Compile Include="Properties\AssemblyInfo.cs" />
79+
<EmbeddedResource Include="Common\ErrorBox.resx">
80+
<DependentUpon>ErrorBox.cs</DependentUpon>
81+
</EmbeddedResource>
7382
<EmbeddedResource Include="Form1.resx">
7483
<DependentUpon>Form1.cs</DependentUpon>
7584
<SubType>Designer</SubType>
@@ -115,6 +124,7 @@
115124
<DependentUpon>AdvantageConnectionForm.cs</DependentUpon>
116125
</Compile>
117126
</ItemGroup>
127+
<ItemGroup />
118128
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
119129
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
120130
Other similar extension points exist, see Microsoft.Common.targets.

‎AdvantageDemo/Common/ErrorBox.Designer.cs

Lines changed: 145 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎AdvantageDemo/Common/ErrorBox.cs

Lines changed: 164 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,164 @@
1+
//*******************************************************************//
2+
// Active Query Builder Component Suite //
3+
// //
4+
// Copyright © 2006-2019 Active Database Software //
5+
// ALL RIGHTS RESERVED //
6+
// //
7+
// CONSULT THE LICENSE AGREEMENT FOR INFORMATION ON //
8+
// RESTRICTIONS. //
9+
//*******************************************************************//
10+
11+
using System;
12+
using System.ComponentModel;
13+
using System.Drawing;
14+
using System.Windows.Forms;
15+
using ActiveQueryBuilder.Core;
16+
17+
namespace AdvantageDemo.Common
18+
{
19+
internal partial class ErrorBox : UserControl
20+
{
21+
private bool _allowChangedSyntax = true;
22+
23+
[Browsable(true)]
24+
public bool IsVisibleCheckSyntaxPanel
25+
{
26+
get { return panelCheckSyntax.Visible; }
27+
set { panelCheckSyntax.Visible = value; }
28+
}
29+
public event EventHandler SyntaxProviderChanged;
30+
public event EventHandler GoToErrorPosition;
31+
public event EventHandler RevertValidText;
32+
33+
public BaseSyntaxProvider CurrentSyntaxProvider { get; set; }
34+
35+
public ErrorBox()
36+
{
37+
InitializeComponent();
38+
39+
Visible = false;
40+
41+
comboBoxSyntaxProvider.Items.Clear();
42+
43+
foreach (Type baseSyntaxProvider in Helpers.SyntaxProviderList)
44+
{
45+
var instance = Activator.CreateInstance(baseSyntaxProvider) as BaseSyntaxProvider;
46+
comboBoxSyntaxProvider.Items.Add(new ComboBoxItem(instance));
47+
}
48+
}
49+
50+
public void Show(string message, BaseSyntaxProvider baseSyntaxProvider)
51+
{
52+
labelMessage.Text = message;
53+
54+
if (string.IsNullOrEmpty(message))
55+
{
56+
Visible = false;
57+
return;
58+
}
59+
60+
Visible = true;
61+
62+
CurrentSyntaxProvider = baseSyntaxProvider;
63+
64+
_allowChangedSyntax = false;
65+
if (CurrentSyntaxProvider != null)
66+
comboBoxSyntaxProvider.Text = CurrentSyntaxProvider.ToString();
67+
_allowChangedSyntax = true;
68+
}
69+
70+
protected virtual void OnSyntaxProviderChanged()
71+
{
72+
if (!_allowChangedSyntax) return;
73+
CurrentSyntaxProvider = ((ComboBoxItem) comboBoxSyntaxProvider.SelectedItem).SyntaxProvider;
74+
SyntaxProviderChanged?.Invoke(this, EventArgs.Empty);
75+
Visible = false;
76+
}
77+
78+
protected virtual void OnGoToErrorPositionEvent()
79+
{
80+
GoToErrorPosition?.Invoke(this, EventArgs.Empty);
81+
Visible = false;
82+
}
83+
84+
protected virtual void OnRevertValidTextEvent()
85+
{
86+
RevertValidText?.Invoke(this, EventArgs.Empty);
87+
Visible = false;
88+
}
89+
90+
private void linkLabelGoTo_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
91+
{
92+
OnGoToErrorPositionEvent();
93+
}
94+
95+
private void linkLabelRevert_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
96+
{
97+
OnRevertValidTextEvent();
98+
}
99+
100+
private void comboBoxSyntaxProvider_SelectedValueChanged(object sender, EventArgs e)
101+
{
102+
OnSyntaxProviderChanged();
103+
}
104+
}
105+
106+
internal class ComboBoxItem
107+
{
108+
public BaseSyntaxProvider SyntaxProvider { get; }
109+
public string DisplayString => SyntaxProvider.ToString();
110+
public ComboBoxItem() { }
111+
112+
public ComboBoxItem(BaseSyntaxProvider provider)
113+
{
114+
SyntaxProvider = provider;
115+
}
116+
}
117+
118+
internal class GrowLabel : Label
119+
{
120+
private bool _mGrowing;
121+
122+
public GrowLabel()
123+
{
124+
AutoSize = false;
125+
}
126+
127+
public sealed override bool AutoSize
128+
{
129+
get { return base.AutoSize; }
130+
set { base.AutoSize = value; }
131+
}
132+
133+
private void resizeLabel()
134+
{
135+
if (_mGrowing) return;
136+
try
137+
{
138+
_mGrowing = true;
139+
Size sz = new Size(this.Width, Int32.MaxValue);
140+
sz = TextRenderer.MeasureText(this.Text, this.Font, sz, TextFormatFlags.WordBreak);
141+
this.Height = sz.Height;
142+
}
143+
finally
144+
{
145+
_mGrowing = false;
146+
}
147+
}
148+
protected override void OnTextChanged(EventArgs e)
149+
{
150+
base.OnTextChanged(e);
151+
resizeLabel();
152+
}
153+
protected override void OnFontChanged(EventArgs e)
154+
{
155+
base.OnFontChanged(e);
156+
resizeLabel();
157+
}
158+
protected override void OnSizeChanged(EventArgs e)
159+
{
160+
base.OnSizeChanged(e);
161+
resizeLabel();
162+
}
163+
}
164+
}

0 commit comments

Comments
 (0)