Skip to content

Commit b32b1f7

Browse files
couchcodingcouchcoding
committed
Further work for release 1.2.0.0
- A bit work on the custom file receiver. Still not finished! - Added a log level annotation bar, right to the log window scrollbar. - Updated all third party components and improved the user interface skin.
1 parent fe517cc commit b32b1f7

File tree

70 files changed

+2497
-784
lines changed

Some content is hidden

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

70 files changed

+2497
-784
lines changed

‎doc/Thumbs.db‎

36 KB
Binary file not shown.

‎src/GuiLibrary/Controls/MenuStripEx.cs‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
#region Copyright © 2015 Couchcoding
2+
3+
// File: MenuStripEx.cs
4+
// Package: GuiLibrary
5+
// Project: Logbert
6+
//
7+
// The MIT License (MIT)
8+
//
9+
// Copyright (c) 2016 Couchcoding
10+
//
11+
// Permission is hereby granted, free of charge, to any person obtaining a copy
12+
// of this software and associated documentation files (the "Software"), to deal
13+
// in the Software without restriction, including without limitation the rights
14+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
15+
// copies of the Software, and to permit persons to whom the Software is
16+
// furnished to do so, subject to the following conditions:
17+
//
18+
// The above copyright notice and this permission notice shall be included in
19+
// all copies or substantial portions of the Software.
20+
//
21+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
22+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
23+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
24+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
25+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
26+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
27+
// THE SOFTWARE.
28+
29+
#endregion
30+
31+
using System;
32+
using System.Windows.Forms;
33+
34+
namespace Com.Couchcoding.GuiLibrary.Controls
35+
{
36+
/// <summary>
37+
/// Implements an enhanced <see cref="MenuStrip"/> control with enabled click through.
38+
/// </summary>
39+
public sealed class MenuStripEx : MenuStrip
40+
{
41+
#region Private Consts
42+
43+
/// <summary>
44+
/// Sent when the cursor is in an inactive window and the user presses a mouse button.
45+
/// </summary>
46+
private const uint WM_MOUSEACTIVATE = 0x21;
47+
48+
/// <summary>
49+
/// Sent when the cursor is in an inactive window and the user presses a mouse button.
50+
/// </summary>
51+
private const uint MA_ACTIVATE = 0x1;
52+
53+
/// <summary>
54+
/// Sent when the cursor is in an inactive window and the user presses a mouse button.
55+
/// </summary>
56+
private const uint MA_ACTIVATEANDEAT = 0x2;
57+
58+
#endregion
59+
60+
#region Overridden Methods
61+
62+
/// <summary>
63+
/// Processes Windows messages.
64+
/// </summary>
65+
/// <param name="m">The Windows <see cref="T:System.Windows.Forms.Message"/> to process.</param>
66+
protected override void WndProc(ref Message m)
67+
{
68+
base.WndProc(ref m);
69+
70+
if (m.Msg == WM_MOUSEACTIVATE && m.Result == (IntPtr)MA_ACTIVATEANDEAT)
71+
{
72+
m.Result = (IntPtr)MA_ACTIVATE;
73+
}
74+
}
75+
76+
#endregion
77+
}
78+
}

‎src/GuiLibrary/GuiLibrary.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@
8181
<Compile Include="Controls\ListViewEx.cs">
8282
<SubType>Component</SubType>
8383
</Compile>
84+
<Compile Include="Controls\MenuStripEx.cs">
85+
<SubType>Component</SubType>
86+
</Compile>
8487
<Compile Include="Controls\PictureBoxEx.cs">
8588
<SubType>Component</SubType>
8689
</Compile>

‎src/GuiLibrary/Properties/AssemblyInfo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
[assembly: AssemblyConfiguration("")]
1010
[assembly: AssemblyCompany("Couchcoding")]
1111
[assembly: AssemblyProduct("Logbert GUI Library")]
12-
[assembly: AssemblyCopyright("Copyright © 2015 Couchcoding")]
12+
[assembly: AssemblyCopyright("Copyright © 2016 Couchcoding")]
1313
[assembly: AssemblyTrademark("")]
1414
[assembly: AssemblyCulture("")]
1515

@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("1.1.0.0")]
35-
[assembly: AssemblyFileVersion("1.1.0.0")]
34+
[assembly: AssemblyVersion("1.2.0.0")]
35+
[assembly: AssemblyFileVersion("1.2.0.0")]

‎src/Logbert Setup/Install/Parts/General.wxi‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,12 @@
3737
Guid = "482ED365-2D32-48D9-800A-D43E14065738"
3838
KeyPath = "yes">
3939

40-
<File Id="Id_LgbrtExe" Source="$(var.ReleaseDir)\Logbert.exe" />
41-
<File Id="Id_GuiLibraryDll" Source="$(var.ReleaseDir)\GuiLibrary.dll" />
42-
<File Id="Id_MoonSharpInterpreterDll" Source="$(var.ReleaseDir)\MoonSharp.Interpreter.dll" />
43-
<File Id="Id_ScintillaNETDll" Source="$(var.ReleaseDir)\ScintillaNET.dll" />
44-
<File Id="Id_WeifenLuoWinFormsUIDockingDll" Source="$(var.ReleaseDir)\WeifenLuo.WinFormsUI.Docking.dll" />
40+
<File Id="Id_LgbrtExe" Source="$(var.ReleaseDir)\Logbert.exe" />
41+
<File Id="Id_GuiLibraryDll" Source="$(var.ReleaseDir)\GuiLibrary.dll" />
42+
<File Id="Id_MoonSharpInterpreterDll" Source="$(var.ReleaseDir)\MoonSharp.Interpreter.dll" />
43+
<File Id="Id_ScintillaNETDll" Source="$(var.ReleaseDir)\ScintillaNET.dll" />
44+
<File Id="Id_WeifenLuoWinFormsUIDockingDll" Source="$(var.ReleaseDir)\WeifenLuo.WinFormsUI.Docking.dll" />
45+
<File Id="Id_WeifenLuoWinFormsUIDockingThemeVS2013Dll" Source="$(var.ReleaseDir)\WeifenLuo.WinFormsUI.Docking.ThemeVS2015.dll" />
4546

4647
<!-- Create a registry key that contains the last used installation
4748
directory for further update installations. -->

‎src/Logbert.sln‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.40629.0
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Logbert", "Logbert\Logbert.csproj", "{EE81C506-55E4-417E-B1D6-09453F89C7CD}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "WinFormsUI\WinFormsUI.csproj", "{C75532C4-765B-418E-B09B-46D36B2ABDB1}"
9-
EndProject
108
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GuiLibrary", "GuiLibrary\GuiLibrary.csproj", "{0D9D135F-9D7A-4D90-8810-903450FD4245}"
119
EndProject
1210
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Logbert Setup", "Logbert Setup\Logbert Setup.wixproj", "{8C408EBB-DDB3-4217-BB6B-AF6584A13F4B}"
@@ -25,10 +23,6 @@ Global
2523
{EE81C506-55E4-417E-B1D6-09453F89C7CD}.Debug|x86.Build.0 = Debug|x86
2624
{EE81C506-55E4-417E-B1D6-09453F89C7CD}.Release|x86.ActiveCfg = Release|x86
2725
{EE81C506-55E4-417E-B1D6-09453F89C7CD}.Release|x86.Build.0 = Release|x86
28-
{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|x86.ActiveCfg = Debug|x86
29-
{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|x86.Build.0 = Debug|x86
30-
{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|x86.ActiveCfg = Release|x86
31-
{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|x86.Build.0 = Release|x86
3226
{0D9D135F-9D7A-4D90-8810-903450FD4245}.Debug|x86.ActiveCfg = Debug|x86
3327
{0D9D135F-9D7A-4D90-8810-903450FD4245}.Debug|x86.Build.0 = Debug|x86
3428
{0D9D135F-9D7A-4D90-8810-903450FD4245}.Release|x86.ActiveCfg = Release|x86

‎src/Logbert/App.config‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,12 @@
339339
<setting name="DockLayoutSyslogUdpReceiver" serializeAs="String">
340340
<value />
341341
</setting>
342+
<setting name="EnableColorMap" serializeAs="String">
343+
<value>True</value>
344+
</setting>
345+
<setting name="ColorMapAnnotation" serializeAs="String">
346+
<value>48</value>
347+
</setting>
342348
</Com.Couchcoding.Logbert.Properties.Settings>
343349
</userSettings>
344350
<applicationSettings>

‎src/Logbert/Controls/ColorMap.Designer.cs‎

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

0 commit comments

Comments
 (0)