From 158783f2d1eb676f5fcdc964233d9854d94543a0 Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Mon, 26 Jul 2021 01:11:01 +0200 Subject: [PATCH 1/3] removed screenshot manager --- mRemoteNG/App/Windows.cs | 6 - .../Config/Settings/DockPanelLayoutLoader.cs | 3 - mRemoteNG/UI/Menu/ToolsMenu.cs | 17 - .../UI/Window/ConnectionWindow.Designer.cs | 10 - mRemoteNG/UI/Window/ConnectionWindow.cs | 11 - .../UI/Window/ScreenshotManagerWindow.cs | 458 ------------------ .../UI/Window/ScreenshotManagerWindow.resx | 132 ----- mRemoteNG/UI/WindowType.cs | 1 - mRemoteNG/mRemoteNG.csproj | 7 - 9 files changed, 645 deletions(-) delete mode 100644 mRemoteNG/UI/Window/ScreenshotManagerWindow.cs delete mode 100644 mRemoteNG/UI/Window/ScreenshotManagerWindow.resx diff --git a/mRemoteNG/App/Windows.cs b/mRemoteNG/App/Windows.cs index 1070d137..8be30810 100644 --- a/mRemoteNG/App/Windows.cs +++ b/mRemoteNG/App/Windows.cs @@ -11,7 +11,6 @@ namespace mRemoteNG.App private static HelpWindow _helpForm; private static ExternalToolsWindow _externalappsForm; private static PortScanWindow _portscanForm; - private static ScreenshotManagerWindow _screenshotmanagerForm; private static UltraVNCWindow _ultravncscForm; private static ConnectionTreeWindow _treeForm; @@ -23,7 +22,6 @@ namespace mRemoteNG.App internal static ConfigWindow ConfigForm { get; set; } = new ConfigWindow(); internal static ErrorAndInfoWindow ErrorsForm { get; set; } = new ErrorAndInfoWindow(); - internal static ScreenshotManagerWindow ScreenshotForm { get; set; } = new ScreenshotManagerWindow(); private static UpdateWindow UpdateForm { get; set; } = new UpdateWindow(); internal static SSHTransferWindow SshtransferForm { get; private set; } = new SSHTransferWindow(); @@ -72,10 +70,6 @@ namespace mRemoteNG.App _portscanForm = new PortScanWindow(); _portscanForm.Show(dockPanel); break; - case WindowType.ScreenshotManager: - _screenshotmanagerForm = new ScreenshotManagerWindow(); - _screenshotmanagerForm.Show(dockPanel); - break; case WindowType.UltraVNCSC: if (_ultravncscForm == null || _ultravncscForm.IsDisposed) _ultravncscForm = new UltraVNCWindow(); diff --git a/mRemoteNG/Config/Settings/DockPanelLayoutLoader.cs b/mRemoteNG/Config/Settings/DockPanelLayoutLoader.cs index 4995384d..51116110 100644 --- a/mRemoteNG/Config/Settings/DockPanelLayoutLoader.cs +++ b/mRemoteNG/Config/Settings/DockPanelLayoutLoader.cs @@ -77,9 +77,6 @@ namespace mRemoteNG.Config.Settings if (persistString == typeof(ErrorAndInfoWindow).ToString()) return Windows.ErrorsForm; - - if (persistString == typeof(ScreenshotManagerWindow).ToString()) - return Windows.ScreenshotForm; } catch (Exception ex) { diff --git a/mRemoteNG/UI/Menu/ToolsMenu.cs b/mRemoteNG/UI/Menu/ToolsMenu.cs index a6944022..3c84b214 100644 --- a/mRemoteNG/UI/Menu/ToolsMenu.cs +++ b/mRemoteNG/UI/Menu/ToolsMenu.cs @@ -14,7 +14,6 @@ namespace mRemoteNG.UI.Menu private ToolStripMenuItem _mMenToolsExternalApps; private ToolStripMenuItem _mMenToolsPortScan; private ToolStripMenuItem _mMenToolsUvncsc; - private ToolStripMenuItem _mMenViewScreenshotManager; public Form MainForm { get; set; } public ICredentialRepositoryList CredentialProviderCatalog { get; set; } @@ -32,7 +31,6 @@ namespace mRemoteNG.UI.Menu _mMenToolsPortScan = new ToolStripMenuItem(); _mMenToolsSep1 = new ToolStripSeparator(); _mMenToolsOptions = new ToolStripMenuItem(); - _mMenViewScreenshotManager = new ToolStripMenuItem(); // // mMenTools // @@ -42,7 +40,6 @@ namespace mRemoteNG.UI.Menu _mMenToolsUvncsc, _mMenToolsExternalApps, _mMenToolsPortScan, - _mMenViewScreenshotManager, _mMenToolsSep1, _mMenToolsOptions }); @@ -83,14 +80,6 @@ namespace mRemoteNG.UI.Menu _mMenToolsPortScan.Text = Language.PortScan; _mMenToolsPortScan.Click += mMenToolsPortScan_Click; // - // mMenViewScreenshotManager - // - _mMenViewScreenshotManager.Image = Properties.Resources.Screenshot; - _mMenViewScreenshotManager.Name = "mMenViewScreenshotManager"; - _mMenViewScreenshotManager.Size = new System.Drawing.Size(228, 22); - _mMenViewScreenshotManager.Text = Language.Screenshots; - _mMenViewScreenshotManager.Click += mMenViewScreenshotManager_Click; - // // mMenToolsSep1 // _mMenToolsSep1.Name = "mMenToolsSep1"; @@ -111,7 +100,6 @@ namespace mRemoteNG.UI.Menu _mMenToolsSshTransfer.Text = Language.SshFileTransfer; _mMenToolsExternalApps.Text = Language.ExternalTool; _mMenToolsPortScan.Text = Language.PortScan; - _mMenViewScreenshotManager.Text = Language.Screenshots; _mMenToolsOptions.Text = Language.Options; } @@ -137,11 +125,6 @@ namespace mRemoteNG.UI.Menu Windows.Show(WindowType.PortScan); } - private void mMenViewScreenshotManager_Click(object sender, EventArgs e) - { - Windows.Show(WindowType.ScreenshotManager); - } - private void mMenToolsOptions_Click(object sender, EventArgs e) { Windows.Show(WindowType.Options); diff --git a/mRemoteNG/UI/Window/ConnectionWindow.Designer.cs b/mRemoteNG/UI/Window/ConnectionWindow.Designer.cs index 64048050..b7caa5d8 100644 --- a/mRemoteNG/UI/Window/ConnectionWindow.Designer.cs +++ b/mRemoteNG/UI/Window/ConnectionWindow.Designer.cs @@ -9,7 +9,6 @@ namespace mRemoteNG.UI.Window { internal ContextMenuStrip cmenTab; private ToolStripMenuItem cmenTabFullscreen; - private ToolStripMenuItem cmenTabScreenshot; private ToolStripMenuItem cmenTabTransferFile; private ToolStripMenuItem cmenTabSendSpecialKeys; private ToolStripSeparator cmenTabSep1; @@ -53,7 +52,6 @@ namespace mRemoteNG.UI.Window this.cmenTabSendSpecialKeysCtrlAltDel = new System.Windows.Forms.ToolStripMenuItem(); this.cmenTabSendSpecialKeysCtrlEsc = new System.Windows.Forms.ToolStripMenuItem(); this.cmenTabSep2 = new System.Windows.Forms.ToolStripSeparator(); - this.cmenTabScreenshot = new System.Windows.Forms.ToolStripMenuItem(); this.cmenTabPuttySettings = new System.Windows.Forms.ToolStripMenuItem(); this.cmenTabExternalApps = new System.Windows.Forms.ToolStripMenuItem(); this.cmenTab.SuspendLayout(); @@ -88,7 +86,6 @@ namespace mRemoteNG.UI.Window this.cmenTabTransferFile, this.cmenTabSendSpecialKeys, this.cmenTabSep2, - this.cmenTabScreenshot, this.cmenTabPuttySettings, this.cmenTabExternalApps}); this.cmenTab.Name = "cmenTab"; @@ -212,13 +209,6 @@ namespace mRemoteNG.UI.Window this.cmenTabSep2.Name = "cmenTabSep2"; this.cmenTabSep2.Size = new System.Drawing.Size(227, 6); // - // cmenTabScreenshot - // - this.cmenTabScreenshot.Image = global::mRemoteNG.Properties.Resources.Screenshot_Add; - this.cmenTabScreenshot.Name = "cmenTabScreenshot"; - this.cmenTabScreenshot.Size = new System.Drawing.Size(230, 22); - this.cmenTabScreenshot.Text = "Screenshot"; - // // cmenTabPuttySettings // this.cmenTabPuttySettings.Image = global::mRemoteNG.Properties.Resources.PuttyConfig; diff --git a/mRemoteNG/UI/Window/ConnectionWindow.cs b/mRemoteNG/UI/Window/ConnectionWindow.cs index 9cdb9965..3ee82f4b 100644 --- a/mRemoteNG/UI/Window/ConnectionWindow.cs +++ b/mRemoteNG/UI/Window/ConnectionWindow.cs @@ -77,7 +77,6 @@ namespace mRemoteNG.UI.Window cmenTabFullscreen.Click += (sender, args) => ToggleFullscreen(); cmenTabSmartSize.Click += (sender, args) => ToggleSmartSize(); cmenTabViewOnly.Click += (sender, args) => ToggleViewOnly(); - cmenTabScreenshot.Click += (sender, args) => CreateScreenshot(); cmenTabStartChat.Click += (sender, args) => StartChat(); cmenTabTransferFile.Click += (sender, args) => TransferFile(); cmenTabRefreshScreen.Click += (sender, args) => RefreshScreen(); @@ -268,7 +267,6 @@ namespace mRemoteNG.UI.Window cmenTabFullscreen.Text = Language.Fullscreen; cmenTabSmartSize.Text = Language.SmartSize; cmenTabViewOnly.Text = Language.ViewOnly; - cmenTabScreenshot.Text = Language.Screenshot; cmenTabStartChat.Text = Language.StartChat; cmenTabTransferFile.Text = Language.TransferFile; cmenTabRefreshScreen.Text = Language.RefreshScreen; @@ -781,15 +779,6 @@ namespace mRemoteNG.UI.Window } } - private void CreateScreenshot() - { - cmenTab.Close(); - Application.DoEvents(); - //var selectedTab = (ConnectionTab)GetInterfaceControl()?.Parent; - if (TabHelper.Instance.CurrentTab == null) return; - Windows.ScreenshotForm.AddScreenshot(MiscTools.TakeScreenshot(TabHelper.Instance.CurrentTab)); - } - #endregion #region Protocols diff --git a/mRemoteNG/UI/Window/ScreenshotManagerWindow.cs b/mRemoteNG/UI/Window/ScreenshotManagerWindow.cs deleted file mode 100644 index ded58043..00000000 --- a/mRemoteNG/UI/Window/ScreenshotManagerWindow.cs +++ /dev/null @@ -1,458 +0,0 @@ -using System; -using System.Drawing; -using System.Windows.Forms; -using WeifenLuo.WinFormsUI.Docking; -using mRemoteNG.App; -using System.IO; -using mRemoteNG.Resources.Language; -using mRemoteNG.UI.Forms; -using mRemoteNG.Themes; - -namespace mRemoteNG.UI.Window -{ - public class ScreenshotManagerWindow : BaseWindow - { - #region Form Init - - internal MenuStrip msMain; - private ToolStripMenuItem mMenFile; - private ToolStripMenuItem mMenFileSaveAll; - private ToolStripMenuItem mMenFileRemoveAll; - internal ContextMenuStrip cMenScreenshot; - private System.ComponentModel.IContainer components; - private ToolStripMenuItem cMenScreenshotCopy; - private ToolStripMenuItem cMenScreenshotSave; - internal SaveFileDialog dlgSaveSingleImage; - internal FolderBrowserDialog dlgSaveAllImages; - - private FlowLayoutPanel flpScreenshots; - private VisualStudioToolStripExtender vsToolStripExtender; - private readonly ToolStripRenderer _toolStripProfessionalRenderer = new ToolStripProfessionalRenderer(); - - private void InitializeComponent() - { - components = new System.ComponentModel.Container(); - flpScreenshots = new FlowLayoutPanel(); - msMain = new MenuStrip(); - mMenFile = new ToolStripMenuItem(); - mMenFileSaveAll = new ToolStripMenuItem(); - mMenFileRemoveAll = new ToolStripMenuItem(); - cMenScreenshot = new ContextMenuStrip(components); - cMenScreenshotCopy = new ToolStripMenuItem(); - cMenScreenshotSave = new ToolStripMenuItem(); - dlgSaveSingleImage = new SaveFileDialog(); - dlgSaveAllImages = new FolderBrowserDialog(); - msMain.SuspendLayout(); - cMenScreenshot.SuspendLayout(); - SuspendLayout(); - // - // flpScreenshots - // - flpScreenshots.Anchor = AnchorStyles.Top | AnchorStyles.Bottom - | AnchorStyles.Left - | AnchorStyles.Right; - flpScreenshots.AutoScroll = true; - flpScreenshots.Location = new Point(0, 26); - flpScreenshots.Name = "flpScreenshots"; - flpScreenshots.Size = new Size(542, 296); - flpScreenshots.TabIndex = 0; - // - // msMain - // - msMain.Font = new Font("Segoe UI", 8.25F, FontStyle.Regular, GraphicsUnit.Point, 0); - msMain.Items.AddRange(new ToolStripItem[] - { - mMenFile - }); - msMain.Location = new Point(0, 0); - msMain.Name = "msMain"; - msMain.RenderMode = ToolStripRenderMode.Professional; - msMain.Size = new Size(542, 24); - msMain.TabIndex = 1; - msMain.Text = "MenuStrip1"; - // - // mMenFile - // - mMenFile.DropDownItems.AddRange(new ToolStripItem[] - { - mMenFileSaveAll, - mMenFileRemoveAll - }); - mMenFile.Image = Properties.Resources.File; - mMenFile.Name = "mMenFile"; - mMenFile.Size = new Size(53, 20); - mMenFile.Text = "&File"; - mMenFile.DropDownOpening += mMenFile_DropDownOpening; - // - // mMenFileSaveAll - // - mMenFileSaveAll.Image = Properties.Resources.Screenshot_Save; - mMenFileSaveAll.Name = "mMenFileSaveAll"; - mMenFileSaveAll.Size = new Size(130, 22); - mMenFileSaveAll.Text = "Save All"; - mMenFileSaveAll.Click += mMenFileSaveAll_Click; - // - // mMenFileRemoveAll - // - mMenFileRemoveAll.Image = Properties.Resources.Screenshot_Delete; - mMenFileRemoveAll.Name = "mMenFileRemoveAll"; - mMenFileRemoveAll.Size = new Size(130, 22); - mMenFileRemoveAll.Text = "Remove All"; - mMenFileRemoveAll.Click += mMenFileRemoveAll_Click; - // - // cMenScreenshot - // - cMenScreenshot.Items.AddRange(new ToolStripItem[] - { - cMenScreenshotCopy, - cMenScreenshotSave - }); - cMenScreenshot.Name = "cMenScreenshot"; - cMenScreenshot.Size = new Size(103, 48); - // - // cMenScreenshotCopy - // - cMenScreenshotCopy.Image = Properties.Resources.Screenshot_Copy; - cMenScreenshotCopy.Name = "cMenScreenshotCopy"; - cMenScreenshotCopy.Size = new Size(102, 22); - cMenScreenshotCopy.Text = "Copy"; - cMenScreenshotCopy.Click += cMenScreenshotCopy_Click; - // - // cMenScreenshotSave - // - cMenScreenshotSave.Image = Properties.Resources.Screenshot_Save; - cMenScreenshotSave.Name = "cMenScreenshotSave"; - cMenScreenshotSave.Size = new Size(102, 22); - cMenScreenshotSave.Text = "Save"; - cMenScreenshotSave.Click += cMenScreenshotSave_Click; - // - // dlgSaveSingleImage - // - dlgSaveSingleImage.Filter = - "Graphics Interchange Format File (.gif)|*.gif|Joint Photographic Experts Group Fi" + - "le (.jpeg)|*.jpeg|Joint Photographic Experts Group File (.jpg)|*.jpg|Portable Ne" + - "twork Graphics File (.png)|*.png"; - dlgSaveSingleImage.FilterIndex = 4; - // - // ScreenshotManagerWindow - // - AutoScaleDimensions = new SizeF(96F, 96F); - AutoScaleMode = AutoScaleMode.Dpi; - ClientSize = new Size(542, 323); - Controls.Add(flpScreenshots); - Controls.Add(msMain); - Font = new Font("Segoe UI", 8.25F, FontStyle.Regular, GraphicsUnit.Point, 0); - HideOnClose = true; - Icon = Properties.Resources.Screenshot_Icon; - MainMenuStrip = msMain; - Name = "ScreenshotManagerWindow"; - TabText = "Screenshots"; - Text = "Screenshots"; - Load += ScreenshotManager_Load; - msMain.ResumeLayout(false); - msMain.PerformLayout(); - cMenScreenshot.ResumeLayout(false); - ResumeLayout(false); - PerformLayout(); - } - - #endregion - - #region Form Stuff - - private void ScreenshotManager_Load(object sender, EventArgs e) - { - ApplyTheme(); - ThemeManager.getInstance().ThemeChanged += ApplyTheme; - ApplyLanguage(); - } - - private new void ApplyTheme() - { - if (!ThemeManager.getInstance().ThemingActive) return; - base.ApplyTheme(); - vsToolStripExtender = new VisualStudioToolStripExtender(components) - { - DefaultRenderer = _toolStripProfessionalRenderer - }; - vsToolStripExtender.SetStyle(cMenScreenshot, ThemeManager.getInstance().ActiveTheme.Version, - ThemeManager.getInstance().ActiveTheme.Theme); - } - - private void ApplyLanguage() - { - mMenFile.Text = Language._File; - mMenFileSaveAll.Text = Language.SaveAll; - mMenFileRemoveAll.Text = Language.RemoveAll; - cMenScreenshotCopy.Text = Language.Copy; - cMenScreenshotSave.Text = Language.Save; - dlgSaveSingleImage.Filter = Language.SaveImageFilter; - TabText = Language.Screenshots; - Text = Language.Screenshots; - } - - #endregion - - #region Public Methods - - public ScreenshotManagerWindow() : this(new DockContent()) - { - } - - internal ScreenshotManagerWindow(DockContent panel) - { - WindowType = WindowType.ScreenshotManager; - DockPnl = panel; - InitializeComponent(); - } - - public void AddScreenshot(Image Screenshot) - { - try - { - var nPB = new PictureBox(); - nPB.MouseDown += pbScreenshot_MouseDown; - - nPB.Parent = flpScreenshots; - nPB.SizeMode = PictureBoxSizeMode.StretchImage; - nPB.BorderStyle = BorderStyle.FixedSingle; - nPB.ContextMenuStrip = cMenScreenshot; - nPB.Image = Screenshot; - nPB.Size = new Size(100, 100); //New Size((Screenshot.Width / 100) * 20, (Screenshot.Height / 100) * 20) - nPB.Show(); - - var nBtn = new Button(); - nBtn.Click += btnCloseScreenshot_Click; - - nBtn.Parent = nPB; - nBtn.FlatStyle = FlatStyle.Flat; - nBtn.Text = "×"; - nBtn.Size = new Size(22, 22); - nBtn.Location = new Point(nPB.Width - nBtn.Width, -1); - nBtn.Show(); - - Show(FrmMain.Default.pnlDock); - } - catch (Exception ex) - { - Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, - "AddScreenshot (UI.Window.ScreenshotManager) failed" + - Environment.NewLine + ex.Message, true); - } - } - - #endregion - - #region Private Methods - - private void pbScreenshot_MouseDown(object sender, MouseEventArgs e) - { - cMenScreenshot.Tag = sender; - - if (e.Button == MouseButtons.Left) - { - OpenScreenshot((PictureBox)sender); - } - } - - private void pbScreenshotOpen_MouseDown(object sender, MouseEventArgs e) - { - if (e.Button == MouseButtons.Left) - { - CloseOpenedScreenshot((Form)((PictureBox)sender).Parent); - } - } - - private void CloseOpenedScreenshot(Form form) - { - form.Close(); - } - - private void OpenScreenshot(PictureBox sender) - { - try - { - var mImage = sender.Image; - - var nForm = new Form - { - StartPosition = FormStartPosition.CenterParent, - ShowInTaskbar = false, - ShowIcon = false, - MaximizeBox = false, - MinimizeBox = false, - Width = mImage.Width + 2, - Height = mImage.Height + 2, - FormBorderStyle = FormBorderStyle.None - }; - - var nPB = new PictureBox - { - Parent = nForm, - BorderStyle = BorderStyle.FixedSingle, - Location = new Point(0, 0), - SizeMode = PictureBoxSizeMode.AutoSize, - Anchor = AnchorStyles.Left | AnchorStyles.Bottom | AnchorStyles.Right | AnchorStyles.Top, - Image = mImage, - ContextMenuStrip = cMenScreenshot - }; - nPB.Show(); - - nPB.MouseDown += pbScreenshotOpen_MouseDown; - - nForm.ShowDialog(); - } - catch (Exception ex) - { - Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, - "OpenScreenshot (UI.Window.ScreenshotManager) failed" + - Environment.NewLine + ex.Message, true); - } - } - - private void btnCloseScreenshot_Click(object sender, EventArgs e) - { - try - { - ((PictureBox)((Button)sender).Parent).Dispose(); - } - catch (Exception ex) - { - Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, - "btnCloseScreenshot_Click (UI.Window.ScreenshotManager) failed" + - Environment.NewLine + ex.Message, - true); - } - } - - private void mMenFileRemoveAll_Click(object sender, EventArgs e) - { - RemoveAllImages(); - } - - private void RemoveAllImages() - { - flpScreenshots.Controls.Clear(); - } - - private void mMenFileSaveAll_Click(object sender, EventArgs e) - { - SaveAllImages(); - } - - private void SaveAllImages() - { - try - { - var pCount = 1; - - if (dlgSaveAllImages.ShowDialog() != DialogResult.OK) return; - foreach (var fPath in Directory.GetFiles(dlgSaveAllImages.SelectedPath, "Screenshot_*", - SearchOption.TopDirectoryOnly)) - { - var f = new FileInfo(fPath); - - var fCount = f.Name; - fCount = fCount.Replace(f.Extension, ""); - fCount = fCount.Replace("Screenshot_", ""); - - pCount = (int)(double.Parse(fCount) + 1); - } - - foreach (Control ctrl in flpScreenshots.Controls) - { - if (!(ctrl is PictureBox)) continue; - (ctrl as PictureBox).Image.Save( - dlgSaveAllImages.SelectedPath + "\\Screenshot_" + - Tools.MiscTools.LeadingZero(Convert.ToString(pCount)) + ".png", - System.Drawing.Imaging.ImageFormat.Png); - pCount++; - } - } - catch (Exception ex) - { - Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, - "SaveAllImages (UI.Window.ScreenshotManager) failed" + - Environment.NewLine + ex.Message, true); - } - } - - private void cMenScreenshotCopy_Click(object sender, EventArgs e) - { - CopyImageToClipboard(); - } - - private void CopyImageToClipboard() - { - try - { - Clipboard.SetImage(((PictureBox)cMenScreenshot.Tag).Image); - } - catch (Exception ex) - { - Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, - "CopyImageToClipboard (UI.Window.ScreenshotManager) failed" + - Environment.NewLine + ex.Message, - true); - } - } - - private void cMenScreenshotSave_Click(object sender, EventArgs e) - { - SaveSingleImage(); - } - - private void SaveSingleImage() - { - try - { - if (dlgSaveSingleImage.ShowDialog() != DialogResult.OK) return; - // ReSharper disable once SwitchStatementMissingSomeCases - switch (dlgSaveSingleImage.FileName - .Substring(dlgSaveSingleImage - .FileName.LastIndexOf(".", StringComparison.Ordinal) + 1) - .ToLower()) - { - case "gif": - ((PictureBox)cMenScreenshot.Tag).Image.Save(dlgSaveSingleImage.FileName, - System.Drawing.Imaging.ImageFormat.Gif); - break; - case "jpeg": - ((PictureBox)cMenScreenshot.Tag).Image.Save(dlgSaveSingleImage.FileName, - System.Drawing.Imaging.ImageFormat.Jpeg); - break; - case "jpg": - ((PictureBox)cMenScreenshot.Tag).Image.Save(dlgSaveSingleImage.FileName, - System.Drawing.Imaging.ImageFormat.Jpeg); - break; - case "png": - ((PictureBox)cMenScreenshot.Tag).Image.Save(dlgSaveSingleImage.FileName, - System.Drawing.Imaging.ImageFormat.Png); - break; - } - } - catch (Exception ex) - { - Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, - "SaveSingleImage (UI.Window.ScreenshotManager) failed" + - Environment.NewLine + ex.Message, true); - } - } - - private void mMenFile_DropDownOpening(object sender, EventArgs e) - { - if (flpScreenshots.Controls.Count < 1) - { - mMenFileSaveAll.Enabled = false; - mMenFileRemoveAll.Enabled = false; - } - else - { - mMenFileSaveAll.Enabled = true; - mMenFileRemoveAll.Enabled = true; - } - } - - #endregion - } -} \ No newline at end of file diff --git a/mRemoteNG/UI/Window/ScreenshotManagerWindow.resx b/mRemoteNG/UI/Window/ScreenshotManagerWindow.resx deleted file mode 100644 index 3919c706..00000000 --- a/mRemoteNG/UI/Window/ScreenshotManagerWindow.resx +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - - 19, 45 - - - 146, 16 - - - 146, 45 - - \ No newline at end of file diff --git a/mRemoteNG/UI/WindowType.cs b/mRemoteNG/UI/WindowType.cs index 0e3e7319..e2c5471c 100644 --- a/mRemoteNG/UI/WindowType.cs +++ b/mRemoteNG/UI/WindowType.cs @@ -6,7 +6,6 @@ Connection = 1, Config = 2, ErrorsAndInfos = 4, - ScreenshotManager = 5, Options = 6, Update = 9, SSHTransfer = 10, diff --git a/mRemoteNG/mRemoteNG.csproj b/mRemoteNG/mRemoteNG.csproj index 1727b538..696fb01d 100644 --- a/mRemoteNG/mRemoteNG.csproj +++ b/mRemoteNG/mRemoteNG.csproj @@ -758,9 +758,6 @@ Form - - Form - Form @@ -1046,10 +1043,6 @@ FrmExport.cs Designer - - ScreenshotManagerWindow.cs - Designer - SSHTransferWindow.cs Designer From fc6e04497a6421149db56b7acc96fd98a794ace8 Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Mon, 2 Aug 2021 00:16:14 +0200 Subject: [PATCH 2/3] updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index da5ab1f4..81a84648 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - #283: Support for native PowerShell remoting as new protocol - #1850: Minify config xml ### Changed +- #2011: Removed screenshot manager - #2010: Redesigned menus - #2005: Removed in-app documentation - #1777: Cleaned up VisualStudio project structure From 9ffe51435090e0ee682ff87830855416c8e4811a Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Mon, 2 Aug 2021 00:29:15 +0200 Subject: [PATCH 3/3] fixed error from previous merge --- mRemoteNG/UI/Menu/ToolsMenu.cs | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/mRemoteNG/UI/Menu/ToolsMenu.cs b/mRemoteNG/UI/Menu/ToolsMenu.cs index 7d88794b..22f7bc0c 100644 --- a/mRemoteNG/UI/Menu/ToolsMenu.cs +++ b/mRemoteNG/UI/Menu/ToolsMenu.cs @@ -27,8 +27,6 @@ namespace mRemoteNG.UI.Menu _mMenToolsUvncsc = new ToolStripMenuItem(); _mMenToolsExternalApps = new ToolStripMenuItem(); _mMenToolsPortScan = new ToolStripMenuItem(); - _mMenToolsSep1 = new ToolStripSeparator(); - _mMenToolsOptions = new ToolStripMenuItem(); // // mMenTools // @@ -37,9 +35,7 @@ namespace mRemoteNG.UI.Menu _mMenToolsSshTransfer, _mMenToolsUvncsc, _mMenToolsExternalApps, - _mMenToolsPortScan, - _mMenToolsSep1, - _mMenToolsOptions + _mMenToolsPortScan }); Name = "mMenTools"; Size = new System.Drawing.Size(48, 20); @@ -77,19 +73,6 @@ namespace mRemoteNG.UI.Menu _mMenToolsPortScan.Size = new System.Drawing.Size(184, 22); _mMenToolsPortScan.Text = Language.PortScan; _mMenToolsPortScan.Click += mMenToolsPortScan_Click; - // - // mMenToolsSep1 - // - _mMenToolsSep1.Name = "mMenToolsSep1"; - _mMenToolsSep1.Size = new System.Drawing.Size(181, 6); - // - // mMenToolsOptions - // - _mMenToolsOptions.Image = Properties.Resources.Options; - _mMenToolsOptions.Name = "mMenToolsOptions"; - _mMenToolsOptions.Size = new System.Drawing.Size(184, 22); - _mMenToolsOptions.Text = Language.Options; - _mMenToolsOptions.Click += mMenToolsOptions_Click; } public void ApplyLanguage() @@ -98,7 +81,6 @@ namespace mRemoteNG.UI.Menu _mMenToolsSshTransfer.Text = Language.SshFileTransfer; _mMenToolsExternalApps.Text = Language.ExternalTool; _mMenToolsPortScan.Text = Language.PortScan; - _mMenToolsOptions.Text = Language.Options; } #region Tools