gronod/ICCery-CPU
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 5 Wiki Activity

feat: add hardware print quality option supporting Canon 5-notch Custom slider and Epson modes (#5) #6

Merged
gronod merged 1 commits from fix/ppd-media-type-and-tray-options into development 2026-09-07 23:42:40 +01:00
Conversation 0 Commits 1 Files Changed 7
+308 -2
gronod commented 2026-09-07 23:37:15 +01:00
Owner
Copy Link
Copy Source

Summary

This PR implements Issue #5: adding a dedicated Print Quality option (hardware droplet addressability / pass count) alongside input raster resolution. It fully supports Canon's 5-notch Custom slider (including Super Fine mode) and Epson's multi-level quality modes.

Key Changes

  1. PPD Quality Discovery (CUPSManager.swift):

    • Extended PPDOptions and PrinterQueue with qualityChoices: [PPDChoice] and qualityKeyword: String?.
    • Added automated candidate keyword discovery (CNIJPrintQuality, EPIJ_Qual, cupsPrintQuality, PrintQuality, CNIJPrintMode2, Quality, StpQuality) and *OpenUI fallback.
    • Preserves human-readable quality labels (e.g. Super Fine, Fine, Best Quality) while binding them to driver choice codes.

  2. Canon Coordinated Multi-Key Driver Injection (PrintEngine.swift):

    • Handled Canon's 5-notch Custom quality slider architecture:
      • Notch 5 (0): Super Fine -> injects CNIJPrintQuality=0, CNIJPrintMode2=5, CNIJPQualitySlider=5.
      • Notch 4 (5): Fine -> injects CNIJPrintQuality=5, CNIJPrintMode2=1, CNIJPQualitySlider=4.
      • Notch 3 (10): Normal(Fine) -> injects CNIJPrintQuality=10, CNIJPrintMode2=2, CNIJPQualitySlider=3.
      • Notch 2 (15): Normal(Fast) -> injects CNIJPrintQuality=15, CNIJPrintMode2=5, CNIJPQualitySlider=2.
      • Notch 1 (20): Fast -> injects CNIJPrintQuality=20, CNIJPrintMode2=3, CNIJPQualitySlider=1.
    • For Epson (EPIJ_Qual) and generic drivers, seamlessly injects the selected quality code.

  3. Inspector UI (InspectorView.swift):

    • Added Print quality dropdown (qualityPop) placed directly above Resolution.
    • Dynamic enable/disable based on printer capabilities and locked job policy.
    • Refined refillChoices to cleanly preserve selections across queue changes without injecting phantom items.

  4. Job Serialization & Controller (TargetJob.swift, PreviewWindowController.swift):

    • Added optional printQuality: String? to PrintSettings.
    • Updated JSON parser and serializer with backward compatibility.
    • Bound loaded job settings to engine.printQuality.

  5. Automated Testing (Tests/PPDOptionsTests.swift, Tests/TestRunnerMain.swift):

    • Added tests verifying PPD discovery for Canon 5-notch and Epson quality modes.
    • Verified Canon Super Fine coordinated multi-key injection.
    • Verified TargetJob serialization and round-trip parsing.

Closes #5

### Summary This PR implements Issue #5: adding a dedicated **Print Quality** option (hardware droplet addressability / pass count) alongside input raster resolution. It fully supports Canon's 5-notch Custom slider (including Super Fine mode) and Epson's multi-level quality modes. ### Key Changes 1. **PPD Quality Discovery (`CUPSManager.swift`)**: - Extended `PPDOptions` and `PrinterQueue` with `qualityChoices: [PPDChoice]` and `qualityKeyword: String?`. - Added automated candidate keyword discovery (`CNIJPrintQuality`, `EPIJ_Qual`, `cupsPrintQuality`, `PrintQuality`, `CNIJPrintMode2`, `Quality`, `StpQuality`) and `*OpenUI` fallback. - Preserves human-readable quality labels (e.g. `Super Fine`, `Fine`, `Best Quality`) while binding them to driver choice codes. 2. **Canon Coordinated Multi-Key Driver Injection (`PrintEngine.swift`)**: - Handled Canon's 5-notch Custom quality slider architecture: - Notch 5 (`0`): **Super Fine** -> injects `CNIJPrintQuality=0`, `CNIJPrintMode2=5`, `CNIJPQualitySlider=5`. - Notch 4 (`5`): **Fine** -> injects `CNIJPrintQuality=5`, `CNIJPrintMode2=1`, `CNIJPQualitySlider=4`. - Notch 3 (`10`): **Normal(Fine)** -> injects `CNIJPrintQuality=10`, `CNIJPrintMode2=2`, `CNIJPQualitySlider=3`. - Notch 2 (`15`): **Normal(Fast)** -> injects `CNIJPrintQuality=15`, `CNIJPrintMode2=5`, `CNIJPQualitySlider=2`. - Notch 1 (`20`): **Fast** -> injects `CNIJPrintQuality=20`, `CNIJPrintMode2=3`, `CNIJPQualitySlider=1`. - For Epson (`EPIJ_Qual`) and generic drivers, seamlessly injects the selected quality code. 3. **Inspector UI (`InspectorView.swift`)**: - Added `Print quality` dropdown (`qualityPop`) placed directly above `Resolution`. - Dynamic enable/disable based on printer capabilities and locked job policy. - Refined `refillChoices` to cleanly preserve selections across queue changes without injecting phantom items. 4. **Job Serialization & Controller (`TargetJob.swift`, `PreviewWindowController.swift`)**: - Added optional `printQuality: String?` to `PrintSettings`. - Updated JSON parser and serializer with backward compatibility. - Bound loaded job settings to `engine.printQuality`. 5. **Automated Testing (`Tests/PPDOptionsTests.swift`, `Tests/TestRunnerMain.swift`)**: - Added tests verifying PPD discovery for Canon 5-notch and Epson quality modes. - Verified Canon Super Fine coordinated multi-key injection. - Verified `TargetJob` serialization and round-trip parsing. Closes #5
gronod added 1 commit 2026-09-07 23:37:16 +01:00
feat: add hardware print quality option supporting Canon 5-notch Custom slider and Epson modes (Closes #5)
Build macOS Packages / Build macOS (Intel) (pull_request) Successful in 32s
Details
Build macOS Packages / Build macOS (Apple Silicon) (pull_request) Successful in 37s
Details
Build macOS Packages / Build macOS (Universal) (pull_request) Failing after 10s
Details
474888541b
gronod merged commit 842caaec04 into development 2026-09-07 23:42:40 +01:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
Compat/Breaking
Breaking change that won't be backward compatible
 Kind/Bug
Something is not working
 Kind/Documentation
Documentation changes
 Kind/Enhancement
Improve existing functionality
 Kind/Feature
New functionality
 Kind/Security
This is security issue
 Kind/Testing
Issue or pull request related to testing
Priority
Critical
1
The priority is critical
Priority
High
2
The priority is high
Priority
Low
4
The priority is low
Priority
Medium
3
The priority is medium
Reviewed
Confirmed
1
Issue has been confirmed
Reviewed
Duplicate
2
This issue or pull request already exists
Reviewed
Invalid
3
Invalid issue
Reviewed
Won't Fix
3
This issue won't be fixed
Status
Abandoned
3
Somebody has started to work on this but abandoned work
Status
Blocked
1
Something is blocking this issue or pull request
Status
Need More Info
2
Feedback is required to reproduce issue or to continue work
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
gronod
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: gronod/ICCery-CPU#6