cui/source/options/optgdlg.cxx | 22 ----------------------
cui/source/options/optgdlg.hxx | 1 -
cui/uiconfig/ui/optgeneralpage.ui | 34 ----------------------------------
3 files changed, 57 deletions(-)
New commits:
commit 3fc89330a976cb2221a579ccc6d7230b9d20691b
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Sun May 30 11:37:19 2021 +0200
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun May 30 17:49:49 2021 +0200
Drop GtkSalPrinter bits from option dialog
After commit ed07ec7606cb24cccaf6b7b81b2bd308debaa2e6 ("drop
never completed GtkSalPrinter"), there is still the experimental
option left, depending on ENABLE_GTK3.
We can't drop the whole PrinterCapType::ExternalDialog, because
the osx code actually uses it.
Change-Id: Ibc4654d8c1ce1de7ee1c9dc7700bb8775af2f678
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116408
Tested-by: Jenkins
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index a4cf97811e75..fd79d34926f1 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -18,7 +18,6 @@
*/
#include <config_features.h>
-#include <config_vclplug.h>
#include <svl/zforlist.hxx>
#include <svl/currencytable.hxx>
#include <svtools/langhelp.hxx>
@@ -155,7 +154,6 @@ OfaMiscTabPage::OfaMiscTabPage(weld::Container* pPage,
weld::DialogController* p
, m_xPopUpNoHelpCB(m_xBuilder->weld_check_button("popupnohelp"))
, m_xShowTipOfTheDay(m_xBuilder->weld_check_button("cbShowTipOfTheDay"))
, m_xFileDlgFrame(m_xBuilder->weld_widget("filedlgframe"))
- , m_xPrintDlgFrame(m_xBuilder->weld_widget("printdlgframe"))
, m_xFileDlgROImage(m_xBuilder->weld_widget("lockimage"))
, m_xFileDlgCB(m_xBuilder->weld_check_button("filedlg"))
, m_xPrintDlgCB(m_xBuilder->weld_check_button("printdlg"))
@@ -185,15 +183,6 @@ OfaMiscTabPage::OfaMiscTabPage(weld::Container* pPage,
weld::DialogController* p
m_xFileDlgCB->set_sensitive(false);
}
-#if !ENABLE_GTK3
- m_xPrintDlgFrame->hide();
-#else
- if (!officecfg::Office::Common::Misc::ExperimentalMode::get())
- {
- m_xPrintDlgFrame->hide();
- }
-#endif
-
m_xQuickLaunchCB->show();
//Only available in Win or if building the gtk systray
@@ -248,15 +237,6 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
bModified = true;
}
- if ( m_xPrintDlgCB->get_state_changed_from_saved() )
- {
- std::shared_ptr< comphelper::ConfigurationChanges > xChanges(
- comphelper::ConfigurationChanges::create());
- officecfg::Office::Common::Misc::UseSystemPrintDialog::set(
!m_xPrintDlgCB->get_active(), xChanges );
- xChanges->commit();
- bModified = true;
- }
-
if (m_xDocStatusCB->get_state_changed_from_saved())
{
officecfg::Office::Common::Print::PrintingModifiesDocument::set(m_xDocStatusCB->get_active(),
batch);
@@ -316,8 +296,6 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet )
m_xShowTipOfTheDay->save_state();
m_xFileDlgCB->set_active(
!officecfg::Office::Common::Misc::UseSystemFileDialog::get() );
m_xFileDlgCB->save_state();
- m_xPrintDlgCB->set_active(
!officecfg::Office::Common::Misc::UseSystemPrintDialog::get() );
- m_xPrintDlgCB->save_state();
m_xDocStatusCB->set_active(officecfg::Office::Common::Print::PrintingModifiesDocument::get());
m_xDocStatusCB->save_state();
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 183ef409e2ca..1bd92980b1d5 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -37,7 +37,6 @@ private:
std::unique_ptr<weld::CheckButton> m_xPopUpNoHelpCB;
std::unique_ptr<weld::CheckButton> m_xShowTipOfTheDay;
std::unique_ptr<weld::Widget> m_xFileDlgFrame;
- std::unique_ptr<weld::Widget> m_xPrintDlgFrame;
std::unique_ptr<weld::Widget> m_xFileDlgROImage;
std::unique_ptr<weld::CheckButton> m_xFileDlgCB;
std::unique_ptr<weld::CheckButton> m_xPrintDlgCB;
diff --git a/cui/uiconfig/ui/optgeneralpage.ui
b/cui/uiconfig/ui/optgeneralpage.ui
index 5f502977f26e..6d9512d72cab 100644
--- a/cui/uiconfig/ui/optgeneralpage.ui
+++ b/cui/uiconfig/ui/optgeneralpage.ui
@@ -152,40 +152,6 @@
<property name="top_attach">1</property>
</packing>
</child>
- <child>
- <object class="GtkFrame" id="printdlgframe">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkCheckButton" id="printdlg">
- <property name="label" translatable="yes"
context="optgeneralpage|printdlg">Use %PRODUCTNAME _dialogs</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="draw_indicator">True</property>
- <property name="margin-start">12</property>
- <property name="margin-top">6</property>
- </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"
context="optgeneralpage|label3">Print Dialogs</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
<child>
<object class="GtkFrame" id="frame4">
<property name="visible">True</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
