diff --git a/Source/Components/ImageGlass.Library/Language/Language.cs b/Source/Components/ImageGlass.Library/Language/Language.cs index 54005cd3d..8247af279 100644 --- a/Source/Components/ImageGlass.Library/Language/Language.cs +++ b/Source/Components/ImageGlass.Library/Language/Language.cs @@ -331,7 +331,7 @@ private void InitDefaultLanguageDictionary() { Items.Add("frmMain._DeleteDialogTitle", "Confirm"); Items.Add("frmMain._ExtractPageText", "Extracting image pages. Please select output folder."); - Items.Add("frmMain._FullScreenMessage", "Press ALT+ENTER to exit full screen mode.");// v2.0 beta, v6.0 + Items.Add("frmMain._FullScreenMessage", "Press {0} to exit full screen mode.");// v2.0 beta, v6.0, v8.0 Items.Add("frmMain._SlideshowMessage", "Press ESC to exit slideshow.\n Right click to open context menu."); // v2.0 beta Items.Add("frmMain._SlideshowMessagePause", "Slideshow is paused"); // v4.0 Items.Add("frmMain._SlideshowMessageResume", "Slideshow is resumed"); // v4.0 @@ -516,7 +516,7 @@ private void InitDefaultLanguageDictionary() { Items.Add("frmSetting.lvImageEditing.clnAppPath", "App path"); //v4.0 Items.Add("frmSetting.lvImageEditing.clnAppArguments", "App arguments"); //v4.0 - Items.Add("frmSetting.chkSaveModifyDate", "Preserve the image's Modify Date on save"); //v5.5 + Items.Add("frmSetting.chkSaveModifyDate", "Preserve the image's modified date on save"); //v5.5, v8.0 #endregion #region TAB File Associations diff --git a/Source/ImageGlass/frmMain.Designer.cs b/Source/ImageGlass/frmMain.Designer.cs index ece0f3a16..740753566 100644 --- a/Source/ImageGlass/frmMain.Designer.cs +++ b/Source/ImageGlass/frmMain.Designer.cs @@ -24,7 +24,7 @@ protected override void Dispose(bool disposing) { /// private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - ImageGlass.DefaultGifAnimator defaultGifAnimator2 = new ImageGlass.DefaultGifAnimator(); + ImageGlass.DefaultGifAnimator defaultGifAnimator1 = new ImageGlass.DefaultGifAnimator(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain)); this.mnuContext = new System.Windows.Forms.ContextMenuStrip(this.components); this.sampleMenuItemToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -88,8 +88,8 @@ private void InitializeComponent() { this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator(); this.mnuMainImageProperties = new System.Windows.Forms.ToolStripMenuItem(); this.mnuMainClipboard = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuMainCopy = new System.Windows.Forms.ToolStripMenuItem(); this.mnuMainCopyImageData = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuMainCopy = new System.Windows.Forms.ToolStripMenuItem(); this.mnuMainCut = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem28 = new System.Windows.Forms.ToolStripSeparator(); this.mnuMainCopyImagePath = new System.Windows.Forms.ToolStripMenuItem(); @@ -894,6 +894,18 @@ private void InitializeComponent() { this.mnuMainClipboard.Text = "&Clipboard"; this.mnuMainClipboard.DropDownOpening += new System.EventHandler(this.subMenu_DropDownOpening); // + // mnuMainCopyImageData + // + this.mnuMainCopyImageData.ForeColor = System.Drawing.Color.Black; + this.mnuMainCopyImageData.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.mnuMainCopyImageData.Name = "mnuMainCopyImageData"; + this.mnuMainCopyImageData.Padding = new System.Windows.Forms.Padding(0, 2, 0, 1); + this.mnuMainCopyImageData.ShortcutKeyDisplayString = "Ctrl+C"; + this.mnuMainCopyImageData.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); + this.mnuMainCopyImageData.Size = new System.Drawing.Size(302, 31); + this.mnuMainCopyImageData.Text = "Copy &image pixels"; + this.mnuMainCopyImageData.Click += new System.EventHandler(this.mnuMainCopyImageData_Click); + // // mnuMainCopy // this.mnuMainCopy.ForeColor = System.Drawing.Color.Black; @@ -907,18 +919,6 @@ private void InitializeComponent() { this.mnuMainCopy.Text = "&Copy"; this.mnuMainCopy.Click += new System.EventHandler(this.mnuMainCopy_Click); // - // mnuMainCopyImageData - // - this.mnuMainCopyImageData.ForeColor = System.Drawing.Color.Black; - this.mnuMainCopyImageData.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.mnuMainCopyImageData.Name = "mnuMainCopyImageData"; - this.mnuMainCopyImageData.Padding = new System.Windows.Forms.Padding(0, 2, 0, 1); - this.mnuMainCopyImageData.ShortcutKeyDisplayString = "Ctrl+C"; - this.mnuMainCopyImageData.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); - this.mnuMainCopyImageData.Size = new System.Drawing.Size(302, 31); - this.mnuMainCopyImageData.Text = "Copy &image pixels"; - this.mnuMainCopyImageData.Click += new System.EventHandler(this.mnuMainCopyImageData_Click); - // // mnuMainCut // this.mnuMainCut.ForeColor = System.Drawing.Color.Black; @@ -1000,7 +1000,8 @@ private void InitializeComponent() { this.mnuMainFullScreen.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.mnuMainFullScreen.Name = "mnuMainFullScreen"; this.mnuMainFullScreen.Padding = new System.Windows.Forms.Padding(0, 2, 0, 1); - this.mnuMainFullScreen.ShortcutKeyDisplayString = "Alt+Enter"; + this.mnuMainFullScreen.ShortcutKeyDisplayString = "F11"; + this.mnuMainFullScreen.ShortcutKeys = System.Windows.Forms.Keys.F11; this.mnuMainFullScreen.Size = new System.Drawing.Size(246, 29); this.mnuMainFullScreen.Text = "&Full screen"; this.mnuMainFullScreen.Click += new System.EventHandler(this.mnuMainFullScreen_Click); @@ -1026,8 +1027,8 @@ private void InitializeComponent() { this.mnuMainSlideShowStart.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.mnuMainSlideShowStart.Name = "mnuMainSlideShowStart"; this.mnuMainSlideShowStart.Padding = new System.Windows.Forms.Padding(0, 2, 0, 1); - this.mnuMainSlideShowStart.ShortcutKeyDisplayString = "F11"; - this.mnuMainSlideShowStart.ShortcutKeys = System.Windows.Forms.Keys.F11; + this.mnuMainSlideShowStart.ShortcutKeyDisplayString = "F12"; + this.mnuMainSlideShowStart.ShortcutKeys = System.Windows.Forms.Keys.F12; this.mnuMainSlideShowStart.Size = new System.Drawing.Size(358, 31); this.mnuMainSlideShowStart.Text = "&Start slideshow"; this.mnuMainSlideShowStart.Click += new System.EventHandler(this.mnuMainSlideShowStart_Click); @@ -1351,7 +1352,7 @@ private void InitializeComponent() { // picMain // this.picMain.AllowDrop = true; - this.picMain.Animator = defaultGifAnimator2; + this.picMain.Animator = defaultGifAnimator1; this.picMain.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(60)))), ((int)(((byte)(61))))); this.picMain.BorderStyle = System.Windows.Forms.BorderStyle.None; this.picMain.ContextMenuStrip = this.mnuContext; diff --git a/Source/ImageGlass/frmMain.cs b/Source/ImageGlass/frmMain.cs index 221162492..3b07cb16d 100644 --- a/Source/ImageGlass/frmMain.cs +++ b/Source/ImageGlass/frmMain.cs @@ -4389,8 +4389,11 @@ private void mnuMainFullScreen_Click(object sender, EventArgs e) { FullScreenMode(enabled: true); - ShowToastMsg(Configs.Language.Items[$"{Name}._FullScreenMessage"] - , 2000); + ShowToastMsg( + string.Format( + Configs.Language.Items[$"{Name}._FullScreenMessage"], + mnuMainFullScreen.ShortcutKeyDisplayString), + 2000); } // exit full screen else {