mirror of
https://github.com/ShareX/ShareX.git
synced 2024-09-30 09:17:36 +13:00
Removed "Show" sub menu, instead moved items to parent menu
This commit is contained in:
parent
6ca6defac9
commit
eb87cc06ec
4 changed files with 15 additions and 52 deletions
|
@ -68,7 +68,6 @@ public partial class HistoryItemManager
|
||||||
private ToolStripMenuItem tsmiCopyFileName;
|
private ToolStripMenuItem tsmiCopyFileName;
|
||||||
private ToolStripMenuItem tsmiCopyFileNameWithExtension;
|
private ToolStripMenuItem tsmiCopyFileNameWithExtension;
|
||||||
private ToolStripMenuItem tsmiCopyFolder;
|
private ToolStripMenuItem tsmiCopyFolder;
|
||||||
private ToolStripMenuItem tsmiShow;
|
|
||||||
private ToolStripMenuItem tsmiShowImagePreview;
|
private ToolStripMenuItem tsmiShowImagePreview;
|
||||||
private ToolStripMenuItem tsmiShowMoreInfo;
|
private ToolStripMenuItem tsmiShowMoreInfo;
|
||||||
private ToolStripMenuItem tsmiUploadFile;
|
private ToolStripMenuItem tsmiUploadFile;
|
||||||
|
@ -111,7 +110,6 @@ private void InitializeComponent()
|
||||||
tsmiCopyFileName = new ToolStripMenuItem();
|
tsmiCopyFileName = new ToolStripMenuItem();
|
||||||
tsmiCopyFileNameWithExtension = new ToolStripMenuItem();
|
tsmiCopyFileNameWithExtension = new ToolStripMenuItem();
|
||||||
tsmiCopyFolder = new ToolStripMenuItem();
|
tsmiCopyFolder = new ToolStripMenuItem();
|
||||||
tsmiShow = new ToolStripMenuItem();
|
|
||||||
tsmiShowImagePreview = new ToolStripMenuItem();
|
tsmiShowImagePreview = new ToolStripMenuItem();
|
||||||
tsmiShowMoreInfo = new ToolStripMenuItem();
|
tsmiShowMoreInfo = new ToolStripMenuItem();
|
||||||
tsmiUploadFile = new ToolStripMenuItem();
|
tsmiUploadFile = new ToolStripMenuItem();
|
||||||
|
@ -125,9 +123,10 @@ private void InitializeComponent()
|
||||||
{
|
{
|
||||||
tsmiOpen,
|
tsmiOpen,
|
||||||
tsmiCopy,
|
tsmiCopy,
|
||||||
tsmiShow,
|
tsmiShowImagePreview,
|
||||||
tsmiUploadFile,
|
tsmiUploadFile,
|
||||||
tsmiEditImage
|
tsmiEditImage,
|
||||||
|
tsmiShowMoreInfo
|
||||||
});
|
});
|
||||||
cmsHistory.Name = "cmsHistory";
|
cmsHistory.Name = "cmsHistory";
|
||||||
cmsHistory.ShowImageMargin = false;
|
cmsHistory.ShowImageMargin = false;
|
||||||
|
@ -396,17 +395,6 @@ private void InitializeComponent()
|
||||||
tsmiCopyFolder.Text = Resources.HistoryItemManager_InitializeComponent_Folder;
|
tsmiCopyFolder.Text = Resources.HistoryItemManager_InitializeComponent_Folder;
|
||||||
tsmiCopyFolder.Click += tsmiCopyFolder_Click;
|
tsmiCopyFolder.Click += tsmiCopyFolder_Click;
|
||||||
//
|
//
|
||||||
// tsmiShow
|
|
||||||
//
|
|
||||||
tsmiShow.DropDownItems.AddRange(new ToolStripItem[]
|
|
||||||
{
|
|
||||||
tsmiShowImagePreview,
|
|
||||||
tsmiShowMoreInfo
|
|
||||||
});
|
|
||||||
tsmiShow.Name = "tsmiShow";
|
|
||||||
tsmiShow.Size = new Size(127, 22);
|
|
||||||
tsmiShow.Text = Resources.HistoryItemManager_InitializeComponent_Show;
|
|
||||||
//
|
|
||||||
// tsmiShowImagePreview
|
// tsmiShowImagePreview
|
||||||
//
|
//
|
||||||
tsmiShowImagePreview.Name = "tsmiShowImagePreview";
|
tsmiShowImagePreview.Name = "tsmiShowImagePreview";
|
||||||
|
@ -501,16 +489,11 @@ public void UpdateContextMenu(int itemCount)
|
||||||
tsmiCopyFileNameWithExtension.Text = Resources.HistoryItemManager_InitializeComponent_File_name_with_extension + " (" + itemCount + ")";
|
tsmiCopyFileNameWithExtension.Text = Resources.HistoryItemManager_InitializeComponent_File_name_with_extension + " (" + itemCount + ")";
|
||||||
tsmiCopyFolder.Text = Resources.HistoryItemManager_InitializeComponent_Folder + " (" + itemCount + ")";
|
tsmiCopyFolder.Text = Resources.HistoryItemManager_InitializeComponent_Folder + " (" + itemCount + ")";
|
||||||
|
|
||||||
// Show
|
// Other
|
||||||
tsmiShow.Enabled = false;
|
|
||||||
tsmiShowImagePreview.Enabled = false;
|
tsmiShowImagePreview.Enabled = false;
|
||||||
tsmiShowMoreInfo.Enabled = false;
|
|
||||||
|
|
||||||
// Upload file
|
|
||||||
tsmiUploadFile.Enabled = false;
|
tsmiUploadFile.Enabled = false;
|
||||||
|
|
||||||
// Edit image
|
|
||||||
tsmiEditImage.Enabled = false;
|
tsmiEditImage.Enabled = false;
|
||||||
|
tsmiShowMoreInfo.Enabled = false;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -570,16 +553,11 @@ public void UpdateContextMenu(int itemCount)
|
||||||
tsmiCopyFileNameWithExtension.Text = Resources.HistoryItemManager_InitializeComponent_File_name_with_extension;
|
tsmiCopyFileNameWithExtension.Text = Resources.HistoryItemManager_InitializeComponent_File_name_with_extension;
|
||||||
tsmiCopyFolder.Text = Resources.HistoryItemManager_InitializeComponent_Folder;
|
tsmiCopyFolder.Text = Resources.HistoryItemManager_InitializeComponent_Folder;
|
||||||
|
|
||||||
// Show
|
// Other
|
||||||
tsmiShow.Enabled = true;
|
|
||||||
tsmiShowImagePreview.Enabled = IsImageFile;
|
tsmiShowImagePreview.Enabled = IsImageFile;
|
||||||
tsmiShowMoreInfo.Enabled = true;
|
|
||||||
|
|
||||||
// Upload file
|
|
||||||
tsmiUploadFile.Enabled = uploadFile != null && IsFileExist;
|
tsmiUploadFile.Enabled = uploadFile != null && IsFileExist;
|
||||||
|
|
||||||
// Edit image
|
|
||||||
tsmiEditImage.Enabled = editImage != null && IsImageFile;
|
tsmiEditImage.Enabled = editImage != null && IsImageFile;
|
||||||
|
tsmiShowMoreInfo.Enabled = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
cmsHistory.ResumeLayout();
|
cmsHistory.ResumeLayout();
|
||||||
|
@ -720,11 +698,6 @@ private void tsmiShowImagePreview_Click(object sender, EventArgs e)
|
||||||
ShowImagePreview();
|
ShowImagePreview();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void tsmiShowMoreInfo_Click(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
ShowMoreInfo();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void tsmiUploadFile_Click(object sender, EventArgs e)
|
private void tsmiUploadFile_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
UploadFile();
|
UploadFile();
|
||||||
|
@ -734,5 +707,10 @@ private void tsmiEditImage_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
EditImage();
|
EditImage();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void tsmiShowMoreInfo_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
ShowMoreInfo();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
11
ShareX.HistoryLib/Properties/Resources.Designer.cs
generated
11
ShareX.HistoryLib/Properties/Resources.Designer.cs
generated
|
@ -270,7 +270,7 @@ internal static string HistoryItemManager_InitializeComponent_Image {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized string similar to Image preview.
|
/// Looks up a localized string similar to Image preview....
|
||||||
/// </summary>
|
/// </summary>
|
||||||
internal static string HistoryItemManager_InitializeComponent_Image_preview {
|
internal static string HistoryItemManager_InitializeComponent_Image_preview {
|
||||||
get {
|
get {
|
||||||
|
@ -332,15 +332,6 @@ internal static string HistoryItemManager_InitializeComponent_Shortened_URL {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Looks up a localized string similar to Show.
|
|
||||||
/// </summary>
|
|
||||||
internal static string HistoryItemManager_InitializeComponent_Show {
|
|
||||||
get {
|
|
||||||
return ResourceManager.GetString("HistoryItemManager_InitializeComponent_Show", resourceCulture);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized string similar to Text.
|
/// Looks up a localized string similar to Text.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -124,7 +124,7 @@
|
||||||
<value>Thumbnail URL</value>
|
<value>Thumbnail URL</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="HistoryItemManager_InitializeComponent_Image_preview" xml:space="preserve">
|
<data name="HistoryItemManager_InitializeComponent_Image_preview" xml:space="preserve">
|
||||||
<value>Image preview</value>
|
<value>Image preview...</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="HistoryItemManager_InitializeComponent_File" xml:space="preserve">
|
<data name="HistoryItemManager_InitializeComponent_File" xml:space="preserve">
|
||||||
<value>File</value>
|
<value>File</value>
|
||||||
|
@ -151,9 +151,6 @@
|
||||||
<data name="HistoryItemManager_InitializeComponent_Copy" xml:space="preserve">
|
<data name="HistoryItemManager_InitializeComponent_Copy" xml:space="preserve">
|
||||||
<value>Copy</value>
|
<value>Copy</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="HistoryItemManager_InitializeComponent_Show" xml:space="preserve">
|
|
||||||
<value>Show</value>
|
|
||||||
</data>
|
|
||||||
<data name="HistoryItemManager_InitializeComponent_HTML_image" xml:space="preserve">
|
<data name="HistoryItemManager_InitializeComponent_HTML_image" xml:space="preserve">
|
||||||
<value>HTML image</value>
|
<value>HTML image</value>
|
||||||
</data>
|
</data>
|
||||||
|
|
|
@ -117,9 +117,6 @@
|
||||||
<resheader name="writer">
|
<resheader name="writer">
|
||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
<data name="HistoryItemManager_InitializeComponent_Show" xml:space="preserve">
|
|
||||||
<value>Göster</value>
|
|
||||||
</data>
|
|
||||||
<data name="HistoryForm_UpdateItemCount___Filtered___0_" xml:space="preserve">
|
<data name="HistoryForm_UpdateItemCount___Filtered___0_" xml:space="preserve">
|
||||||
<value>Filtrelenmiş: {0}</value>
|
<value>Filtrelenmiş: {0}</value>
|
||||||
</data>
|
</data>
|
||||||
|
@ -169,7 +166,7 @@
|
||||||
<value>Resim</value>
|
<value>Resim</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="HistoryItemManager_InitializeComponent_Image_preview" xml:space="preserve">
|
<data name="HistoryItemManager_InitializeComponent_Image_preview" xml:space="preserve">
|
||||||
<value>Resim önizleme</value>
|
<value>Resim önizleme...</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="HistoryItemManager_InitializeComponent_More_info" xml:space="preserve">
|
<data name="HistoryItemManager_InitializeComponent_More_info" xml:space="preserve">
|
||||||
<value>Daha fazla bilgi</value>
|
<value>Daha fazla bilgi</value>
|
||||||
|
|
Loading…
Reference in a new issue