sw/source/ui/config/optpage.cxx | 65 ++++
sw/source/uibase/inc/optpage.hxx | 14 +
sw/uiconfig/swriter/ui/printoptionspage.ui | 389 +++++++++++++++++++++--------
3 files changed, 369 insertions(+), 99 deletions(-)
New commits:
commit d93d11529e7922fe391edcc839af8a3b4044b809
Author: Balazs Varga <balazs.varga.ext...@allotropia.de>
AuthorDate: Mon Nov 13 18:01:45 2023 +0100
Commit: Balazs Varga <balazs.varga.ext...@allotropia.de>
CommitDate: Tue Nov 14 08:22:10 2023 +0100
tdf#158130 - UI: Part 26 - Unify lockdown behavior of Options dialog
for Writer - Print Page.
Change-Id: Id6bc4da75cba3daf83a9709233eaafea372bb600
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159392
Tested-by: Jenkins
Reviewed-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 1abc9d46d334..8506d8773d55 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -399,25 +399,39 @@ SwAddPrinterTabPage::SwAddPrinterTabPage(weld::Container*
pPage, weld::DialogCon
, m_bAttrModified(false)
, m_bPreview(false)
, m_xGrfCB(m_xBuilder->weld_check_button("graphics"))
+ , m_xGrfImg(m_xBuilder->weld_widget("lockgraphics"))
, m_xCtrlFieldCB(m_xBuilder->weld_check_button("formcontrols"))
+ , m_xCtrlFieldImg(m_xBuilder->weld_widget("lockformcontrols"))
, m_xBackgroundCB(m_xBuilder->weld_check_button("background"))
+ , m_xBackgroundImg(m_xBuilder->weld_widget("lockbackground"))
, m_xBlackFontCB(m_xBuilder->weld_check_button("inblack"))
+ , m_xBlackFontImg(m_xBuilder->weld_widget("lockinblack"))
, m_xPrintHiddenTextCB(m_xBuilder->weld_check_button("hiddentext"))
+ , m_xPrintHiddenTextImg(m_xBuilder->weld_widget("lockhiddentext"))
,
m_xPrintTextPlaceholderCB(m_xBuilder->weld_check_button("textplaceholder"))
+ ,
m_xPrintTextPlaceholderImg(m_xBuilder->weld_widget("locktextplaceholder"))
, m_xPagesFrame(m_xBuilder->weld_widget("pagesframe"))
, m_xLeftPageCB(m_xBuilder->weld_check_button("leftpages"))
+ , m_xLeftPageImg(m_xBuilder->weld_widget("lockleftpages"))
, m_xRightPageCB(m_xBuilder->weld_check_button("rightpages"))
+ , m_xRightPageImg(m_xBuilder->weld_widget("lockrightpages"))
, m_xProspectCB(m_xBuilder->weld_check_button("brochure"))
+ , m_xProspectImg(m_xBuilder->weld_widget("lockbrochure"))
, m_xProspectCB_RTL(m_xBuilder->weld_check_button("rtl"))
+ , m_xProspectImg_RTL(m_xBuilder->weld_widget("lockrtl"))
, m_xCommentsFrame(m_xBuilder->weld_widget("commentsframe"))
, m_xNoRB(m_xBuilder->weld_radio_button("none"))
, m_xOnlyRB(m_xBuilder->weld_radio_button("only"))
, m_xEndRB(m_xBuilder->weld_radio_button("end"))
, m_xEndPageRB(m_xBuilder->weld_radio_button("endpage"))
, m_xInMarginsRB(m_xBuilder->weld_radio_button("inmargins"))
+ , m_xMarginsImg(m_xBuilder->weld_widget("lockcomments"))
, m_xPrintEmptyPagesCB(m_xBuilder->weld_check_button("blankpages"))
+ , m_xPrintEmptyPagesImg(m_xBuilder->weld_widget("lockblankpages"))
, m_xPaperFromSetupCB(m_xBuilder->weld_check_button("papertray"))
+ , m_xPaperFromSetupImg(m_xBuilder->weld_widget("lockpapertray"))
, m_xFaxLB(m_xBuilder->weld_combo_box("fax"))
+ , m_xFaxImg(m_xBuilder->weld_widget("lockfax"))
{
Link<weld::Toggleable&,void> aLk = LINK( this, SwAddPrinterTabPage,
AutoClickHdl);
m_xGrfCB->connect_toggled( aLk );
@@ -550,32 +564,79 @@ void SwAddPrinterTabPage::Reset( const SfxItemSet* )
if( const SwAddPrinterItem* pAddPrinterAttr = rSet.GetItemIfSet(
FN_PARAM_ADDPRINTER , false ) )
{
m_xGrfCB->set_active(pAddPrinterAttr->m_bPrintGraphic ||
pAddPrinterAttr->m_bPrintDraw);
+
m_xGrfCB->set_sensitive(!officecfg::Office::Writer::Print::Content::Graphic::isReadOnly());
+
m_xGrfImg->set_visible(officecfg::Office::Writer::Print::Content::Graphic::isReadOnly());
+
m_xCtrlFieldCB->set_active( pAddPrinterAttr->m_bPrintControl);
+
m_xCtrlFieldCB->set_sensitive(!officecfg::Office::Writer::Print::Content::Control::isReadOnly());
+
m_xCtrlFieldImg->set_visible(officecfg::Office::Writer::Print::Content::Control::isReadOnly());
+
m_xBackgroundCB->set_active(
pAddPrinterAttr->m_bPrintPageBackground);
+
m_xBackgroundCB->set_sensitive(!officecfg::Office::Writer::Print::Content::Background::isReadOnly());
+
m_xBackgroundImg->set_visible(officecfg::Office::Writer::Print::Content::Background::isReadOnly());
+
m_xBlackFontCB->set_active( pAddPrinterAttr->m_bPrintBlackFont);
+
m_xBlackFontCB->set_sensitive(!officecfg::Office::Writer::Print::Content::PrintBlack::isReadOnly());
+
m_xBlackFontImg->set_visible(officecfg::Office::Writer::Print::Content::PrintBlack::isReadOnly());
+
m_xPrintHiddenTextCB->set_active( pAddPrinterAttr->m_bPrintHiddenText);
+
m_xPrintHiddenTextCB->set_sensitive(!officecfg::Office::Writer::Print::Content::PrintHiddenText::isReadOnly());
+
m_xPrintHiddenTextImg->set_visible(officecfg::Office::Writer::Print::Content::PrintHiddenText::isReadOnly());
+
m_xPrintTextPlaceholderCB->set_active(pAddPrinterAttr->m_bPrintTextPlaceholder);
+
m_xPrintTextPlaceholderCB->set_sensitive(!officecfg::Office::Writer::Print::Content::PrintPlaceholders::isReadOnly());
+
m_xPrintTextPlaceholderImg->set_visible(officecfg::Office::Writer::Print::Content::PrintPlaceholders::isReadOnly());
+
m_xLeftPageCB->set_active( pAddPrinterAttr->m_bPrintLeftPages);
+
m_xLeftPageCB->set_sensitive(!officecfg::Office::Writer::Print::Page::LeftPage::isReadOnly());
+
m_xLeftPageImg->set_visible(officecfg::Office::Writer::Print::Page::LeftPage::isReadOnly());
+
m_xRightPageCB->set_active( pAddPrinterAttr->m_bPrintRightPages);
+
m_xRightPageCB->set_sensitive(!officecfg::Office::Writer::Print::Page::RightPage::isReadOnly());
+
m_xRightPageImg->set_visible(officecfg::Office::Writer::Print::Page::RightPage::isReadOnly());
+
m_xPaperFromSetupCB->set_active(pAddPrinterAttr->m_bPaperFromSetup);
+
m_xPaperFromSetupCB->set_sensitive(!officecfg::Office::Writer::Print::Papertray::FromPrinterSetup::isReadOnly());
+
m_xPaperFromSetupImg->set_visible(officecfg::Office::Writer::Print::Papertray::FromPrinterSetup::isReadOnly());
+
m_xPrintEmptyPagesCB->set_active(pAddPrinterAttr->m_bPrintEmptyPages);
+
m_xPrintEmptyPagesCB->set_sensitive(!officecfg::Office::Writer::Print::EmptyPages::isReadOnly());
+
m_xPrintEmptyPagesImg->set_visible(officecfg::Office::Writer::Print::EmptyPages::isReadOnly());
+
m_xProspectCB->set_active( pAddPrinterAttr->m_bPrintProspect);
+
m_xProspectCB->set_sensitive(!officecfg::Office::Writer::Print::Page::Brochure::isReadOnly());
+
m_xProspectImg->set_visible(officecfg::Office::Writer::Print::Page::Brochure::isReadOnly());
+
m_xProspectCB_RTL->set_active(
pAddPrinterAttr->m_bPrintProspectRTL);
+
m_xProspectCB_RTL->set_sensitive(!officecfg::Office::Writer::Print::Page::BrochureRightToLeft::isReadOnly());
+
m_xProspectImg_RTL->set_visible(officecfg::Office::Writer::Print::Page::BrochureRightToLeft::isReadOnly());
m_xNoRB->set_active(pAddPrinterAttr->m_nPrintPostIts==
SwPostItMode::NONE ) ;
m_xOnlyRB->set_active(pAddPrinterAttr->m_nPrintPostIts==
SwPostItMode::Only ) ;
m_xEndRB->set_active(pAddPrinterAttr->m_nPrintPostIts==
SwPostItMode::EndDoc ) ;
m_xEndPageRB->set_active(pAddPrinterAttr->m_nPrintPostIts==
SwPostItMode::EndPage ) ;
m_xInMarginsRB->set_active(pAddPrinterAttr->m_nPrintPostIts==
SwPostItMode::InMargins ) ;
+
+ bool bNotesReadOnly =
officecfg::Office::Writer::Print::Content::Note::isReadOnly();
+ m_xNoRB->set_sensitive(!bNotesReadOnly);
+ m_xOnlyRB->set_sensitive(!bNotesReadOnly);
+ m_xEndRB->set_sensitive(!bNotesReadOnly);
+ m_xEndPageRB->set_sensitive(!bNotesReadOnly);
+ m_xInMarginsRB->set_sensitive(!bNotesReadOnly);
+ m_xMarginsImg->set_visible(bNotesReadOnly);
+
auto nFound = m_xFaxLB->find_text(pAddPrinterAttr->m_sFaxName);
if (nFound != -1)
m_xFaxLB->set_active(nFound);
else if (m_xFaxLB->get_count())
m_xFaxLB->set_active(0);
+
+
m_xFaxLB->set_sensitive(!officecfg::Office::Writer::Print::Output::Fax::isReadOnly());
+
m_xFaxImg->set_visible(officecfg::Office::Writer::Print::Output::Fax::isReadOnly());
}
if (m_xProspectCB->get_active())
{
- m_xProspectCB_RTL->set_sensitive(true);
+
m_xProspectCB_RTL->set_sensitive(!officecfg::Office::Writer::Print::Page::BrochureRightToLeft::isReadOnly());
m_xNoRB->set_sensitive( false );
m_xOnlyRB->set_sensitive( false );
m_xEndRB->set_sensitive( false );
@@ -583,6 +644,8 @@ void SwAddPrinterTabPage::Reset( const SfxItemSet* )
}
else
m_xProspectCB_RTL->set_sensitive( false );
+
+
m_xProspectImg_RTL->set_visible(officecfg::Office::Writer::Print::Page::BrochureRightToLeft::isReadOnly());
}
IMPL_LINK_NOARG(SwAddPrinterTabPage, AutoClickHdl, weld::Toggleable&, void)
diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx
index 6e3a7cbb797b..74b5e34697bc 100644
--- a/sw/source/uibase/inc/optpage.hxx
+++ b/sw/source/uibase/inc/optpage.hxx
@@ -98,17 +98,27 @@ class SwAddPrinterTabPage final : public SfxTabPage
bool m_bPreview;
std::unique_ptr<weld::CheckButton> m_xGrfCB;
+ std::unique_ptr<weld::Widget> m_xGrfImg;
std::unique_ptr<weld::CheckButton> m_xCtrlFieldCB;
+ std::unique_ptr<weld::Widget> m_xCtrlFieldImg;
std::unique_ptr<weld::CheckButton> m_xBackgroundCB;
+ std::unique_ptr<weld::Widget> m_xBackgroundImg;
std::unique_ptr<weld::CheckButton> m_xBlackFontCB;
+ std::unique_ptr<weld::Widget> m_xBlackFontImg;
std::unique_ptr<weld::CheckButton> m_xPrintHiddenTextCB;
+ std::unique_ptr<weld::Widget> m_xPrintHiddenTextImg;
std::unique_ptr<weld::CheckButton> m_xPrintTextPlaceholderCB;
+ std::unique_ptr<weld::Widget> m_xPrintTextPlaceholderImg;
std::unique_ptr<weld::Widget> m_xPagesFrame;
std::unique_ptr<weld::CheckButton> m_xLeftPageCB;
+ std::unique_ptr<weld::Widget> m_xLeftPageImg;
std::unique_ptr<weld::CheckButton> m_xRightPageCB;
+ std::unique_ptr<weld::Widget> m_xRightPageImg;
std::unique_ptr<weld::CheckButton> m_xProspectCB;
+ std::unique_ptr<weld::Widget> m_xProspectImg;
std::unique_ptr<weld::CheckButton> m_xProspectCB_RTL;
+ std::unique_ptr<weld::Widget> m_xProspectImg_RTL;
std::unique_ptr<weld::Widget> m_xCommentsFrame;
std::unique_ptr<weld::RadioButton> m_xNoRB;
@@ -116,10 +126,14 @@ class SwAddPrinterTabPage final : public SfxTabPage
std::unique_ptr<weld::RadioButton> m_xEndRB;
std::unique_ptr<weld::RadioButton> m_xEndPageRB;
std::unique_ptr<weld::RadioButton> m_xInMarginsRB;
+ std::unique_ptr<weld::Widget> m_xMarginsImg;
std::unique_ptr<weld::CheckButton> m_xPrintEmptyPagesCB;
+ std::unique_ptr<weld::Widget> m_xPrintEmptyPagesImg;
std::unique_ptr<weld::CheckButton> m_xPaperFromSetupCB;
+ std::unique_ptr<weld::Widget> m_xPaperFromSetupImg;
std::unique_ptr<weld::ComboBox> m_xFaxLB;
+ std::unique_ptr<weld::Widget> m_xFaxImg;
DECL_LINK(AutoClickHdl, weld::Toggleable&, void);
DECL_LINK(SelectHdl, weld::ComboBox&, void);
diff --git a/sw/uiconfig/swriter/ui/printoptionspage.ui
b/sw/uiconfig/swriter/ui/printoptionspage.ui
index 82ea06cc3ef1..dd10a102e5d4 100644
--- a/sw/uiconfig/swriter/ui/printoptionspage.ui
+++ b/sw/uiconfig/swriter/ui/printoptionspage.ui
@@ -22,7 +22,7 @@
<property name="label-xalign">0</property>
<property name="shadow-type">none</property>
<child>
- <!-- n-columns=1 n-rows=6 -->
+ <!-- n-columns=2 n-rows=6 -->
<object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can-focus">False</property>
@@ -44,7 +44,7 @@
</child>
</object>
<packing>
- <property name="left-attach">0</property>
+ <property name="left-attach">1</property>
<property name="top-attach">0</property>
</packing>
</child>
@@ -63,7 +63,7 @@
</child>
</object>
<packing>
- <property name="left-attach">0</property>
+ <property name="left-attach">1</property>
<property name="top-attach">1</property>
</packing>
</child>
@@ -82,7 +82,7 @@
</child>
</object>
<packing>
- <property name="left-attach">0</property>
+ <property name="left-attach">1</property>
<property name="top-attach">2</property>
</packing>
</child>
@@ -101,7 +101,7 @@
</child>
</object>
<packing>
- <property name="left-attach">0</property>
+ <property name="left-attach">1</property>
<property name="top-attach">3</property>
</packing>
</child>
@@ -120,7 +120,7 @@
</child>
</object>
<packing>
- <property name="left-attach">0</property>
+ <property name="left-attach">1</property>
<property name="top-attach">4</property>
</packing>
</child>
@@ -138,6 +138,84 @@
</object>
</child>
</object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="lockgraphics">
+ <property name="can-focus">False</property>
+ <property name="no-show-all">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="icon-name">res/lock.png</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="lockformcontrols">
+ <property name="can-focus">False</property>
+ <property name="no-show-all">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="icon-name">res/lock.png</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="lockbackground">
+ <property name="can-focus">False</property>
+ <property name="no-show-all">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="icon-name">res/lock.png</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="lockinblack">
+ <property name="can-focus">False</property>
+ <property name="no-show-all">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="icon-name">res/lock.png</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="lockhiddentext">
+ <property name="can-focus">False</property>
+ <property name="no-show-all">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="icon-name">res/lock.png</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="locktextplaceholder">
+ <property name="can-focus">False</property>
+ <property name="no-show-all">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="icon-name">res/lock.png</property>
+ </object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">5</property>
@@ -168,7 +246,7 @@
<property name="label-xalign">0</property>
<property name="shadow-type">none</property>
<child>
- <!-- n-columns=1 n-rows=4 -->
+ <!-- n-columns=2 n-rows=4 -->
<object class="GtkGrid" id="grid4">
<property name="visible">True</property>
<property name="can-focus">False</property>
@@ -190,7 +268,7 @@
</child>
</object>
<packing>
- <property name="left-attach">0</property>
+ <property name="left-attach">1</property>
<property name="top-attach">0</property>
</packing>
</child>
@@ -209,7 +287,7 @@
</child>
</object>
<packing>
- <property name="left-attach">0</property>
+ <property name="left-attach">1</property>
<property name="top-attach">1</property>
</packing>
</child>
@@ -228,7 +306,7 @@
</child>
</object>
<packing>
- <property name="left-attach">0</property>
+ <property name="left-attach">1</property>
<property name="top-attach">2</property>
</packing>
</child>
@@ -247,6 +325,58 @@
</object>
</child>
</object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="lockleftpages">
+ <property name="can-focus">False</property>
+ <property name="no-show-all">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="icon-name">res/lock.png</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="lockrightpages">
+ <property name="can-focus">False</property>
+ <property name="no-show-all">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="icon-name">res/lock.png</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="lockbrochure">
+ <property name="can-focus">False</property>
+ <property name="no-show-all">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="icon-name">res/lock.png</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="lockrtl">
+ <property name="can-focus">False</property>
+ <property name="no-show-all">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="icon-name">res/lock.png</property>
+ </object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">3</property>
@@ -277,111 +407,135 @@
<property name="label-xalign">0</property>
<property name="shadow-type">none</property>
<child>
- <!-- n-columns=1 n-rows=5 -->
- <object class="GtkGrid" id="grid5">
+ <!-- n-columns=2 n-rows=1 -->
+ <object class="GtkGrid">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="margin-start">12</property>
- <property name="margin-top">6</property>
- <property name="row-spacing">6</property>
<child>
- <object class="GtkRadioButton" id="none">
- <property name="label" translatable="yes"
context="printoptionspage|none">_None</property>
+ <!-- n-columns=1 n-rows=5 -->
+ <object class="GtkGrid" id="grid5">
<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="active">True</property>
- <property name="draw-indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="none-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="printoptionspage|extended_tip|none">Do not print
document comments.</property>
+ <property name="can-focus">False</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
+ <property name="row-spacing">6</property>
+ <child>
+ <object class="GtkRadioButton" id="none">
+ <property name="label" translatable="yes"
context="printoptionspage|none">_None</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="active">True</property>
+ <property name="draw-indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="none-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="printoptionspage|extended_tip|none">Do not print
document comments.</property>
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="only">
- <property name="label" translatable="yes"
context="printoptionspage|only">Comments _only</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="group">none</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="only-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="printoptionspage|extended_tip|only">Only print the
comments of your document.</property>
+ <child>
+ <object class="GtkRadioButton" id="only">
+ <property name="label" translatable="yes"
context="printoptionspage|only">Comments _only</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="group">none</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="only-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="printoptionspage|extended_tip|only">Only print the
comments of your document.</property>
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="end">
- <property name="label" translatable="yes"
context="printoptionspage|end">End of docu_ment</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="group">none</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="end-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="printoptionspage|extended_tip|end">Print comments
on a new page at end of the document.</property>
+ <child>
+ <object class="GtkRadioButton" id="end">
+ <property name="label" translatable="yes"
context="printoptionspage|end">End of docu_ment</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="group">none</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="end-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="printoptionspage|extended_tip|end">Print comments
on a new page at end of the document.</property>
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="endpage">
- <property name="label" translatable="yes"
context="printoptionspage|endpage">_End of page</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="group">none</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="endpage-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|endpage">Print comments on a new page
after the current page.</property>
+ <child>
+ <object class="GtkRadioButton" id="endpage">
+ <property name="label" translatable="yes"
context="printoptionspage|endpage">_End of page</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="group">none</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="endpage-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|endpage">Print comments on a new page
after the current page.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="inmargins">
+ <property name="label" translatable="yes"
context="printoptionspage|inmargins">In margins</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="group">none</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="inmargins-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="printoptionspage|extended_tip|inmargins">Include
the comments boxes on the margin of the page. The page contents is rendered to
fit both contents and the comments boxes.</property>
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">4</property>
+ </packing>
</child>
</object>
<packing>
- <property name="left-attach">0</property>
- <property name="top-attach">3</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="inmargins">
- <property name="label" translatable="yes"
context="printoptionspage|inmargins">In margins</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="group">none</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="inmargins-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="printoptionspage|extended_tip|inmargins">Include
the comments boxes on the margin of the page. The page contents is rendered to
fit both contents and the comments boxes.</property>
- </object>
- </child>
+ <object class="GtkImage" id="lockcomments">
+ <property name="can-focus">False</property>
+ <property name="no-show-all">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="icon-name">res/lock.png</property>
</object>
<packing>
<property name="left-attach">0</property>
- <property name="top-attach">4</property>
+ <property name="top-attach">0</property>
</packing>
</child>
</object>
@@ -419,7 +573,7 @@
<property name="label-xalign">0</property>
<property name="shadow-type">none</property>
<child>
- <!-- n-columns=1 n-rows=3 -->
+ <!-- n-columns=2 n-rows=3 -->
<object class="GtkGrid" id="grid6">
<property name="visible">True</property>
<property name="can-focus">False</property>
@@ -467,7 +621,7 @@
</child>
</object>
<packing>
- <property name="left-attach">0</property>
+ <property name="left-attach">1</property>
<property name="top-attach">2</property>
</packing>
</child>
@@ -486,7 +640,7 @@
</child>
</object>
<packing>
- <property name="left-attach">0</property>
+ <property name="left-attach">1</property>
<property name="top-attach">0</property>
</packing>
</child>
@@ -504,11 +658,50 @@
</object>
</child>
</object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="lockblankpages">
+ <property name="can-focus">False</property>
+ <property name="no-show-all">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="icon-name">res/lock.png</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="lockpapertray">
+ <property name="can-focus">False</property>
+ <property name="no-show-all">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="icon-name">res/lock.png</property>
+ </object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkImage" id="lockfax">
+ <property name="can-focus">False</property>
+ <property name="no-show-all">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="icon-name">res/lock.png</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
+ </packing>
+ </child>
</object>
</child>
<child type="label">
