From 68cac69adfafbdf00fca383edfd43119ebe8a39a Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Wed, 5 Mar 2008 15:53:05 +0000 Subject: INTEGRATION: CWS vcl86_DEV300 (1.23.10); FILE MERGED 2008/02/20 17:38:08 pl 1.23.10.1: #i83676# add disable CUPS option for the very few people who want that --- padmin/source/padialog.cxx | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'padmin/source') diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx index bc9b2e24403d..a47553dfb918 100644 --- a/padmin/source/padialog.cxx +++ b/padmin/source/padialog.cxx @@ -4,9 +4,9 @@ * * $RCSfile: padialog.cxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: ihi $ $Date: 2007-11-26 15:17:02 $ + * last change: $Author: kz $ $Date: 2008-03-05 16:53:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -131,6 +131,8 @@ PADialog::PADialog( Window* pParent, BOOL /*bAdmin*/ ) : m_aCommand( this, PaResId( RID_PA_TXT_COMMAND_STRING ) ), m_aCommentTxt( this, PaResId( RID_PA_TXT_COMMENT ) ), m_aComment( this, PaResId( RID_PA_TXT_COMMENT_STRING ) ), + m_aCUPSFL( this, PaResId( RID_PA_FL_CUPSUSAGE ) ), + m_aCUPSCB( this, PaResId( RID_PA_CB_CUPSUSAGE ) ), m_aSepButtonFL( this, PaResId( RID_PA_FL_SEPBUTTON ) ), m_aAddPB( this, PaResId( RID_PA_BTN_ADD ) ), m_aFontsPB( this, PaResId( RID_PA_BTN_FONTS ) ), @@ -165,6 +167,7 @@ void PADialog::Init() { // #i79787# initially ensure printer discovery has ended m_rPIManager.checkPrintersChanged( true ); + m_aCUPSCB.Check( m_rPIManager.isCUPSDisabled() ); UpdateDevice(); UpdateText(); @@ -181,6 +184,7 @@ void PADialog::Init() m_aFontsPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) ); m_aAddPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) ); m_aDevicesLB.setDelPressedLink( LINK( this, PADialog, DelPressedHdl ) ); + m_aCUPSCB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) ); ::psp::PrintFontManager& rFontManager( ::psp::PrintFontManager::get() ); if( ! rFontManager.checkImportPossible() ) @@ -255,6 +259,12 @@ IMPL_LINK( PADialog, ClickBtnHdl, PushButton*, pButton ) FontNameDlg aDialog( this ); aDialog.Execute(); } + else if( static_cast(pButton) == &m_aCUPSCB ) + { + m_rPIManager.setCUPSDisabled( m_aCUPSCB.IsChecked() ); + UpdateDevice(); + UpdateText(); + } return 0; } -- cgit v1.2.3