move print options .ui to sfx2 and adapt code

Change-Id: I8a7b1d15a002cbe74ac0fb97fcd8ce60a47a4e61

sfx2/AllLangResTarget_sfx2.mk

@@ -58,7 +58,6 @@ $(eval $(call gb_SrsTarget_add_files,sfx/res,\
     sfx2/source/dialog/mailwindow.src \
     sfx2/source/dialog/mgetempl.src \
     sfx2/source/dialog/newstyle.src \
-    sfx2/source/dialog/printopt.src \
     sfx2/source/dialog/recfloat.src \
     sfx2/source/dialog/srchdlg.src \
     sfx2/source/dialog/taskpane.src \

sfx2/UI_sfx.mk

@@ -16,6 +16,7 @@ $(eval $(call gb_UI_add_uifiles,sfx,\
 	sfx2/uiconfig/ui/documentinfopage \
 	sfx2/uiconfig/ui/documentpropertiesdialog \
 	sfx2/uiconfig/ui/internetinfopage \
+	sfx2/uiconfig/ui/optprintpage \
 	sfx2/uiconfig/ui/password \
 	sfx2/uiconfig/ui/printeroptionsdialog \
 	sfx2/uiconfig/ui/securityinfopage \

sfx2/inc/sfx2/printopt.hxx

@@ -41,39 +41,32 @@ class SFX2_DLLPUBLIC SfxCommonPrintOptionsTabPage : public SfxTabPage
 {
 private:
 
-    FixedLine           aReduceGB;
+    RadioButton*        m_pPrinterOutputRB;
+    RadioButton*        m_pPrintFileOutputRB;
 
-    FixedText           aOutputTypeFT;
-    RadioButton         aPrinterOutputRB;
-    RadioButton         aPrintFileOutputRB;
+    CheckBox*           m_pReduceTransparencyCB;
+    RadioButton*        m_pReduceTransparencyAutoRB;
+    RadioButton*        m_pReduceTransparencyNoneRB;
 
-    FixedLine           aOutputGB;
+    CheckBox*           m_pReduceGradientsCB;
+    RadioButton*        m_pReduceGradientsStripesRB;
+    RadioButton*        m_pReduceGradientsColorRB;
+    NumericField*       m_pReduceGradientsStepCountNF;
 
-    CheckBox            aReduceTransparencyCB;
-    RadioButton         aReduceTransparencyAutoRB;
-    RadioButton         aReduceTransparencyNoneRB;
+    CheckBox*           m_pReduceBitmapsCB;
+    RadioButton*        m_pReduceBitmapsOptimalRB;
+    RadioButton*        m_pReduceBitmapsNormalRB;
+    RadioButton*        m_pReduceBitmapsResolutionRB;
+    ListBox*            m_pReduceBitmapsResolutionLB;
+    CheckBox*           m_pReduceBitmapsTransparencyCB;
 
-    CheckBox            aReduceGradientsCB;
-    RadioButton         aReduceGradientsStripesRB;
-    RadioButton         aReduceGradientsColorRB;
-    NumericField        aReduceGradientsStepCountNF;
+    CheckBox*           m_pConvertToGreyscalesCB;
 
-    CheckBox            aReduceBitmapsCB;
-    RadioButton         aReduceBitmapsOptimalRB;
-    RadioButton         aReduceBitmapsNormalRB;
-    RadioButton         aReduceBitmapsResolutionRB;
-    ListBox             aReduceBitmapsResolutionLB;
-    CheckBox            aReduceBitmapsTransparencyCB;
+    CheckBox*           m_pPDFCB;
 
-    CheckBox            aConvertToGreyscalesCB;
-
-    CheckBox            aPDFCB;
-
-    FixedLine           aWarnGB;
-
-    CheckBox            aPaperSizeCB;
-    CheckBox            aPaperOrientationCB;
-    CheckBox            aTransparencyCB;
+    CheckBox*           m_pPaperSizeCB;
+    CheckBox*           m_pPaperOrientationCB;
+    CheckBox*           m_pTransparencyCB;
 
 private:
 
@@ -93,9 +86,6 @@ private:
     SAL_DLLPRIVATE void ImplUpdateControls( const PrinterOptions* pCurrentOptions );
     SAL_DLLPRIVATE void ImplSaveControls( PrinterOptions* pCurrentOptions );
 
-    // #i63982#
-    SAL_DLLPRIVATE void ImplSetAccessibleNames();
-
 protected:
 
     using TabPage::DeactivatePage;

sfx2/source/dialog/dialog.hrc

@@ -54,8 +54,6 @@
 
 #define STR_APPLY                       ( RC_DIALOG_BEGIN + 87 )
 
-#define TP_COMMONPRINTOPTIONS           ( RC_DIALOG_BEGIN + 90 )
-
 #define RID_ERRBOX_MAIL_CONFIG          ( RC_DIALOG_BEGIN + 92 )
 
 // 100-106 in tbxcust.hrc

sfx2/source/dialog/printopt.cxx

@@ -27,8 +27,6 @@
 
 #include <comphelper/processfactory.hxx>
 
-#include "printopt.hrc"
-#include "dialog.hrc"
 #include "sfx2/sfxresid.hxx"
 #include <sfx2/viewsh.hxx>
 #include <sfx2/printopt.hxx>
@@ -38,98 +36,53 @@ static sal_Bool     bOutputForPrinter = sal_True;
 
 #define DPI_COUNT (sizeof(aDPIArray)/sizeof(aDPIArray[0 ]))
 
-SfxCommonPrintOptionsTabPage::SfxCommonPrintOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) :
-    SfxTabPage( pParent, SfxResId( TP_COMMONPRINTOPTIONS ), rSet ),
-
-    aReduceGB( this, SfxResId( GB_REDUCE ) ),
-    aOutputTypeFT( this, SfxResId( FT_OUTPUTTYPE ) ),
-    aPrinterOutputRB( this, SfxResId( RB_PRINTEROUTPUT ) ),
-    aPrintFileOutputRB( this, SfxResId( RB_PRINTFILEOUTPUT ) ),
-    aOutputGB( this, SfxResId( GB_OUTPUT ) ),
-    aReduceTransparencyCB( this, SfxResId( CB_REDUCETRANSPARENCY ) ),
-    aReduceTransparencyAutoRB( this, SfxResId( RB_REDUCETRANSPARENCY_AUTO ) ),
-    aReduceTransparencyNoneRB( this, SfxResId( RB_REDUCETRANSPARENCY_NONE ) ),
-    aReduceGradientsCB( this, SfxResId( CB_REDUCEGRADIENTS ) ),
-    aReduceGradientsStripesRB( this, SfxResId( RB_REDUCEGRADIENTS_STRIPES ) ),
-    aReduceGradientsColorRB( this, SfxResId( RB_REDUCEGRADIENTS_COLOR ) ),
-    aReduceGradientsStepCountNF( this, SfxResId( NF_REDUCEGRADIENTS_STEPCOUNT ) ),
-    aReduceBitmapsCB( this, SfxResId( CB_REDUCEBITMAPS ) ),
-    aReduceBitmapsOptimalRB( this, SfxResId( RB_REDUCEBITMAPS_OPTIMAL ) ),
-    aReduceBitmapsNormalRB( this, SfxResId( RB_REDUCEBITMAPS_NORMAL ) ),
-    aReduceBitmapsResolutionRB( this, SfxResId( RB_REDUCEBITMAPS_RESOLUTION ) ),
-    aReduceBitmapsResolutionLB( this, SfxResId( LB_REDUCEBITMAPS_RESOLUTION ) ),
-    aReduceBitmapsTransparencyCB( this, SfxResId( CB_REDUCEBITMAPS_TRANSPARENCY ) ),
-    aConvertToGreyscalesCB( this, SfxResId( CB_CONVERTTOGREYSCALES ) ),
-    aPDFCB( this, SfxResId( CB_PDF ) ),
-    aWarnGB( this, SfxResId( GB_PRINT_WARN ) ),
-    aPaperSizeCB( this, SfxResId( CB_PAPERSIZE ) ),
-    aPaperOrientationCB( this, SfxResId( CB_PAPERORIENTATION ) ),
-    aTransparencyCB( this, SfxResId( CB_TRANSPARENCY ) )
+SfxCommonPrintOptionsTabPage::SfxCommonPrintOptionsTabPage( Window* pParent, const SfxItemSet& rSet )
+    : SfxTabPage(pParent, "OptPrintPage", "sfx/ui/optprintpage.ui", rSet)
 {
-    FreeResource();
+    get(m_pPrinterOutputRB, "printer");
+    get(m_pPrintFileOutputRB, "file");
+    get(m_pReduceTransparencyCB, "reducetrans");
+    get(m_pReduceTransparencyAutoRB, "reducetransauto");
+    get(m_pReduceTransparencyNoneRB, "reducetransnone");
+    get(m_pReduceGradientsCB, "reducegrad");
+    get(m_pReduceGradientsStripesRB, "reducegradstripes");
+    get(m_pReduceGradientsColorRB, "reducegradcolor");
+    get(m_pReduceGradientsStepCountNF, "reducegradstep");
+    get(m_pReduceBitmapsCB, "reducebitmap");
+    get(m_pReduceBitmapsOptimalRB, "reducebitmapoptimal");
+    get(m_pReduceBitmapsNormalRB, "reducebitmapnormal");
+    get(m_pReduceBitmapsResolutionRB, "reducebitmapresol");
+    get(m_pReduceBitmapsResolutionLB, "reducebitmapdpi");
+    get(m_pReduceBitmapsTransparencyCB, "reducebitmaptrans");
+    get(m_pConvertToGreyscalesCB, "converttogray");
+    get(m_pPDFCB, "pdf");
+    get(m_pPaperSizeCB, "papersize");
+    get(m_pPaperOrientationCB, "paperorient");
+    get(m_pTransparencyCB, "trans");
 
 #ifndef ENABLE_CUPS
-    long nDiff = aWarnGB.GetPosPixel().Y() - aPDFCB.GetPosPixel().Y();
-    aPDFCB.Hide();
-
-    Point aPoint;
-
-    aPoint = aWarnGB.GetPosPixel();
-    aPoint.Y() -= nDiff;
-    aWarnGB.SetPosPixel(aPoint);
-
-    aPoint = aPaperSizeCB.GetPosPixel();
-    aPoint.Y() -= nDiff;
-    aPaperSizeCB.SetPosPixel(aPoint);
-
-    aPoint = aPaperOrientationCB.GetPosPixel();
-    aPoint.Y() -= nDiff;
-    aPaperOrientationCB.SetPosPixel(aPoint);
-
-    aPoint = aTransparencyCB.GetPosPixel();
-    aPoint.Y() -= nDiff;
-    aTransparencyCB.SetPosPixel(aPoint);
+    m_pPDFCB->Hide();
 #endif
 
-    aOutputGB.SetStyle( aOutputGB.GetStyle() | WB_NOLABEL );
-
     if( bOutputForPrinter )
     {
-        aPrinterOutputRB.Check( sal_True );
-        aOutputGB.SetText( OutputDevice::GetNonMnemonicString( aPrinterOutputRB.GetText() ) );
+        m_pPrinterOutputRB->Check( sal_True );
     }
     else
     {
-        aPrintFileOutputRB.Check( sal_True );
-        aOutputGB.SetText( OutputDevice::GetNonMnemonicString( aPrintFileOutputRB.GetText() ) );
-        aPDFCB.Disable();
+        m_pPrintFileOutputRB->Check( sal_True );
+        m_pPDFCB->Disable();
     }
 
-    aPrinterOutputRB.SetToggleHdl( LINK( this, SfxCommonPrintOptionsTabPage, ToggleOutputPrinterRBHdl ) );
-    aPrintFileOutputRB.SetToggleHdl( LINK( this, SfxCommonPrintOptionsTabPage, ToggleOutputPrintFileRBHdl ) );
-
-    aReduceTransparencyCB.SetClickHdl( LINK( this, SfxCommonPrintOptionsTabPage, ClickReduceTransparencyCBHdl ) );
-    aReduceGradientsCB.SetClickHdl( LINK( this, SfxCommonPrintOptionsTabPage, ClickReduceGradientsCBHdl ) );
-    aReduceBitmapsCB.SetClickHdl( LINK( this, SfxCommonPrintOptionsTabPage, ClickReduceBitmapsCBHdl ) );
-
-    aReduceGradientsStripesRB.SetToggleHdl( LINK( this, SfxCommonPrintOptionsTabPage, ToggleReduceGradientsStripesRBHdl ) );
-    aReduceBitmapsResolutionRB.SetToggleHdl( LINK( this, SfxCommonPrintOptionsTabPage, ToggleReduceBitmapsResolutionRBHdl ) );
-
-    // #i89164# calculate dynamically the width of radiobutton and listbox
-    const long nOffset = 10;
-    Size aOldSize = aReduceBitmapsResolutionRB.GetSizePixel();
-    Size aNewSize = aReduceBitmapsResolutionRB.GetOptimalSize();
-    aNewSize.Width() += nOffset;
-    aNewSize.Height() = aOldSize.Height();
-    long nDelta = aOldSize.Width() - aNewSize.Width();
-    aReduceBitmapsResolutionRB.SetSizePixel( aNewSize );
-    Point aPos = aReduceBitmapsResolutionLB.GetPosPixel();
-    aPos.X() -= nDelta;
-    aOldSize = aReduceBitmapsResolutionLB.GetSizePixel();
-    aNewSize = aReduceBitmapsResolutionLB.GetOptimalSize();
-    aNewSize.Width() += nOffset;
-    aNewSize.Height() = aOldSize.Height();
-    aReduceBitmapsResolutionLB.SetPosSizePixel( aPos, aNewSize );
+    m_pPrinterOutputRB->SetToggleHdl( LINK( this, SfxCommonPrintOptionsTabPage, ToggleOutputPrinterRBHdl ) );
+    m_pPrintFileOutputRB->SetToggleHdl( LINK( this, SfxCommonPrintOptionsTabPage, ToggleOutputPrintFileRBHdl ) );
+
+    m_pReduceTransparencyCB->SetClickHdl( LINK( this, SfxCommonPrintOptionsTabPage, ClickReduceTransparencyCBHdl ) );
+    m_pReduceGradientsCB->SetClickHdl( LINK( this, SfxCommonPrintOptionsTabPage, ClickReduceGradientsCBHdl ) );
+    m_pReduceBitmapsCB->SetClickHdl( LINK( this, SfxCommonPrintOptionsTabPage, ClickReduceBitmapsCBHdl ) );
+
+    m_pReduceGradientsStripesRB->SetToggleHdl( LINK( this, SfxCommonPrintOptionsTabPage, ToggleReduceGradientsStripesRBHdl ) );
+    m_pReduceBitmapsResolutionRB->SetToggleHdl( LINK( this, SfxCommonPrintOptionsTabPage, ToggleReduceBitmapsResolutionRBHdl ) );
 }
 
 SfxCommonPrintOptionsTabPage::~SfxCommonPrintOptionsTabPage()
@@ -143,20 +96,20 @@ SfxTabPage* SfxCommonPrintOptionsTabPage::Create( Window* pParent, const SfxItem
 
 Window* SfxCommonPrintOptionsTabPage::GetParentLabeledBy( const Window* pWindow ) const
 {
-    if ( pWindow == (Window *)&aReduceGradientsStepCountNF )
-        return (Window *)&aReduceGradientsStripesRB;
-    else if ( pWindow == (Window *)&aReduceBitmapsResolutionLB )
-        return (Window *)&aReduceBitmapsResolutionRB;
+    if ( pWindow == (Window *)m_pReduceGradientsStepCountNF )
+        return m_pReduceGradientsStripesRB;
+    else if ( pWindow == (Window *)m_pReduceBitmapsResolutionLB )
+        return m_pReduceBitmapsResolutionRB;
     else
         return SfxTabPage::GetParentLabeledBy( pWindow );
 }
 
 Window* SfxCommonPrintOptionsTabPage::GetParentLabelFor( const Window* pWindow ) const
 {
-    if ( pWindow == (Window *)&aReduceGradientsStripesRB )
-        return (Window *)&aReduceGradientsStepCountNF;
-    else if ( pWindow == (Window *)&aReduceBitmapsResolutionRB )
-        return (Window *)&aReduceBitmapsResolutionLB;
+    if ( pWindow == (Window *)m_pReduceGradientsStripesRB )
+        return m_pReduceGradientsStepCountNF;
+    else if ( pWindow == (Window *)m_pReduceBitmapsResolutionRB )
+        return m_pReduceBitmapsResolutionLB;
     else
         return SfxTabPage::GetParentLabelFor( pWindow );
 }
@@ -169,15 +122,15 @@ sal_Bool SfxCommonPrintOptionsTabPage::FillItemSet( SfxItemSet& /*rSet*/ )
     sal_Bool                    bModified = sal_False;
 
 
-    if( aPaperSizeCB.IsChecked() != aPaperSizeCB.GetSavedValue())
-        aWarnOptions.SetPaperSize(aPaperSizeCB.IsChecked());
-    if( aPaperOrientationCB.IsChecked() != aPaperOrientationCB.GetSavedValue() )
-        aWarnOptions.SetPaperOrientation(aPaperOrientationCB.IsChecked());
+    if( m_pPaperSizeCB->IsChecked() != m_pPaperSizeCB->GetSavedValue())
+        aWarnOptions.SetPaperSize(m_pPaperSizeCB->IsChecked());
+    if( m_pPaperOrientationCB->IsChecked() != m_pPaperOrientationCB->GetSavedValue() )
+        aWarnOptions.SetPaperOrientation(m_pPaperOrientationCB->IsChecked());
 
-    if( aTransparencyCB.IsChecked() != aTransparencyCB.GetSavedValue() )
-        aWarnOptions.SetTransparency( aTransparencyCB.IsChecked() );
+    if( m_pTransparencyCB->IsChecked() != m_pTransparencyCB->GetSavedValue() )
+        aWarnOptions.SetTransparency( m_pTransparencyCB->IsChecked() );
 
-    ImplSaveControls( aPrinterOutputRB.IsChecked() ? &maPrinterOptions : &maPrintFileOptions );
+    ImplSaveControls( m_pPrinterOutputRB->IsChecked() ? &maPrinterOptions : &maPrintFileOptions );
 
     aPrinterOptions.SetPrinterOptions( maPrinterOptions );
     aPrintFileOptions.SetPrinterOptions( maPrintFileOptions );
@@ -191,22 +144,19 @@ void SfxCommonPrintOptionsTabPage::Reset( const SfxItemSet& /*rSet*/ )
     SvtPrinterOptions       aPrinterOptions;
     SvtPrintFileOptions     aPrintFileOptions;
 
-    aPaperSizeCB.Check( aWarnOptions.IsPaperSize() );
-    aPaperOrientationCB.Check( aWarnOptions.IsPaperOrientation() );
+    m_pPaperSizeCB->Check( aWarnOptions.IsPaperSize() );
+    m_pPaperOrientationCB->Check( aWarnOptions.IsPaperOrientation() );
 
-    aTransparencyCB.Check( aWarnOptions.IsTransparency() );
+    m_pTransparencyCB->Check( aWarnOptions.IsTransparency() );
 
-    aPaperSizeCB.SaveValue();
-    aPaperOrientationCB.SaveValue();
-    aTransparencyCB.SaveValue();
+    m_pPaperSizeCB->SaveValue();
+    m_pPaperOrientationCB->SaveValue();
+    m_pTransparencyCB->SaveValue();
 
     aPrinterOptions.GetPrinterOptions( maPrinterOptions );
     aPrintFileOptions.GetPrinterOptions( maPrintFileOptions );
 
-    ImplUpdateControls( aPrinterOutputRB.IsChecked() ? &maPrinterOptions : &maPrintFileOptions );
-
-    // #i63982#
-    ImplSetAccessibleNames();
+    ImplUpdateControls( m_pPrinterOutputRB->IsChecked() ? &maPrinterOptions : &maPrintFileOptions );
 }
 
 int SfxCommonPrintOptionsTabPage::DeactivatePage( SfxItemSet* pItemSet )
@@ -219,174 +169,76 @@ int SfxCommonPrintOptionsTabPage::DeactivatePage( SfxItemSet* pItemSet )
 
 void SfxCommonPrintOptionsTabPage::ImplUpdateControls( const PrinterOptions* pCurrentOptions )
 {
-    aReduceTransparencyCB.Check( pCurrentOptions->IsReduceTransparency() );
+    m_pReduceTransparencyCB->Check( pCurrentOptions->IsReduceTransparency() );
 
     if( pCurrentOptions->GetReducedTransparencyMode() == PRINTER_TRANSPARENCY_AUTO )
-        aReduceTransparencyAutoRB.Check( sal_True );
+        m_pReduceTransparencyAutoRB->Check( sal_True );
     else
-        aReduceTransparencyNoneRB.Check( sal_True );
+        m_pReduceTransparencyNoneRB->Check( sal_True );
 
-    aReduceGradientsCB.Check( pCurrentOptions->IsReduceGradients() );
+    m_pReduceGradientsCB->Check( pCurrentOptions->IsReduceGradients() );
 
     if( pCurrentOptions->GetReducedGradientMode() == PRINTER_GRADIENT_STRIPES )
-        aReduceGradientsStripesRB.Check( sal_True );
+        m_pReduceGradientsStripesRB->Check( sal_True );
     else
-        aReduceGradientsColorRB.Check( sal_True );
+        m_pReduceGradientsColorRB->Check( sal_True );
 
-    aReduceGradientsStepCountNF.SetValue( pCurrentOptions->GetReducedGradientStepCount() );
+    m_pReduceGradientsStepCountNF->SetValue( pCurrentOptions->GetReducedGradientStepCount() );
 
-    aReduceBitmapsCB.Check( pCurrentOptions->IsReduceBitmaps() );
+    m_pReduceBitmapsCB->Check( pCurrentOptions->IsReduceBitmaps() );
 
     if( pCurrentOptions->GetReducedBitmapMode() == PRINTER_BITMAP_OPTIMAL )
-        aReduceBitmapsOptimalRB.Check( sal_True );
+        m_pReduceBitmapsOptimalRB->Check( sal_True );
     else if( pCurrentOptions->GetReducedBitmapMode() == PRINTER_BITMAP_NORMAL )
-        aReduceBitmapsNormalRB.Check( sal_True );
+        m_pReduceBitmapsNormalRB->Check( sal_True );
     else
-        aReduceBitmapsResolutionRB.Check( sal_True );
+        m_pReduceBitmapsResolutionRB->Check( sal_True );
 
     const sal_uInt16 nDPI = pCurrentOptions->GetReducedBitmapResolution();
 
     if( nDPI < aDPIArray[ 0 ] )
-        aReduceBitmapsResolutionLB.SelectEntryPos( 0 );
+        m_pReduceBitmapsResolutionLB->SelectEntryPos( 0 );
     else
     {
         for( long i = ( DPI_COUNT - 1 ); i >= 0; i-- )
         {
             if( nDPI >= aDPIArray[ i ] )
             {
-                aReduceBitmapsResolutionLB.SelectEntryPos( (sal_uInt16) i );
+                m_pReduceBitmapsResolutionLB->SelectEntryPos( (sal_uInt16) i );
                 i = -1;
             }
         }
     }
 
-    aReduceBitmapsResolutionLB.SetText( aReduceBitmapsResolutionLB.GetEntry( aReduceBitmapsResolutionLB.GetSelectEntryPos() ) );
-
-    aReduceBitmapsTransparencyCB.Check( pCurrentOptions->IsReducedBitmapIncludesTransparency() );
-    aConvertToGreyscalesCB.Check( pCurrentOptions->IsConvertToGreyscales() );
-    aPDFCB.Check( pCurrentOptions->IsPDFAsStandardPrintJobFormat() );
-
-    ClickReduceTransparencyCBHdl( &aReduceTransparencyCB );
-    ClickReduceGradientsCBHdl( &aReduceGradientsCB );
-    ClickReduceBitmapsCBHdl( &aReduceBitmapsCB );
-}
-
-void SfxCommonPrintOptionsTabPage::ImplSetAccessibleNames()
-{
-    const rtl::OUString cSeparator(" - ");
-
-    String sReduceText = aReduceGB.GetDisplayText();
-    sReduceText += cSeparator;
-
-    String sAccessibleName = sReduceText;
-    sAccessibleName += aPrinterOutputRB.GetDisplayText();
-    aPrinterOutputRB.SetAccessibleName( sAccessibleName );
-
-    sAccessibleName = sReduceText;
-    sAccessibleName += aPrintFileOutputRB.GetDisplayText();
-    aPrintFileOutputRB.SetAccessibleName( sAccessibleName );
-
-    String sOutputText = sReduceText;
-    sOutputText += aOutputGB.GetDisplayText();
-    sOutputText += cSeparator;
-
-    sAccessibleName = sOutputText;
-    sAccessibleName += aReduceTransparencyCB.GetDisplayText();
-    aReduceTransparencyCB.SetAccessibleName( sAccessibleName );
-
-    String sTransparencyText = aReduceTransparencyCB.GetAccessibleName();
-    sTransparencyText += cSeparator;
-
-    sAccessibleName = sTransparencyText;
-    sAccessibleName += aReduceTransparencyAutoRB.GetDisplayText();
-    aReduceTransparencyAutoRB.SetAccessibleName( sAccessibleName );
-
-    sAccessibleName = sTransparencyText;
-    sAccessibleName += aReduceTransparencyNoneRB.GetDisplayText();
-    aReduceTransparencyNoneRB.SetAccessibleName( sAccessibleName );
-
-    sAccessibleName = sOutputText;
-    sAccessibleName += aReduceGradientsCB.GetDisplayText();
-    aReduceGradientsCB.SetAccessibleName( sAccessibleName );
-
-    String sGradientText = aReduceGradientsCB.GetAccessibleName();
-    sGradientText += cSeparator;
-
-    sAccessibleName = sGradientText;
-    sAccessibleName += aReduceGradientsStripesRB.GetDisplayText();
-    aReduceGradientsStripesRB.SetAccessibleName( sAccessibleName );
-
-    sAccessibleName = aReduceGradientsStripesRB.GetAccessibleName();
-    aReduceGradientsStepCountNF.SetAccessibleName( sAccessibleName );
-
-    sAccessibleName = sGradientText;
-    sAccessibleName += aReduceGradientsColorRB.GetDisplayText();
-    aReduceGradientsColorRB.SetAccessibleName( sAccessibleName );
-
-    sAccessibleName = sOutputText;
-    sAccessibleName += aReduceBitmapsCB.GetDisplayText();
-    aReduceBitmapsCB.SetAccessibleName( sAccessibleName );
-
-    String sBitmapText = aReduceBitmapsCB.GetAccessibleName();
-    sBitmapText += cSeparator;
-
-    sAccessibleName = sBitmapText;
-    sAccessibleName += aReduceBitmapsOptimalRB.GetDisplayText();
-    aReduceBitmapsOptimalRB.SetAccessibleName( sAccessibleName );
-
-    sAccessibleName = sBitmapText;
-    sAccessibleName += aReduceBitmapsNormalRB.GetDisplayText();
-    aReduceBitmapsNormalRB.SetAccessibleName( sAccessibleName );
-
-    sAccessibleName = sBitmapText;
-    sAccessibleName += aReduceBitmapsResolutionRB.GetDisplayText();
-    aReduceBitmapsResolutionRB.SetAccessibleName( sAccessibleName );
-
-    sAccessibleName = aReduceBitmapsResolutionRB.GetAccessibleName();
-    aReduceBitmapsResolutionLB.SetAccessibleName( sAccessibleName );
-
-    sAccessibleName = sBitmapText;
-    sAccessibleName += aReduceBitmapsTransparencyCB.GetDisplayText();
-    aReduceBitmapsTransparencyCB.SetAccessibleName( sAccessibleName );
-
-    sAccessibleName = sOutputText;
-    sAccessibleName += aConvertToGreyscalesCB.GetDisplayText();
-    aConvertToGreyscalesCB.SetAccessibleName( sAccessibleName );
-
-    String sWarnText = aWarnGB.GetDisplayText();
-    sWarnText += cSeparator;
-
-    sAccessibleName = sWarnText;
-    sAccessibleName += aPaperSizeCB.GetDisplayText();
-    aPaperSizeCB.SetAccessibleName( sAccessibleName );
+    m_pReduceBitmapsResolutionLB->SetText( m_pReduceBitmapsResolutionLB->GetEntry( m_pReduceBitmapsResolutionLB->GetSelectEntryPos() ) );
 
-    sAccessibleName = sWarnText;
-    sAccessibleName += aPaperOrientationCB.GetDisplayText();
-    aPaperOrientationCB.SetAccessibleName( sAccessibleName );
+    m_pReduceBitmapsTransparencyCB->Check( pCurrentOptions->IsReducedBitmapIncludesTransparency() );
+    m_pConvertToGreyscalesCB->Check( pCurrentOptions->IsConvertToGreyscales() );
+    m_pPDFCB->Check( pCurrentOptions->IsPDFAsStandardPrintJobFormat() );
 
-    sAccessibleName = sWarnText;
-    sAccessibleName += aTransparencyCB.GetDisplayText();
-    aTransparencyCB.SetAccessibleName( sAccessibleName );
+    ClickReduceTransparencyCBHdl(m_pReduceTransparencyCB);
+    ClickReduceGradientsCBHdl(m_pReduceGradientsCB);
+    ClickReduceBitmapsCBHdl(m_pReduceBitmapsCB);
 }
 
 void SfxCommonPrintOptionsTabPage::ImplSaveControls( PrinterOptions* pCurrentOptions )
 {
-    pCurrentOptions->SetReduceTransparency( aReduceTransparencyCB.IsChecked() );
-    pCurrentOptions->SetReducedTransparencyMode( aReduceTransparencyAutoRB.IsChecked() ? PRINTER_TRANSPARENCY_AUTO : PRINTER_TRANSPARENCY_NONE );
-    pCurrentOptions->SetReduceGradients( aReduceGradientsCB.IsChecked() );
-    pCurrentOptions->SetReducedGradientMode( aReduceGradientsStripesRB.IsChecked() ? PRINTER_GRADIENT_STRIPES : PRINTER_GRADIENT_COLOR  );
-    pCurrentOptions->SetReducedGradientStepCount( (sal_uInt16) aReduceGradientsStepCountNF.GetValue() );
-    pCurrentOptions->SetReduceBitmaps( aReduceBitmapsCB.IsChecked() );
-    pCurrentOptions->SetReducedBitmapMode( aReduceBitmapsOptimalRB.IsChecked() ? PRINTER_BITMAP_OPTIMAL :
-                                           ( aReduceBitmapsNormalRB.IsChecked() ? PRINTER_BITMAP_NORMAL : PRINTER_BITMAP_RESOLUTION ) );
-    pCurrentOptions->SetReducedBitmapResolution( aDPIArray[ Min( (sal_uInt16) aReduceBitmapsResolutionLB.GetSelectEntryPos(),
+    pCurrentOptions->SetReduceTransparency( m_pReduceTransparencyCB->IsChecked() );
+    pCurrentOptions->SetReducedTransparencyMode( m_pReduceTransparencyAutoRB->IsChecked() ? PRINTER_TRANSPARENCY_AUTO : PRINTER_TRANSPARENCY_NONE );
+    pCurrentOptions->SetReduceGradients( m_pReduceGradientsCB->IsChecked() );
+    pCurrentOptions->SetReducedGradientMode( m_pReduceGradientsStripesRB->IsChecked() ? PRINTER_GRADIENT_STRIPES : PRINTER_GRADIENT_COLOR  );
+    pCurrentOptions->SetReducedGradientStepCount( (sal_uInt16) m_pReduceGradientsStepCountNF->GetValue() );
+    pCurrentOptions->SetReduceBitmaps( m_pReduceBitmapsCB->IsChecked() );
+    pCurrentOptions->SetReducedBitmapMode( m_pReduceBitmapsOptimalRB->IsChecked() ? PRINTER_BITMAP_OPTIMAL :
+                                           ( m_pReduceBitmapsNormalRB->IsChecked() ? PRINTER_BITMAP_NORMAL : PRINTER_BITMAP_RESOLUTION ) );
+    pCurrentOptions->SetReducedBitmapResolution( aDPIArray[ Min( (sal_uInt16) m_pReduceBitmapsResolutionLB->GetSelectEntryPos(),
                                                             (sal_uInt16)( (sizeof (aDPIArray) / sizeof (aDPIArray[0])) - 1 ) ) ] );
-    pCurrentOptions->SetReducedBitmapIncludesTransparency( aReduceBitmapsTransparencyCB.IsChecked() );
-    pCurrentOptions->SetConvertToGreyscales( aConvertToGreyscalesCB.IsChecked() );
+    pCurrentOptions->SetReducedBitmapIncludesTransparency( m_pReduceBitmapsTransparencyCB->IsChecked() );
+    pCurrentOptions->SetConvertToGreyscales( m_pConvertToGreyscalesCB->IsChecked() );
     sal_Bool bOrigBackEnd = pCurrentOptions->IsPDFAsStandardPrintJobFormat();
-    if (bOrigBackEnd != aPDFCB.IsChecked())
+    if (bOrigBackEnd != m_pPDFCB->IsChecked())
     {
-        pCurrentOptions->SetPDFAsStandardPrintJobFormat( aPDFCB.IsChecked() );
+        pCurrentOptions->SetPDFAsStandardPrintJobFormat( m_pPDFCB->IsChecked() );
             svtools::executeRestartDialog(
                 comphelper::getProcessComponentContext(), 0,
                 svtools::RESTART_REASON_PDF_AS_STANDARD_JOB_FORMAT);
@@ -396,12 +248,12 @@ void SfxCommonPrintOptionsTabPage::ImplSaveControls( PrinterOptions* pCurrentOpt
 IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceTransparencyCBHdl, CheckBox*, pBox )
 {
     (void)pBox; //unused
-    const sal_Bool bReduceTransparency = aReduceTransparencyCB.IsChecked();
+    const sal_Bool bReduceTransparency = m_pReduceTransparencyCB->IsChecked();
 
-    aReduceTransparencyAutoRB.Enable( bReduceTransparency );
-    aReduceTransparencyNoneRB.Enable( bReduceTransparency );
+    m_pReduceTransparencyAutoRB->Enable( bReduceTransparency );
+    m_pReduceTransparencyNoneRB->Enable( bReduceTransparency );
 
-    aTransparencyCB.Enable( !bReduceTransparency );
+    m_pTransparencyCB->Enable( !bReduceTransparency );
 
     return 0;
 }
@@ -409,13 +261,13 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceTransparencyCBHdl, CheckBox*
 IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceGradientsCBHdl, CheckBox*, pBox )
 {
     (void)pBox; //unused
-    const sal_Bool bEnable = aReduceGradientsCB.IsChecked();
+    const sal_Bool bEnable = m_pReduceGradientsCB->IsChecked();
 
-    aReduceGradientsStripesRB.Enable( bEnable );
-    aReduceGradientsColorRB.Enable( bEnable );
-    aReduceGradientsStepCountNF.Enable( bEnable );
+    m_pReduceGradientsStripesRB->Enable( bEnable );
+    m_pReduceGradientsColorRB->Enable( bEnable );
+    m_pReduceGradientsStepCountNF->Enable( bEnable );
 
-    ToggleReduceGradientsStripesRBHdl( &aReduceGradientsStripesRB );
+    ToggleReduceGradientsStripesRBHdl(m_pReduceGradientsStripesRB);
 
     return 0;
 }
@@ -423,15 +275,15 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceGradientsCBHdl, CheckBox*, p
 IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceBitmapsCBHdl, CheckBox*, pBox )
 {
     (void)pBox; //unused
-    const sal_Bool bEnable = aReduceBitmapsCB.IsChecked();
+    const sal_Bool bEnable = m_pReduceBitmapsCB->IsChecked();
 
-    aReduceBitmapsOptimalRB.Enable( bEnable );
-    aReduceBitmapsNormalRB.Enable( bEnable );
-    aReduceBitmapsResolutionRB.Enable( bEnable );
-    aReduceBitmapsTransparencyCB.Enable( bEnable );
-    aReduceBitmapsResolutionLB.Enable( bEnable );
+    m_pReduceBitmapsOptimalRB->Enable( bEnable );
+    m_pReduceBitmapsNormalRB->Enable( bEnable );
+    m_pReduceBitmapsResolutionRB->Enable( bEnable );
+    m_pReduceBitmapsTransparencyCB->Enable( bEnable );
+    m_pReduceBitmapsResolutionLB->Enable( bEnable );
 
-    ToggleReduceBitmapsResolutionRBHdl( &aReduceBitmapsResolutionRB );
+    ToggleReduceBitmapsResolutionRBHdl(m_pReduceBitmapsResolutionRB);
 
     return 0;
 }
@@ -439,9 +291,9 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceBitmapsCBHdl, CheckBox*, pBo
 IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleReduceGradientsStripesRBHdl, RadioButton*, pButton )
 {
     (void)pButton; //unused
-    const sal_Bool bEnable = aReduceGradientsCB.IsChecked() && aReduceGradientsStripesRB.IsChecked();
+    const sal_Bool bEnable = m_pReduceGradientsCB->IsChecked() && m_pReduceGradientsStripesRB->IsChecked();
 
-    aReduceGradientsStepCountNF.Enable( bEnable );
+    m_pReduceGradientsStepCountNF->Enable( bEnable );
 
     return 0;
 }
@@ -449,9 +301,9 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleReduceGradientsStripesRBHdl, Radi
 IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleReduceBitmapsResolutionRBHdl, RadioButton*, pButton )
 {
     (void)pButton; //unused
-    const sal_Bool bEnable = aReduceBitmapsCB.IsChecked() && aReduceBitmapsResolutionRB.IsChecked();
+    const sal_Bool bEnable = m_pReduceBitmapsCB->IsChecked() && m_pReduceBitmapsResolutionRB->IsChecked();
 
-    aReduceBitmapsResolutionLB.Enable( bEnable );
+    m_pReduceBitmapsResolutionLB->Enable( bEnable );
 
     return 0;
 }
@@ -460,11 +312,8 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrinterRBHdl, RadioButton*,
 {
     if( pButton->IsChecked() )
     {
-        aOutputGB.SetText( OutputDevice::GetNonMnemonicString( pButton->GetText() ) );
         ImplUpdateControls( &maPrinterOptions );
         bOutputForPrinter = sal_True;
-        // #i63982#
-        ImplSetAccessibleNames();
     }
     else
         ImplSaveControls( &maPrinterOptions );
@@ -476,17 +325,14 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrintFileRBHdl, RadioButton
 {
     if( pButton->IsChecked() )
     {
-        aOutputGB.SetText( OutputDevice::GetNonMnemonicString( pButton->GetText() ) );
         ImplUpdateControls( &maPrintFileOptions );
         bOutputForPrinter = sal_False;
-        // #i63982#
-        ImplSetAccessibleNames();
-        aPDFCB.Disable();
+        m_pPDFCB->Disable();
     }
     else
     {
         ImplSaveControls( &maPrintFileOptions );
-        aPDFCB.Enable();
+        m_pPDFCB->Enable();
     }
 
     return 0;

sfx2/source/dialog/printopt.hrc

-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#define GB_REDUCE                       1
-
-#define FT_OUTPUTTYPE                   2
-#define RB_PRINTEROUTPUT                3
-#define RB_PRINTFILEOUTPUT              4
-
-#define GB_OUTPUT                       5
-
-#define CB_REDUCETRANSPARENCY           10
-#define RB_REDUCETRANSPARENCY_AUTO      11
-#define RB_REDUCETRANSPARENCY_NONE      12
-
-#define CB_REDUCEGRADIENTS              20
-#define RB_REDUCEGRADIENTS_STRIPES      21
-#define RB_REDUCEGRADIENTS_COLOR        22
-#define NF_REDUCEGRADIENTS_STEPCOUNT    23
-
-#define CB_REDUCEBITMAPS                30
-#define RB_REDUCEBITMAPS_OPTIMAL        31
-#define RB_REDUCEBITMAPS_NORMAL         32
-#define RB_REDUCEBITMAPS_RESOLUTION     33
-#define CB_REDUCEBITMAPS_TRANSPARENCY   34
-#define LB_REDUCEBITMAPS_RESOLUTION     35
-
-#define CB_CONVERTTOGREYSCALES          40
-
-#define GB_PRINT_WARN                   50
-#define CB_PAPERSIZE                    51
-#define CB_PAPERORIENTATION             52
-#define CB_TRANSPARENCY                 53
-
-#define CB_PDF                          54

sfx2/source/dialog/printopt.src

-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <sfx2/sfx.hrc>
-#include <sfx2/tabpage.hrc>
-#include "printopt.hrc"
-#include "dialog.hrc"
-#include "helpid.hrc"
-
-//****************************************************************************
-// TabPage
-//****************************************************************************
-
-TabPage TP_COMMONPRINTOPTIONS
-{
-    HelpID = HID_TP_COMMONPRINTOPTIONS;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-    Hide = TRUE ;
-
-    FixedLine GB_REDUCE
-    {
-        Pos = MAP_APPFONT ( 6, 3 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Reduce print data";
-    };
-    FixedText FT_OUTPUTTYPE
-    {
-        TabStop = TRUE;
-        Pos = MAP_APPFONT ( 12, 14 ) ;
-        Size = MAP_APPFONT ( 60, 10 ) ;
-        Text [ en-US ] = "Settings for";
-    };
-    RadioButton RB_PRINTEROUTPUT
-    {
-        HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_PRINTEROUTPUT";
-        TabStop = TRUE;
-        Pos = MAP_APPFONT ( 81, 14 ) ;
-        Size = MAP_APPFONT ( 60, 10 ) ;
-        Text [ en-US ] = "~Printer";
-    };
-    RadioButton RB_PRINTFILEOUTPUT
-    {
-        HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_PRINTFILEOUTPUT";
-        TabStop = TRUE;
-        Pos = MAP_APPFONT ( 142, 14 ) ;
-        Size = MAP_APPFONT ( 100, 10 ) ;
-        Text [ en-US ] = "Print to ~file";
-    };
-
-    // -----------
-
-    FixedLine GB_OUTPUT
-    {
-        Pos = MAP_APPFONT ( 12, 27 ) ;
-        Size = MAP_APPFONT ( 242 , 8 ) ;
-    };
-
-    CheckBox CB_REDUCETRANSPARENCY
-    {
-        HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCETRANSPARENCY";
-        TabStop = TRUE;
-        Pos = MAP_APPFONT ( 18, 38 ) ;
-        Size = MAP_APPFONT ( 115, 10 ) ;
-        Text [ en-US ] = "~Reduce transparency";
-    };
-    RadioButton RB_REDUCETRANSPARENCY_AUTO
-    {
-        HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCETRANSPARENCY_AUTO";
-        TabStop = TRUE;
-        Pos = MAP_APPFONT ( 28, 51 ) ;
-        Size = MAP_APPFONT ( 105, 10 ) ;
-        Text [ en-US ] = "Auto~matically";
-    };
-    RadioButton RB_REDUCETRANSPARENCY_NONE
-    {
-        HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCETRANSPARENCY_NONE";
-        TabStop = TRUE;
-        Pos = MAP_APPFONT ( 28, 64 ) ;
-        Size = MAP_APPFONT ( 105, 10 ) ;
-        Text [ en-US ] = "~No transparency";
-    };
-
-    // -----------
-
-    CheckBox CB_REDUCEGRADIENTS
-    {
-        HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEGRADIENTS";
-        TabStop = TRUE;
-        Pos = MAP_APPFONT ( 136, 38 ) ;
-        Size = MAP_APPFONT ( 121, 10 ) ;
-        Text [ en-US ] = "Reduce ~gradients";
-    };
-    RadioButton RB_REDUCEGRADIENTS_STRIPES
-    {
-        HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEGRADIENTS_STRIPES";
-        TabStop = TRUE;
-        Pos = MAP_APPFONT ( 146, 51 ) ;
-        Size = MAP_APPFONT ( 77, 10 ) ;
-        Text [ en-US ] = "Gradient ~stripes";
-    };
-    NumericField NF_REDUCEGRADIENTS_STEPCOUNT
-    {
-        HelpID = "sfx2:NumericField:TP_COMMONPRINTOPTIONS:NF_REDUCEGRADIENTS_STEPCOUNT";
-        TabStop = TRUE;
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 224, 49 ) ;
-        Size = MAP_APPFONT ( 24, 12 ) ;
-        Minimum = 2;
-        Maximum = 256;
-        Spin = TRUE ;
-        Repeat = TRUE ;
-    };
-    RadioButton RB_REDUCEGRADIENTS_COLOR
-    {
-        HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEGRADIENTS_COLOR";
-        TabStop = TRUE;
-        Pos = MAP_APPFONT ( 146, 64 ) ;
-        Size = MAP_APPFONT ( 108, 10 ) ;
-        Text [ en-US ] = "Intermediate ~color";
-    };
-
-    // -----------
-
-    CheckBox CB_REDUCEBITMAPS
-    {
-        HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEBITMAPS";
-        TabStop = TRUE;
-        Pos = MAP_APPFONT ( 18, 80 ) ;
-        Size = MAP_APPFONT ( 115, 10 ) ;
-        Text [ en-US ] = "Reduce ~bitmaps";
-    };
-    RadioButton RB_REDUCEBITMAPS_OPTIMAL
-    {
-        HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_OPTIMAL";
-        TabStop = TRUE;
-        Pos = MAP_APPFONT ( 28, 93 ) ;
-        Size = MAP_APPFONT ( 226, 10 ) ;
-        Text [ en-US ] = "~High print quality";
-    };
-    RadioButton RB_REDUCEBITMAPS_NORMAL
-    {
-        HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_NORMAL";
-        TabStop = TRUE;
-        Pos = MAP_APPFONT ( 28, 106 ) ;
-        Size = MAP_APPFONT ( 226, 10 ) ;
-        Text [ en-US ] = "N~ormal print quality";
-    };
-    RadioButton RB_REDUCEBITMAPS_RESOLUTION
-    {
-        HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_RESOLUTION";
-        TabStop = TRUE;
-        Pos = MAP_APPFONT ( 28, 119 ) ;
-        Size = MAP_APPFONT ( 52, 10 ) ;
-        Text [ en-US ] = "Reso~lution";
-    };
-    ListBox LB_REDUCEBITMAPS_RESOLUTION
-    {
-        HelpID = "sfx2:ListBox:TP_COMMONPRINTOPTIONS:LB_REDUCEBITMAPS_RESOLUTION";
-        TabStop = TRUE;
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 81, 117 ) ;
-        Size = MAP_APPFONT ( 60, 100 ) ;
-        DropDown = TRUE;
-
-    StringList [ en-US ] =
-    {
-            < "72 DPI"; 0; > ;
-        < "96 DPI"; 0;  > ;
-        < "150 DPI (Fax)"; 0; > ;
-        < "200 DPI (default)"; 0; > ;
-        < "300 DPI"; 0; > ;
-        < "600 DPI"; 0; > ;
-    };
-    };
-    CheckBox CB_REDUCEBITMAPS_TRANSPARENCY
-    {
-        HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEBITMAPS_TRANSPARENCY";
-        TabStop = TRUE;
-        Pos = MAP_APPFONT ( 28, 132 ) ;
-        Size = MAP_APPFONT ( 226, 10 ) ;
-        Text [ en-US ] = "Include transparent ob~jects";
-    };
-
-    // -----------
-
-    CheckBox CB_CONVERTTOGREYSCALES
-    {
-        HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_CONVERTTOGREYSCALES";
-        TabStop = TRUE;
-        Pos = MAP_APPFONT ( 136, 80 ) ;
-        Size = MAP_APPFONT ( 123, 10 ) ;
-        Text [ en-US ] = "Con~vert colors to grayscale";
-    };
-
-    // -----------
-
-    CheckBox CB_PDF
-    {
-        HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEBITMAPS";
-        TabStop = TRUE;
-        Pos = MAP_APPFONT ( 18, 146 ) ;
-        Size = MAP_APPFONT ( 115, 10 ) ;
-        Text [ en-US ] = "PDF as Standard Print Job Format";
-    };
-
-    // -----------
-
-    FixedLine GB_PRINT_WARN
-    {
-        Pos = MAP_APPFONT ( 6, 162 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Printer warnings" ;
-    };
-    CheckBox CB_PAPERSIZE
-    {
-        HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_PAPERSIZE";
-        TabStop = TRUE;
-        Pos = MAP_APPFONT ( 12, 173 ) ;
-        Size = MAP_APPFONT ( 123, 10 ) ;
-        Text [ en-US ] = "P~aper size" ;
-    };
-    CheckBox CB_PAPERORIENTATION
-    {
-        HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_PAPERORIENTATION";
-        TabStop = TRUE;
-        Pos = MAP_APPFONT ( 12, 186 ) ;
-        Size = MAP_APPFONT ( 123 , 10 ) ;
-        Text [ en-US ] = "Pap~er orientation" ;
-    };
-    CheckBox CB_TRANSPARENCY
-    {
-        HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_TRANSPARENCY";
-        TabStop = TRUE;
-        Pos = MAP_APPFONT ( 136, 173 ) ;
-        Size = MAP_APPFONT ( 123, 10 ) ;
-        Text [ en-US ] = "~Transparency";
-    };
-};

sfx2/source/inc/helpid.hrc

@@ -96,7 +96,6 @@
 #define HID_CNT_SENT_VIEW_UNSENT_ARTICLES                     "SFX2_HID_CNT_SENT_VIEW_UNSENT_ARTICLES"
 #define HID_CNT_SENT_VIEW_MARKED_ARTICLES                     "SFX2_HID_CNT_SENT_VIEW_MARKED_ARTICLES"
 #define HID_TABDLG_APPLY_BTN                                  "SFX2_HID_TABDLG_APPLY_BTN"
-#define HID_TP_COMMONPRINTOPTIONS                             "SFX2_HID_TP_COMMONPRINTOPTIONS"
 #define HID_HELP_WINDOW                                       "SFX2_HID_HELP_WINDOW"
 #define HID_HELP_LISTBOX                                      "SFX2_HID_HELP_LISTBOX"
 #define HID_HELP_TABCONTROL                                   "SFX2_HID_HELP_TABCONTROL"

sw/uiconfig/swriter/ui/libprint.ui → sfx2/uiconfig/ui/optprintpage.ui

 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkBox" id="box1">
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="lower">2</property>
+    <property name="upper">256</property>
+    <property name="value">64</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkBox" id="OptPrintPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
+    <property name="hexpand">True</property>
+    <property name="border_width">6</property>
     <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
+    <property name="spacing">12</property>
     <child>
       <object class="GtkFrame" id="frame1">
         <property name="visible">True</property>
@@ -16,6 +25,7 @@
           <object class="GtkAlignment" id="alignment1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="top_padding">6</property>
             <property name="left_padding">12</property>
             <child>
               <object class="GtkGrid" id="grid1">
@@ -24,230 +34,155 @@
                 <property name="row_spacing">6</property>
                 <property name="column_spacing">12</property>
                 <child>
-                  <object class="GtkFrame" id="frame3">
+                  <object class="GtkGrid" id="grid2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="column_spacing">12</property>
+                    <property name="column_homogeneous">True</property>
+                    <child>
+                      <object class="GtkRadioButton" id="printer">
+                        <property name="label" translatable="yes">_Printer</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">file</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="file">
+                        <property name="label" translatable="yes">Print to _file</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">printer</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">2</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label4">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Settings for:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">printer</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkAlignment" id="alignment3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
+                    <property name="left_padding">12</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment3">
+                      <object class="GtkGrid" id="grid4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="margin_top">6</property>
-                        <property name="left_padding">12</property>
+                        <property name="row_spacing">6</property>
+                        <property name="column_spacing">12</property>
+                        <property name="column_homogeneous">True</property>
+                        <child>
+                          <object class="GtkCheckButton" id="reducetrans">
+                            <property name="label" translatable="yes">_Reduce transparency</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="reducegrad">
+                            <property name="label" translatable="yes">Reduce _gradient</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
                         <child>
-                          <object class="GtkGrid" id="grid4">
+                          <object class="GtkCheckButton" id="converttogray">
+                            <property name="label" translatable="yes">Con_vert colors to grayscale</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">2</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkAlignment" id="alignment4">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="row_spacing">6</property>
-                            <property name="column_spacing">12</property>
-                            <child>
-                              <object class="GtkCheckButton" id="checkbutton4">
-                                <property name="label" translatable="yes">~Reduce transparency</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="xalign">0</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="checkbutton5">
-                                <property name="label" translatable="yes">Reduce ~gradient</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="xalign">0</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkRadioButton" id="radiobutton1">
-                                <property name="label" translatable="yes">Auto~matically</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="margin_left">24</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="xalign">0</property>
-                                <property name="active">True</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkRadioButton" id="radiobutton3">
-                                <property name="label" translatable="yes">~No transparency</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="margin_left">24</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="xalign">0</property>
-                                <property name="active">True</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">2</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkRadioButton" id="radiobutton4">
-                                <property name="label" translatable="yes">Intermediate ~color</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="margin_left">24</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="xalign">0</property>
-                                <property name="active">True</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">2</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="checkbutton6">
-                                <property name="label" translatable="yes">Reduce ~bitmaps</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="xalign">0</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">3</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="checkbutton7">
-                                <property name="label" translatable="yes">Con~vert colors to grayscale</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="xalign">0</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">3</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                              </packing>
-                            </child>
+                            <property name="left_padding">12</property>
                             <child>
-                              <object class="GtkCheckButton" id="checkbutton8">
-                                <property name="label" translatable="yes">Include transparent objects</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="margin_left">24</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="xalign">0</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">7</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkRadioButton" id="radiobutton5">
-                                <property name="label" translatable="yes">~High print quality</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="margin_left">24</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="xalign">0</property>
-                                <property name="active">True</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">4</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkRadioButton" id="radiobutton6">
-                                <property name="label" translatable="yes">N~ormal print quality</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="margin_left">24</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="xalign">0</property>
-                                <property name="active">True</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">5</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkGrid" id="grid5">
+                              <object class="GtkGrid" id="grid7">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="GtkRadioButton" id="radiobutton9">
-                                    <property name="label" translatable="yes">Reso~lution</property>
-                                    <property name="use_action_appearance">False</property>
+                                  <object class="GtkRadioButton" id="reducetransauto">
+                                    <property name="label" translatable="yes">Auto_matically</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="margin_left">24</property>
-                                    <property name="use_action_appearance">False</property>
+                                    <property name="use_underline">True</property>
                                     <property name="xalign">0</property>
                                     <property name="active">True</property>
                                     <property name="draw_indicator">True</property>
+                                    <property name="group">reducetransnone</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
@@ -257,42 +192,137 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkSpinButton" id="spinbutton1">
+                                  <object class="GtkRadioButton" id="reducetransnone">
+                                    <property name="label" translatable="yes">_No transparency</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="invisible_char">•</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="draw_indicator">True</property>
+                                    <property name="group">reducetransauto</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="width">1</property>
+                                    <property name="height">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">1</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkAlignment" id="alignment5">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <object class="GtkGrid" id="grid8">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkGrid" id="grid6">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="column_spacing">12</property>
+                                    <child>
+                                      <object class="GtkRadioButton" id="reducegradstripes">
+                                        <property name="label" translatable="yes">Gradient _stripes</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="active">True</property>
+                                        <property name="draw_indicator">True</property>
+                                        <property name="group">reducegradcolor</property>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">0</property>
+                                        <property name="top_attach">0</property>
+                                        <property name="width">1</property>
+                                        <property name="height">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkSpinButton" id="reducegradstep">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">•</property>
+                                        <property name="invisible_char_set">True</property>
+                                        <property name="adjustment">adjustment1</property>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="top_attach">0</property>
+                                        <property name="width">1</property>
+                                        <property name="height">1</property>
+                                      </packing>
+                                    </child>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">1</property>
+                                    <property name="left_attach">0</property>
                                     <property name="top_attach">0</property>
                                     <property name="width">1</property>
                                     <property name="height">1</property>
                                   </packing>
                                 </child>
+                                <child>
+                                  <object class="GtkRadioButton" id="reducegradcolor">
+                                    <property name="label" translatable="yes">Intermediate _color</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="draw_indicator">True</property>
+                                    <property name="group">reducegradstripes</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="width">1</property>
+                                    <property name="height">1</property>
+                                  </packing>
+                                </child>
                               </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">6</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                              </packing>
                             </child>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">1</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkAlignment" id="alignment6">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="left_padding">12</property>
                             <child>
-                              <object class="GtkGrid" id="grid6">
+                              <object class="GtkGrid" id="grid9">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="GtkRadioButton" id="radiobutton2">
-                                    <property name="label" translatable="yes">Gradient ~stripes</property>
-                                    <property name="use_action_appearance">False</property>
+                                  <object class="GtkRadioButton" id="reducebitmapoptimal">
+                                    <property name="label" translatable="yes">_High print quality</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="margin_left">24</property>
-                                    <property name="use_action_appearance">False</property>
+                                    <property name="use_underline">True</property>
                                     <property name="xalign">0</property>
                                     <property name="active">True</property>
                                     <property name="draw_indicator">True</property>
+                                    <property name="group">reducebitmapnormal</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
@@ -302,47 +332,142 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkSpinButton" id="spinbutton2">
+                                  <object class="GtkRadioButton" id="reducebitmapnormal">
+                                    <property name="label" translatable="yes">N_ormal print quality</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="invisible_char">•</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="draw_indicator">True</property>
+                                    <property name="group">reducebitmapresol</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">0</property>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="width">1</property>
+                                    <property name="height">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkGrid" id="grid5">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="column_spacing">12</property>
+                                    <child>
+                                      <object class="GtkRadioButton" id="reducebitmapresol">
+                                        <property name="label" translatable="yes">Reso_lution</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <property name="group">reducebitmapoptimal</property>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">0</property>
+                                        <property name="top_attach">0</property>
+                                        <property name="width">1</property>
+                                        <property name="height">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkComboBoxText" id="reducebitmapdpi">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="entry_text_column">0</property>
+                                        <property name="id_column">1</property>
+                                        <items>
+                                          <item translatable="yes">72 DPI</item>
+                                          <item translatable="yes">96 DPI</item>
+                                          <item translatable="yes">150 DPI (Fax)</item>
+                                          <item translatable="yes">200 DPI (default)</item>
+                                          <item translatable="yes">300 DPI</item>
+                                          <item translatable="yes">600 DPI</item>
+                                        </items>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="top_attach">0</property>
+                                        <property name="width">1</property>
+                                        <property name="height">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="width">1</property>
+                                    <property name="height">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="reducebitmaptrans">
+                                    <property name="label" translatable="yes">Include transparent objects</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">3</property>
                                     <property name="width">1</property>
                                     <property name="height">1</property>
                                   </packing>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <placeholder/>
-                            </child>
-                            <child>
-                              <placeholder/>
-                            </child>
-                            <child>
-                              <placeholder/>
-                            </child>
-                            <child>
-                              <placeholder/>
                             </child>
                           </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">3</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="reducebitmap">
+                            <property name="label" translatable="yes">Reduce _bitmaps</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">2</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="pdf">
+                            <property name="label" translatable="yes">_PDF as Standard Print Job Format</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">4</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
                         </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="label3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Printer</property>
                       </object>
                     </child>
                   </object>
@@ -353,71 +478,6 @@
                     <property name="height">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkGrid" id="grid2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_top">6</property>
-                    <property name="column_spacing">30</property>
-                    <child>
-                      <object class="GtkRadioButton" id="radiobutton7">
-                        <property name="label" translatable="yes">~Printer</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="xalign">0</property>
-                        <property name="active">True</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkRadioButton" id="radiobutton8">
-                        <property name="label" translatable="yes">Print to ~file</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="xalign">0</property>
-                        <property name="active">True</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">2</property>
-                        <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label4">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Settings for</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
               </object>
             </child>
           </object>
@@ -427,6 +487,9 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="label" translatable="yes">Reduce print data</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
           </object>
         </child>
       </object>
@@ -446,22 +509,22 @@
           <object class="GtkAlignment" id="alignment2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="top_padding">6</property>
             <property name="left_padding">12</property>
             <child>
               <object class="GtkGrid" id="grid3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_top">6</property>
                 <property name="row_spacing">6</property>
-                <property name="column_spacing">30</property>
+                <property name="column_spacing">12</property>
+                <property name="column_homogeneous">True</property>
                 <child>
-                  <object class="GtkCheckButton" id="checkbutton1">
-                    <property name="label" translatable="yes">P~aper size</property>
-                    <property name="use_action_appearance">False</property>
+                  <object class="GtkCheckButton" id="papersize">
+                    <property name="label" translatable="yes">P_aper size</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="use_action_appearance">False</property>
+                    <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -473,13 +536,12 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkCheckButton" id="checkbutton2">
-                    <property name="label" translatable="yes">Pap~er orientation</property>
-                    <property name="use_action_appearance">False</property>
+                  <object class="GtkCheckButton" id="paperorient">
+                    <property name="label" translatable="yes">Pap_er orientation</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="use_action_appearance">False</property>
+                    <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -491,13 +553,12 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkCheckButton" id="checkbutton3">
-                    <property name="label" translatable="yes">~Transparency</property>
-                    <property name="use_action_appearance">False</property>
+                  <object class="GtkCheckButton" id="trans">
+                    <property name="label" translatable="yes">_Transparency</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="use_action_appearance">False</property>
+                    <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -520,6 +581,9 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="label" translatable="yes">Printer warnings</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
           </object>
         </child>
       </object>