Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 14:07:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Renamed UI classes, that did not follow naming scheme

Browse Source
This commit is contained in:
Faryan Rezagholi
2020-06-13 13:35:19 +02:00
parent c0a6240764
commit 9b77d390c0
22 changed files with 39 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mRemoteNG/App/Export.cs
View File

@@ -25,7 +25,7 @@ namespace mRemoteNG.App
{
var saveFilter = new SaveFilter();
using (var exportForm = new ExportForm())
using (var exportForm = new FrmExport())
{
if (selectedNode?.GetTreeNodeType() == TreeNodeType.Container)
exportForm.SelectedFolder = selectedNode as ContainerInfo;
@@ -42,10 +42,10 @@ namespace mRemoteNG.App
ConnectionInfo exportTarget;
switch (exportForm.Scope)
{
case ExportForm.ExportScope.SelectedFolder:
case FrmExport.ExportScope.SelectedFolder:
exportTarget = exportForm.SelectedFolder;
break;
case ExportForm.ExportScope.SelectedConnection:
case FrmExport.ExportScope.SelectedConnection:
exportTarget = exportForm.SelectedConnection;
break;
default:

4
mRemoteNG/App/ProgramRoot.cs
View File

@@ -90,7 +90,7 @@ namespace mRemoteNG.App
if (FrmMain.Default.IsDisposed) return;
var window = new UnhandledExceptionWindow(e.Exception, false);
var window = new FrmUnhandledException(e.Exception, false);
window.ShowDialog(FrmMain.Default);
}
@@ -100,7 +100,7 @@ namespace mRemoteNG.App
if (!FrmSplashScreen.getInstance().IsDisposed)
FrmSplashScreen.getInstance().Close();
var window = new UnhandledExceptionWindow(e.ExceptionObject as Exception, e.IsTerminating);
var window = new FrmUnhandledException(e.ExceptionObject as Exception, e.IsTerminating);
window.ShowDialog(FrmMain.Default);
}
}

2
mRemoteNG/Tools/MiscTools.cs
View File

@@ -47,7 +47,7 @@ namespace mRemoteNG.Tools
if (!splash.IsDisposed && splash.Visible)
splash.Close();
var passwordForm = new PasswordForm(passwordName, verify);
var passwordForm = new FrmPassword(passwordName, verify);
return passwordForm.GetKey();
}

2
mRemoteNG/UI/Forms/ExportForm.Designer.cs → mRemoteNG/UI/Forms/FrmExport.Designer.cs generated
View File

@@ -3,7 +3,7 @@ using System.Windows.Forms;
namespace mRemoteNG.UI.Forms
{
public partial class ExportForm : Form
public partial class FrmExport : Form
{
#region Windows Form Designer generated code

4
mRemoteNG/UI/Forms/ExportForm.cs → mRemoteNG/UI/Forms/FrmExport.cs
View File

@@ -10,7 +10,7 @@ using mRemoteNG.Themes;
namespace mRemoteNG.UI.Forms
{
public partial class ExportForm
public partial class FrmExport
{
private ThemeManager _themeManager;
@@ -128,7 +128,7 @@ namespace mRemoteNG.UI.Forms
#region Constructors
public ExportForm()
public FrmExport()
{
InitializeComponent();
FontOverrider.FontOverride(this);

0
mRemoteNG/UI/Forms/ExportForm.resx → mRemoteNG/UI/Forms/FrmExport.resx
View File

2
mRemoteNG/UI/Forms/Input/FrmInputBox.Designer.cs → mRemoteNG/UI/Forms/FrmInputBox.Designer.cs generated
View File

@@ -1,4 +1,4 @@
namespace mRemoteNG.UI.Forms.Input
namespace mRemoteNG.UI.Forms
{
sealed partial class FrmInputBox
{

2
mRemoteNG/UI/Forms/Input/FrmInputBox.cs → mRemoteNG/UI/Forms/FrmInputBox.cs
View File

@@ -2,7 +2,7 @@
using mRemoteNG.Resources.Language;
using mRemoteNG.Themes;
namespace mRemoteNG.UI.Forms.Input
namespace mRemoteNG.UI.Forms
{
public sealed partial class FrmInputBox : Form
{

0
mRemoteNG/UI/Forms/Input/FrmInputBox.resx → mRemoteNG/UI/Forms/FrmInputBox.resx
View File

2
mRemoteNG/UI/Forms/PasswordForm.Designer.cs → mRemoteNG/UI/Forms/FrmPassword.Designer.cs generated
View File

@@ -3,7 +3,7 @@
namespace mRemoteNG.UI.Forms
{
public
partial class PasswordForm : System.Windows.Forms.Form
partial class FrmPassword : System.Windows.Forms.Form
{
//Form overrides dispose to clean up the component list.

4
mRemoteNG/UI/Forms/PasswordForm.cs → mRemoteNG/UI/Forms/FrmPassword.cs
View File

@@ -8,7 +8,7 @@ using mRemoteNG.Tools;
namespace mRemoteNG.UI.Forms
{
public partial class PasswordForm : IKeyProvider
public partial class FrmPassword : IKeyProvider
{
private readonly string _passwordName;
private SecureString _password = new SecureString();
@@ -29,7 +29,7 @@ namespace mRemoteNG.UI.Forms
/// password box is shown which must match the first password
/// to continue.
/// </param>
public PasswordForm(string passwordName = null, bool newPasswordMode = true)
public FrmPassword(string passwordName = null, bool newPasswordMode = true)
{
InitializeComponent();
_passwordName = passwordName;

0
mRemoteNG/UI/Forms/PasswordForm.resx → mRemoteNG/UI/Forms/FrmPassword.resx
View File

2
mRemoteNG/UI/Forms/UnhandledExceptionWindow.Designer.cs → mRemoteNG/UI/Forms/FrmUnhandledException.Designer.cs generated
View File

@@ -1,6 +1,6 @@
namespace mRemoteNG.UI.Forms
{
partial class UnhandledExceptionWindow
partial class FrmUnhandledException
{
/// <summary>
/// Required designer variable.

6
mRemoteNG/UI/Forms/UnhandledExceptionWindow.cs → mRemoteNG/UI/Forms/FrmUnhandledException.cs
View File

@@ -9,16 +9,16 @@ using mRemoteNG.Resources.Language;
namespace mRemoteNG.UI.Forms
{
public partial class UnhandledExceptionWindow : Form
public partial class FrmUnhandledException : Form
{
private readonly bool _isFatal;
public UnhandledExceptionWindow()
public FrmUnhandledException()
: this(null, false)
{
}
public UnhandledExceptionWindow(Exception exception, bool isFatal)
public FrmUnhandledException(Exception exception, bool isFatal)
{
_isFatal = isFatal;
InitializeComponent();

0
mRemoteNG/UI/Forms/UnhandledExceptionWindow.resx → mRemoteNG/UI/Forms/FrmUnhandledException.resx
View File

1
mRemoteNG/UI/Forms/OptionsPages/ThemePage.cs
View File

@@ -6,7 +6,6 @@ using System.Collections.Generic;
using BrightIdeasSoftware;
using mRemoteNG.Properties;
using mRemoteNG.Resources.Language;
using mRemoteNG.UI.Forms.Input;
using mRemoteNG.UI.TaskDialog;
namespace mRemoteNG.UI.Forms.OptionsPages

1
mRemoteNG/UI/Forms/frmChoosePanel.cs
View File

@@ -2,7 +2,6 @@
using mRemoteNG.App;
using mRemoteNG.Resources.Language;
using mRemoteNG.Themes;
using mRemoteNG.UI.Forms.Input;
using mRemoteNG.UI.Panels;
namespace mRemoteNG.UI.Forms

1
mRemoteNG/UI/Panels/PanelAdder.cs
View File

@@ -1,7 +1,6 @@
using mRemoteNG.App;
using mRemoteNG.Messages;
using mRemoteNG.UI.Forms;
using mRemoteNG.UI.Forms.Input;
using mRemoteNG.UI.Window;
using System;
using System.Collections;

1
mRemoteNG/UI/Window/ConnectionWindow.cs
View File

@@ -16,7 +16,6 @@ using mRemoteNG.Resources.Language;
using mRemoteNG.Themes;
using mRemoteNG.Tools;
using mRemoteNG.UI.Forms;
using mRemoteNG.UI.Forms.Input;
using mRemoteNG.UI.Tabs;
using mRemoteNG.UI.TaskDialog;
using WeifenLuo.WinFormsUI.Docking;

36
mRemoteNG/mRemoteNG.csproj
View File

@@ -493,10 +493,10 @@
<DependentUpon>FrmSplashScreen.cs</DependentUpon>
</Compile>
<Compile Include="UI\Forms\FullscreenHandler.cs" />
<Compile Include="UI\Forms\Input\FrmInputBox.cs">
<Compile Include="UI\Forms\FrmInputBox.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="UI\Forms\Input\FrmInputBox.Designer.cs">
<Compile Include="UI\Forms\FrmInputBox.Designer.cs">
<DependentUpon>FrmInputBox.cs</DependentUpon>
</Compile>
<Compile Include="UI\Forms\OptionsPages\AdvancedPage.Designer.cs">
@@ -618,10 +618,10 @@
<Compile Include="UI\Forms\FrmMain.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="UI\Forms\PasswordForm.Designer.cs">
<DependentUpon>PasswordForm.cs</DependentUpon>
<Compile Include="UI\Forms\FrmPassword.Designer.cs">
<DependentUpon>FrmPassword.cs</DependentUpon>
</Compile>
<Compile Include="UI\Forms\PasswordForm.cs">
<Compile Include="UI\Forms\FrmPassword.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Messages\Message.cs" />
@@ -652,11 +652,11 @@
<Compile Include="UI\Forms\TextBox.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="UI\Forms\UnhandledExceptionWindow.cs">
<Compile Include="UI\Forms\FrmUnhandledException.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="UI\Forms\UnhandledExceptionWindow.Designer.cs">
<DependentUpon>UnhandledExceptionWindow.cs</DependentUpon>
<Compile Include="UI\Forms\FrmUnhandledException.Designer.cs">
<DependentUpon>FrmUnhandledException.cs</DependentUpon>
</Compile>
<Compile Include="UI\GraphicsUtilities\GdiPlusGraphicsProvider.cs" />
<Compile Include="UI\GraphicsUtilities\IGraphicsProvider.cs" />
@@ -734,8 +734,8 @@
<Compile Include="UI\Window\ErrorAndInfoWindow.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="UI\Forms\ExportForm.Designer.cs">
<DependentUpon>ExportForm.cs</DependentUpon>
<Compile Include="UI\Forms\FrmExport.Designer.cs">
<DependentUpon>FrmExport.cs</DependentUpon>
</Compile>
<Compile Include="UI\Window\ErrorAndInfoWindow.Designer.cs">
<DependentUpon>ErrorAndInfoWindow.cs</DependentUpon>
@@ -759,7 +759,7 @@
<Compile Include="UI\Window\PortScanWindow.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="UI\Forms\ExportForm.cs">
<Compile Include="UI\Forms\FrmExport.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="UI\Window\ScreenshotManagerWindow.cs">
@@ -886,7 +886,7 @@
<EmbeddedResource Include="UI\Forms\FrmSplashScreen.resx">
<DependentUpon>FrmSplashScreen.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\Forms\Input\FrmInputBox.resx">
<EmbeddedResource Include="UI\Forms\FrmInputBox.resx">
<DependentUpon>FrmInputBox.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\Forms\OptionsPages\AdvancedPage.resx">
@@ -926,8 +926,8 @@
<EmbeddedResource Include="UI\Forms\OptionsPages\UpdatesPage.resx">
<DependentUpon>UpdatesPage.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\Forms\PasswordForm.resx">
<DependentUpon>PasswordForm.cs</DependentUpon>
<EmbeddedResource Include="UI\Forms\FrmPassword.resx">
<DependentUpon>FrmPassword.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Resources\Language\Language.de.resx">
@@ -998,8 +998,8 @@
<EmbeddedResource Include="UI\Forms\TextBox.resx">
<DependentUpon>TextBox.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\Forms\UnhandledExceptionWindow.resx">
<DependentUpon>UnhandledExceptionWindow.cs</DependentUpon>
<EmbeddedResource Include="UI\Forms\FrmUnhandledException.resx">
<DependentUpon>FrmUnhandledException.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\Tabs\ConnectionTab.resx">
<DependentUpon>ConnectionTab.cs</DependentUpon>
@@ -1049,8 +1049,8 @@
<DependentUpon>PortScanWindow.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="UI\Forms\ExportForm.resx">
<DependentUpon>ExportForm.cs</DependentUpon>
<EmbeddedResource Include="UI\Forms\FrmExport.resx">
<DependentUpon>FrmExport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="UI\Window\ScreenshotManagerWindow.resx">

1
mRemoteNGInstaller/Installer/Fragments/FilesFragment.wxs
View File

@@ -107,6 +107,7 @@
<Component Id="cmpADE94032AA8563E1E37003C8AB2D8F7E" Directory="INSTALLDIR" Guid="*">
<File Id="fil6BA5B21301D77ADAE00F1DA02BFE8584" KeyPath="yes" Source="$(var.HarvestPath)\ConsoleControl.dll" />
</Component>

4
mRemoteNGTests/UI/Forms/PasswordFormTests.cs
View File

@@ -7,12 +7,12 @@ namespace mRemoteNGTests.UI.Forms
[TestFixture]
public class PasswordFormTests
{
PasswordForm _passwordForm;
FrmPassword _passwordForm;
[SetUp]
public void Setup()
{
_passwordForm = new PasswordForm();
_passwordForm = new FrmPassword();
_passwordForm.Show();
}