cyanfish/naps2
1
1
Fork 0
mirror of https://github.com/cyanfish/naps2.git synced 2024-10-05 03:47:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Moved files into more appropriate folders, and adjusted namespaces accordingly.

Browse Source
This commit is contained in:
Ben Olden-Cooligan 2013-07-09 18:20:27 -04:00
parent 3cfda2c9d3
commit c3af5454c0
40 changed files with 105 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
NAPS2/NAPS2.csproj
View File

@ -113,8 +113,8 @@
<DependentUpon>Icons.resx</DependentUpon>
</Compile>
<Compile Include="IProfileManager.cs" />
<Compile Include="IScanPerformer.cs" />
<Compile Include="IScanReceiver.cs" />
<Compile Include="Scan\IScanPerformer.cs" />
<Compile Include="Scan\IScanReceiver.cs" />
<Compile Include="Lang\LanguageResources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
@ -133,17 +133,17 @@
<Compile Include="LoggerFactory.cs" />
<Compile Include="MessageBoxErrorOutput.cs" />
<Compile Include="Paths.cs" />
<Compile Include="ScannedImageList.cs" />
<Compile Include="ScanPerformer.cs" />
<Compile Include="Scan\ScannedImageList.cs" />
<Compile Include="Scan\ScanPerformer.cs" />
<Compile Include="Scan\Exceptions\ScanDriverUnknownException.cs" />
<Compile Include="Scan\LocalizedDescriptionAttribute.cs" />
<Compile Include="Scan\Stub\StubScanDriver.cs" />
<Compile Include="Scan\Twain\DibUtils.cs" />
<Compile Include="Scan\Twain\TwainApi.cs" />
<Compile Include="Scan\Twain\FTwainGui.cs">
<Compile Include="WinForms\FTwainGui.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Scan\Twain\FTwainGui.Designer.cs">
<Compile Include="WinForms\FTwainGui.Designer.cs">
<DependentUpon>FTwainGui.cs</DependentUpon>
</Compile>
<Compile Include="Scan\Twain\TwainDefs.cs" />
@ -162,10 +162,10 @@
<Compile Include="Scan\Twain\TwainScanDriver.cs" />
<Compile Include="Scan\ScanDevice.cs" />
<Compile Include="Scan\ScannedImage.cs" />
<Compile Include="FAbout.cs">
<Compile Include="WinForms\FAbout.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FAbout.Designer.cs">
<Compile Include="WinForms\FAbout.Designer.cs">
<DependentUpon>FAbout.cs</DependentUpon>
</Compile>
<Compile Include="Scan\IScanDriver.cs" />
@ -174,43 +174,43 @@
<Compile Include="Scan\Wia\WiaScanDriver.cs" />
<Compile Include="ProfileManager.cs" />
<Compile Include="TiffHelper.cs" />
<Compile Include="FChooseIcon.cs">
<Compile Include="WinForms\FChooseIcon.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FChooseIcon.Designer.cs">
<Compile Include="WinForms\FChooseIcon.Designer.cs">
<DependentUpon>FChooseIcon.cs</DependentUpon>
</Compile>
<Compile Include="FChooseProfile.cs">
<Compile Include="WinForms\FChooseProfile.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FChooseProfile.Designer.cs">
<Compile Include="WinForms\FChooseProfile.Designer.cs">
<DependentUpon>FChooseProfile.cs</DependentUpon>
</Compile>
<Compile Include="FEditScanSettings.cs">
<Compile Include="WinForms\FEditScanSettings.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FEditScanSettings.Designer.cs">
<Compile Include="WinForms\FEditScanSettings.Designer.cs">
<DependentUpon>FEditScanSettings.cs</DependentUpon>
</Compile>
<Compile Include="FManageProfiles.cs">
<Compile Include="WinForms\FManageProfiles.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FManageProfiles.Designer.cs">
<Compile Include="WinForms\FManageProfiles.Designer.cs">
<DependentUpon>FManageProfiles.cs</DependentUpon>
</Compile>
<Compile Include="FDesktop.cs">
<Compile Include="WinForms\FDesktop.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FDesktop.Designer.cs">
<Compile Include="WinForms\FDesktop.Designer.cs">
<DependentUpon>FDesktop.cs</DependentUpon>
</Compile>
<Compile Include="FPDFSave.cs">
<Compile Include="WinForms\FPDFSave.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FPDFSave.Designer.cs">
<Compile Include="WinForms\FPDFSave.Designer.cs">
<DependentUpon>FPDFSave.cs</DependentUpon>
</Compile>
<Compile Include="FViewer.cs">
<Compile Include="WinForms\FViewer.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="ILProfileIcons.cs">
@ -224,35 +224,35 @@
<Compile Include="Email\MAPIMessage.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="FAbout.resx">
<EmbeddedResource Include="WinForms\FAbout.resx">
<DependentUpon>FAbout.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="FChooseIcon.resx">
<EmbeddedResource Include="WinForms\FChooseIcon.resx">
<SubType>Designer</SubType>
<DependentUpon>FChooseIcon.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FChooseProfile.resx">
<EmbeddedResource Include="WinForms\FChooseProfile.resx">
<SubType>Designer</SubType>
<DependentUpon>FChooseProfile.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FEditScanSettings.resx">
<EmbeddedResource Include="WinForms\FEditScanSettings.resx">
<SubType>Designer</SubType>
<DependentUpon>FEditScanSettings.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FManageProfiles.resx">
<EmbeddedResource Include="WinForms\FManageProfiles.resx">
<SubType>Designer</SubType>
<DependentUpon>FManageProfiles.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FDesktop.resx">
<EmbeddedResource Include="WinForms\FDesktop.resx">
<SubType>Designer</SubType>
<DependentUpon>FDesktop.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FPDFSave.resx">
<EmbeddedResource Include="WinForms\FPDFSave.resx">
<DependentUpon>FPDFSave.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="FViewer.resx">
<EmbeddedResource Include="WinForms\FViewer.resx">
<DependentUpon>FViewer.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
@ -281,19 +281,19 @@
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Scan\Twain\FTwainGui.resx">
<EmbeddedResource Include="WinForms\FTwainGui.resx">
<DependentUpon>FTwainGui.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="ThumbnailList.resx">
<EmbeddedResource Include="WinForms\ThumbnailList.resx">
<SubType>Designer</SubType>
<DependentUpon>ThumbnailList.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="TiffViewer.resx">
<EmbeddedResource Include="WinForms\TiffViewer.resx">
<DependentUpon>TiffViewer.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="TiffViewerCtl.resx">
<EmbeddedResource Include="WinForms\TiffViewerCtl.resx">
<DependentUpon>TiffViewerCtl.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
@ -314,16 +314,16 @@
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<Compile Include="ThumbnailList.cs">
<Compile Include="WinForms\ThumbnailList.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="ThumbnailList.Designer.cs">
<Compile Include="WinForms\ThumbnailList.Designer.cs">
<DependentUpon>ThumbnailList.cs</DependentUpon>
</Compile>
<Compile Include="TiffViewer.cs">
<Compile Include="WinForms\TiffViewer.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="TiffViewerCtl.cs">
<Compile Include="WinForms\TiffViewerCtl.cs">
<SubType>UserControl</SubType>
</Compile>
</ItemGroup>
@ -395,9 +395,7 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<Folder Include="Lang\tmx\" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

1
NAPS2/Program.cs
View File

@ -23,6 +23,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Windows.Forms;
using NAPS2.WinForms;
using Ninject;
using Ninject.Parameters;
using NLog;

3
NAPS2/IScanPerformer.cs → NAPS2/Scan/IScanPerformer.cs
View File

@ -22,9 +22,8 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Windows.Forms;
using NAPS2.Scan;
namespace NAPS2
namespace NAPS2.Scan
{
public interface IScanPerformer
{

3
NAPS2/IScanReceiver.cs → NAPS2/Scan/IScanReceiver.cs
View File

@ -21,9 +21,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using NAPS2.Scan;
namespace NAPS2
namespace NAPS2.Scan
{
public interface IScanReceiver
{

3
NAPS2/ScanPerformer.cs → NAPS2/Scan/ScanPerformer.cs
View File

@ -22,12 +22,11 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Windows.Forms;
using NAPS2.Scan;
using NAPS2.Scan.Exceptions;
using Ninject;
using NLog;
namespace NAPS2
namespace NAPS2.Scan
{
public class ScanPerformer : IScanPerformer
{

3
NAPS2/ScannedImageList.cs → NAPS2/Scan/ScannedImageList.cs
View File

@ -22,9 +22,8 @@ using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using NAPS2.Scan;
namespace NAPS2
namespace NAPS2.Scan
{
public class ScannedImageList
{

1
NAPS2/Scan/Twain/TwainApi.cs
View File

@ -23,6 +23,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Windows.Forms;
using NAPS2.Scan.Exceptions;
using NAPS2.WinForms;
namespace NAPS2.Scan.Twain
{

6
NAPS2/FAbout.Designer.cs → NAPS2/WinForms/FAbout.Designer.cs generated
View File

@ -1,4 +1,8 @@
namespace NAPS2
using System;
using System.Collections.Generic;
using System.Linq;
namespace NAPS2.WinForms
{
partial class FAbout
{

2
NAPS2/FAbout.cs → NAPS2/WinForms/FAbout.cs
View File

@ -27,7 +27,7 @@ using System.Reflection;
using System.Windows.Forms;
using NAPS2.Lang.Resources;
namespace NAPS2
namespace NAPS2.WinForms
{
partial class FAbout : Form
{

0
NAPS2/FAbout.resx → NAPS2/WinForms/FAbout.resx
View File

6
NAPS2/FChooseIcon.Designer.cs → NAPS2/WinForms/FChooseIcon.Designer.cs generated
View File

@ -1,4 +1,8 @@
namespace NAPS2
using System;
using System.Collections.Generic;
using System.Linq;
namespace NAPS2.WinForms
{
partial class FChooseIcon
{

2
NAPS2/FChooseIcon.cs → NAPS2/WinForms/FChooseIcon.cs
View File

@ -24,7 +24,7 @@ using System.Drawing;
using System.Linq;
using System.Windows.Forms;
namespace NAPS2
namespace NAPS2.WinForms
{
public partial class FChooseIcon : Form
{

0
NAPS2/FChooseIcon.resx → NAPS2/WinForms/FChooseIcon.resx
View File

6
NAPS2/FChooseProfile.Designer.cs → NAPS2/WinForms/FChooseProfile.Designer.cs generated
View File

@ -1,4 +1,8 @@
namespace NAPS2
using System;
using System.Collections.Generic;
using System.Linq;
namespace NAPS2.WinForms
{
partial class FChooseProfile
{

2
NAPS2/FChooseProfile.cs → NAPS2/WinForms/FChooseProfile.cs
View File

@ -26,7 +26,7 @@ using NAPS2.Lang.Resources;
using NAPS2.Scan;
using Ninject;
namespace NAPS2
namespace NAPS2.WinForms
{
public partial class FChooseProfile : Form
{

0
NAPS2/FChooseProfile.resx → NAPS2/WinForms/FChooseProfile.resx
View File

8
NAPS2/FDesktop.Designer.cs → NAPS2/WinForms/FDesktop.Designer.cs generated
View File

@ -1,4 +1,8 @@
namespace NAPS2
using System;
using System.Collections.Generic;
using System.Linq;
namespace NAPS2.WinForms
{
partial class FDesktop
{
@ -31,7 +35,7 @@ namespace NAPS2
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FDesktop));
this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer();
this.thumbnailList1 = new NAPS2.ThumbnailList();
this.thumbnailList1 = new ThumbnailList();
this.tStrip = new System.Windows.Forms.ToolStrip();
this.tsScan = new System.Windows.Forms.ToolStripButton();
this.tsProfiles = new System.Windows.Forms.ToolStripButton();

5
NAPS2/FDesktop.cs → NAPS2/WinForms/FDesktop.cs
View File

@ -21,13 +21,10 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Drawing.Imaging;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Threading;
using System.Windows.Forms;
using NAPS2.Email;
@ -37,7 +34,7 @@ using NAPS2.Scan;
using Ninject;
using Ninject.Parameters;
namespace NAPS2
namespace NAPS2.WinForms
{
public partial class FDesktop : Form, IScanReceiver
{

0
NAPS2/FDesktop.resx → NAPS2/WinForms/FDesktop.resx
View File

6
NAPS2/FEditScanSettings.Designer.cs → NAPS2/WinForms/FEditScanSettings.Designer.cs generated
View File

@ -1,4 +1,8 @@
namespace NAPS2
using System;
using System.Collections.Generic;
using System.Linq;
namespace NAPS2.WinForms
{
partial class FEditScanSettings
{

2
NAPS2/FEditScanSettings.cs → NAPS2/WinForms/FEditScanSettings.cs
View File

@ -30,7 +30,7 @@ using NAPS2.Scan.Wia;
using Ninject;
using NLog;
namespace NAPS2
namespace NAPS2.WinForms
{
public partial class FEditScanSettings : Form
{

0
NAPS2/FEditScanSettings.resx → NAPS2/WinForms/FEditScanSettings.resx
View File

6
NAPS2/FManageProfiles.Designer.cs → NAPS2/WinForms/FManageProfiles.Designer.cs generated
View File

@ -1,4 +1,8 @@
namespace NAPS2
using System;
using System.Collections.Generic;
using System.Linq;
namespace NAPS2.WinForms
{
partial class FManageProfiles
{

2
NAPS2/FManageProfiles.cs → NAPS2/WinForms/FManageProfiles.cs
View File

@ -26,7 +26,7 @@ using NAPS2.Lang.Resources;
using NAPS2.Scan;
using Ninject;
namespace NAPS2
namespace NAPS2.WinForms
{
public partial class FManageProfiles : Form
{

0
NAPS2/FManageProfiles.resx → NAPS2/WinForms/FManageProfiles.resx
View File

6
NAPS2/FPDFSave.Designer.cs → NAPS2/WinForms/FPDFSave.Designer.cs generated
View File

@ -1,4 +1,8 @@
namespace NAPS2
using System;
using System.Collections.Generic;
using System.Linq;
namespace NAPS2.WinForms
{
partial class FPDFSave
{

2
NAPS2/FPDFSave.cs → NAPS2/WinForms/FPDFSave.cs
View File

@ -28,7 +28,7 @@ using NAPS2.Lang.Resources;
using NAPS2.Pdf;
using NAPS2.Scan;
namespace NAPS2
namespace NAPS2.WinForms
{
public partial class FPDFSave : Form
{

0
NAPS2/FPDFSave.resx → NAPS2/WinForms/FPDFSave.resx
View File

6
NAPS2/Scan/Twain/FTwainGui.Designer.cs → NAPS2/WinForms/FTwainGui.Designer.cs generated
View File

@ -1,4 +1,8 @@
namespace NAPS2.Scan.Twain
using System;
using System.Collections.Generic;
using System.Linq;
namespace NAPS2.WinForms
{
partial class FTwainGui
{

4
NAPS2/Scan/Twain/FTwainGui.cs → NAPS2/WinForms/FTwainGui.cs
View File

@ -25,8 +25,10 @@ using System.Drawing;
using System.Drawing.Imaging;
using System.Linq;
using System.Windows.Forms;
using NAPS2.Scan;
using NAPS2.Scan.Twain;
namespace NAPS2.Scan.Twain
namespace NAPS2.WinForms
{
internal partial class FTwainGui : Form, IMessageFilter
{

0
NAPS2/Scan/Twain/FTwainGui.resx → NAPS2/WinForms/FTwainGui.resx
View File

4
NAPS2/FViewer.cs → NAPS2/WinForms/FViewer.cs
View File

@ -25,7 +25,7 @@ using System.Drawing;
using System.Linq;
using System.Windows.Forms;
namespace NAPS2
namespace NAPS2.WinForms
{
public class FViewer : Form
{
@ -63,7 +63,7 @@ namespace NAPS2
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FViewer));
this.tiffViewer1 = new NAPS2.TiffViewerCtl();
this.tiffViewer1 = new TiffViewerCtl();
this.SuspendLayout();
//
// tiffViewer1

0
NAPS2/FViewer.resx → NAPS2/WinForms/FViewer.resx
View File

6
NAPS2/ThumbnailList.Designer.cs → NAPS2/WinForms/ThumbnailList.Designer.cs generated
View File

@ -1,4 +1,8 @@
namespace NAPS2
using System;
using System.Collections.Generic;
using System.Linq;
namespace NAPS2.WinForms
{
partial class ThumbnailList
{

2
NAPS2/ThumbnailList.cs → NAPS2/WinForms/ThumbnailList.cs
View File

@ -24,7 +24,7 @@ using System.Linq;
using System.Windows.Forms;
using NAPS2.Scan;
namespace NAPS2
namespace NAPS2.WinForms
{
public partial class ThumbnailList : ListView
{

0
NAPS2/ThumbnailList.resx → NAPS2/WinForms/ThumbnailList.resx
View File

2
NAPS2/TiffViewer.cs → NAPS2/WinForms/TiffViewer.cs
View File

@ -26,7 +26,7 @@ using System.Drawing.Drawing2D;
using System.Linq;
using System.Windows.Forms;
namespace NAPS2
namespace NAPS2.WinForms
{
public class TiffViewer : UserControl
{

0
NAPS2/TiffViewer.resx → NAPS2/WinForms/TiffViewer.resx
View File

2
NAPS2/TiffViewerCtl.cs → NAPS2/WinForms/TiffViewerCtl.cs
View File

@ -25,7 +25,7 @@ using System.Drawing;
using System.Linq;
using System.Windows.Forms;
namespace NAPS2
namespace NAPS2.WinForms
{
public class TiffViewerCtl : UserControl
{

0
NAPS2/TiffViewerCtl.resx → NAPS2/WinForms/TiffViewerCtl.resx
View File