Support enter key in search textbox

This commit is contained in:
Jaex 2018-07-23 20:04:18 +03:00
parent a134a4498e
commit 67b5e6cf4b
3 changed files with 67 additions and 56 deletions

View file

@ -106,6 +106,7 @@ private void InitializeComponent()
this.tstbSearch.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tstbSearch.Name = "tstbSearch";
resources.ApplyResources(this.tstbSearch, "tstbSearch");
this.tstbSearch.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tstbSearch_KeyDown);
//
// tsbSearch
//

View file

@ -99,13 +99,15 @@ public ImageHistoryForm(string historyPath, int viewMode, Size thumbnailSize, Ac
private void RefreshHistoryItems()
{
SearchText = tstbSearch.Text;
if (history == null)
{
history = new HistoryManager(HistoryPath);
}
ilvImages.Items.Clear();
ImageListViewItem[] ilvItems = GetHistoryItems().Select(historyItem => new ImageListViewItem(historyItem.Filepath) { Tag = historyItem }).ToArray();
ImageListViewItem[] ilvItems = GetHistoryItems().Select(hi => new ImageListViewItem(hi.Filepath) { Tag = hi }).ToArray();
ilvImages.Items.AddRange(ilvItems);
}
@ -131,6 +133,7 @@ private HistoryItem[] him_GetHistoryItems()
private void ImageHistoryForm_Shown(object sender, EventArgs e)
{
tstbSearch.Focus();
Application.DoEvents();
this.ForceActivate();
RefreshHistoryItems();
@ -138,12 +141,10 @@ private void ImageHistoryForm_Shown(object sender, EventArgs e)
private void ImageHistoryForm_KeyDown(object sender, KeyEventArgs e)
{
switch (e.KeyData)
if (e.KeyCode == Keys.F5)
{
case Keys.F5:
RefreshHistoryItems();
e.Handled = true;
break;
RefreshHistoryItems();
e.Handled = true;
}
}
@ -165,9 +166,18 @@ private void ilvImages_ItemDoubleClick(object sender, ItemClickEventArgs e)
him.ShowImagePreview();
}
private void tstbSearch_KeyDown(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Enter)
{
RefreshHistoryItems();
e.Handled = true;
e.SuppressKeyPress = true;
}
}
private void tsbSearch_Click(object sender, EventArgs e)
{
SearchText = tstbSearch.Text;
RefreshHistoryItems();
}

View file

@ -231,12 +231,60 @@
<data name="tsbSearch.Text" xml:space="preserve">
<value>toolStripButton1</value>
</data>
<data name="tsmiViewModeThumbnails.Size" type="System.Drawing.Size, System.Drawing">
<value>137, 22</value>
</data>
<data name="tsmiViewModeThumbnails.Text" xml:space="preserve">
<value>Thumbnails</value>
</data>
<data name="tsmiViewModeGallery.Size" type="System.Drawing.Size, System.Drawing">
<value>137, 22</value>
</data>
<data name="tsmiViewModeGallery.Text" xml:space="preserve">
<value>Gallery</value>
</data>
<data name="tsmiViewModePane.Size" type="System.Drawing.Size, System.Drawing">
<value>137, 22</value>
</data>
<data name="tsmiViewModePane.Text" xml:space="preserve">
<value>Pane</value>
</data>
<data name="tsddbViewMode.Size" type="System.Drawing.Size, System.Drawing">
<value>79, 22</value>
</data>
<data name="tsddbViewMode.Text" xml:space="preserve">
<value>View mode</value>
</data>
<data name="tsmiThumbnailSize75.Size" type="System.Drawing.Size, System.Drawing">
<value>121, 22</value>
</data>
<data name="tsmiThumbnailSize75.Text" xml:space="preserve">
<value>75 x 75</value>
</data>
<data name="tsmiThumbnailSize100.Size" type="System.Drawing.Size, System.Drawing">
<value>121, 22</value>
</data>
<data name="tsmiThumbnailSize100.Text" xml:space="preserve">
<value>100 x 100</value>
</data>
<data name="tsmiThumbnailSize150.Size" type="System.Drawing.Size, System.Drawing">
<value>121, 22</value>
</data>
<data name="tsmiThumbnailSize150.Text" xml:space="preserve">
<value>150 x 150</value>
</data>
<data name="tsmiThumbnailSize200.Size" type="System.Drawing.Size, System.Drawing">
<value>121, 22</value>
</data>
<data name="tsmiThumbnailSize200.Text" xml:space="preserve">
<value>200 x 200</value>
</data>
<data name="tsmiThumbnailSize250.Size" type="System.Drawing.Size, System.Drawing">
<value>121, 22</value>
</data>
<data name="tsmiThumbnailSize250.Text" xml:space="preserve">
<value>250 x 250</value>
</data>
<data name="tsddbThumbnailSize.Size" type="System.Drawing.Size, System.Drawing">
<value>100, 22</value>
</data>
@ -247,7 +295,7 @@
<value>3, 0</value>
</data>
<data name="tsMain.Size" type="System.Drawing.Size, System.Drawing">
<value>489, 25</value>
<value>458, 25</value>
</data>
<data name="tsMain.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -288,54 +336,6 @@
<data name="&gt;&gt;tscMain.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="tsmiViewModeThumbnails.Size" type="System.Drawing.Size, System.Drawing">
<value>137, 22</value>
</data>
<data name="tsmiViewModeThumbnails.Text" xml:space="preserve">
<value>Thumbnails</value>
</data>
<data name="tsmiViewModeGallery.Size" type="System.Drawing.Size, System.Drawing">
<value>137, 22</value>
</data>
<data name="tsmiViewModeGallery.Text" xml:space="preserve">
<value>Gallery</value>
</data>
<data name="tsmiViewModePane.Size" type="System.Drawing.Size, System.Drawing">
<value>137, 22</value>
</data>
<data name="tsmiViewModePane.Text" xml:space="preserve">
<value>Pane</value>
</data>
<data name="tsmiThumbnailSize75.Size" type="System.Drawing.Size, System.Drawing">
<value>121, 22</value>
</data>
<data name="tsmiThumbnailSize75.Text" xml:space="preserve">
<value>75 x 75</value>
</data>
<data name="tsmiThumbnailSize100.Size" type="System.Drawing.Size, System.Drawing">
<value>121, 22</value>
</data>
<data name="tsmiThumbnailSize100.Text" xml:space="preserve">
<value>100 x 100</value>
</data>
<data name="tsmiThumbnailSize150.Size" type="System.Drawing.Size, System.Drawing">
<value>121, 22</value>
</data>
<data name="tsmiThumbnailSize150.Text" xml:space="preserve">
<value>150 x 150</value>
</data>
<data name="tsmiThumbnailSize200.Size" type="System.Drawing.Size, System.Drawing">
<value>121, 22</value>
</data>
<data name="tsmiThumbnailSize200.Text" xml:space="preserve">
<value>200 x 200</value>
</data>
<data name="tsmiThumbnailSize250.Size" type="System.Drawing.Size, System.Drawing">
<value>121, 22</value>
</data>
<data name="tsmiThumbnailSize250.Text" xml:space="preserve">
<value>250 x 250</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>