vcl/uiconfig/ui/printerdevicepage.ui | 41 ++------------------------- vcl/unx/generic/print/prtsetup.cxx | 52 ----------------------------------- vcl/unx/generic/print/prtsetup.hxx | 3 -- 3 files changed, 4 insertions(+), 92 deletions(-)
New commits: commit c3a4f689f44d83e3e9520bc280c566c83c4f2b5e Author: Khaled Hosny <[email protected]> AuthorDate: Fri Jun 30 09:37:45 2023 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Sat Jul 1 21:09:25 2023 +0200 Remove option to set printer language type Drop support for changing printer language type from printer properties dialog, in preparation for dropping support for PostScript printing. This is a follow up to: commit 2a40505d00fcd79bfa433c301ddc05a35287bfb1 Date: Thu Jan 26 11:49:43 2023 +0000 remove option to toggle IsPDFAsStandardPrintJobFormat from UI Change-Id: I970d627588396d6ff648d6e6304e449da7ec1425 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153817 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/vcl/uiconfig/ui/printerdevicepage.ui b/vcl/uiconfig/ui/printerdevicepage.ui index 7b6d6f28213e..249562950ef9 100644 --- a/vcl/uiconfig/ui/printerdevicepage.ui +++ b/vcl/uiconfig/ui/printerdevicepage.ui @@ -161,7 +161,7 @@ </packing> </child> <child> - <!-- n-columns=2 n-rows=3 --> + <!-- n-columns=2 n-rows=2 --> <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -178,7 +178,7 @@ </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">2</property> + <property name="top-attach">1</property> </packing> </child> <child> @@ -190,44 +190,11 @@ <property name="mnemonic-widget">colorspace</property> <property name="xalign">1</property> </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label9"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="printerdevicepage|label9">Printer language _type:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">level</property> - <property name="xalign">1</property> - </object> <packing> <property name="left-attach">0</property> <property name="top-attach">0</property> </packing> </child> - <child> - <object class="GtkComboBoxText" id="level"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="hexpand">True</property> - <items> - <item id="0" translatable="yes" context="printerdevicepage|liststore1">Automatic : %s</item> - <item id="1" translatable="yes" context="printerdevicepage|liststore1">PostScript (Level from driver)</item> - <item id="2" translatable="yes" context="printerdevicepage|liststore1">PostScript Level 1</item> - <item id="3" translatable="yes" context="printerdevicepage|liststore1">PostScript Level 2</item> - <item id="4" translatable="yes" context="printerdevicepage|liststore1">PostScript Level 3</item> - <item id="10" translatable="yes" context="printerdevicepage|liststore1">PDF</item> - </items> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> - </packing> - </child> <child> <object class="GtkComboBoxText" id="colorspace"> <property name="visible">True</property> @@ -240,7 +207,7 @@ </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> @@ -254,7 +221,7 @@ </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">2</property> + <property name="top-attach">1</property> </packing> </child> </object> diff --git a/vcl/unx/generic/print/prtsetup.cxx b/vcl/unx/generic/print/prtsetup.cxx index 90ae49ec5179..4b0a63c1b3e8 100644 --- a/vcl/unx/generic/print/prtsetup.cxx +++ b/vcl/unx/generic/print/prtsetup.cxx @@ -115,8 +115,6 @@ IMPL_LINK( RTSDialog, ClickButton, weld::Button&, rButton, void ) { m_aJobData.m_nColorDepth = m_xDevicePage->getDepth(); m_aJobData.m_nColorDevice = m_xDevicePage->getColorDevice(); - m_aJobData.m_nPSLevel = m_xDevicePage->getLevel(); - m_aJobData.m_nPDFDevice = m_xDevicePage->getPDFDevice(); } m_xDialog->response(RET_OK); } @@ -271,7 +269,6 @@ RTSDevicePage::RTSDevicePage(weld::Widget* pPage, RTSDialog* pParent) , m_xPPDKeyBox(m_xBuilder->weld_tree_view("options")) , m_xPPDValueBox(m_xBuilder->weld_tree_view("values")) , m_xCustomEdit(m_xBuilder->weld_entry("custom")) - , m_xLevelBox(m_xBuilder->weld_combo_box("level")) , m_xSpaceBox(m_xBuilder->weld_combo_box("colorspace")) , m_xDepthBox(m_xBuilder->weld_combo_box("colordepth")) , m_aReselectCustomIdle("RTSDevicePage m_aReselectCustomIdle") @@ -286,7 +283,6 @@ RTSDevicePage::RTSDevicePage(weld::Widget* pPage, RTSDialog* pParent) m_xPPDKeyBox->connect_changed( LINK( this, RTSDevicePage, SelectHdl ) ); m_xPPDValueBox->connect_changed( LINK( this, RTSDevicePage, SelectHdl ) ); - m_xLevelBox->connect_changed(LINK(this, RTSDevicePage, ComboChangedHdl)); m_xSpaceBox->connect_changed(LINK(this, RTSDevicePage, ComboChangedHdl)); m_xDepthBox->connect_changed(LINK(this, RTSDevicePage, ComboChangedHdl)); @@ -303,36 +299,6 @@ RTSDevicePage::RTSDevicePage(weld::Widget* pPage, RTSDialog* pParent) break; } - sal_Int32 nLevelEntryData = 0; //automatic - if( m_pParent->m_aJobData.m_nPDFDevice == 2 ) //explicit PDF - nLevelEntryData = 10; - else if (m_pParent->m_aJobData.m_nPSLevel > 0) //explicit PS Level - nLevelEntryData = m_pParent->m_aJobData.m_nPSLevel+1; - else if (m_pParent->m_aJobData.m_nPDFDevice == 1) //automatically PDF - nLevelEntryData = 0; - else if (m_pParent->m_aJobData.m_nPDFDevice == -1) //explicitly PS from driver - nLevelEntryData = 1; - - bool bAutoIsPDF = officecfg::Office::Common::Print::Option::Printer::PDFAsStandardPrintJobFormat::get(); - - assert(nLevelEntryData != 0 - || "Generic Printer" == m_pParent->m_aJobData.m_aPrinterName - || int(bAutoIsPDF) == m_pParent->m_aJobData.m_nPDFDevice); - - OUString sStr = m_xLevelBox->get_text(0); - OUString sId = m_xLevelBox->get_id(0); - m_xLevelBox->insert(0, sStr.replaceAll("%s", bAutoIsPDF ? m_xLevelBox->get_text(5) : m_xLevelBox->get_text(1)), &sId, nullptr, nullptr); - m_xLevelBox->remove(1); - - for (int i = 0; i < m_xLevelBox->get_count(); ++i) - { - if (m_xLevelBox->get_id(i).toInt32() == nLevelEntryData) - { - m_xLevelBox->set_active(i); - break; - } - } - if (m_pParent->m_aJobData.m_nColorDepth == 8) m_xDepthBox->set_active(0); else if (m_pParent->m_aJobData.m_nColorDepth == 24) @@ -393,24 +359,6 @@ sal_uLong RTSDevicePage::getColorDevice() const return 0; } -sal_uLong RTSDevicePage::getLevel() const -{ - auto nLevel = m_xLevelBox->get_active_id().toInt32(); - if (nLevel == 0) - return 0; //automatic - return nLevel < 10 ? nLevel-1 : 0; -} - -sal_uLong RTSDevicePage::getPDFDevice() const -{ - auto nLevel = m_xLevelBox->get_active_id().toInt32(); - if (nLevel > 9) - return 2; //explicitly PDF - else if (nLevel == 0) - return 0; //automatic - return -1; //explicitly PS -} - IMPL_LINK(RTSDevicePage, ModifyHdl, weld::Entry&, rEdit, void) { if (m_pCustomValue) diff --git a/vcl/unx/generic/print/prtsetup.hxx b/vcl/unx/generic/print/prtsetup.hxx index 04b89d54e075..1a32eb3318cc 100644 --- a/vcl/unx/generic/print/prtsetup.hxx +++ b/vcl/unx/generic/print/prtsetup.hxx @@ -109,7 +109,6 @@ private: std::unique_ptr<weld::TreeView> m_xPPDValueBox; std::unique_ptr<weld::Entry> m_xCustomEdit; - std::unique_ptr<weld::ComboBox> m_xLevelBox; std::unique_ptr<weld::ComboBox> m_xSpaceBox; std::unique_ptr<weld::ComboBox> m_xDepthBox; @@ -127,8 +126,6 @@ public: RTSDevicePage(weld::Widget* pPage, RTSDialog* pDialog); ~RTSDevicePage(); - sal_uLong getLevel() const; - sal_uLong getPDFDevice() const; sal_uLong getDepth() const; sal_uLong getColorDevice() const; };
