Skip to content

Commit 5fc90f5

Browse files
AlexanderProAlexanderPro
committed
Added the ability to remove an element from the historical list
1 parent 85e070b commit 5fc90f5

File tree

7 files changed

+175
-133
lines changed

7 files changed

+175
-133
lines changed

‎WindowTextExtractor/Forms/MainForm.Designer.cs‎

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

‎WindowTextExtractor/Forms/MainForm.cs‎

Lines changed: 49 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ protected override void OnLoad(EventArgs e)
104104

105105
Application.AddMessageFilter(this);
106106

107-
menuItemAlwaysOnTop_Click(this, EventArgs.Empty);
107+
MenuItemAlwaysOnTopClick(this, EventArgs.Empty);
108108
OnContentChanged();
109109

110110
var font = new Font(DEFAULT_FONT_NAME, DEFAULT_FONT_SIZE, FontStyle.Regular, GraphicsUnit.Point);
@@ -190,11 +190,11 @@ protected override void WndProc(ref Message m)
190190
base.WndProc(ref m);
191191
}
192192

193-
private void txtContent_TextChanged(object sender, EventArgs e) => OnContentChanged();
193+
private void TextContentTextChanged(object sender, EventArgs e) => OnContentChanged();
194194

195-
private void txtContent_MultilineChanged(object sender, EventArgs e) => OnContentChanged();
195+
private void TextContentMultilineChanged(object sender, EventArgs e) => OnContentChanged();
196196

197-
private void gvTextList_SelectionChanged(object sender, EventArgs e)
197+
private void GridViewTextListSelectionChanged(object sender, EventArgs e)
198198
{
199199
foreach (DataGridViewRow row in gvTextList.Rows)
200200
{
@@ -208,7 +208,31 @@ private void gvTextList_SelectionChanged(object sender, EventArgs e)
208208
}
209209
}
210210

211-
private void menuItemSaveInformationAs_Click(object sender, EventArgs e)
211+
private void GridViewTextListCellClick(object sender, DataGridViewCellEventArgs e)
212+
{
213+
var grid = (DataGridView)sender;
214+
215+
if (e.ColumnIndex == 1)
216+
{
217+
grid.Rows.RemoveAt(e.RowIndex);
218+
if (grid.Rows.Count > 0)
219+
{
220+
var lastRowIndex = grid.Rows.Count - 1;
221+
var lastRow = grid.Rows[lastRowIndex];
222+
var firstCell = lastRow.Cells[0];
223+
lastRow.Selected = true;
224+
grid.FirstDisplayedScrollingRowIndex = lastRowIndex;
225+
txtContent.Text = ((string)firstCell.Value) ?? string.Empty;
226+
}
227+
else
228+
{
229+
txtContent.Text = string.Empty;
230+
}
231+
OnContentChanged();
232+
}
233+
}
234+
235+
private void MenuItemSaveInformationAsClick(object sender, EventArgs e)
212236
{
213237
var dialog = new SaveFileDialog
214238
{
@@ -234,7 +258,7 @@ private void menuItemSaveInformationAs_Click(object sender, EventArgs e)
234258
}
235259
}
236260

237-
private void menuItemSaveTextAs_Click(object sender, EventArgs e)
261+
private void MenuItemSaveTextAsClick(object sender, EventArgs e)
238262
{
239263
var dialog = new SaveFileDialog
240264
{
@@ -259,7 +283,7 @@ private void menuItemSaveTextAs_Click(object sender, EventArgs e)
259283
}
260284
}
261285

262-
private void menuItemSaveTextListAs_Click(object sender, EventArgs e)
286+
private void MenuItemSaveTextListAsClick(object sender, EventArgs e)
263287
{
264288
var dialog = new SaveFileDialog
265289
{
@@ -286,7 +310,7 @@ private void menuItemSaveTextListAs_Click(object sender, EventArgs e)
286310
}
287311
}
288312

289-
private void menuItemSaveImageAs_Click(object sender, EventArgs e)
313+
private void MenuItemSaveImageAsClick(object sender, EventArgs e)
290314
{
291315
var dialog = new SaveFileDialog
292316
{
@@ -317,7 +341,7 @@ private void menuItemSaveImageAs_Click(object sender, EventArgs e)
317341
}
318342
}
319343

320-
private void menuItemSaveEnvironmentAs_Click(object sender, EventArgs e)
344+
private void MenuItemSaveEnvironmentAsClick(object sender, EventArgs e)
321345
{
322346
var dialog = new SaveFileDialog
323347
{
@@ -353,9 +377,9 @@ private void menuItemSaveEnvironmentAs_Click(object sender, EventArgs e)
353377
}
354378
}
355379

356-
private void menuItemExit_Click(object sender, EventArgs e) => Close();
380+
private void MenuItemExitClick(object sender, EventArgs e) => Close();
357381

358-
private void menuItemFont_Click(object sender, EventArgs e)
382+
private void MenuItemFontClick(object sender, EventArgs e)
359383
{
360384
var dialog = new FontDialog
361385
{
@@ -370,19 +394,19 @@ private void menuItemFont_Click(object sender, EventArgs e)
370394
}
371395
}
372396

373-
private void menuItemAlwaysOnTop_Click(object sender, EventArgs e)
397+
private void MenuItemAlwaysOnTopClick(object sender, EventArgs e)
374398
{
375399
TopMost = !TopMost;
376400
menuItemAlwaysOnTop.Checked = TopMost;
377401
}
378402

379-
private void menuItemChecked_Click(object sender, EventArgs e)
403+
private void MenuItemCheckedClick(object sender, EventArgs e)
380404
{
381405
var menuItem = (ToolStripMenuItem)sender;
382406
menuItem.Checked = !menuItem.Checked;
383407
}
384408

385-
private void menuItemShowTextList_Click(object sender, EventArgs e)
409+
private void MenuItemShowTextListClick(object sender, EventArgs e)
386410
{
387411
menuItemShowTextList.Checked = !menuItemShowTextList.Checked;
388412
if (menuItemShowTextList.Checked)
@@ -397,13 +421,13 @@ private void menuItemShowTextList_Click(object sender, EventArgs e)
397421
}
398422
}
399423

400-
private void menuItemAbout_Click(object sender, EventArgs e)
424+
private void MenuItemAboutClick(object sender, EventArgs e)
401425
{
402426
var dialog = new AboutForm();
403427
dialog.ShowDialog(this);
404428
}
405429

406-
private void btnTarget_MouseDown(object sender, MouseEventArgs e)
430+
private void ButtonTargetMouseDown(object sender, MouseEventArgs e)
407431
{
408432
if (!_isButtonTargetMouseDown)
409433
{
@@ -421,7 +445,7 @@ private void btnTarget_MouseDown(object sender, MouseEventArgs e)
421445
}
422446
}
423447

424-
private void actionButtonStrip_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
448+
private void ActionButtonStripItemClicked(object sender, ToolStripItemClickedEventArgs e)
425449
{
426450
var windowHandle = IntPtr.Zero;
427451
lock (_lockObject)
@@ -460,7 +484,7 @@ private void actionButtonStrip_ItemClicked(object sender, ToolStripItemClickedEv
460484
FillInformation(windowInformation);
461485
}
462486

463-
private void btnRecord_Click(object sender, EventArgs e)
487+
private void ButtonRecordClick(object sender, EventArgs e)
464488
{
465489
var isRecording = false;
466490
lock (_lockObject)
@@ -502,7 +526,7 @@ private void btnRecord_Click(object sender, EventArgs e)
502526
numericScale.Enabled = !isRecording;
503527
}
504528

505-
private void btnGrab_Click(object sender, EventArgs e)
529+
private void ButtonGrabClick(object sender, EventArgs e)
506530
{
507531
lock (_lockObject)
508532
{
@@ -539,7 +563,7 @@ private void btnGrab_Click(object sender, EventArgs e)
539563
}
540564
}
541565

542-
private void btnBrowseFile_Click(object sender, EventArgs e)
566+
private void ButtonBrowseFileClick(object sender, EventArgs e)
543567
{
544568
var dialog = new SaveFileDialog
545569
{
@@ -562,37 +586,37 @@ private void btnBrowseFile_Click(object sender, EventArgs e)
562586
}
563587
}
564588

565-
private void numericFps_ValueChanged(object sender, EventArgs e)
589+
private void NumericFpsValueChanged(object sender, EventArgs e)
566590
{
567591
_fps = (int)((NumericUpDown)sender).Value;
568592
InitTimers(_fps);
569593
}
570594

571-
private void numericScale_ValueChanged(object sender, EventArgs e)
595+
private void NumericScaleValueChanged(object sender, EventArgs e)
572596
{
573597
lock (_lockObject)
574598
{
575599
_scale = ((NumericUpDown)sender).Value;
576600
}
577601
}
578602

579-
private void cmbRefresh_SelectedIndexChanged(object sender, EventArgs e)
603+
private void ComboBoxRefreshSelectedIndexChanged(object sender, EventArgs e)
580604
{
581605
lock (_lockObject)
582606
{
583607
_refreshImage = ((ComboBox)sender).SelectedIndex == 0;
584608
}
585609
}
586610

587-
private void cmbCaptureCursor_SelectedIndexChanged(object sender, EventArgs e)
611+
private void ComboBoxCaptureCursorSelectedIndexChanged(object sender, EventArgs e)
588612
{
589613
lock (_lockObject)
590614
{
591615
_captureCursor = ((ComboBox)sender).SelectedIndex == 0;
592616
}
593617
}
594618

595-
private void tabContent_SelectedIndexChanged(object sender, EventArgs e)
619+
private void TabContentSelectedIndexChanged(object sender, EventArgs e)
596620
{
597621
lock (_lockObject)
598622
{

‎WindowTextExtractor/Forms/MainForm.resx‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -156,22 +156,10 @@
156156
<metadata name="clmnValue.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
157157
<value>True</value>
158158
</metadata>
159-
<metadata name="clmnName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
160-
<value>True</value>
161-
</metadata>
162-
<metadata name="clmnValue.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
163-
<value>True</value>
164-
</metadata>
165159
<metadata name="dataGridColumnText.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
166160
<value>True</value>
167161
</metadata>
168-
<metadata name="dataGridColumnText.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
169-
<value>True</value>
170-
</metadata>
171-
<metadata name="clmnEnvironmentName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
172-
<value>True</value>
173-
</metadata>
174-
<metadata name="clmnEnvironmentValue.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
162+
<metadata name="dataGridColumnClose.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
175163
<value>True</value>
176164
</metadata>
177165
<metadata name="clmnEnvironmentName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

‎WindowTextExtractor/Images/Close.png‎

278 Bytes
Loading

‎WindowTextExtractor/Properties/Resources.Designer.cs‎

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

‎WindowTextExtractor/Properties/Resources.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,9 @@
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120120
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121+
<data name="Close" type="System.Resources.ResXFileRef, System.Windows.Forms">
122+
<value>..\Images\Close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
123+
</data>
121124
<data name="OnePixel" type="System.Resources.ResXFileRef, System.Windows.Forms">
122125
<value>..\Images\1x1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
123126
</data>

‎WindowTextExtractor/WindowTextExtractor.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@
219219
</ItemGroup>
220220
<ItemGroup>
221221
<Content Include="Images\1x1.png" />
222+
<Content Include="Images\Close.png" />
222223
<Content Include="Images\Target.png" />
223224
<Content Include="Images\Target32.ico" />
224225
<Content Include="Images\WindowTextExtractor.ico" />

0 commit comments

Comments
 (0)