Use file-scoped namespaces in forms

This commit is contained in:
Ben Olden-Cooligan 2022-07-02 16:12:34 -07:00
parent 6731df4789
commit d1e86b18e3
18 changed files with 2813 additions and 2831 deletions

View File

@ -1,5 +1,5 @@
namespace NAPS2.WinForms
{
namespace NAPS2.WinForms;
public abstract class DialogHelper
{
public abstract bool PromptToSavePdfOrImage(string defaultPath, out string savePath);
@ -8,4 +8,3 @@
public abstract bool PromptToSaveImage(string defaultPath, out string savePath);
}
}

View File

@ -2,8 +2,8 @@
using System.Windows.Forms;
using NAPS2.ImportExport.Email;
namespace NAPS2.WinForms
{
namespace NAPS2.WinForms;
public partial class EmailProviderWidget : Button
{
public EmailProviderWidget()
@ -42,4 +42,3 @@ namespace NAPS2.WinForms
ClickAction?.Invoke();
}
}
}

View File

@ -3,8 +3,8 @@ using System.Threading;
using System.Windows.Forms;
using NAPS2.ImportExport.Email.Oauth;
namespace NAPS2.WinForms
{
namespace NAPS2.WinForms;
public partial class FAuthorize : FormBase
{
private readonly ErrorOutput _errorOutput;
@ -59,4 +59,3 @@ namespace NAPS2.WinForms
_cancelTokenSource?.Cancel();
}
}
}

View File

@ -7,8 +7,8 @@ using NAPS2.Scan;
using NAPS2.Scan.Batch;
using NAPS2.Scan.Exceptions;
namespace NAPS2.WinForms
{
namespace NAPS2.WinForms;
public partial class FBatchScan : FormBase
{
public const string PATCH_CODE_INFO_URL = "http://www.naps2.com/doc-batch-scan.html#patch-t";
@ -370,4 +370,3 @@ namespace NAPS2.WinForms
}
}
}
}

View File

@ -2,8 +2,8 @@ using System.Drawing;
using System.Drawing.Imaging;
using System.Windows.Forms;
namespace NAPS2.WinForms
{
namespace NAPS2.WinForms;
partial class FCrop : ImageForm
{
private static CropTransform _lastTransform;
@ -228,4 +228,3 @@ namespace NAPS2.WinForms
return new Point((int)Math.Round(x), (int)Math.Round(y));
}
}
}

View File

@ -12,8 +12,8 @@ using NAPS2.ImportExport.Images;
#endregion
namespace NAPS2.WinForms
{
namespace NAPS2.WinForms;
public partial class FDesktop : FormBase
{
private readonly ToolbarFormatter _toolbarFormatter;
@ -790,4 +790,3 @@ namespace NAPS2.WinForms
#endregion
}
}

View File

@ -5,8 +5,8 @@ using NAPS2.ImportExport.Email.Mapi;
using NAPS2.ImportExport.Email.Oauth;
using NAPS2.Scan;
namespace NAPS2.WinForms
{
namespace NAPS2.WinForms;
public partial class FEmailProvider : FormBase
{
private readonly GmailOauthProvider _gmailOauthProvider;
@ -148,4 +148,3 @@ namespace NAPS2.WinForms
return null;
}
}
}

View File

@ -1,7 +1,7 @@
using System.Windows.Forms;
namespace NAPS2.WinForms
{
namespace NAPS2.WinForms;
partial class FHueSaturation : ImageForm
{
public FHueSaturation(ImageContext imageContext)
@ -72,4 +72,3 @@ namespace NAPS2.WinForms
UpdateTransform();
}
}
}

View File

@ -1,8 +1,8 @@
using System.Windows.Forms;
using NAPS2.Ocr;
namespace NAPS2.WinForms
{
namespace NAPS2.WinForms;
public partial class FOcrLanguageDownload : FormBase
{
private readonly TesseractLanguageManager _tesseractLanguageManager;
@ -89,4 +89,3 @@ namespace NAPS2.WinForms
progressForm.ShowDialog();
}
}
}

View File

@ -1,7 +1,7 @@
using System.Windows.Forms;
namespace NAPS2.WinForms
{
namespace NAPS2.WinForms;
public partial class FPdfPassword : FormBase
{
public FPdfPassword()
@ -34,4 +34,3 @@ namespace NAPS2.WinForms
Close();
}
}
}

View File

@ -1,7 +1,7 @@
using System.Windows.Forms;
namespace NAPS2.WinForms
{
namespace NAPS2.WinForms;
public partial class FProgress : FormBase
{
private readonly ErrorOutput _errorOutput;
@ -95,4 +95,3 @@ namespace NAPS2.WinForms
Close();
}
}
}

View File

@ -1,7 +1,7 @@
using System.Windows.Forms;
namespace NAPS2.WinForms
{
namespace NAPS2.WinForms;
public partial class FRecover : FormBase
{
public FRecover()
@ -35,4 +35,3 @@ namespace NAPS2.WinForms
Close();
}
}
}

View File

@ -1,8 +1,8 @@
using System.Windows.Forms;
using NAPS2.Scan;
namespace NAPS2.WinForms
{
namespace NAPS2.WinForms;
public partial class FSelectDevice : FormBase
{
public FSelectDevice()
@ -61,4 +61,3 @@ namespace NAPS2.WinForms
Close();
}
}
}

View File

@ -3,8 +3,8 @@ using System.Globalization;
using System.Windows.Forms;
using NAPS2.Images.Gdi;
namespace NAPS2.WinForms
{
namespace NAPS2.WinForms;
public class FViewer : FormBase
{
private readonly Container _components = null;
@ -639,4 +639,3 @@ namespace NAPS2.WinForms
_ksm.Assign(ks.SavePDF, _tsSavePdf);
}
}
}

View File

@ -1,7 +1,7 @@
using System.ComponentModel;
namespace NAPS2.WinForms
{
namespace NAPS2.WinForms;
public partial class ILProfileIcons : Component
{
public ILProfileIcons()
@ -16,4 +16,3 @@ namespace NAPS2.WinForms
InitializeComponent();
}
}
}

View File

@ -3,8 +3,8 @@ using System.Windows.Forms;
using NAPS2.Images.Gdi;
using Timer = System.Threading.Timer;
namespace NAPS2.WinForms
{
namespace NAPS2.WinForms;
public partial class ImageForm : FormBase
{
private readonly ImageContext _imageContext;
@ -179,4 +179,3 @@ namespace NAPS2.WinForms
_closed = true;
}
}
}

View File

@ -1,7 +1,7 @@
using System.Windows.Forms;
namespace NAPS2.WinForms
{
namespace NAPS2.WinForms;
public partial class OperationProgressNotifyWidget : NotifyWidgetBase
{
private readonly OperationProgress _operationProgress;
@ -71,4 +71,3 @@ namespace NAPS2.WinForms
}
}
}
}

View File

@ -2,8 +2,8 @@ using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms;
namespace NAPS2.WinForms
{
namespace NAPS2.WinForms;
public class TiffViewer : UserControl
{
private readonly Container _components = null;
@ -171,4 +171,3 @@ namespace NAPS2.WinForms
}
#endregion
}
}