From c0d1df36476cc6e77398356e007c70ac1ec0cacc Mon Sep 17 00:00:00 2001 From: Riley McArdle Date: Wed, 6 Jan 2010 16:41:39 -0600 Subject: [PATCH] Changed default format for saving screenshot images to PNG. --- mRemoteV1/ChangeLog.txt | 1 + mRemoteV1/Language/Language.DE.vb | 2 +- mRemoteV1/Language/Language.EN.vb | 2 +- mRemoteV1/UI/UI.Window.ScreenshotManager.vb | 41 ++++++++++++--------- 4 files changed, 26 insertions(+), 20 deletions(-) diff --git a/mRemoteV1/ChangeLog.txt b/mRemoteV1/ChangeLog.txt index 99509283..8cb1fa26 100644 --- a/mRemoteV1/ChangeLog.txt +++ b/mRemoteV1/ChangeLog.txt @@ -6,6 +6,7 @@ Changed name and location of log file %USERPROFILE%\Local Settings\Application Data\mRemoteNG\mRemoteNG.log Changed filename delimiter in title bar from pipe to dash + Changed default format for saving screenshot images to PNG 1.50: Added the following formats to the "Save Connections As" function: diff --git a/mRemoteV1/Language/Language.DE.vb b/mRemoteV1/Language/Language.DE.vb index 438b5239..2e0cfcd5 100644 --- a/mRemoteV1/Language/Language.DE.vb +++ b/mRemoteV1/Language/Language.DE.vb @@ -282,7 +282,7 @@ Public Const SaveAll As String = "Alle speichern" Public Const RemoveAll As String = "Alle entfernen" Public Const Save As String = "Speichern" - Public Const File As String = "Datei" + Public Const SaveImageFilter As String = "Graphics Interchange Format File (.gif)|*.gif|Joint Photographic Experts Group File (.jpeg)|*.jpeg|Joint Photographic Experts Group File (.jpg)|*.jpg|Portable Network Graphics File (.png)|*.png" ' TODO: Translate Public Const Screenshots As String = "Screenshots" Public Const Activity As String = "Aktivität" Public Const Type As String = "Type" diff --git a/mRemoteV1/Language/Language.EN.vb b/mRemoteV1/Language/Language.EN.vb index 5de8be9e..b4a54edd 100644 --- a/mRemoteV1/Language/Language.EN.vb +++ b/mRemoteV1/Language/Language.EN.vb @@ -283,7 +283,7 @@ Public Const SaveAll As String = "Save All" Public Const RemoveAll As String = "Remove All" Public Const Save As String = "Save" - Public Const File As String = "File" + Public Const SaveImageFilter As String = "Graphics Interchange Format File (.gif)|*.gif|Joint Photographic Experts Group File (.jpeg)|*.jpeg|Joint Photographic Experts Group File (.jpg)|*.jpg|Portable Network Graphics File (.png)|*.png" Public Const Screenshots As String = "Screenshots" Public Const Activity As String = "Activity" Public Const Type As String = "Type" diff --git a/mRemoteV1/UI/UI.Window.ScreenshotManager.vb b/mRemoteV1/UI/UI.Window.ScreenshotManager.vb index c3f9666d..121127e7 100644 --- a/mRemoteV1/UI/UI.Window.ScreenshotManager.vb +++ b/mRemoteV1/UI/UI.Window.ScreenshotManager.vb @@ -64,45 +64,48 @@ Namespace UI Me.mMenFile.Image = Global.mRemote.My.Resources.Resources.File Me.mMenFile.Name = "mMenFile" Me.mMenFile.Size = New System.Drawing.Size(51, 20) - Me.mMenFile.Text = Language.Base.Menu_File + Me.mMenFile.Text = "&File" ' 'mMenFileSaveAll ' Me.mMenFileSaveAll.Image = Global.mRemote.My.Resources.Resources.Screenshot_Save Me.mMenFileSaveAll.Name = "mMenFileSaveAll" - Me.mMenFileSaveAll.Size = New System.Drawing.Size(152, 22) - Me.mMenFileSaveAll.Text = Language.Base.SaveAll + Me.mMenFileSaveAll.Size = New System.Drawing.Size(128, 22) + Me.mMenFileSaveAll.Text = "Save All" ' 'mMenFileRemoveAll ' Me.mMenFileRemoveAll.Image = Global.mRemote.My.Resources.Resources.Screenshot_Delete Me.mMenFileRemoveAll.Name = "mMenFileRemoveAll" - Me.mMenFileRemoveAll.Size = New System.Drawing.Size(152, 22) - Me.mMenFileRemoveAll.Text = Language.Base.RemoveAll + Me.mMenFileRemoveAll.Size = New System.Drawing.Size(128, 22) + Me.mMenFileRemoveAll.Text = "Remove All" ' 'cMenScreenshot ' Me.cMenScreenshot.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.cMenScreenshotCopy, Me.cMenScreenshotSave}) Me.cMenScreenshot.Name = "cMenScreenshot" - Me.cMenScreenshot.Size = New System.Drawing.Size(111, 48) + Me.cMenScreenshot.Size = New System.Drawing.Size(100, 48) ' 'cMenScreenshotCopy ' Me.cMenScreenshotCopy.Image = Global.mRemote.My.Resources.Resources.Screenshot_Copy Me.cMenScreenshotCopy.Name = "cMenScreenshotCopy" - Me.cMenScreenshotCopy.Size = New System.Drawing.Size(110, 22) - Me.cMenScreenshotCopy.Text = Language.Base.Copy + Me.cMenScreenshotCopy.Size = New System.Drawing.Size(99, 22) + Me.cMenScreenshotCopy.Text = "Copy" ' 'cMenScreenshotSave ' Me.cMenScreenshotSave.Image = Global.mRemote.My.Resources.Resources.Screenshot_Save Me.cMenScreenshotSave.Name = "cMenScreenshotSave" - Me.cMenScreenshotSave.Size = New System.Drawing.Size(110, 22) - Me.cMenScreenshotSave.Text = Language.Base.Save + Me.cMenScreenshotSave.Size = New System.Drawing.Size(99, 22) + Me.cMenScreenshotSave.Text = "Save" ' 'dlgSaveSingleImage ' - Me.dlgSaveSingleImage.Filter = "JPG " & Language.Base.File & " (.jpg)|*.jpg|PNG " & Language.Base.File & " (.png)|*.png|GIF " & Language.Base.File & " (.gif)|*.gif" + Me.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" + Me.dlgSaveSingleImage.FilterIndex = 4 ' 'ScreenshotManager ' @@ -113,8 +116,8 @@ Namespace UI Me.Icon = Global.mRemote.My.Resources.Resources.Screenshot_Icon Me.MainMenuStrip = Me.msMain Me.Name = "ScreenshotManager" - Me.TabText = Language.Base.Screenshots - Me.Text = Language.Base.Screenshots + Me.TabText = "Screenshots" + Me.Text = "Screenshots" Me.msMain.ResumeLayout(False) Me.msMain.PerformLayout() Me.cMenScreenshot.ResumeLayout(False) @@ -135,7 +138,7 @@ Namespace UI mMenFileRemoveAll.Text = Language.Base.RemoveAll cMenScreenshotCopy.Text = Language.Base.Copy cMenScreenshotSave.Text = Language.Base.Save - dlgSaveSingleImage.Filter = "JPG " & Language.Base.File & " (.jpg)|*.jpg|PNG " & Language.Base.File & " (.png)|*.png|GIF " & Language.Base.File & " (.gif)|*.gif" + dlgSaveSingleImage.Filter = Language.Base.SaveImageFilter TabText = Language.Base.Screenshots Text = Language.Base.Screenshots End Sub @@ -300,12 +303,14 @@ Namespace UI Try If Me.dlgSaveSingleImage.ShowDialog() = System.Windows.Forms.DialogResult.OK Then Select Case LCase(Me.dlgSaveSingleImage.FileName.Substring(Me.dlgSaveSingleImage.FileName.LastIndexOf(".") + 1)) - Case "png" - TryCast(Me.cMenScreenshot.Tag, PictureBox).Image.Save(Me.dlgSaveSingleImage.FileName, Imaging.ImageFormat.Png) - Case "jpg" - TryCast(Me.cMenScreenshot.Tag, PictureBox).Image.Save(Me.dlgSaveSingleImage.FileName, Imaging.ImageFormat.Jpeg) Case "gif" TryCast(Me.cMenScreenshot.Tag, PictureBox).Image.Save(Me.dlgSaveSingleImage.FileName, Imaging.ImageFormat.Gif) + Case "jpeg" + TryCast(Me.cMenScreenshot.Tag, PictureBox).Image.Save(Me.dlgSaveSingleImage.FileName, Imaging.ImageFormat.Jpeg) + Case "jpg" + TryCast(Me.cMenScreenshot.Tag, PictureBox).Image.Save(Me.dlgSaveSingleImage.FileName, Imaging.ImageFormat.Jpeg) + Case "png" + TryCast(Me.cMenScreenshot.Tag, PictureBox).Image.Save(Me.dlgSaveSingleImage.FileName, Imaging.ImageFormat.Png) End Select End If Catch ex As Exception