Skip to content

PPD NickNames #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
darkvision77 merged 2 commits into from
Dec 28, 2025
+8 −8
Merged

PPD NickNames #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d75af2
Generate proper make-and-model for CUPS web interface
ValdikSS Dec 28, 2025
f6f2ae7
Update PPD NickNames for model matching
ValdikSS Dec 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions captbackend/Core/PrinterInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ void PrinterInfo::Report(std::ostream& stream) const {
// so that backends can be distinguished in the CUPS web UI.
stream << "direct "; // device-class
this->WriteUri(stream) << ' '; // uri
stream << '"' << this->Manufacturer << ' ' << this->Model << " (" CAPTBACKEND_NAME ")\" "; // device-make-and-model/description
stream << '"' << this->Manufacturer << ' ' << this->Model << '"' << ' '; // device-info/name
stream << '"' << this->Manufacturer << ' ' << this->Model << '"' << ' '; // device-make-and-model
stream << '"' << this->Manufacturer << ' ' << this->Model << "(" CAPTBACKEND_NAME ")\" "; // device-info/name
stream << '"' << this->DeviceId << '"'; // device-id
stream << " \"\""; // device-location
stream << std::endl;
Expand Down
12 changes: 6 additions & 6 deletions ppd/captppd.drv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,24 +57,24 @@ Option "cupsHalftoneType/Dithering type" PickOne AnySetup 40
#endif

{
ModelName "LBP800"
Attribute "NickName" "" "Canon LBP800, captppd $CAPTBACKEND_VERSION"
ModelName "LBP-800"
Attribute "NickName" "" "Canon LBP-800, captppd $CAPTBACKEND_VERSION"
Throughput 8
Attribute "1284DeviceID" "" "MFG:Canon;MDL:LBP-800;CMD:CAPT;VER:1.0;CLS:PRINTER;DES:Canon LBP-800" // assumed from LBP810
PCFileName "LBP800CAPTPPD.ppd"
}

{
ModelName "LBP810"
Attribute "NickName" "" "Canon LBP810, captppd $CAPTBACKEND_VERSION"
ModelName "LBP-810"
Attribute "NickName" "" "Canon LBP-810, captppd $CAPTBACKEND_VERSION"
Throughput 8
Attribute "1284DeviceID" "" "MFG:Canon;MDL:LBP-810;CMD:CAPT;VER:1.0;CLS:PRINTER;DES:Canon LBP-810"
PCFileName "LBP810CAPTPPD.ppd"
}

{
ModelName "LBP1120"
Attribute "NickName" "" "Canon LBP1120, captppd $CAPTBACKEND_VERSION"
ModelName "LASER SHOT LBP-1120"
Attribute "NickName" "" "Canon LASER SHOT LBP-1120, captppd $CAPTBACKEND_VERSION"
Throughput 10
Attribute "1284DeviceID" "" "MFG:Canon;MDL:LASER SHOT LBP-1120;CMD:CAPT;VER:1.0;CLS:PRINTER;DES:Canon LASER SHOT LBP-1120"
PCFileName "LBP1120CAPTPPD.ppd"
Expand Down