Commit Graph

177 Commits

Author SHA1 Message Date
Ben Olden-Cooligan
cc54d3f040 Console autosave (-a) WIP 2016-02-09 21:45:04 -05:00
Ben Olden-Cooligan
5440026668 Don't render thumbnails in NAPS2.Console. 2016-02-09 02:06:40 -05:00
Ben Olden-Cooligan
79ec229212 Change static ThumbnailHelper to an injected ThumbnailRenderer type and pre-render thumbnails whenever an instance of ScannedImage is created to avoid having to re-load bitmaps immediately. TODO: Avoid thumbnail rendering for NAPS2.Console. 2016-02-09 01:54:36 -05:00
Ben Olden-Cooligan
dff0253df3 Fix --bcc argument in console 2016-02-04 11:52:55 -05:00
Ben Olden-Cooligan
a0bd302bfa PUBLISH (4.6.1) 2016-01-30 11:19:15 -05:00
Ben Olden-Cooligan
05b5adb97e PUBLISH (4.6.0) 2016-01-24 15:32:17 -05:00
Ben Olden-Cooligan
ea339d05de Fix platform targets 2016-01-24 15:15:44 -05:00
Ben Olden-Cooligan
fdfeb4c7aa Add options to NAPS2.Console to reorder images (e.g. interleave). 2016-01-21 13:10:31 -05:00
Ben Olden-Cooligan
3b1c07cc74 Switch NAPS2 and NAPS2.Console targets back to x86 in preparation for merge because x64 isn't quite ready 2016-01-16 02:37:13 -05:00
Ben Olden-Cooligan
1cc38bdbce Merge branch 'master' into 64bit_2
# Conflicts:
#	NAPS2.Core/NAPS2.Core.csproj
#	NAPS2.Core/Scan/Images/ScannedImage.cs
#	NAPS2.Core/Scan/Twain/TwainScanDriver.cs
#	NAPS2.Core/WinForms/ThumbnailList.cs
2016-01-13 19:11:31 -05:00
Ben Olden-Cooligan
7b7f3cf531 PUBLISH (4.5.1) 2016-01-12 22:54:46 -05:00
Ben Olden-Cooligan
49d7e54d30 Remove IScannedImage abstraction and rename FileBasedScannedImage to ScannedImage (deleting previous no longer used implementation) 2016-01-10 21:37:59 -05:00
Ben Olden-Cooligan
c741ff2a4e Remove IScannedImage abstraction and rename FileBasedScannedImage to ScannedImage (deleting previous no longer used implementation) 2016-01-10 15:32:40 -05:00
Ben Olden-Cooligan
71b4fbe60e Update Ninject and NLog dependencies 2016-01-10 14:02:14 -05:00
Ben Olden-Cooligan
c247bdb3ab Re-target all projects to AnyCPU (instead of x86) 2016-01-10 14:02:14 -05:00
Ben Olden-Cooligan
1a9f493bc7 PUBLISH (4.5.0) 2016-01-09 18:49:26 -05:00
Ben Olden-Cooligan
a8890bd33d Basic auto save working 2016-01-08 20:24:22 -05:00
Ben Olden-Cooligan
f7d0fd85a0 Fix cancel on email, email progress title, and unsaved changes state lost when save is canceled 2016-01-08 01:23:44 -05:00
Ben Olden-Cooligan
0d002771d4 Make progress reporting in AutomatedScanning more reliable 2016-01-07 17:16:59 -05:00
Ben Olden-Cooligan
bc0a52ba36 SaveImagesOperation and RecoveryOperation 2016-01-06 19:18:08 -05:00
Ben Olden-Cooligan
baadbf1980 Replace PdfSaver with SavePdfOperation 2016-01-06 14:04:17 -05:00
Ben Olden-Cooligan
d4dd0e8387 Revert "Revert "Add import progress form""
This reverts commit 2147361e5b.
2016-01-06 11:56:08 -05:00
Ben Olden-Cooligan
55f1cab720 PUBLISH (4.4.1) 2016-01-01 15:34:22 -05:00
Ben Olden-Cooligan
1126098ffa PUBLISH (4.4.0) 2015-12-31 22:55:32 -05:00
Ben Olden-Cooligan
2147361e5b Revert "Add import progress form"
This reverts commit 456ac61118.
2015-12-30 15:38:54 -05:00
Ben Olden-Cooligan
456ac61118 Add import progress form 2015-12-29 14:58:52 -05:00
Ben Olden-Cooligan
219fe0b11b PUBLISH (4.3.1) 2015-12-19 11:45:45 -05:00
Ben Olden-Cooligan
fd0bc5e169 Remove assemblyfileversion 2015-12-19 11:43:24 -05:00
Ben Olden-Cooligan
c52ab69eed PUBLISH (4.3.0) 2015-12-18 18:54:45 -05:00
Ben Olden-Cooligan
5785e94409 Refactor ExtendedScanSettings to ScanProfile and remove old types from the type hierarchy 2015-12-06 07:25:11 -05:00
Ben Olden-Cooligan
98a64027be Add a new ScanParams type used alongside the profile (ExtendedScanSettings) and move the DetectPatchCodes flag into it. This type is not saved and not a user setting, it's specified by the caller to ScanPerformer.PerformScan. 2015-11-14 15:14:14 -05:00
Ben Olden-Cooligan
ad8776aab0 Remove IScanReceiver interface and replace it with a delegate for more flexibility 2015-11-12 17:34:34 -05:00
Ben Olden-Cooligan
683e2ccab0 Batch scan WIP (no compile) 2015-11-12 17:25:58 -05:00
Ben Olden-Cooligan
0556b675bf PUBLISH (4.2.3) 2015-09-30 18:41:00 -04:00
Ben Olden-Cooligan
4318ca60ee PUBLISH (4.2.2) 2015-08-30 15:27:45 -04:00
Ben Olden-Cooligan
db32c2f6d0 PUBLISH (4.2.1) 2015-08-27 04:12:20 -04:00
Ben Olden-Cooligan
6c35eb05c7 PUBLISH (4.2.0) 2015-08-25 17:42:45 -04:00
Ben Olden-Cooligan
05faa80e22 PUBLISH (4.1.1) 2015-08-07 18:18:38 -04:00
Ben Olden-Cooligan
bcd4cc3501 PUBLISH (4.1.0) 2015-08-06 00:56:56 -04:00
Ben Olden-Cooligan
718b481048 Rename "substitutions" to "placeholders" 2015-08-05 20:36:55 -04:00
Ben Olden-Cooligan
995e03ff39 PUBLISH (4.0b3) 2015-08-04 03:25:56 -04:00
Ben Olden-Cooligan
0f27dc1233 Improve console documentation to include substitutions 2015-08-04 03:17:14 -04:00
Ben Olden-Cooligan
b926565994 Improve NAPS2.Console output for recent changes. 2015-08-04 03:05:27 -04:00
Ben Olden-Cooligan
68d61003f7 Big refactoring and fix for FileNameSubstitution: Ensure substitution responsibility makes sense, handle overwrite prompts consistently, keep subbed timestamps consistent. 2015-08-04 01:34:41 -04:00
Ben Olden-Cooligan
c1df392528 Minor refactoring. Use static Log class instead of ILogger where appropriate. 2015-08-03 06:42:28 -04:00
Ben Olden-Cooligan
6712a4fe82 Refactor classes out of the root namespace (creating a Util namespace for some) and remove unused Usings 2015-08-03 06:18:22 -04:00
Ben Olden-Cooligan
0ad9563633 Handle arbitrary IO exceptions when saving. 2015-08-03 03:36:52 -04:00
Ben Olden-Cooligan
e829745494 Add JPEG quality option to command line 2015-08-03 00:56:42 -04:00
Ben Olden-Cooligan
07d3f50fa1 File name substitution working 2015-08-02 18:44:44 -04:00
Ben Olden-Cooligan
c222d9a519 PUBLISH (4.0b2) 2015-07-31 19:47:18 -04:00
Ben Olden-Cooligan
bc90bf7c06 Add page counter to NAPS2.Console to replace the removed dialogs. 2015-07-31 19:45:40 -04:00
Ben Olden-Cooligan
2ba5289d91 Update new CLI options and fix importing encrypted PDFs on the command line. 2015-07-31 19:03:18 -04:00
Ben Olden-Cooligan
573b48feed Implement import password for NAPS2.Console. 2015-07-31 02:58:29 -04:00
Ben Olden-Cooligan
3e645bc76e Separate PDF metadata and encryption config. Implement related CLI options. 2015-07-31 02:50:48 -04:00
Ben Olden-Cooligan
3a17633d96 Simplify CLI PDF options (no impl yet) 2015-07-30 15:57:02 -04:00
Ben Olden-Cooligan
0b6c044077 Add more CLI options WIP 2015-07-30 15:50:21 -04:00
Ben Olden-Cooligan
bd62df1b9f Email settings 2015-07-30 02:11:31 -04:00
Ben Olden-Cooligan
2ff0e9b51a Import encrypted PDFs 2015-07-29 17:00:18 -04:00
Ben Olden-Cooligan
3ce235056d Working PDF settings and encryption 2015-07-29 16:15:56 -04:00
Ben Olden-Cooligan
c67e534e5c Update copyright year to 2015 2015-07-29 14:30:32 -04:00
Ben Olden-Cooligan
02595ee62b Use a custom WIA dialog to avoid stealing focus and to allow silent scanning from console. (untested) 2015-07-19 14:45:13 -04:00
Ben Olden-Cooligan
9b3e55a742 PUBLISH (4.0b1) 2015-07-13 16:15:48 -04:00
Ben Olden-Cooligan
ce8e0cd318 PUBLISH (3.3.5) 2015-07-07 15:28:57 -04:00
Ben Olden-Cooligan
552d4e71aa PUBLISH (3.3.4) 2015-06-30 17:22:20 -04:00
Ben Olden-Cooligan
69401e1773 PUBLISH (3.3.3) 2015-06-24 15:46:19 -04:00
Ben Olden-Cooligan
6166625ece PUBLISH (3.3.2) 2015-06-22 02:41:43 -04:00
Ben Olden-Cooligan
0a1d14289c PUBLISH (3.3.1) with fix 2015-06-12 14:37:28 -04:00
Ben Olden-Cooligan
8ddf2b8f3a PUBLISH (3.3.0) 2015-06-10 16:58:40 -04:00
Ben Olden-Cooligan
bab9e45984 Move use of console option WaitForEnter for consistency on all errors 2015-06-10 16:53:44 -04:00
Ben Olden-Cooligan
ed0e8c2395 Simplify and correct overwrite checking in NAPS2.Console. 2015-06-10 14:42:47 -04:00
Ben Olden-Cooligan
0dda6a6c7d Move overwrite check in NAPS2.Console to the start of the operation for PDF files (to avoid wasted scans). 2015-06-05 19:08:10 -04:00
Ben Olden-Cooligan
19a24c17ba Fix errors missing from log in NAPS2.Console 2015-06-05 18:48:51 -04:00
Ben Olden-Cooligan
d143cc3cd8 Fix verb forms of ocr console option help texts. 2015-06-02 16:43:03 -04:00
Ben Olden-Cooligan
94c1b40668 Change --ocrlang console argument to imply --enableocr (to meet user expectations). Can still be disabled via --disableocr. 2015-06-02 15:36:11 -04:00
Ben Olden-Cooligan
667c1b5c0b Add OCR options to console. Also fix progress display when using OCR. 2015-06-02 14:37:50 -04:00
Ben Olden-Cooligan
f155cfc582 PUBLISH (3.2.1) 2015-06-01 16:32:18 -04:00
Ben Olden-Cooligan
79936394dd PUBLISH (3.2.0) 2015-05-12 18:37:16 -04:00
Ben Olden-Cooligan
f55cd7fcbd PUBLISH (3.1.1) 2015-05-11 15:33:27 -04:00
Ben Olden-Cooligan
92b191ef31 PUBLISH (3.1.0) 2015-05-09 12:01:00 -04:00
Ben Olden-Cooligan
eaf3e78bcf PUBLISH (3.1) 2015-05-08 19:21:37 -04:00
Ben Olden-Cooligan
b12dd43de5 Correctly dispose of scanned images in NAPS2.Console in order to prevent recovery data from lingering. 2015-02-09 22:15:58 -05:00
Ben Olden-Cooligan
53316f8b27 Updated copyright year to 2014. 2014-11-13 16:45:36 -05:00
Ben Olden-Cooligan
212eaf66d5 Fix setup/publish files for new languages and path restructuring. 2014-11-13 03:49:48 -05:00
Ben Olden-Cooligan
21cba25785 Import error handling and B&W importing. 2014-10-19 19:33:21 -04:00
Ben Olden-Cooligan
21329e3716 Save PDF now has options to save all or selected. Same todo for images and email (email is broken until that's implemented).
Restructured menu options (rotate is one menu). Added Reorder menu option with Interleave and Deinterleave actions.
Fixed some logging.
2014-10-15 12:56:42 -04:00
Ben Olden-Cooligan
9f368a2c57 Importing via command-line. Can enable NAPS2 to operate as a simple pdf generator (import a series of images). 2014-10-14 22:06:28 -04:00
Ben Olden-Cooligan
b1fe3288dd Merge branch 'master' into separate_projects
Conflicts:
	NAPS2/NAPS2.csproj
	NAPS2/Setup/naps2.ps1
	NAPS2/Setup/setup.iss
2013-11-30 14:54:43 -05:00
Ben Olden-Cooligan
28843944cf Moved most code from the NAPS2 project to a new NAPS2.Core project, without Ninject/NLog dependencies. 2013-11-30 14:44:17 -05:00
Ben Olden-Cooligan
cc00388eec PUBLISH (2.6.3) 2013-11-03 19:01:01 -05:00
Ben Olden-Cooligan
5b8029d9d1 PUBLISH (2.6.2) 2013-10-05 19:56:20 -04:00
Ben Olden-Cooligan
30ef6c47fb PUBLISH (2.6.1) 2013-09-25 19:20:25 -04:00
Ben Olden-Cooligan
861eefec21 Fixed error when scanning after clearing previously scanned images.
Fixed console help text.
2013-09-25 19:17:41 -04:00
Ben Olden-Cooligan
a3c19de8f3 Changed bin folder paths to remove the platform (x86) folder, so that the publish scripts match the paths correctly (I could have modified the publish scripts instead, but this was easier) 2013-09-22 12:00:40 -04:00
Ben Olden-Cooligan
9ef1fe3c1b Updated project and solution configurations to move from Release/Standalone to InstallerEXE/MSI/StandaloneZIP/7Z. 2013-09-21 09:37:36 -04:00
Ben Olden-Cooligan
2acd479976 Merge branch 'import' into auto_update 2013-09-21 09:18:31 -04:00
Ben Olden-Cooligan
c2633f011e PUBLISH (2.6) 2013-09-08 20:15:13 -04:00
Ben Olden-Cooligan
c52b5718cf Moved Ninject (dependency injection) code to a DI namespace/folder, and moved common bindings for both the NAPS2 and NAPS2.Console projects to a new module called NAPS2.DI.CommonModule (and NAPS2.DI.WinFormsModule, NAPS2.Console.DI.ConsoleModule for the project-specific things). 2013-09-03 22:14:15 -04:00
Ben Olden-Cooligan
764a7a872e PUBLISH (2.5) 2013-09-01 13:41:22 -04:00
Ben Olden-Cooligan
a5fd782315 Moved NAPS2.Pdf and NAPS2.Email into the subnamespaces NAPS2.ImportExport.Pdf and NAPS2.ImportExport.Email. Also created the namespace NAPS2.ImportExport.Images, which includes some files that were previously in the NAPS2 namespace.
Note that ImportExport only currently contains exporting code, but I imagine that the import support I plan to do more logically fits within the same namespace.
2013-08-28 18:12:57 -04:00
Ben Olden-Cooligan
83164e9561 Added two new namespaces: NAPS2.Scan.Images and NAPS2.Scan.Recovery, and moved the appropriate classes into them. 2013-08-28 17:59:44 -04:00