Skip to content

Commit 46f017b

Browse files
HirogenHirogen
authored
Merge pull request #238 from Hirogen/issues/issue-182-high-dpi
Issues/issue 182 high dpi
2 parents 6390095 + 9258183 commit 46f017b

File tree

76 files changed

+2123
-2029
lines changed

Some content is hidden

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

76 files changed

+2123
-2029
lines changed

‎src/LogExpert/Classes/Bookmark/BookmarkExporter.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ public static void ExportBookmarkList(SortedList<int, Entities.Bookmark> bookmar
2222
foreach (Entities.Bookmark bookmark in bookmarkList.Values)
2323
{
2424
string line = logfileName + ";" + bookmark.LineNum + ";" +
25-
bookmark.Text.Replace(replacementForNewLine, @"\" + replacementForNewLine).Replace("\r\n",
26-
replacementForNewLine);
25+
bookmark.Text.Replace(replacementForNewLine, @"\" + replacementForNewLine).Replace("\r\n", replacementForNewLine);
2726
writer.WriteLine(line);
2827
}
2928
writer.Close();

‎src/LogExpert/Classes/Win32.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ public static Icon LoadIconFromExe(string fileName, int index)
8181
}
8282
return result;
8383
}
84+
85+
[DllImport("user32.dll")]
86+
public static extern long GetSystemMetricsForDpi(long index);
8487

8588

8689
[DllImport("user32.dll")]

‎src/LogExpert/Classes/xml/XmlBlockSplitter.cs‎

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,29 @@ internal class XmlBlockSplitter : LogStreamReaderBase
1212
{
1313
#region Fields
1414

15-
private static readonly string[] splitStrings = new string[] { "\r\n", "\n", "\r" };
16-
private static readonly char[] newLineChar = new char[] { '\n' };
15+
private static readonly string[] _splitStrings = { "\r\n", "\n", "\r" };
1716

18-
private readonly XmlLogReader reader;
17+
private static readonly char[] _newLineChar = { '\n' };
1918

20-
private readonly XmlParserContext context;
21-
private readonly XmlReaderSettings settings;
19+
private readonly XmlLogReader _reader;
2220

23-
private readonly Queue<string> lineList = new Queue<string>();
21+
private readonly XmlParserContext _context;
22+
private readonly XmlReaderSettings _settings;
23+
24+
private readonly Queue<string> _lineList = new Queue<string>();
2425

25-
private string stylesheet;
26-
private XslCompiledTransform xslt;
26+
private string _stylesheet;
27+
private XslCompiledTransform _xslt;
2728

2829
#endregion
2930

3031
#region cTor
3132

3233
public XmlBlockSplitter(XmlLogReader reader, IXmlLogConfiguration xmlLogConfig)
3334
{
34-
this.reader = reader;
35-
this.reader.StartTag = xmlLogConfig.XmlStartTag;
36-
this.reader.EndTag = xmlLogConfig.XmlEndTag;
35+
_reader = reader;
36+
_reader.StartTag = xmlLogConfig.XmlStartTag;
37+
_reader.EndTag = xmlLogConfig.XmlEndTag;
3738

3839
Stylesheet = xmlLogConfig.Stylesheet;
3940

@@ -45,9 +46,9 @@ public XmlBlockSplitter(XmlLogReader reader, IXmlLogConfiguration xmlLogConfig)
4546
nsmgr.AddNamespace(xmlLogConfig.Namespace[0], xmlLogConfig.Namespace[1]);
4647
}
4748
// Create the XmlParserContext.
48-
context = new XmlParserContext(nt, nsmgr, null, XmlSpace.None);
49-
settings = new XmlReaderSettings();
50-
settings.ConformanceLevel = ConformanceLevel.Fragment;
49+
_context = new XmlParserContext(nt, nsmgr, null, XmlSpace.None);
50+
_settings = new XmlReaderSettings();
51+
_settings.ConformanceLevel = ConformanceLevel.Fragment;
5152
}
5253

5354
#endregion
@@ -56,30 +57,30 @@ public XmlBlockSplitter(XmlLogReader reader, IXmlLogConfiguration xmlLogConfig)
5657

5758
public override long Position
5859
{
59-
get => reader.Position;
60-
set => reader.Position = value;
60+
get => _reader.Position;
61+
set => _reader.Position = value;
6162
}
6263

63-
public override Encoding Encoding => reader.Encoding;
64+
public override Encoding Encoding => _reader.Encoding;
6465

65-
public override bool IsBufferComplete => lineList.Count == 0;
66+
public override bool IsBufferComplete => _lineList.Count == 0;
6667

6768
public string Stylesheet
6869
{
69-
get => stylesheet;
70+
get => _stylesheet;
7071
set
7172
{
72-
stylesheet = value;
73-
if (stylesheet != null)
73+
_stylesheet = value;
74+
if (_stylesheet != null)
7475
{
75-
XmlReader stylesheetReader = XmlReader.Create(new StringReader(stylesheet));
76+
XmlReader stylesheetReader = XmlReader.Create(new StringReader(_stylesheet));
7677

77-
xslt = new XslCompiledTransform();
78-
xslt.Load(stylesheetReader);
78+
_xslt = new XslCompiledTransform();
79+
_xslt.Load(stylesheetReader);
7980
}
8081
else
8182
{
82-
xslt = null;
83+
_xslt = null;
8384
}
8485
}
8586
}
@@ -90,16 +91,16 @@ public string Stylesheet
9091

9192
private void ParseXmlBlock(string block)
9293
{
93-
if (stylesheet != null)
94+
if (_stylesheet != null)
9495
{
95-
XmlReader xmlReader = XmlReader.Create(new StringReader(block), settings, context);
96+
XmlReader xmlReader = XmlReader.Create(new StringReader(block), _settings, _context);
9697

9798
xmlReader.Read();
9899
xmlReader.MoveToContent();
99100
//xmlReader.MoveToContent();
100101
StringWriter textWriter = new StringWriter();
101102

102-
xslt.Transform(xmlReader, null, textWriter);
103+
_xslt.Transform(xmlReader, null, textWriter);
103104
string message = textWriter.ToString();
104105
SplitToLinesList(message);
105106
}
@@ -113,17 +114,17 @@ private void ParseXmlBlock(string block)
113114
private void SplitToLinesList(string message)
114115
{
115116
const int MAX_LEN = 3000;
116-
string[] lines = message.Split(splitStrings, StringSplitOptions.None);
117+
string[] lines = message.Split(_splitStrings, StringSplitOptions.None);
117118
foreach (string theLine in lines)
118119
{
119-
string line = theLine.Trim(newLineChar);
120+
string line = theLine.Trim(_newLineChar);
120121
while (line.Length > MAX_LEN)
121122
{
122123
string part = line.Substring(0, MAX_LEN);
123124
line = line.Substring(MAX_LEN);
124-
lineList.Enqueue(part);
125+
_lineList.Enqueue(part);
125126
}
126-
lineList.Enqueue(line);
127+
_lineList.Enqueue(line);
127128
}
128129
}
129130

@@ -135,20 +136,20 @@ protected override void Dispose(bool disposing)
135136
{
136137
if (disposing)
137138
{
138-
reader.Dispose();
139+
_reader.Dispose();
139140
}
140141
}
141142

142143
public override int ReadChar()
143144
{
144-
return reader.ReadChar();
145+
return _reader.ReadChar();
145146
}
146147

147148
public override string ReadLine()
148149
{
149-
if (lineList.Count == 0)
150+
if (_lineList.Count == 0)
150151
{
151-
string block = reader.ReadLine();
152+
string block = _reader.ReadLine();
152153
if (block == null)
153154
{
154155
return null;
@@ -160,10 +161,10 @@ public override string ReadLine()
160161
}
161162
catch (XmlException)
162163
{
163-
lineList.Enqueue("[XML Parser error] " + block);
164+
_lineList.Enqueue("[XML Parser error] " + block);
164165
}
165166
}
166-
return lineList.Dequeue();
167+
return _lineList.Dequeue();
167168
}
168169

169170
#endregion

‎src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,17 @@ public partial class LogTabWindow : Form
7373
public LogTabWindow(string[] fileNames, int instanceNumber, bool showInstanceNumbers)
7474
{
7575
InitializeComponent();
76+
77+
AutoScaleDimensions = new SizeF(96F, 96F);
78+
AutoScaleMode = AutoScaleMode.Dpi;
79+
7680
_startupFileNames = fileNames;
77-
this._instanceNumber = instanceNumber;
78-
this._showInstanceNumbers = showInstanceNumbers;
81+
_instanceNumber = instanceNumber;
82+
_showInstanceNumbers = showInstanceNumbers;
7983

8084
Load += OnLogTabWindowLoad;
8185

82-
ConfigManager.Instance.ConfigChanged += ConfigChanged;
86+
ConfigManager.Instance.ConfigChanged += OnConfigChanged;
8387
HilightGroupList = ConfigManager.Settings.hilightGroupList;
8488

8589
Rectangle led = new Rectangle(0, 0, 8, 2);

‎src/LogExpert/Controls/LogTabWindow/LogTabWindowEventHandlers.cs‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ private void OnLogTabWindowClosing(object sender, CancelEventArgs e)
9999

100100
DestroyBookmarkWindow();
101101

102-
ConfigManager.Instance.ConfigChanged -= ConfigChanged;
102+
ConfigManager.Instance.ConfigChanged -= OnConfigChanged;
103103

104104
SaveWindowPosition();
105105
ConfigManager.Save(SettingsFlags.WindowPosition | SettingsFlags.FileHistory);
@@ -707,6 +707,7 @@ private void OnTabColorToolStripMenuItemClick(object sender, EventArgs e)
707707
LogWindow.LogWindow logWindow = dockPanel.ActiveContent as LogWindow.LogWindow;
708708

709709
LogWindowData data = logWindow.Tag as LogWindowData;
710+
710711
if (data == null)
711712
{
712713
return;
@@ -720,18 +721,21 @@ private void OnTabColorToolStripMenuItemClick(object sender, EventArgs e)
720721
SetTabColor(logWindow, data.color);
721722
}
722723
List<ColorEntry> delList = new List<ColorEntry>();
724+
723725
foreach (ColorEntry entry in ConfigManager.Settings.fileColors)
724726
{
725727
if (entry.FileName.ToLower().Equals(logWindow.FileName.ToLower()))
726728
{
727729
delList.Add(entry);
728730
}
729731
}
732+
730733
foreach (ColorEntry entry in delList)
731734
{
732735
ConfigManager.Settings.fileColors.Remove(entry);
733736
}
734737
ConfigManager.Settings.fileColors.Add(new ColorEntry(logWindow.FileName, dlg.Color));
738+
735739
while (ConfigManager.Settings.fileColors.Count > MAX_COLOR_HISTORY)
736740
{
737741
ConfigManager.Settings.fileColors.RemoveAt(0);
@@ -751,6 +755,7 @@ private void OnSaveProjectToolStripMenuItemClick(object sender, EventArgs e)
751755
SaveFileDialog dlg = new SaveFileDialog();
752756
dlg.DefaultExt = "lxj";
753757
dlg.Filter = @"LogExpert session (*.lxj)|*.lxj";
758+
754759
if (dlg.ShowDialog() == DialogResult.OK)
755760
{
756761
string fileName = dlg.FileName;
@@ -768,6 +773,7 @@ private void OnSaveProjectToolStripMenuItemClick(object sender, EventArgs e)
768773
}
769774
}
770775
}
776+
771777
ProjectData projectData = new ProjectData();
772778
projectData.memberList = fileNames;
773779
projectData.tabLayoutXml = SaveLayout();
@@ -836,7 +842,8 @@ private void OnHighlightGroupsComboBoxMouseUp(object sender, MouseEventArgs e)
836842
}
837843
}
838844

839-
private void ConfigChanged(object sender, ConfigChangedEventArgs e)
845+
846+
private void OnConfigChanged(object sender, ConfigChangedEventArgs e)
840847
{
841848
if (LogExpertProxy != null)
842849
{

‎src/LogExpert/Controls/LogTabWindow/LogTabWindowPrivate.cs‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1114,17 +1114,20 @@ private void StartTool(string cmd, string args, bool sysoutPipe, string columniz
11141114
}
11151115

11161116
SysoutPipe pipe = new SysoutPipe(process.StandardOutput);
1117+
11171118
LogWindow.LogWindow logWin = AddTempFileTab(pipe.FileName,
11181119
CurrentLogWindow.IsTempFile
11191120
? CurrentLogWindow.TempTitleName
11201121
: Util.GetNameFromPath(CurrentLogWindow.FileName) + "->E");
11211122
logWin.ForceColumnizer(columnizer);
1123+
11221124
process.Exited += pipe.ProcessExitedEventHandler;
11231125
//process.BeginOutputReadLine();
11241126
}
11251127
else
11261128
{
11271129
_logger.Info("Starting external tool: {0} {1}", cmd, args);
1130+
11281131
try
11291132
{
11301133
startInfo.UseShellExecute = false;
@@ -1187,7 +1190,7 @@ private void LoadProject(string projectFileName, bool restoreLayout)
11871190
CloseAllTabs();
11881191
break;
11891192
case ProjectLoadDlgResult.NewWindow:
1190-
LogExpertProxy.NewWindow(new string[] {projectFileName});
1193+
LogExpertProxy.NewWindow(new[] {projectFileName});
11911194
return;
11921195
}
11931196
}
@@ -1288,32 +1291,35 @@ private void ThrowExceptionThreadFx()
12881291

12891292
private string SaveLayout()
12901293
{
1291-
;
12921294
using (MemoryStream memStream = new MemoryStream(2000))
1293-
using (StreamReader r = new StreamReader(memStream))
12941295
{
1295-
dockPanel.SaveAsXml(memStream, Encoding.UTF8, true);
1296+
using (StreamReader r = new StreamReader(memStream))
1297+
{
1298+
dockPanel.SaveAsXml(memStream, Encoding.UTF8, true);
12961299

1297-
memStream.Seek(0, SeekOrigin.Begin);
1298-
string resultXml = r.ReadToEnd();
1300+
memStream.Seek(0, SeekOrigin.Begin);
1301+
string resultXml = r.ReadToEnd();
12991302

1300-
r.Close();
1303+
r.Close();
13011304

1302-
return resultXml;
1305+
return resultXml;
1306+
}
13031307
}
13041308
}
13051309

13061310
private void RestoreLayout(string layoutXml)
13071311
{
13081312
using (MemoryStream memStream = new MemoryStream(2000))
1309-
using (StreamWriter w = new StreamWriter(memStream))
13101313
{
1311-
w.Write(layoutXml);
1312-
w.Flush();
1314+
using (StreamWriter w = new StreamWriter(memStream))
1315+
{
1316+
w.Write(layoutXml);
1317+
w.Flush();
13131318

1314-
memStream.Seek(0, SeekOrigin.Begin);
1319+
memStream.Seek(0, SeekOrigin.Begin);
13151320

1316-
dockPanel.LoadFromXml(memStream, DeserializeDockContent, true);
1321+
dockPanel.LoadFromXml(memStream, DeserializeDockContent, true);
1322+
}
13171323
}
13181324
}
13191325

‎src/LogExpert/Controls/LogWindow/LogWindow.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,9 @@ public LogWindow(LogTabWindow.LogTabWindow parent, string fileName, bool isTempF
135135

136136
InitializeComponent();
137137

138+
AutoScaleDimensions = new SizeF(96F, 96F);
139+
AutoScaleMode = AutoScaleMode.Dpi;
140+
138141
columnNamesLabel.Text = ""; // no filtering on columns by default
139142

140143
_parentLogTabWin = parent;
@@ -502,9 +505,7 @@ protected override string GetPersistString()
502505

503506
private delegate void SelectLineFx(int line, bool triggerSyncCall);
504507

505-
private delegate void FilterFx(
506-
FilterParams filterParams, List<int> filterResultLines, List<int> lastFilterResultLines,
507-
List<int> filterHitList);
508+
private delegate void FilterFx(FilterParams filterParams, List<int> filterResultLines, List<int> lastFilterResultLines, List<int> filterHitList);
508509

509510
private delegate void UpdateProgressBarFx(int lineNum);
510511

‎src/LogExpert/Controls/LogWindow/LogWindow.designer.cs‎

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

0 commit comments

Comments
 (0)