mDNSResponder-107.1.tar.gz

[apple/mdnsresponder.git] / Clients / PrinterSetupWizard / FourthPage.cpp

diff --git a/Clients/PrinterSetupWizard/FourthPage.cpp b/Clients/PrinterSetupWizard/FourthPage.cpp
index c4ccc52a96ee1175d7a3e78e8a79cf154c7c16f5..a2a7a502893236ce9cb23c11adc313fe8603b243 100644 (file)
--- a/Clients/PrinterSetupWizard/FourthPage.cpp
+++ b/Clients/PrinterSetupWizard/FourthPage.cpp
@@ -23,6 +23,12 @@
     Change History (most recent first):
     
 $Log: FourthPage.cpp,v $
     Change History (most recent first):
     
 $Log: FourthPage.cpp,v $

+Revision 1.6  2005/02/08 21:45:06  shersche
+<rdar://problem/3947490> Default to Generic PostScript or PCL if unable to match driver
+
+Revision 1.5  2005/01/06 08:17:08  shersche
+Display the selected protocol ("Raw", "LPR", "IPP") rather than the port name
+

 Revision 1.4  2004/07/13 20:15:04  shersche
 <rdar://problem/3726363> Load large font name from resource
 Bug #: 3726363
 Revision 1.4  2004/07/13 20:15:04  shersche
 <rdar://problem/3726363> Load large font name from resource
 Bug #: 3726363


@@ -77,7 +83,7 @@ void CFourthPage::DoDataExchange(CDataExchange* pDX)
        DDX_Control(pDX, IDC_PRINTER_NAME, m_printerNameCtrl);
        DDX_Control(pDX, IDC_PRINTER_MANUFACTURER, m_printerManufacturerCtrl);
        DDX_Control(pDX, IDC_PRINTER_MODEL, m_printerModelCtrl);
        DDX_Control(pDX, IDC_PRINTER_NAME, m_printerNameCtrl);
        DDX_Control(pDX, IDC_PRINTER_MANUFACTURER, m_printerManufacturerCtrl);
        DDX_Control(pDX, IDC_PRINTER_MODEL, m_printerModelCtrl);

-       DDX_Control(pDX, IDC_PRINTER_PORT, m_printerPortCtrl);
+       DDX_Control(pDX, IDC_PRINTER_PROTOCOL, m_printerProtocolCtrl);

        DDX_Control(pDX, IDC_PRINTER_DEFAULT, m_printerDefault);
 }
 
        DDX_Control(pDX, IDC_PRINTER_DEFAULT, m_printerDefault);
 }
 


@@ -123,8 +129,11 @@ CFourthPage::OnSetActive()
 
        m_printerNameCtrl.SetWindowText( printer->actualName );
        m_printerManufacturerCtrl.SetWindowText ( printer->manufacturer );
 
        m_printerNameCtrl.SetWindowText( printer->actualName );
        m_printerManufacturerCtrl.SetWindowText ( printer->manufacturer );

-       m_printerModelCtrl.SetWindowText ( printer->model );
-       m_printerPortCtrl.SetWindowText ( printer->portName );
+       m_printerModelCtrl.SetWindowText ( printer->displayModelName );
+
+       Service * service = printer->services.front();
+       require_quiet( service, exit );
+       m_printerProtocolCtrl.SetWindowText ( service->protocol );

 
        if (printer->deflt)
        {
 
        if (printer->deflt)
        {