Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions src/LogExpert.Resources/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions src/LogExpert.Resources/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -2051,4 +2051,12 @@ Continue?</value>
<data name="SearchDialog_UI_Error_InvalidRegexPattern" xml:space="preserve">
<value>Invalid regex pattern: {0}</value>
</data>
<data name="LogTabWindow_UI_Message_PluginTrustConfigurationUpdate" xml:space="preserve">
<value>Plugin trust configuration updated.

Restart LogExpert to apply changes?</value>
</data>
<data name="LogTabWindow_UI_Title_RestartRecommended" xml:space="preserve">
<value>Restart Recommended</value>
</data>
</root>
36 changes: 18 additions & 18 deletions src/LogExpert.UI/Controls/LogWindow/LogWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ public LogWindow (LogTabWindow.LogTabWindow parent, string fileName, bool isTemp
listBoxFilter.DrawMode = DrawMode.OwnerDrawVariable;
listBoxFilter.MeasureItem += MeasureItem;

Closing += OnLogWindowClosing;
FormClosing += OnLogWindowClosing;
Disposed += OnLogWindowDisposed;
Load += OnLogWindowLoad;

Expand Down Expand Up @@ -466,6 +466,15 @@ private void SetResources ()
ApplyCheckBoxResources();
ApplyToolStripMenuItemResources();
ApplyToolTipsResources();
ApplyResourceImages();
}

private void ApplyResourceImages ()
{
pnlProFilterLabel.BackgroundImage = Resources.Pro_Filter;
btnFilterDown.BackgroundImage = Resources.ArrowDown;
btnFilterUp.BackgroundImage = Resources.ArrowUp;
btnToggleHighlightPanel.Image = Resources.Arrow_menu_open;
}

private void ApplyCheckBoxResources ()
Expand Down Expand Up @@ -1693,7 +1702,6 @@ private void OnColumnContextMenuStripOpening (object sender, CancelEventArgs e)
}
}


var col = gridView.Columns[_selectedCol];
moveLeftToolStripMenuItem.Enabled = col != null && col.DisplayIndex > 0;
moveRightToolStripMenuItem.Enabled = col != null && col.DisplayIndex < gridView.Columns.Count - 1;
Expand Down Expand Up @@ -1767,7 +1775,7 @@ private void OnMoveToLastColumnToolStripMenuItemClick (object sender, EventArgs
{
var gridView = columnContextMenuStrip.SourceControl as BufferedDataGridView;
var col = gridView.Columns[_selectedCol];
col?.DisplayIndex = gridView.Columns.Count - 1;
_ = col?.DisplayIndex = gridView.Columns.Count - 1;
}

[SupportedOSPlatform("windows")]
Expand Down Expand Up @@ -3265,7 +3273,7 @@ private void SetColumnizerInternal (ILogLineColumnizer columnizer)
CurrentColumnizer = columnizer;
_freezeStateMap.Clear();

_logFileReader?.PreProcessColumnizer = CurrentColumnizer is IPreProcessColumnizer columnizer1
_ = _logFileReader?.PreProcessColumnizer = CurrentColumnizer is IPreProcessColumnizer columnizer1
? columnizer1
: null;

Expand Down Expand Up @@ -4209,7 +4217,7 @@ private void ApplyFilterParams ()
[SupportedOSPlatform("windows")]
private void ResetFilterControls ()
{
filterComboBox.Text = "";
filterComboBox.Text = string.Empty;
filterCaseSensitiveCheckBox.Checked = false;
filterRegexCheckBox.Checked = false;
//this.filterTailCheckBox.Checked = this.Preferences.filterTail;
Expand All @@ -4219,7 +4227,7 @@ private void ResetFilterControls ()
rangeCheckBox.Checked = false;
columnRestrictCheckBox.Checked = false;
knobControlFuzzy.Value = 0;
filterRangeComboBox.Text = "";
filterRangeComboBox.Text = string.Empty;
}

[SupportedOSPlatform("windows")]
Expand Down Expand Up @@ -4781,17 +4789,9 @@ private bool IsFilterSearchDirty (FilterParams filterParams)
return true;
}

if (filterParams.FuzzyValue != knobControlFuzzy.Value)
{
return true;
}

if (filterParams.ColumnRestrict != columnRestrictCheckBox.Checked)
{
return true;
}

return filterParams.IsCaseSensitive != filterCaseSensitiveCheckBox.Checked;
return filterParams.FuzzyValue != knobControlFuzzy.Value ||
filterParams.ColumnRestrict != columnRestrictCheckBox.Checked ||
filterParams.IsCaseSensitive != filterCaseSensitiveCheckBox.Checked;
}

[SupportedOSPlatform("windows")]
Expand Down Expand Up @@ -5311,7 +5311,7 @@ private string CalculateColumnNames (FilterParams filter)
}

// skip first two columns: marker + line number
names.Append(dataGridView.Columns[2 + colIndex].HeaderText);
_ = names.Append(dataGridView.Columns[2 + colIndex].HeaderText);
}
}
}
Expand Down
20 changes: 7 additions & 13 deletions src/LogExpert.UI/Controls/LogWindow/LogWindow.designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading