Kaydet (Commit) 820e6726 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

bool improvements

Change-Id: I8b745ed0ad7693540b5a57a90c2ea835704fbe33
üst 8e15df3d
......@@ -59,13 +59,13 @@ APChooseDevicePage::APChooseDevicePage( AddPrinterDialog* pParent ) :
m_aPDFBtn.Check( sal_False );
m_aOldBtn.Check( sal_False );
if( AddPrinterDialog::getOldPrinterLocation().isEmpty() )
m_aOldBtn.Enable( sal_False );
m_aOldBtn.Enable( false );
if( ! PrinterInfoManager::get().addOrRemovePossible() )
{
m_aPrinterBtn.Check( sal_False );
m_aFaxBtn.Check( sal_True );
m_aPrinterBtn.Enable( sal_False );
m_aOldBtn.Enable( sal_False );
m_aPrinterBtn.Enable( false );
m_aOldBtn.Enable( false );
}
}
......@@ -326,11 +326,11 @@ APNamePage::APNamePage( AddPrinterDialog* pParent, const OUString& rInitName, De
{
FreeResource();
if( eKind != DeviceKind::Printer )
m_aDefaultBox.Show( sal_False );
m_aDefaultBox.Show( false );
else
m_aNameEdt.SetText( rInitName );
if( eKind != DeviceKind::Fax )
m_aFaxSwallowBox.Show( sal_False );
m_aFaxSwallowBox.Show( false );
m_aNameEdt.SetText( AddPrinterDialog::uniquePrinterName( m_aNameEdt.GetText() ) );
m_aDefaultBox.Check( sal_False );
......@@ -368,16 +368,16 @@ APCommandPage::APCommandPage( AddPrinterDialog* pParent, DeviceKind::type eKind
::std::list< OUString > aCommands;
if( m_eKind == DeviceKind::Printer )
{
m_aHelpBtn.Show( sal_False );
m_aHelpBtn.Show( false );
Size aSize = m_aCommandTxt.GetSizePixel();
aSize.Width() = m_aCommandBox.GetSizePixel().Width();
m_aCommandTxt.SetSizePixel( aSize );
}
if( m_eKind != DeviceKind::Pdf )
{
m_aPdfDirBtn.Show( sal_False );
m_aPdfDirEdt.Show( sal_False );
m_aPdfDirTxt.Show( sal_False );
m_aPdfDirBtn.Show( false );
m_aPdfDirEdt.Show( false );
m_aPdfDirTxt.Show( false );
}
switch( m_eKind )
{
......@@ -748,9 +748,9 @@ AddPrinterDialog::AddPrinterDialog( Window* pParent )
{
FreeResource();
m_pCurrentPage = m_pChooseDevicePage = new APChooseDevicePage( this );
m_pCurrentPage->Show( sal_True );
m_aFinishPB.Enable( sal_False );
m_aPrevPB.Enable( sal_False );
m_pCurrentPage->Show( true );
m_aFinishPB.Enable( false );
m_aPrevPB.Enable( false );
m_aNextPB.SetClickHdl( LINK( this, AddPrinterDialog, ClickBtnHdl ) );
m_aPrevPB.SetClickHdl( LINK( this, AddPrinterDialog, ClickBtnHdl ) );
......@@ -809,7 +809,7 @@ void AddPrinterDialog::DataChanged( const DataChangedEvent& rEv )
void AddPrinterDialog::advance()
{
m_pCurrentPage->Show( sal_False );
m_pCurrentPage->Show( false );
if( m_pCurrentPage == m_pChooseDevicePage )
{
if( m_pChooseDevicePage->isPrinter() )
......@@ -817,30 +817,30 @@ void AddPrinterDialog::advance()
if( ! m_pChooseDriverPage )
m_pChooseDriverPage = new APChooseDriverPage( this );
m_pCurrentPage = m_pChooseDriverPage;
m_aPrevPB.Enable( sal_True );
m_aPrevPB.Enable( true );
}
else if( m_pChooseDevicePage->isOld() )
{
if( ! m_pOldPrinterPage )
m_pOldPrinterPage = new APOldPrinterPage( this );
m_pCurrentPage = m_pOldPrinterPage;
m_aPrevPB.Enable( sal_True );
m_aFinishPB.Enable( sal_True );
m_aNextPB.Enable( sal_False );
m_aPrevPB.Enable( true );
m_aFinishPB.Enable( true );
m_aNextPB.Enable( false );
}
else if( m_pChooseDevicePage->isFax() )
{
if( ! m_pFaxDriverPage )
m_pFaxDriverPage = new APFaxDriverPage( this );
m_pCurrentPage = m_pFaxDriverPage;
m_aPrevPB.Enable( sal_True );
m_aPrevPB.Enable( true );
}
else if( m_pChooseDevicePage->isPDF() )
{
if( ! m_pPdfDriverPage )
m_pPdfDriverPage = new APPdfDriverPage( this );
m_pCurrentPage = m_pPdfDriverPage;
m_aPrevPB.Enable( sal_True );
m_aPrevPB.Enable( true );
}
}
else if( m_pCurrentPage == m_pChooseDriverPage )
......@@ -856,8 +856,8 @@ void AddPrinterDialog::advance()
else
m_pNamePage->setText( m_aPrinter.m_aPrinterName );
m_pCurrentPage = m_pNamePage;
m_aFinishPB.Enable( sal_True );
m_aNextPB.Enable( sal_False );
m_aFinishPB.Enable( true );
m_aNextPB.Enable( false );
}
else if( m_pCurrentPage == m_pFaxDriverPage )
{
......@@ -885,8 +885,8 @@ void AddPrinterDialog::advance()
if( ! m_pFaxNamePage )
m_pFaxNamePage = new APNamePage( this, OUString(), DeviceKind::Fax );
m_pCurrentPage = m_pFaxNamePage;
m_aNextPB.Enable( sal_False );
m_aFinishPB.Enable( sal_True );
m_aNextPB.Enable( false );
m_aFinishPB.Enable( true );
}
else if( m_pCurrentPage == m_pPdfDriverPage )
{
......@@ -914,26 +914,26 @@ void AddPrinterDialog::advance()
if( ! m_pPdfNamePage )
m_pPdfNamePage = new APNamePage( this, OUString(), DeviceKind::Pdf );
m_pCurrentPage = m_pPdfNamePage;
m_aNextPB.Enable( sal_False );
m_aFinishPB.Enable( sal_True );
m_aNextPB.Enable( false );
m_aFinishPB.Enable( true );
}
m_pCurrentPage->Show( sal_True );
m_pCurrentPage->Show( true );
m_aTitleImage.SetText( m_pCurrentPage->getTitle() );
}
void AddPrinterDialog::back()
{
m_pCurrentPage->Show( sal_False );
m_pCurrentPage->Show( false );
if( m_pCurrentPage == m_pChooseDriverPage )
{
m_pCurrentPage = m_pChooseDevicePage;
m_aPrevPB.Enable( sal_False );
m_aPrevPB.Enable( false );
}
else if( m_pCurrentPage == m_pNamePage )
{
m_pCurrentPage = m_pCommandPage;
m_aNextPB.Enable( sal_True );
m_aNextPB.Enable( true );
}
else if( m_pCurrentPage == m_pCommandPage )
{
......@@ -942,13 +942,13 @@ void AddPrinterDialog::back()
else if( m_pCurrentPage == m_pOldPrinterPage )
{
m_pCurrentPage = m_pChooseDevicePage;
m_aPrevPB.Enable( sal_False );
m_aNextPB.Enable( sal_True );
m_aPrevPB.Enable( false );
m_aNextPB.Enable( true );
}
else if( m_pCurrentPage == m_pFaxDriverPage )
{
m_pCurrentPage = m_pChooseDevicePage;
m_aPrevPB.Enable( sal_False );
m_aPrevPB.Enable( false );
}
else if( m_pCurrentPage == m_pFaxSelectDriverPage )
{
......@@ -957,17 +957,17 @@ void AddPrinterDialog::back()
else if( m_pCurrentPage == m_pFaxNamePage )
{
m_pCurrentPage = m_pFaxCommandPage;
m_aNextPB.Enable( sal_True );
m_aNextPB.Enable( true );
}
else if( m_pCurrentPage == m_pFaxCommandPage )
{
m_pCurrentPage = m_pFaxDriverPage->isDefault() ? (APTabPage*)m_pFaxDriverPage : (APTabPage*)m_pFaxSelectDriverPage;
m_aNextPB.Enable( sal_True );
m_aNextPB.Enable( true );
}
else if( m_pCurrentPage == m_pPdfDriverPage )
{
m_pCurrentPage = m_pChooseDevicePage;
m_aPrevPB.Enable( sal_False );
m_aPrevPB.Enable( false );
}
else if( m_pCurrentPage == m_pPdfSelectDriverPage )
{
......@@ -976,14 +976,14 @@ void AddPrinterDialog::back()
else if( m_pCurrentPage == m_pPdfNamePage )
{
m_pCurrentPage = m_pPdfCommandPage;
m_aNextPB.Enable( sal_True );
m_aNextPB.Enable( true );
}
else if( m_pCurrentPage == m_pPdfCommandPage )
{
m_pCurrentPage = m_pPdfDriverPage->isDefault() || m_pPdfDriverPage->isDist() ? (APTabPage*)m_pPdfDriverPage : (APTabPage*)m_pPdfSelectDriverPage;
m_aNextPB.Enable( sal_True );
m_aNextPB.Enable( true );
}
m_pCurrentPage->Show( sal_True );
m_pCurrentPage->Show( true );
m_aTitleImage.SetText( m_pCurrentPage->getTitle() );
}
......
......@@ -260,10 +260,10 @@ RTSCommandPage::RTSCommandPage( RTSDialog* pParent ) :
m_aPdfDirectoryButton.SetClickHdl( LINK( this, RTSCommandPage, ClickBtnHdl ) );
m_aExternalCB.SetToggleHdl( LINK( this, RTSCommandPage, ClickBtnHdl ) );
m_aPdfDirectoryButton.Show( sal_False );
m_aPdfDirectoryEdit.Show( sal_False );
m_aPdfDirectoryText.Show( sal_False );
m_aFaxSwallowBox.Show( sal_False );
m_aPdfDirectoryButton.Show( false );
m_aPdfDirectoryEdit.Show( false );
m_aPdfDirectoryText.Show( false );
m_aFaxSwallowBox.Show( false );
m_aCommandsCB.SetText( m_pParent->m_aJobData.m_aCommand );
m_aQuickCB.SetText( m_pParent->m_aJobData.m_aQuickCommand );
......@@ -277,7 +277,7 @@ RTSCommandPage::RTSCommandPage( RTSDialog* pParent ) :
if( aToken.startsWith( "fax" ) )
{
m_bWasFax = true;
m_aFaxSwallowBox.Show( sal_True );
m_aFaxSwallowBox.Show( true );
sal_Int32 nPos = 0;
m_aFaxSwallowBox.Check( aToken.getToken( 1, '=', nPos ).startsWith( "swallow" ) ? sal_True : sal_False );
m_aConfigureBox.SelectEntryPos( m_nFaxEntry );
......@@ -287,9 +287,9 @@ RTSCommandPage::RTSCommandPage( RTSDialog* pParent ) :
m_bWasPdf = true;
sal_Int32 nPos = 0;
m_aPdfDirectoryEdit.SetText( aToken.getToken( 1, '=', nPos ) );
m_aPdfDirectoryEdit.Show( sal_True );
m_aPdfDirectoryButton.Show( sal_True );
m_aPdfDirectoryText.Show( sal_True );
m_aPdfDirectoryEdit.Show( true );
m_aPdfDirectoryButton.Show( true );
m_aPdfDirectoryText.Show( true );
m_aConfigureBox.SelectEntryPos( m_nPdfEntry );
}
else if( aToken.equalsAscii( "external_dialog" ) )
......@@ -421,7 +421,7 @@ IMPL_LINK( RTSCommandPage, SelectHdl, Control*, pBox )
}
else if( pBox == &m_aCommandsCB )
{
m_aRemovePB.Enable( sal_True );
m_aRemovePB.Enable( true );
}
return 0;
......
......@@ -198,13 +198,13 @@ QueryString::QueryString( Window* pParent, OUString& rQuery, OUString& rRet, con
m_aComboBox.InsertEntry( m_rReturnValue );
for( ::std::list<OUString>::const_iterator it = rChoices.begin(); it != rChoices.end(); ++it )
m_aComboBox.InsertEntry( *it );
m_aEdit.Show( sal_False );
m_aEdit.Show( false );
m_bUseEdit = false;
}
else
{
m_aEdit.SetText( m_rReturnValue );
m_aComboBox.Show( sal_False );
m_aComboBox.Show( false );
m_bUseEdit = true;
}
SetText( Application::GetDisplayName() );
......
......@@ -113,7 +113,7 @@ void PADialog::Init()
UpdateDevice();
UpdateText();
m_aRemPB.Enable( sal_False );
m_aRemPB.Enable( false );
m_aDevicesLB.SetDoubleClickHdl( LINK( this, PADialog, DoubleClickHdl ) );
m_aDevicesLB.SetSelectHdl( LINK( this, PADialog, SelectHdl ) );
......@@ -130,12 +130,12 @@ void PADialog::Init()
// but the write will have checked whether any writeable config exists
if( ! m_rPIManager.writePrinterConfig() )
{
m_aAddPB.Enable( sal_False );
m_aRemPB.Enable( sal_False );
m_aConfPB.Enable( sal_False );
m_aRenamePB.Enable( sal_False );
m_aStdPB.Enable( sal_False );
m_aCUPSCB.Enable( sal_False );
m_aAddPB.Enable( false );
m_aRemPB.Enable( false );
m_aConfPB.Enable( false );
m_aRenamePB.Enable( false );
m_aStdPB.Enable( false );
m_aCUPSCB.Enable( false );
ErrorBox aBox( GetParent(), WB_OK | WB_DEF_OK, OUString( PaResId( RID_ERR_NOWRITE ) ) );
aBox.Execute();
}
......@@ -228,9 +228,9 @@ IMPL_LINK( PADialog, SelectHdl, ListBox*, pListBox )
OUString sSelect = getSelectedDevice();
OUString sDefPrt = m_rPIManager.getDefaultPrinter();
if( sDefPrt == sSelect || ! m_rPIManager.removePrinter( sSelect, true ) )
m_aRemPB.Enable( sal_False );
m_aRemPB.Enable( false );
else
m_aRemPB.Enable( sal_True );
m_aRemPB.Enable( true );
UpdateText();
}
return 0;
......@@ -245,7 +245,7 @@ void PADialog::UpdateDefPrt()
if( m_aRemPB.HasFocus() )
m_aDevicesLB.GetFocus();
m_aRemPB.Enable( sal_False );
m_aRemPB.Enable( false );
}
void PADialog::UpdateText()
......@@ -622,7 +622,7 @@ void PADialog::RemDevice()
m_aDevicesLB.GetFocus();
if( m_aDevicesLB.GetEntryCount() < 2 )
m_aRemPB.Enable( sal_False );
m_aRemPB.Enable( false );
}
void PADialog::ConfigureDevice()
......
......@@ -66,7 +66,7 @@ void ProgressDialog::startOperation( const OUString& rOperation )
maProgressBar.SetValue( 0 );
mbCanceled = false;
if( ! IsVisible() )
Show( sal_True );
Show( true );
}
void ProgressDialog::setValue( int nValue )
......
......@@ -249,8 +249,8 @@ void RTSPaperPage::update()
}
else
{
m_pDuplexText->Enable( sal_False );
m_pDuplexBox->Enable( sal_False );
m_pDuplexText->Enable( false );
m_pDuplexBox->Enable( false );
}
// paper
......@@ -261,8 +261,8 @@ void RTSPaperPage::update()
}
else
{
m_pPaperText->Enable( sal_False );
m_pPaperBox->Enable( sal_False );
m_pPaperText->Enable( false );
m_pPaperBox->Enable( false );
}
// input slots
......@@ -273,8 +273,8 @@ void RTSPaperPage::update()
}
else
{
m_pSlotText->Enable( sal_False );
m_pSlotBox->Enable( sal_False );
m_pSlotText->Enable( false );
m_pSlotBox->Enable( false );
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment