Skip to content

C
core
Kaydet (Commit) 6b86b551 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

move print options .ui to sfx2 and adapt code 

Change-Id: I8a7b1d15a002cbe74ac0fb97fcd8ce60a47a4e61
üst 62fb1958
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 338 deletions
sfx2/AllLangResTarget_sfx2.mk
Dosyayı görüntüle @ 6b86b551
......@@ -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
Dosyayı görüntüle @ 6b86b551
......@@ -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
Dosyayı görüntüle @ 6b86b551
......@@ -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
Dosyayı görüntüle @ 6b86b551
......@@ -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
Dosyayı görüntüle @ 6b86b551
This diff is collapsed.
sfx2/source/dialog/printopt.hrc deleted 100644 → 0
Dosyayı görüntüle @ 62fb1958
/*
* 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 deleted 100644 → 0
Dosyayı görüntüle @ 62fb1958
/*
* 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
Dosyayı görüntüle @ 6b86b551
......@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment