filter/source/pdf/impdialog.cxx | 115 +++++++++++------------------
filter/source/pdf/impdialog.hxx | 30 +++----
filter/uiconfig/ui/pdfuserinterfacepage.ui | 3
3 files changed, 58 insertions(+), 90 deletions(-)
New commits:
commit 0dfcc4bbd41ca1886a87149d715f2c87c6800c0c
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jun 18 12:03:33 2018 +0100
weld ImpPDFTabViewerPage
Change-Id: I5eab308a89d9803c244699138cb601c49345ee3b
Reviewed-on: https://gerrit.libreoffice.org/56035
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 7474ba9a648f..018e02368c3e 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -1037,108 +1037,81 @@ IMPL_LINK_NOARG( ImpPDFTabOpnFtrPage, ToggleRbMagnHdl,
weld::ToggleButton&, void
mxNumZoom->set_sensitive(mxRbMagnZoom->get_active());
}
-
/// The Viewer preferences tab page
-ImpPDFTabViewerPage::ImpPDFTabViewerPage( vcl::Window* pParent,
- const SfxItemSet& rCoreSet )
-: SfxTabPage(pParent,
"PdfUserInterfacePage","filter/ui/pdfuserinterfacepage.ui", &rCoreSet)
- , mbIsPresentation(false)
-{
- get(m_pCbResWinInit,"resize");
- get(m_pCbCenterWindow,"center");
- get(m_pCbOpenFullScreen,"open");
- get(m_pCbDispDocTitle,"display");
- get(m_pCbHideViewerMenubar,"menubar");
- get(m_pCbHideViewerToolbar,"toolbar");
- get(m_pCbHideViewerWindowControls,"window");
- get(m_pCbTransitionEffects,"effects");
- get(m_pRbAllBookmarkLevels,"allbookmarks");
- get(m_pRbVisibleBookmarkLevels,"visiblebookmark");
- get(m_pNumBookmarkLevels,"visiblelevel");
-
- m_pRbAllBookmarkLevels->SetToggleHdl( LINK( this, ImpPDFTabViewerPage,
ToggleRbBookmarksHdl ) );
- m_pRbVisibleBookmarkLevels->SetToggleHdl( LINK( this, ImpPDFTabViewerPage,
ToggleRbBookmarksHdl ) );
+ImpPDFTabViewerPage::ImpPDFTabViewerPage(TabPageParent pParent, const
SfxItemSet& rCoreSet )
+ : SfxTabPage(pParent, "filter/ui/pdfuserinterfacepage.ui",
"PdfUserInterfacePage", &rCoreSet)
+ , mbIsPresentation(false)
+ , m_xCbResWinInit(m_xBuilder->weld_check_button("resize"))
+ , m_xCbCenterWindow(m_xBuilder->weld_check_button("center"))
+ , m_xCbOpenFullScreen(m_xBuilder->weld_check_button("open"))
+ , m_xCbDispDocTitle(m_xBuilder->weld_check_button("display"))
+ , m_xCbHideViewerMenubar(m_xBuilder->weld_check_button("menubar"))
+ , m_xCbHideViewerToolbar(m_xBuilder->weld_check_button("toolbar"))
+ , m_xCbHideViewerWindowControls(m_xBuilder->weld_check_button("window"))
+ , m_xCbTransitionEffects(m_xBuilder->weld_check_button("effects"))
+ , m_xRbAllBookmarkLevels(m_xBuilder->weld_radio_button("allbookmarks"))
+ ,
m_xRbVisibleBookmarkLevels(m_xBuilder->weld_radio_button("visiblebookmark"))
+ , m_xNumBookmarkLevels(m_xBuilder->weld_spin_button("visiblelevel"))
+{
+ m_xRbAllBookmarkLevels->connect_toggled(LINK(this, ImpPDFTabViewerPage,
ToggleRbBookmarksHdl));
+ m_xRbVisibleBookmarkLevels->connect_toggled(LINK(this,
ImpPDFTabViewerPage, ToggleRbBookmarksHdl));
}
-
ImpPDFTabViewerPage::~ImpPDFTabViewerPage()
{
- disposeOnce();
-}
-
-
-void ImpPDFTabViewerPage::dispose()
-{
- m_pCbResWinInit.clear();
- m_pCbCenterWindow.clear();
- m_pCbOpenFullScreen.clear();
- m_pCbDispDocTitle.clear();
- m_pCbHideViewerMenubar.clear();
- m_pCbHideViewerToolbar.clear();
- m_pCbHideViewerWindowControls.clear();
- m_pCbTransitionEffects.clear();
- m_pRbAllBookmarkLevels.clear();
- m_pRbVisibleBookmarkLevels.clear();
- m_pNumBookmarkLevels.clear();
- SfxTabPage::dispose();
}
-
-IMPL_LINK_NOARG( ImpPDFTabViewerPage, ToggleRbBookmarksHdl, RadioButton&, void
)
+IMPL_LINK_NOARG( ImpPDFTabViewerPage, ToggleRbBookmarksHdl,
weld::ToggleButton&, void )
{
- m_pNumBookmarkLevels->Enable( m_pRbVisibleBookmarkLevels->IsChecked() );
+
m_xNumBookmarkLevels->set_sensitive(m_xRbVisibleBookmarkLevels->get_active());
}
-
VclPtr<SfxTabPage> ImpPDFTabViewerPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet)
{
- return VclPtr<ImpPDFTabViewerPage>::Create( pParent.pParent, *rAttrSet );
+ return VclPtr<ImpPDFTabViewerPage>::Create(pParent, *rAttrSet);
}
-
void ImpPDFTabViewerPage::GetFilterConfigItem( ImpPDFTabDialog* paParent )
{
- paParent->mbHideViewerMenubar = m_pCbHideViewerMenubar->IsChecked();
- paParent->mbHideViewerToolbar = m_pCbHideViewerToolbar->IsChecked( );
- paParent->mbHideViewerWindowControls =
m_pCbHideViewerWindowControls->IsChecked();
- paParent->mbResizeWinToInit = m_pCbResWinInit->IsChecked();
- paParent->mbOpenInFullScreenMode = m_pCbOpenFullScreen->IsChecked();
- paParent->mbCenterWindow = m_pCbCenterWindow->IsChecked();
- paParent->mbDisplayPDFDocumentTitle = m_pCbDispDocTitle->IsChecked();
- paParent->mbUseTransitionEffects = m_pCbTransitionEffects->IsChecked();
- paParent->mnOpenBookmarkLevels = m_pRbAllBookmarkLevels->IsChecked() ?
- -1 :
static_cast<sal_Int32>(m_pNumBookmarkLevels->GetValue());
+ paParent->mbHideViewerMenubar = m_xCbHideViewerMenubar->get_active();
+ paParent->mbHideViewerToolbar = m_xCbHideViewerToolbar->get_active();
+ paParent->mbHideViewerWindowControls =
m_xCbHideViewerWindowControls->get_active();
+ paParent->mbResizeWinToInit = m_xCbResWinInit->get_active();
+ paParent->mbOpenInFullScreenMode = m_xCbOpenFullScreen->get_active();
+ paParent->mbCenterWindow = m_xCbCenterWindow->get_active();
+ paParent->mbDisplayPDFDocumentTitle = m_xCbDispDocTitle->get_active();
+ paParent->mbUseTransitionEffects = m_xCbTransitionEffects->get_active();
+ paParent->mnOpenBookmarkLevels = m_xRbAllBookmarkLevels->get_active() ?
+ -1 :
static_cast<sal_Int32>(m_xNumBookmarkLevels->get_value());
}
-
void ImpPDFTabViewerPage::SetFilterConfigItem( const ImpPDFTabDialog*
paParent )
{
- m_pCbHideViewerMenubar->Check( paParent->mbHideViewerMenubar );
- m_pCbHideViewerToolbar->Check( paParent->mbHideViewerToolbar );
- m_pCbHideViewerWindowControls->Check( paParent->mbHideViewerWindowControls
);
+ m_xCbHideViewerMenubar->set_active( paParent->mbHideViewerMenubar );
+ m_xCbHideViewerToolbar->set_active( paParent->mbHideViewerToolbar );
+ m_xCbHideViewerWindowControls->set_active(
paParent->mbHideViewerWindowControls );
- m_pCbResWinInit->Check( paParent->mbResizeWinToInit );
- m_pCbOpenFullScreen->Check( paParent->mbOpenInFullScreenMode );
- m_pCbCenterWindow->Check( paParent->mbCenterWindow );
- m_pCbDispDocTitle->Check( paParent->mbDisplayPDFDocumentTitle );
+ m_xCbResWinInit->set_active( paParent->mbResizeWinToInit );
+ m_xCbOpenFullScreen->set_active( paParent->mbOpenInFullScreenMode );
+ m_xCbCenterWindow->set_active( paParent->mbCenterWindow );
+ m_xCbDispDocTitle->set_active( paParent->mbDisplayPDFDocumentTitle );
mbIsPresentation = paParent->mbIsPresentation;
- m_pCbTransitionEffects->Check( paParent->mbUseTransitionEffects );
- m_pCbTransitionEffects->Enable( mbIsPresentation );
+ m_xCbTransitionEffects->set_active( paParent->mbUseTransitionEffects );
+ m_xCbTransitionEffects->set_sensitive( mbIsPresentation );
if( paParent->mnOpenBookmarkLevels < 0 )
{
- m_pRbAllBookmarkLevels->Check();
- m_pNumBookmarkLevels->Enable( false );
+ m_xRbAllBookmarkLevels->set_active(true);
+ m_xNumBookmarkLevels->set_sensitive( false );
}
else
{
- m_pRbVisibleBookmarkLevels->Check();
- m_pNumBookmarkLevels->Enable();
- m_pNumBookmarkLevels->SetValue( paParent->mnOpenBookmarkLevels );
+ m_xRbVisibleBookmarkLevels->set_active(true);
+ m_xNumBookmarkLevels->set_sensitive(true);
+ m_xNumBookmarkLevels->set_value(paParent->mnOpenBookmarkLevels);
}
}
-
/// The Security preferences tab page
ImpPDFTabSecurityPage::ImpPDFTabSecurityPage(TabPageParent i_pParent, const
SfxItemSet& i_rCoreSet)
: SfxTabPage(i_pParent, "filter/ui/pdfsecuritypage.ui", "PdfSecurityPage",
&i_rCoreSet)
diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx
index f4613f0757d3..ba23621b2a3e 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -293,30 +293,26 @@ public:
/// Class tab page viewer
class ImpPDFTabViewerPage : public SfxTabPage
{
- VclPtr<CheckBox> m_pCbResWinInit;
- VclPtr<CheckBox> m_pCbCenterWindow;
- VclPtr<CheckBox> m_pCbOpenFullScreen;
- VclPtr<CheckBox> m_pCbDispDocTitle;
-
-
- VclPtr<CheckBox> m_pCbHideViewerMenubar;
- VclPtr<CheckBox> m_pCbHideViewerToolbar;
- VclPtr<CheckBox> m_pCbHideViewerWindowControls;
-
- VclPtr<CheckBox> m_pCbTransitionEffects;
bool mbIsPresentation;
- VclPtr<RadioButton> m_pRbAllBookmarkLevels;
- VclPtr<RadioButton> m_pRbVisibleBookmarkLevels;
- VclPtr<NumericField> m_pNumBookmarkLevels;
+ std::unique_ptr<weld::CheckButton> m_xCbResWinInit;
+ std::unique_ptr<weld::CheckButton> m_xCbCenterWindow;
+ std::unique_ptr<weld::CheckButton> m_xCbOpenFullScreen;
+ std::unique_ptr<weld::CheckButton> m_xCbDispDocTitle;
+ std::unique_ptr<weld::CheckButton> m_xCbHideViewerMenubar;
+ std::unique_ptr<weld::CheckButton> m_xCbHideViewerToolbar;
+ std::unique_ptr<weld::CheckButton> m_xCbHideViewerWindowControls;
+ std::unique_ptr<weld::CheckButton> m_xCbTransitionEffects;
+ std::unique_ptr<weld::RadioButton> m_xRbAllBookmarkLevels;
+ std::unique_ptr<weld::RadioButton> m_xRbVisibleBookmarkLevels;
+ std::unique_ptr<weld::SpinButton>m_xNumBookmarkLevels;
- DECL_LINK( ToggleRbBookmarksHdl, RadioButton&, void );
+ DECL_LINK(ToggleRbBookmarksHdl, weld::ToggleButton&, void);
public:
- ImpPDFTabViewerPage( vcl::Window* pParent,
const SfxItemSet& rSet );
+ ImpPDFTabViewerPage(TabPageParent pParent, const SfxItemSet& rSet);
virtual ~ImpPDFTabViewerPage() override;
- virtual void dispose() override;
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const
SfxItemSet* rAttrSet );
void GetFilterConfigItem( ImpPDFTabDialog*
paParent);
diff --git a/filter/uiconfig/ui/pdfuserinterfacepage.ui
b/filter/uiconfig/ui/pdfuserinterfacepage.ui
index dd1b028e1536..b05c37e58ccd 100644
--- a/filter/uiconfig/ui/pdfuserinterfacepage.ui
+++ b/filter/uiconfig/ui/pdfuserinterfacepage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="flt">
<requires lib="gtk+" version="3.18"/>
<object class="GtkAdjustment" id="adjustment1">
@@ -287,7 +287,6 @@
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- <property name="group">visiblebookmark</property>
</object>
<packing>
<property name="left_attach">0</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
