summaryrefslogtreecommitdiff
path: root/vcl/source/window/printdlg.cxx
diff options
context:
space:
mode:
authorAyhan Yalçınsoy <ayhanyalcinsoy@pisilinux.org>2020-10-26 13:28:38 +0300
committerHeiko Tietze <heiko.tietze@documentfoundation.org>2020-10-29 09:22:09 +0100
commit1628d815712ef40020f744a80b949e3cf4d8380d (patch)
tree53f19d875331359d5919829fce62eeaa96c9242a /vcl/source/window/printdlg.cxx
parent695600ab48f86dccd656a6173b6728c02f795fd5 (diff)
tdf#137506: Move single control in 'More Options' to print dialog
Change-Id: Iacefe276bf174b96118015b48e746d1591b93c1d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104805 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Diffstat (limited to 'vcl/source/window/printdlg.cxx')
-rw-r--r--vcl/source/window/printdlg.cxx43
1 files changed, 7 insertions, 36 deletions
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 88516e9f320b..8e970bfc0154 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -63,36 +63,6 @@ namespace {
}
}
-MoreOptionsDialog::MoreOptionsDialog(PrintDialog* i_pParent)
- : GenericDialogController(i_pParent->getDialog(), "vcl/ui/moreoptionsdialog.ui", "MoreOptionsDialog")
- , mpParent( i_pParent )
- , mxOKButton(m_xBuilder->weld_button("ok"))
- , mxCancelButton(m_xBuilder->weld_button("cancel"))
- , mxSingleJobsBox(m_xBuilder->weld_check_button("singlejobs"))
-{
- mxSingleJobsBox->set_active( mpParent->isSingleJobs() );
-
- mxOKButton->connect_clicked( LINK( this, MoreOptionsDialog, ClickHdl ) );
- mxCancelButton->connect_clicked( LINK( this, MoreOptionsDialog, ClickHdl ) );
-}
-
-MoreOptionsDialog::~MoreOptionsDialog()
-{
-}
-
-IMPL_LINK (MoreOptionsDialog, ClickHdl, weld::Button&, rButton, void)
-{
- if (&rButton == mxOKButton.get())
- {
- mpParent->mbSingleJobs = mxSingleJobsBox->get_active();
- m_xDialog->response(RET_OK);
- }
- else if (&rButton == mxCancelButton.get())
- {
- m_xDialog->response(RET_CANCEL);
- }
-}
-
PrintDialog::PrintPreviewWindow::PrintPreviewWindow(PrintDialog* pDialog)
: mpDialog(pDialog)
, maMtf()
@@ -531,6 +501,7 @@ PrintDialog::PrintDialog(weld::Window* i_pWindow, const std::shared_ptr<PrinterC
, mxPageRangeEdit(m_xBuilder->weld_entry("pagerange"))
, mxPageRangesRadioButton(m_xBuilder->weld_radio_button("rbRangePages"))
, mxPaperSidesBox(m_xBuilder->weld_combo_box("sidesbox"))
+ , mxSingleJobsBox(m_xBuilder->weld_check_button("singlejobs"))
, mxReverseOrderBox(m_xBuilder->weld_check_button("reverseorder"))
, mxOKButton(m_xBuilder->weld_button("ok"))
, mxCancelButton(m_xBuilder->weld_button("cancel"))
@@ -674,7 +645,6 @@ PrintDialog::PrintDialog(weld::Window* i_pWindow, const std::shared_ptr<PrinterC
mxCancelButton->connect_clicked(LINK(this, PrintDialog, ClickHdl));
mxHelpButton->connect_clicked(LINK(this, PrintDialog, ClickHdl));
mxSetupButton->connect_clicked( LINK( this, PrintDialog, ClickHdl ) );
- mxMoreOptionsBtn->connect_clicked( LINK( this, PrintDialog, ClickHdl ) );
mxBackwardBtn->connect_clicked(LINK(this, PrintDialog, ClickHdl));
mxForwardBtn->connect_clicked(LINK(this, PrintDialog, ClickHdl));
mxFirstBtn->connect_clicked(LINK(this, PrintDialog, ClickHdl));
@@ -1868,6 +1838,12 @@ IMPL_LINK(PrintDialog, ClickHdl, weld::Button&, rButton, void)
makeAny( isCollate() ) );
checkControlDependencies();
}
+ else if( &rButton == mxSingleJobsBox.get() )
+ {
+ maPController->setValue( "SingleJob",
+ makeAny( isSingleJobs() ) );
+ checkControlDependencies();
+ }
else if( &rButton == mxReverseOrderBox.get() )
{
bool bChecked = mxReverseOrderBox->get_active();
@@ -1880,11 +1856,6 @@ IMPL_LINK(PrintDialog, ClickHdl, weld::Button&, rButton, void)
{
updateNup();
}
- else if ( &rButton == mxMoreOptionsBtn.get() )
- {
- mxMoreOptionsDlg.reset(new MoreOptionsDialog(this));
- mxMoreOptionsDlg->run();
- }
else
{
if( &rButton == mxSetupButton.get() )