mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#34641: move initial focus to printer selection

Browse Source
This commit is contained in:
Ivan Timofeev
2011-11-30 21:59:13 +04:00
parent 7d3f21b274
commit 041fc1f566
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vcl/inc/printdlg.hxx
View File

@@ -212,9 +212,6 @@ namespace vcl
void setupLayout(); void setupLayout();
}; };
OKButton maOKButton;
CancelButton maCancelButton;
HelpButton maHelpButton;
PrintPreviewWindow maPreviewWindow; PrintPreviewWindow maPreviewWindow;
NumericField maPageEdit; NumericField maPageEdit;
FixedText maNumPagesText; FixedText maNumPagesText;
@@ -228,6 +225,10 @@ namespace vcl
FixedLine maButtonLine; FixedLine maButtonLine;
OKButton maOKButton;
CancelButton maCancelButton;
HelpButton maHelpButton;
boost::shared_ptr< PrinterController > maPController; boost::shared_ptr< PrinterController > maPController;
rtl::OUString maPageStr; rtl::OUString maPageStr;

6
vcl/source/window/printdlg.cxx
View File

@@ -718,9 +718,6 @@ void PrintDialog::OutputOptPage::storeToSettings()
PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterController>& i_rController ) PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterController>& i_rController )
: ModalDialog( i_pParent, VclResId( SV_DLG_PRINT ) ) : ModalDialog( i_pParent, VclResId( SV_DLG_PRINT ) )
, maOKButton( this, VclResId( SV_PRINT_OK ) )
, maCancelButton( this, VclResId( SV_PRINT_CANCEL ) )
, maHelpButton( this, VclResId( SV_PRINT_HELP ) )
, maPreviewWindow( this, VclResId( SV_PRINT_PAGE_PREVIEW ) ) , maPreviewWindow( this, VclResId( SV_PRINT_PAGE_PREVIEW ) )
, maPageEdit( this, VclResId( SV_PRINT_PAGE_EDIT ) ) , maPageEdit( this, VclResId( SV_PRINT_PAGE_EDIT ) )
, maNumPagesText( this, VclResId( SV_PRINT_PAGE_TXT ) ) , maNumPagesText( this, VclResId( SV_PRINT_PAGE_TXT ) )
@@ -731,6 +728,9 @@ PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterCont
, maJobPage( &maTabCtrl, VclResId( SV_PRINT_TAB_JOB ) ) , maJobPage( &maTabCtrl, VclResId( SV_PRINT_TAB_JOB ) )
, maOptionsPage( &maTabCtrl, VclResId( SV_PRINT_TAB_OPT ) ) , maOptionsPage( &maTabCtrl, VclResId( SV_PRINT_TAB_OPT ) )
, maButtonLine( this, VclResId( SV_PRINT_BUTTONLINE ) ) , maButtonLine( this, VclResId( SV_PRINT_BUTTONLINE ) )
, maOKButton( this, VclResId( SV_PRINT_OK ) )
, maCancelButton( this, VclResId( SV_PRINT_CANCEL ) )
, maHelpButton( this, VclResId( SV_PRINT_HELP ) )
, maPController( i_rController ) , maPController( i_rController )
, maNoPageStr( String( VclResId( SV_PRINT_NOPAGES ) ) ) , maNoPageStr( String( VclResId( SV_PRINT_NOPAGES ) ) )
, mnCurPage( 0 ) , mnCurPage( 0 )