mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

weld HeaderFooterDialog

Browse Source 
Change-Id: I6a5068106d0f243646cf12ec676dff60a04922ee
Reviewed-on: https://gerrit.libreoffice.org/73596
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2019-06-05 20:19:11 +01:00
parent 36ed48a4f7
commit 3880bf655f
10 changed files with 283 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
extras/source/glade/libreoffice-catalog.xml.in
View File

@@ -188,9 +188,6 @@
<glade-widget-class title="NUP Preview" name="vcllo-ShowNupOrderWindow" <glade-widget-class title="NUP Preview" name="vcllo-ShowNupOrderWindow"
generic-name="NUP Preview" parent="GtkDrawingArea" generic-name="NUP Preview" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/> icon-name="widget-gtk-drawingarea"/>
<glade-widget-class title="Presentation Preview" name="sduilo-PresLayoutPreview"
generic-name="Presentation Preview" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
<glade-widget-class title="Address Preview" name="swlo-SwAddressPreview" <glade-widget-class title="Address Preview" name="swlo-SwAddressPreview"
generic-name="Address Preview" parent="GtkDrawingArea" generic-name="Address Preview" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/> icon-name="widget-gtk-drawingarea"/>

6
sd/inc/sdabstdlg.hxx
View File

@@ -196,10 +196,10 @@ public:
virtual VclPtr<VclAbstractDialog> CreateMasterLayoutDialog(weld::Window* pParent, SdDrawDocument* pDoc, SdPage*) = 0; virtual VclPtr<VclAbstractDialog> CreateMasterLayoutDialog(weld::Window* pParent, SdDrawDocument* pDoc, SdPage*) = 0;
virtual VclPtr<AbstractHeaderFooterDialog> CreateHeaderFooterDialog( sd::ViewShell* pViewShell, virtual VclPtr<AbstractHeaderFooterDialog> CreateHeaderFooterDialog(sd::ViewShell* pViewShell,
vcl::Window* pParent, weld::Window* pParent,
SdDrawDocument* pDoc, SdDrawDocument* pDoc,
SdPage* pCurrentPage ) = 0; SdPage* pCurrentPage) = 0;
virtual CreateTabPage GetSdOptionsContentsTabPageCreatorFunc() = 0; virtual CreateTabPage GetSdOptionsContentsTabPageCreatorFunc() = 0;
virtual CreateTabPage GetSdPrintOptionsTabPageCreatorFunc() = 0; virtual CreateTabPage GetSdPrintOptionsTabPageCreatorFunc() = 0;

5
sd/qa/unit/dialogs-test.cxx
View File

@@ -578,7 +578,7 @@ VclPtr<VclAbstractDialog> SdDialogsTest::createDialogByID(sal_uInt32 nID)
} }
case 22: case 22:
{ {
// CreateHeaderFooterDialog(sd::ViewShell* pViewShell, vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage) override; // CreateHeaderFooterDialog(sd::ViewShell* pViewShell, weld::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage) override;
// This is a hard case, for two reasons: // This is a hard case, for two reasons:
// - It uses BaseClass TabPage which has a very sparse interface, // - It uses BaseClass TabPage which has a very sparse interface,
// need to add 'Screenshot interface' there and implement // need to add 'Screenshot interface' there and implement
@@ -589,9 +589,10 @@ VclPtr<VclAbstractDialog> SdDialogsTest::createDialogByID(sal_uInt32 nID)
CPPUNIT_ASSERT(pDrawDoc); CPPUNIT_ASSERT(pDrawDoc);
SdPage* pSdPage = pDrawDoc->GetSdPage(0, PageKind::Standard); SdPage* pSdPage = pDrawDoc->GetSdPage(0, PageKind::Standard);
CPPUNIT_ASSERT(pSdPage); CPPUNIT_ASSERT(pSdPage);
auto const parent = Application::GetDefDialogParent();
pRetval = getSdAbstractDialogFactory()->CreateHeaderFooterDialog( pRetval = getSdAbstractDialogFactory()->CreateHeaderFooterDialog(
getViewShell(), getViewShell(),
Application::GetDefDialogParent(), parent == nullptr ? nullptr : parent->GetFrameWeld(),
pDrawDoc, pDrawDoc,
pSdPage); pSdPage);
break; break;

420
sd/source/ui/dlg/headerfooterdlg.cxx
View File

@@ -44,6 +44,7 @@
#include <tools/color.hxx> #include <tools/color.hxx>
#include <i18nlangtag/mslangid.hxx> #include <i18nlangtag/mslangid.hxx>
#include <svtools/colorcfg.hxx> #include <svtools/colorcfg.hxx>
#include <vcl/customweld.hxx>
#include <vcl/decoview.hxx> #include <vcl/decoview.hxx>
#include <vcl/builderfactory.hxx> #include <vcl/builderfactory.hxx>
@@ -57,7 +58,7 @@
namespace sd namespace sd
{ {
class PresLayoutPreview : public Control class PresLayoutPreview : public weld::CustomWidgetController
{ {
private: private:
SdPage* mpMaster; SdPage* mpMaster;
@@ -69,10 +70,11 @@ private:
void Paint(vcl::RenderContext& rRenderContext, SdrTextObj const * pObj, bool bVisible, bool bDotted = false); void Paint(vcl::RenderContext& rRenderContext, SdrTextObj const * pObj, bool bVisible, bool bDotted = false);
public: public:
explicit PresLayoutPreview(vcl::Window* pParent); explicit PresLayoutPreview();
virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
virtual void Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect) override; virtual void Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect) override;
virtual Size GetOptimalSize() const override;
void init(SdPage* pMaster); void init(SdPage* pMaster);
void update(HeaderFooterSettings const & rSettings); void update(HeaderFooterSettings const & rSettings);
@@ -109,50 +111,46 @@ DateAndTimeFormat const nDateTimeFormats[nDateTimeFormatsCount] =
{ SvxDateFormat::AppDefault, SvxTimeFormat::HH12_MM_SS }, { SvxDateFormat::AppDefault, SvxTimeFormat::HH12_MM_SS },
}; };
class HeaderFooterTabPage : public TabPage class HeaderFooterTabPage
{ {
private: private:
VclPtr<FixedText> mpFTIncludeOn;
VclPtr<CheckBox> mpCBHeader;
VclPtr<VclContainer> mpHeaderBox;
VclPtr<Edit> mpTBHeader;
VclPtr<CheckBox> mpCBDateTime;
VclPtr<RadioButton> mpRBDateTimeFixed;
VclPtr<RadioButton> mpRBDateTimeAutomatic;
VclPtr<Edit> mpTBDateTimeFixed;
VclPtr<ListBox> mpCBDateTimeFormat;
VclPtr<FixedText> mpFTDateTimeLanguage;
VclPtr<SvxLanguageBox> mpCBDateTimeLanguage;
VclPtr<CheckBox> mpCBFooter;
VclPtr<VclContainer> mpFooterBox;
VclPtr<Edit> mpTBFooter;
VclPtr<CheckBox> mpCBSlideNumber;
VclPtr<CheckBox> mpCBNotOnTitle;
VclPtr<PresLayoutPreview> mpCTPreview;
SdDrawDocument* mpDoc; SdDrawDocument* mpDoc;
LanguageType meOldLanguage; LanguageType meOldLanguage;
bool const mbHandoutMode; bool const mbHandoutMode;
DECL_LINK( UpdateOnClickHdl, Button*, void ); std::unique_ptr<weld::Builder> mxBuilder;
DECL_LINK( LanguageChangeHdl, ListBox&, void ); std::unique_ptr<weld::Container> mxContainer;
std::unique_ptr<weld::Label> mxFTIncludeOn;
std::unique_ptr<weld::CheckButton> mxCBHeader;
std::unique_ptr<weld::Widget> mxHeaderBox;
std::unique_ptr<weld::Entry> mxTBHeader;
std::unique_ptr<weld::CheckButton> mxCBDateTime;
std::unique_ptr<weld::RadioButton> mxRBDateTimeFixed;
std::unique_ptr<weld::RadioButton> mxRBDateTimeAutomatic;
std::unique_ptr<weld::Entry> mxTBDateTimeFixed;
std::unique_ptr<weld::ComboBox> mxCBDateTimeFormat;
std::unique_ptr<weld::Label> mxFTDateTimeLanguage;
std::unique_ptr<LanguageBox> mxCBDateTimeLanguage;
std::unique_ptr<weld::CheckButton> mxCBFooter;
std::unique_ptr<weld::Widget> mxFooterBox;
std::unique_ptr<weld::Entry> mxTBFooter;
std::unique_ptr<weld::CheckButton> mxCBSlideNumber;
std::unique_ptr<weld::CheckButton> mxCBNotOnTitle;
std::unique_ptr<weld::Label> mxReplacementA;
std::unique_ptr<weld::Label> mxReplacementB;
std::unique_ptr<PresLayoutPreview> mxCTPreview;
std::unique_ptr<weld::CustomWeld> mxCTPreviewWin;
DECL_LINK( UpdateOnClickHdl, weld::Button&, void );
DECL_LINK( LanguageChangeHdl, weld::ComboBox&, void );
void FillFormatList(sal_Int32 nSelectedPos); void FillFormatList(sal_Int32 nSelectedPos);
void GetOrSetDateTimeLanguage( LanguageType &rLanguage, bool bSet ); void GetOrSetDateTimeLanguage( LanguageType &rLanguage, bool bSet );
void GetOrSetDateTimeLanguage( LanguageType &rLanguage, bool bSet, SdPage* pPage ); void GetOrSetDateTimeLanguage( LanguageType &rLanguage, bool bSet, SdPage* pPage );
public: public:
HeaderFooterTabPage( vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pActualPage, bool bHandoutMode ); HeaderFooterTabPage(weld::Container* pParent, SdDrawDocument* pDoc, SdPage* pActualPage, bool bHandoutMode );
virtual ~HeaderFooterTabPage() override;
virtual void dispose() override;
void init( const HeaderFooterSettings& rSettings, bool bNotOnTitle ); void init( const HeaderFooterSettings& rSettings, bool bNotOnTitle );
void getData( HeaderFooterSettings& rSettings, bool& rNotOnTitle ); void getData( HeaderFooterSettings& rSettings, bool& rNotOnTitle );
@@ -163,14 +161,16 @@ public:
using namespace ::sd; using namespace ::sd;
HeaderFooterDialog::HeaderFooterDialog( ViewShell* pViewShell, vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) : HeaderFooterDialog::HeaderFooterDialog(ViewShell* pViewShell, weld::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage)
TabDialog ( pParent, "HeaderFooterDialog", "modules/simpress/ui/headerfooterdialog.ui" ), : GenericDialogController(pParent, "modules/simpress/ui/headerfooterdialog.ui", "HeaderFooterDialog")
mpDoc( pDoc ), , mpDoc( pDoc )
mpCurrentPage( pCurrentPage ), , mpCurrentPage( pCurrentPage )
mpViewShell( pViewShell ) , mpViewShell( pViewShell )
, mxTabCtrl(m_xBuilder->weld_notebook("tabs"))
, mxPBApplyToAll(m_xBuilder->weld_button("apply_all"))
, mxPBApply(m_xBuilder->weld_button("apply"))
, mxPBCancel(m_xBuilder->weld_button("cancel"))
{ {
get(mpTabCtrl, "tabs" );
SdPage* pSlide; SdPage* pSlide;
SdPage* pNotes; SdPage* pNotes;
if( pCurrentPage->GetPageKind() == PageKind::Standard ) if( pCurrentPage->GetPageKind() == PageKind::Standard )
@@ -192,115 +192,82 @@ HeaderFooterDialog::HeaderFooterDialog( ViewShell* pViewShell, vcl::Window* pPar
mpCurrentPage = nullptr; mpCurrentPage = nullptr;
} }
mxSlideTabPage.reset(new HeaderFooterTabPage(mxTabCtrl->get_page("slides"), pDoc, pSlide, false));
mxNotesHandoutsTabPage.reset(new HeaderFooterTabPage(mxTabCtrl->get_page("notes"), pDoc, pNotes, true));
pDoc->StopWorkStartupDelay(); pDoc->StopWorkStartupDelay();
mpTabCtrl->Show(); mxTabCtrl->show();
mnSlidesId = mpTabCtrl->GetPageId("slides"); ActivatePageHdl(mxTabCtrl->get_current_page_ident());
mpSlideTabPage = VclPtr<HeaderFooterTabPage>::Create( mpTabCtrl, pDoc, pSlide, false );
mpTabCtrl->SetTabPage( mnSlidesId, mpSlideTabPage );
Size aSiz = mpSlideTabPage->GetSizePixel(); mxTabCtrl->connect_enter_page( LINK( this, HeaderFooterDialog, ActivatePageHdl ) );
Size aCtrlSiz = mpTabCtrl->GetOutputSizePixel();
// set size on TabControl only if smaller than TabPage
if ( aCtrlSiz.Width() < aSiz.Width() || aCtrlSiz.Height() < aSiz.Height() )
{
mpTabCtrl->SetOutputSizePixel( aSiz );
aCtrlSiz = aSiz;
}
sal_uInt16 nNotesId = mpTabCtrl->GetPageId("notes"); mxPBApplyToAll->connect_clicked( LINK( this, HeaderFooterDialog, ClickApplyToAllHdl ) );
mpNotesHandoutsTabPage = VclPtr<HeaderFooterTabPage>::Create( mpTabCtrl, pDoc, pNotes, true ); mxPBApply->connect_clicked( LINK( this, HeaderFooterDialog, ClickApplyHdl ) );
mpTabCtrl->SetTabPage( nNotesId, mpNotesHandoutsTabPage ); mxPBCancel->connect_clicked( LINK( this, HeaderFooterDialog, ClickCancelHdl ) );
get(maPBApplyToAll, "apply_all" );
get(maPBApply, "apply" );
get(maPBCancel, "cancel" );
ActivatePageHdl( mpTabCtrl );
mpTabCtrl->SetActivatePageHdl( LINK( this, HeaderFooterDialog, ActivatePageHdl ) );
maPBApplyToAll->SetClickHdl( LINK( this, HeaderFooterDialog, ClickApplyToAllHdl ) );
maPBApply->SetClickHdl( LINK( this, HeaderFooterDialog, ClickApplyHdl ) );
maPBCancel->SetClickHdl( LINK( this, HeaderFooterDialog, ClickCancelHdl ) );
maSlideSettings = pSlide->getHeaderFooterSettings(); maSlideSettings = pSlide->getHeaderFooterSettings();
const HeaderFooterSettings& rTitleSettings = mpDoc->GetSdPage(0, PageKind::Standard)->getHeaderFooterSettings(); const HeaderFooterSettings& rTitleSettings = mpDoc->GetSdPage(0, PageKind::Standard)->getHeaderFooterSettings();
bool bNotOnTitle = !rTitleSettings.mbFooterVisible && !rTitleSettings.mbSlideNumberVisible && !rTitleSettings.mbDateTimeVisible; bool bNotOnTitle = !rTitleSettings.mbFooterVisible && !rTitleSettings.mbSlideNumberVisible && !rTitleSettings.mbDateTimeVisible;
mpSlideTabPage->init( maSlideSettings, bNotOnTitle ); mxSlideTabPage->init( maSlideSettings, bNotOnTitle );
maNotesHandoutSettings = pNotes->getHeaderFooterSettings(); maNotesHandoutSettings = pNotes->getHeaderFooterSettings();
mpNotesHandoutsTabPage->init( maNotesHandoutSettings, false ); mxNotesHandoutsTabPage->init( maNotesHandoutSettings, false );
} }
HeaderFooterDialog::~HeaderFooterDialog() HeaderFooterDialog::~HeaderFooterDialog()
{ {
disposeOnce();
} }
void HeaderFooterDialog::dispose() IMPL_LINK(HeaderFooterDialog, ActivatePageHdl, const OString&, rIdent, void)
{ {
mpSlideTabPage.disposeAndClear(); mxPBApply->set_visible(rIdent == "slides");
mpNotesHandoutsTabPage.disposeAndClear(); mxPBApply->set_sensitive(mpCurrentPage != nullptr);
mpTabCtrl.clear();
maPBApplyToAll.clear();
maPBApply.clear();
maPBCancel.clear();
TabDialog::dispose();
} }
IMPL_LINK( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) IMPL_LINK_NOARG(HeaderFooterDialog, ClickApplyToAllHdl, weld::Button&, void)
{
const sal_uInt16 nId = pTabCtrl->GetCurPageId();
TabPage* pTabPage = pTabCtrl->GetTabPage( nId );
pTabPage->Show();
maPBApply->Show( nId == mnSlidesId );
maPBApply->Enable( mpCurrentPage != nullptr );
}
IMPL_LINK_NOARG(HeaderFooterDialog, ClickApplyToAllHdl, Button*, void)
{ {
ApplyToAll(); ApplyToAll();
} }
IMPL_LINK_NOARG(HeaderFooterDialog, ClickApplyHdl, Button*, void) IMPL_LINK_NOARG(HeaderFooterDialog, ClickApplyHdl, weld::Button&, void)
{ {
Apply(); Apply();
} }
IMPL_LINK_NOARG(HeaderFooterDialog, ClickCancelHdl, Button*, void) IMPL_LINK_NOARG(HeaderFooterDialog, ClickCancelHdl, weld::Button&, void)
{ {
EndDialog(); m_xDialog->response(RET_CANCEL);
} }
short HeaderFooterDialog::Execute() short HeaderFooterDialog::run()
{ {
sal_uInt16 nRet = TabDialog::Execute(); short nRet = GenericDialogController::run();
if( nRet ) if (nRet)
mpViewShell->GetDocSh()->SetModified(); mpViewShell->GetDocSh()->SetModified();
return nRet; return nRet;
} }
void HeaderFooterDialog::ApplyToAll() void HeaderFooterDialog::ApplyToAll()
{ {
sal_uInt16 tabId = mpTabCtrl->GetCurPageId(); OString tabId = mxTabCtrl->get_current_page_ident();
apply( true, tabId == mnSlidesId ); apply(true, tabId == "slides");
EndDialog(1); m_xDialog->response(RET_OK);
} }
void HeaderFooterDialog::Apply() void HeaderFooterDialog::Apply()
{ {
sal_uInt16 tabId = mpTabCtrl->GetCurPageId(); OString tabId = mxTabCtrl->get_current_page_ident();
apply( false, tabId == mnSlidesId ); apply(false, tabId == "slides");
EndDialog(1); m_xDialog->response(RET_OK);
} }
void HeaderFooterDialog::apply( bool bToAll, bool bForceSlides ) void HeaderFooterDialog::apply( bool bToAll, bool bForceSlides )
{ {
std::unique_ptr<SdUndoGroup> pUndoGroup(new SdUndoGroup(mpDoc)); std::unique_ptr<SdUndoGroup> pUndoGroup(new SdUndoGroup(mpDoc));
OUString aComment( GetText() ); OUString aComment( m_xDialog->get_title() );
pUndoGroup->SetComment( aComment ); pUndoGroup->SetComment( aComment );
HeaderFooterSettings aNewSettings; HeaderFooterSettings aNewSettings;
@@ -308,7 +275,7 @@ void HeaderFooterDialog::apply( bool bToAll, bool bForceSlides )
// change slide settings first ... // change slide settings first ...
mpSlideTabPage->getData( aNewSettings, bNewNotOnTitle ); mxSlideTabPage->getData( aNewSettings, bNewNotOnTitle );
// only if we pressed apply or apply all on the slide tab page or if the slide settings // only if we pressed apply or apply all on the slide tab page or if the slide settings
// have been changed // have been changed
@@ -351,7 +318,7 @@ void HeaderFooterDialog::apply( bool bToAll, bool bForceSlides )
// now notes settings // now notes settings
mpNotesHandoutsTabPage->getData( aNewSettings, bNewNotOnTitle ); mxNotesHandoutsTabPage->getData( aNewSettings, bNewNotOnTitle );
// only if we pressed apply or apply all on the notes tab page or if the notes settings // only if we pressed apply or apply all on the notes tab page or if the notes settings
// have been changed // have been changed
@@ -381,172 +348,115 @@ void HeaderFooterDialog::change( SdUndoGroup* pUndoGroup, SdPage* pPage, const H
pPage->setHeaderFooterSettings( rNewSettings ); pPage->setHeaderFooterSettings( rNewSettings );
} }
namespace { HeaderFooterTabPage::HeaderFooterTabPage(weld::Container* pParent, SdDrawDocument* pDoc, SdPage* pActualPage, bool bHandoutMode)
: mpDoc(pDoc)
void recursive_rename_ui_element(vcl::Window& rWindow, const OUString& rPrefix) , mbHandoutMode(bHandoutMode)
, mxBuilder(Application::CreateBuilder(pParent, "modules/simpress/ui/headerfootertab.ui"))
, mxContainer(mxBuilder->weld_container("HeaderFooterTab"))
, mxFTIncludeOn(mxBuilder->weld_label("include_label"))
, mxCBHeader(mxBuilder->weld_check_button("header_cb" ))
, mxHeaderBox(mxBuilder->weld_widget("header_box"))
, mxTBHeader(mxBuilder->weld_entry("header_text"))
, mxCBDateTime(mxBuilder->weld_check_button("datetime_cb"))
, mxRBDateTimeFixed(mxBuilder->weld_radio_button("rb_fixed"))
, mxRBDateTimeAutomatic(mxBuilder->weld_radio_button("rb_auto"))
, mxTBDateTimeFixed(mxBuilder->weld_entry("datetime_value"))
, mxCBDateTimeFormat(mxBuilder->weld_combo_box("datetime_format_list"))
, mxFTDateTimeLanguage(mxBuilder->weld_label("language_label"))
, mxCBDateTimeLanguage(new LanguageBox(mxBuilder->weld_combo_box("language_list")))
, mxCBFooter(mxBuilder->weld_check_button("footer_cb"))
, mxFooterBox(mxBuilder->weld_widget("footer_box" ))
, mxTBFooter(mxBuilder->weld_entry("footer_text"))
, mxCBSlideNumber(mxBuilder->weld_check_button("slide_number"))
, mxCBNotOnTitle(mxBuilder->weld_check_button("not_on_title"))
, mxReplacementA(mxBuilder->weld_label("replacement_a"))
, mxReplacementB(mxBuilder->weld_label("replacement_b"))
, mxCTPreview(new PresLayoutPreview)
, mxCTPreviewWin(new weld::CustomWeld(*mxBuilder, "preview", *mxCTPreview))
{ {
OUString aID = rWindow.get_id(); mxCTPreview->init( pActualPage ?
if (aID.isEmpty())
{
rWindow.set_id(rPrefix + aID);
}
size_t nChildCount = rWindow.GetChildCount();
for (size_t i = 0; i < nChildCount; ++i)
{
vcl::Window* pChild = rWindow.GetChild(i);
if (pChild)
recursive_rename_ui_element(*pChild, rPrefix);
}
}
}
HeaderFooterTabPage::HeaderFooterTabPage( vcl::Window* pWindow, SdDrawDocument* pDoc, SdPage* pActualPage, bool bHandoutMode ) :
TabPage( pWindow, "HeaderFooterTab", "modules/simpress/ui/headerfootertab.ui" ),
mpDoc(pDoc),
mbHandoutMode( bHandoutMode )
{
get(mpFTIncludeOn, "include_label");
get(mpCBHeader, "header_cb" );
get(mpHeaderBox, "header_box" );
get(mpTBHeader, "header_text" );
get(mpCBDateTime, "datetime_cb" );
get(mpRBDateTimeFixed, "rb_fixed" );
get(mpRBDateTimeAutomatic, "rb_auto" );
get(mpTBDateTimeFixed, "datetime_value" );
get(mpCBDateTimeFormat, "datetime_format_list" );
get(mpFTDateTimeLanguage, "language_label" );
get(mpCBDateTimeLanguage, "language_list" );
get(mpCBFooter, "footer_cb" );
get(mpFooterBox, "footer_box" );
get(mpTBFooter, "footer_text" );
get(mpCBSlideNumber, "slide_number" );
get(mpCBNotOnTitle, "not_on_title" );
get(mpCTPreview, "preview");
mpCTPreview->init( pActualPage ?
(pActualPage->IsMasterPage() ? pActualPage : static_cast<SdPage*>(&(pActualPage->TRG_GetMasterPage()))) : (pActualPage->IsMasterPage() ? pActualPage : static_cast<SdPage*>(&(pActualPage->TRG_GetMasterPage()))) :
(pDoc->GetMasterSdPage( 0, bHandoutMode ? PageKind::Notes : PageKind::Standard )) ); (pDoc->GetMasterSdPage( 0, bHandoutMode ? PageKind::Notes : PageKind::Standard )) );
if( mbHandoutMode ) if( mbHandoutMode )
{ {
OUString sPageNo = get<FixedText>("replacement_a")->GetText(); OUString sPageNo = mxReplacementA->get_label();
mpCBSlideNumber->SetText( sPageNo ); mxCBSlideNumber->set_label( sPageNo );
OUString sFrameTitle = get<FixedText>("replacement_b")->GetText(); OUString sFrameTitle = mxReplacementB->get_label();
mpFTIncludeOn->SetText( sFrameTitle ); mxFTIncludeOn->set_label( sFrameTitle );
} }
mpCBHeader->Show( mbHandoutMode ); mxCBHeader->set_visible( mbHandoutMode );
mpHeaderBox->Show( mbHandoutMode ); mxHeaderBox->set_visible( mbHandoutMode );
mpCBNotOnTitle->Show( !mbHandoutMode ); mxCBNotOnTitle->set_visible( !mbHandoutMode );
mpCBDateTime->SetClickHdl( LINK( this, HeaderFooterTabPage, UpdateOnClickHdl ) ); mxCBDateTime->connect_clicked( LINK( this, HeaderFooterTabPage, UpdateOnClickHdl ) );
mpRBDateTimeFixed->SetClickHdl( LINK( this, HeaderFooterTabPage, UpdateOnClickHdl ) ); mxRBDateTimeFixed->connect_clicked( LINK( this, HeaderFooterTabPage, UpdateOnClickHdl ) );
mpRBDateTimeAutomatic->SetClickHdl( LINK( this, HeaderFooterTabPage, UpdateOnClickHdl ) ); mxRBDateTimeAutomatic->connect_clicked( LINK( this, HeaderFooterTabPage, UpdateOnClickHdl ) );
mpCBFooter->SetClickHdl( LINK( this, HeaderFooterTabPage, UpdateOnClickHdl ) ); mxCBFooter->connect_clicked( LINK( this, HeaderFooterTabPage, UpdateOnClickHdl ) );
mpCBHeader->SetClickHdl( LINK( this, HeaderFooterTabPage, UpdateOnClickHdl ) ); mxCBHeader->connect_clicked( LINK( this, HeaderFooterTabPage, UpdateOnClickHdl ) );
mpCBSlideNumber->SetClickHdl( LINK( this, HeaderFooterTabPage, UpdateOnClickHdl ) ); mxCBSlideNumber->connect_clicked( LINK( this, HeaderFooterTabPage, UpdateOnClickHdl ) );
mpCBDateTimeLanguage->SetLanguageList( SvxLanguageListFlags::ALL|SvxLanguageListFlags::ONLY_KNOWN, false, false ); mxCBDateTimeLanguage->SetLanguageList( SvxLanguageListFlags::ALL|SvxLanguageListFlags::ONLY_KNOWN, false, false );
mpCBDateTimeLanguage->SetSelectHdl( LINK( this, HeaderFooterTabPage, LanguageChangeHdl ) ); mxCBDateTimeLanguage->connect_changed( LINK( this, HeaderFooterTabPage, LanguageChangeHdl ) );
GetOrSetDateTimeLanguage( meOldLanguage, false ); GetOrSetDateTimeLanguage( meOldLanguage, false );
meOldLanguage = MsLangId::getRealLanguage( meOldLanguage ); meOldLanguage = MsLangId::getRealLanguage( meOldLanguage );
mpCBDateTimeLanguage->SelectLanguage( meOldLanguage ); mxCBDateTimeLanguage->set_active_id( meOldLanguage );
FillFormatList(0); FillFormatList(0);
if (mbHandoutMode)
recursive_rename_ui_element(*this, "handout");
else
recursive_rename_ui_element(*this, "slide");
} }
HeaderFooterTabPage::~HeaderFooterTabPage() IMPL_LINK_NOARG(HeaderFooterTabPage, LanguageChangeHdl, weld::ComboBox&, void)
{ {
disposeOnce(); FillFormatList( mxCBDateTimeFormat->get_active() );
}
void HeaderFooterTabPage::dispose()
{
mpFTIncludeOn.clear();
mpCBHeader.clear();
mpHeaderBox.clear();
mpTBHeader.clear();
mpCBDateTime.clear();
mpRBDateTimeFixed.clear();
mpRBDateTimeAutomatic.clear();
mpTBDateTimeFixed.clear();
mpCBDateTimeFormat.clear();
mpFTDateTimeLanguage.clear();
mpCBDateTimeLanguage.clear();
mpCBFooter.clear();
mpFooterBox.clear();
mpTBFooter.clear();
mpCBSlideNumber.clear();
mpCBNotOnTitle.clear();
mpCTPreview.clear();
TabPage::dispose();
}
IMPL_LINK_NOARG(HeaderFooterTabPage, LanguageChangeHdl, ListBox&, void)
{
FillFormatList( mpCBDateTimeFormat->GetSelectedEntryPos() );
} }
void HeaderFooterTabPage::FillFormatList( sal_Int32 nSelectedPos ) void HeaderFooterTabPage::FillFormatList( sal_Int32 nSelectedPos )
{ {
LanguageType eLanguage = mpCBDateTimeLanguage->GetSelectedLanguage(); LanguageType eLanguage = mxCBDateTimeLanguage->get_active_id();
mpCBDateTimeFormat->Clear(); mxCBDateTimeFormat->clear();
DateTime aDateTime( DateTime::SYSTEM ); DateTime aDateTime( DateTime::SYSTEM );
for( int nFormat = 0; nFormat < nDateTimeFormatsCount; nFormat++ ) for (int nFormat = 0; nFormat < nDateTimeFormatsCount; ++nFormat)
{ {
OUString aStr( SvxDateTimeField::GetFormatted( OUString aStr( SvxDateTimeField::GetFormatted(
aDateTime, aDateTime, aDateTime, aDateTime,
nDateTimeFormats[nFormat].meDateFormat, nDateTimeFormats[nFormat].meTimeFormat, nDateTimeFormats[nFormat].meDateFormat, nDateTimeFormats[nFormat].meTimeFormat,
*(SD_MOD()->GetNumberFormatter()), eLanguage ) ); *(SD_MOD()->GetNumberFormatter()), eLanguage ) );
const sal_Int32 nEntry = mpCBDateTimeFormat->InsertEntry( aStr ); mxCBDateTimeFormat->append_text(aStr);
if( nFormat == nSelectedPos ) if (nFormat == nSelectedPos)
{ mxCBDateTimeFormat->set_active(nFormat);
mpCBDateTimeFormat->SelectEntryPos( nEntry );
mpCBDateTimeFormat->SetText( aStr );
}
} }
} }
void HeaderFooterTabPage::init( const HeaderFooterSettings& rSettings, bool bNotOnTitle ) void HeaderFooterTabPage::init( const HeaderFooterSettings& rSettings, bool bNotOnTitle )
{ {
mpCBDateTime->Check( rSettings.mbDateTimeVisible ); mxCBDateTime->set_active( rSettings.mbDateTimeVisible );
mpRBDateTimeFixed->Check( rSettings.mbDateTimeIsFixed ); mxRBDateTimeFixed->set_active( rSettings.mbDateTimeIsFixed );
mpRBDateTimeAutomatic->Check( !rSettings.mbDateTimeIsFixed ); mxRBDateTimeAutomatic->set_active( !rSettings.mbDateTimeIsFixed );
mpTBDateTimeFixed->SetText( rSettings.maDateTimeText ); mxTBDateTimeFixed->set_text( rSettings.maDateTimeText );
mpCBHeader->Check( rSettings.mbHeaderVisible ); mxCBHeader->set_active( rSettings.mbHeaderVisible );
mpTBHeader->SetText( rSettings.maHeaderText ); mxTBHeader->set_text( rSettings.maHeaderText );
mpCBFooter->Check( rSettings.mbFooterVisible ); mxCBFooter->set_active( rSettings.mbFooterVisible );
mpTBFooter->SetText( rSettings.maFooterText ); mxTBFooter->set_text( rSettings.maFooterText );
mpCBSlideNumber->Check( rSettings.mbSlideNumberVisible ); mxCBSlideNumber->set_active( rSettings.mbSlideNumberVisible );
mpCBNotOnTitle->Check( bNotOnTitle ); mxCBNotOnTitle->set_active( bNotOnTitle );
mpCBDateTimeLanguage->SelectLanguage( meOldLanguage ); mxCBDateTimeLanguage->set_active_id( meOldLanguage );
for( sal_Int32 nPos = 0; nPos < mpCBDateTimeFormat->GetEntryCount(); nPos++ ) for (sal_Int32 nPos = 0, nEntryCount = mxCBDateTimeFormat->get_count(); nPos < nEntryCount; ++nPos)
{ {
if( nDateTimeFormats[nPos].meDateFormat == rSettings.meDateFormat && nDateTimeFormats[nPos].meTimeFormat == rSettings.meTimeFormat ) if( nDateTimeFormats[nPos].meDateFormat == rSettings.meDateFormat && nDateTimeFormats[nPos].meTimeFormat == rSettings.meTimeFormat )
{ {
mpCBDateTimeFormat->SelectEntryPos( nPos ); mxCBDateTimeFormat->set_active(nPos);
mpCBDateTimeFormat->SetText( mpCBDateTimeFormat->GetEntry(nPos) );
break; break;
} }
} }
@@ -556,49 +466,47 @@ void HeaderFooterTabPage::init( const HeaderFooterSettings& rSettings, bool bNot
void HeaderFooterTabPage::getData( HeaderFooterSettings& rSettings, bool& rNotOnTitle ) void HeaderFooterTabPage::getData( HeaderFooterSettings& rSettings, bool& rNotOnTitle )
{ {
rSettings.mbDateTimeVisible = mpCBDateTime->IsChecked(); rSettings.mbDateTimeVisible = mxCBDateTime->get_active();
rSettings.mbDateTimeIsFixed = mpRBDateTimeFixed->IsChecked(); rSettings.mbDateTimeIsFixed = mxRBDateTimeFixed->get_active();
rSettings.maDateTimeText = mpTBDateTimeFixed->GetText(); rSettings.maDateTimeText = mxTBDateTimeFixed->get_text();
rSettings.mbFooterVisible = mpCBFooter->IsChecked(); rSettings.mbFooterVisible = mxCBFooter->get_active();
rSettings.maFooterText = mpTBFooter->GetText(); rSettings.maFooterText = mxTBFooter->get_text();
rSettings.mbSlideNumberVisible = mpCBSlideNumber->IsChecked(); rSettings.mbSlideNumberVisible = mxCBSlideNumber->get_active();
rSettings.mbHeaderVisible = mpCBHeader->IsChecked(); rSettings.mbHeaderVisible = mxCBHeader->get_active();
rSettings.maHeaderText = mpTBHeader->GetText(); rSettings.maHeaderText = mxTBHeader->get_text();
if( mpCBDateTimeFormat->GetSelectedEntryCount() == 1 ) int nPos = mxCBDateTimeFormat->get_active();
if (nPos != -1)
{ {
sal_Int32 nPos = mpCBDateTimeFormat->GetSelectedEntryPos();
rSettings.meDateFormat = nDateTimeFormats[nPos].meDateFormat; rSettings.meDateFormat = nDateTimeFormats[nPos].meDateFormat;
rSettings.meTimeFormat = nDateTimeFormats[nPos].meTimeFormat; rSettings.meTimeFormat = nDateTimeFormats[nPos].meTimeFormat;
} }
LanguageType eLanguage = mpCBDateTimeLanguage->GetSelectedLanguage(); LanguageType eLanguage = mxCBDateTimeLanguage->get_active_id();
if( eLanguage != meOldLanguage ) if( eLanguage != meOldLanguage )
GetOrSetDateTimeLanguage( eLanguage, true ); GetOrSetDateTimeLanguage( eLanguage, true );
rNotOnTitle = mpCBNotOnTitle->IsChecked(); rNotOnTitle = mxCBNotOnTitle->get_active();
} }
void HeaderFooterTabPage::update() void HeaderFooterTabPage::update()
{ {
mpRBDateTimeFixed->Enable( mpCBDateTime->IsChecked() ); mxRBDateTimeFixed->set_sensitive( mxCBDateTime->get_active() );
mpTBDateTimeFixed->Enable( mpRBDateTimeFixed->IsChecked() && mpCBDateTime->IsChecked() ); mxTBDateTimeFixed->set_sensitive( mxRBDateTimeFixed->get_active() && mxCBDateTime->get_active() );
mpRBDateTimeAutomatic->Enable( mpCBDateTime->IsChecked() ); mxRBDateTimeAutomatic->set_sensitive( mxCBDateTime->get_active() );
mpCBDateTimeFormat->Enable( mpCBDateTime->IsChecked() && mpRBDateTimeAutomatic->IsChecked() ); mxCBDateTimeFormat->set_sensitive( mxCBDateTime->get_active() && mxRBDateTimeAutomatic->get_active() );
mpFTDateTimeLanguage->Enable( mpCBDateTime->IsChecked() && mpRBDateTimeAutomatic->IsChecked() ); mxFTDateTimeLanguage->set_sensitive( mxCBDateTime->get_active() && mxRBDateTimeAutomatic->get_active() );
mpCBDateTimeLanguage->Enable( mpCBDateTime->IsChecked() && mpRBDateTimeAutomatic->IsChecked() ); mxCBDateTimeLanguage->set_sensitive( mxCBDateTime->get_active() && mxRBDateTimeAutomatic->get_active() );
mxFooterBox->set_sensitive( mxCBFooter->get_active() );
mpFooterBox->Enable( mpCBFooter->IsChecked() ); mxHeaderBox->set_sensitive( mxCBHeader->get_active() );
mpHeaderBox->Enable( mpCBHeader->IsChecked() );
HeaderFooterSettings aSettings; HeaderFooterSettings aSettings;
bool bNotOnTitle; bool bNotOnTitle;
getData( aSettings, bNotOnTitle ); getData( aSettings, bNotOnTitle );
mpCTPreview->update( aSettings ); mxCTPreview->update( aSettings );
} }
IMPL_LINK_NOARG(HeaderFooterTabPage, UpdateOnClickHdl, Button*, void) IMPL_LINK_NOARG(HeaderFooterTabPage, UpdateOnClickHdl, weld::Button&, void)
{ {
update(); update();
} }
@@ -713,17 +621,17 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, boo
pOutl->Init( nOutlMode ); pOutl->Init( nOutlMode );
} }
PresLayoutPreview::PresLayoutPreview( vcl::Window* pParent ) PresLayoutPreview::PresLayoutPreview()
: Control(pParent) : mpMaster(nullptr)
, mpMaster(nullptr)
{ {
} }
VCL_BUILDER_FACTORY(PresLayoutPreview) void PresLayoutPreview::SetDrawingArea(weld::DrawingArea* pDrawingArea)
Size PresLayoutPreview::GetOptimalSize() const
{ {
return LogicToPixel(Size(80, 80), MapMode(MapUnit::MapAppFont)); Size aSize(pDrawingArea->get_ref_device().LogicToPixel(Size(80, 80), MapMode(MapUnit::MapAppFont)));
pDrawingArea->set_size_request(aSize.Width(), aSize.Height());
CustomWidgetController::SetDrawingArea(pDrawingArea);
SetOutputSizePixel(aSize);
} }
void PresLayoutPreview::init( SdPage *pMaster ) void PresLayoutPreview::init( SdPage *pMaster )

17
sd/source/ui/dlg/sddlgfact.cxx
View File

@@ -137,7 +137,16 @@ short AbstractSdVectorizeDlg_Impl::Execute()
} }
IMPL_ABSTDLG_BASE(AbstractSdPublishingDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSdPublishingDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractHeaderFooterDialog_Impl);
short AbstractHeaderFooterDialog_Impl::Execute()
{
return m_xDlg->run();
}
bool AbstractHeaderFooterDialog_Impl::StartExecuteAsync(AsyncContext &rCtx)
{
return weld::DialogController::runAsync(m_xDlg, rCtx.maEndDialogFn);
}
short AbstractBulletDialog_Impl::Execute() short AbstractBulletDialog_Impl::Execute()
{ {
@@ -521,10 +530,10 @@ VclPtr<VclAbstractDialog> SdAbstractDialogFactory_Impl::CreateMasterLayoutDialog
return VclPtr<AbstractMasterLayoutDialog_Impl>::Create(std::make_unique<::sd::MasterLayoutDialog>(pParent, pDoc, pCurrentPage)); return VclPtr<AbstractMasterLayoutDialog_Impl>::Create(std::make_unique<::sd::MasterLayoutDialog>(pParent, pDoc, pCurrentPage));
} }
VclPtr<AbstractHeaderFooterDialog> SdAbstractDialogFactory_Impl::CreateHeaderFooterDialog( sd::ViewShell* pViewShell, VclPtr<AbstractHeaderFooterDialog> SdAbstractDialogFactory_Impl::CreateHeaderFooterDialog(sd::ViewShell* pViewShell,
vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) weld::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage)
{ {
return VclPtr<AbstractHeaderFooterDialog_Impl>::Create( VclPtr<::sd::HeaderFooterDialog>::Create( pViewShell, pParent, pDoc, pCurrentPage )); return VclPtr<AbstractHeaderFooterDialog_Impl>::Create(std::make_unique<::sd::HeaderFooterDialog>(pViewShell, pParent, pDoc, pCurrentPage));
} }
VclPtr<VclAbstractDialog> SdAbstractDialogFactory_Impl::CreateSdPhotoAlbumDialog(weld::Window* pParent, SdDrawDocument* pDoc) VclPtr<VclAbstractDialog> SdAbstractDialogFactory_Impl::CreateSdPhotoAlbumDialog(weld::Window* pParent, SdDrawDocument* pDoc)

16
sd/source/ui/dlg/sddlgfact.hxx
View File

@@ -353,7 +353,15 @@ class AbstractSdPublishingDlg_Impl :public AbstractSdPublishingDlg
class AbstractHeaderFooterDialog_Impl :public AbstractHeaderFooterDialog class AbstractHeaderFooterDialog_Impl :public AbstractHeaderFooterDialog
{ {
DECL_ABSTDLG_BASE(AbstractHeaderFooterDialog_Impl,::sd::HeaderFooterDialog) private:
std::shared_ptr<::sd::HeaderFooterDialog> m_xDlg;
public:
AbstractHeaderFooterDialog_Impl(std::unique_ptr<::sd::HeaderFooterDialog> pDlg)
: m_xDlg(std::move(pDlg))
{
}
virtual short Execute() override;
virtual bool StartExecuteAsync(AsyncContext &rCtx) override;
}; };
//AbstractDialogFactory_Impl implementations //AbstractDialogFactory_Impl implementations
@@ -390,10 +398,10 @@ public:
virtual VclPtr<VclAbstractDialog> CreateMasterLayoutDialog(weld::Window* pParent, SdDrawDocument* pDoc, SdPage*) override; virtual VclPtr<VclAbstractDialog> CreateMasterLayoutDialog(weld::Window* pParent, SdDrawDocument* pDoc, SdPage*) override;
virtual VclPtr<AbstractHeaderFooterDialog> CreateHeaderFooterDialog( sd::ViewShell* pViewShell, virtual VclPtr<AbstractHeaderFooterDialog> CreateHeaderFooterDialog(sd::ViewShell* pViewShell,
vcl::Window* pParent, weld::Window* pParent,
SdDrawDocument* pDoc, SdDrawDocument* pDoc,
SdPage* pCurrentPage ) override; SdPage* pCurrentPage) override;
// For TabPage // For TabPage
virtual CreateTabPage GetSdOptionsContentsTabPageCreatorFunc() override; virtual CreateTabPage GetSdOptionsContentsTabPageCreatorFunc() override;

37
sd/source/ui/inc/headerfooterdlg.hxx
View File

@@ -19,9 +19,7 @@
#ifndef INCLUDED_SD_SOURCE_UI_INC_HEADERFOOTERDLG_HXX #ifndef INCLUDED_SD_SOURCE_UI_INC_HEADERFOOTERDLG_HXX
#define INCLUDED_SD_SOURCE_UI_INC_HEADERFOOTERDLG_HXX #define INCLUDED_SD_SOURCE_UI_INC_HEADERFOOTERDLG_HXX
#include <vcl/tabdlg.hxx> #include <vcl/weld.hxx>
#include <vcl/button.hxx>
#include <vcl/tabctrl.hxx>
#include <sdpage.hxx> #include <sdpage.hxx>
@@ -33,24 +31,13 @@ class ViewShell;
class HeaderFooterTabPage; class HeaderFooterTabPage;
class HeaderFooterDialog : public TabDialog class HeaderFooterDialog : public weld::GenericDialogController
{ {
private: private:
DECL_LINK( ActivatePageHdl, TabControl*, void ); DECL_LINK( ActivatePageHdl, const OString&, void );
DECL_LINK( ClickApplyToAllHdl, Button*, void ); DECL_LINK( ClickApplyToAllHdl, weld::Button&, void );
DECL_LINK( ClickApplyHdl, Button*, void ); DECL_LINK( ClickApplyHdl, weld::Button&, void );
DECL_LINK( ClickCancelHdl, Button*, void ); DECL_LINK( ClickCancelHdl, weld::Button&, void );
VclPtr<TabControl> mpTabCtrl;
VclPtr<HeaderFooterTabPage> mpSlideTabPage;
VclPtr<HeaderFooterTabPage> mpNotesHandoutsTabPage;
sal_uInt16 mnSlidesId;
VclPtr<PushButton> maPBApplyToAll;
VclPtr<PushButton> maPBApply;
VclPtr<CancelButton> maPBCancel;
HeaderFooterSettings maSlideSettings; HeaderFooterSettings maSlideSettings;
HeaderFooterSettings maNotesHandoutSettings; HeaderFooterSettings maNotesHandoutSettings;
@@ -59,18 +46,24 @@ private:
SdPage* mpCurrentPage; SdPage* mpCurrentPage;
ViewShell* mpViewShell; ViewShell* mpViewShell;
std::unique_ptr<weld::Notebook> mxTabCtrl;
std::unique_ptr<weld::Button> mxPBApplyToAll;
std::unique_ptr<weld::Button> mxPBApply;
std::unique_ptr<weld::Button> mxPBCancel;
std::unique_ptr<HeaderFooterTabPage> mxSlideTabPage;
std::unique_ptr<HeaderFooterTabPage> mxNotesHandoutsTabPage;
void apply( bool bToAll, bool bForceSlides ); void apply( bool bToAll, bool bForceSlides );
void change( SdUndoGroup* pUndoGroup, SdPage* pPage, const HeaderFooterSettings& rNewSettings ); void change( SdUndoGroup* pUndoGroup, SdPage* pPage, const HeaderFooterSettings& rNewSettings );
public: public:
HeaderFooterDialog( ViewShell* pViewShell, vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ); HeaderFooterDialog(ViewShell* pViewShell, weld::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage);
virtual ~HeaderFooterDialog() override; virtual ~HeaderFooterDialog() override;
virtual void dispose() override;
void ApplyToAll(); void ApplyToAll();
void Apply(); void Apply();
virtual short Execute() override; virtual short run() override;
}; };
} }

7
sd/source/ui/view/drviews3.cxx
View File

@@ -301,15 +301,18 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
case SID_INSERT_DATE_TIME: case SID_INSERT_DATE_TIME:
{ {
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
VclPtr<AbstractHeaderFooterDialog> pDlg(pFact->CreateHeaderFooterDialog( this, GetActiveWindow(), GetDoc(), mpActualPage )); vcl::Window* pWin = GetActiveWindow();
VclPtr<AbstractHeaderFooterDialog> pDlg(pFact->CreateHeaderFooterDialog(this, pWin ? pWin->GetFrameWeld() : nullptr, GetDoc(), mpActualPage));
std::shared_ptr<SfxRequest> xRequest(new SfxRequest(rReq)); std::shared_ptr<SfxRequest> xRequest(new SfxRequest(rReq));
rReq.Ignore(); // the 'old' request is not relevant any more rReq.Ignore(); // the 'old' request is not relevant any more
pDlg->StartExecuteAsync([this, xRequest](sal_Int32 /*nResult*/){ pDlg->StartExecuteAsync([this, pDlg, xRequest](sal_Int32 /*nResult*/){
GetActiveWindow()->Invalidate(); GetActiveWindow()->Invalidate();
UpdatePreview( mpActualPage ); UpdatePreview( mpActualPage );
Invalidate(); Invalidate();
xRequest->Done(); xRequest->Done();
pDlg->disposeOnce();
}); });
break; break;
} }

57
sd/uiconfig/simpress/ui/headerfooterdialog.ui
View File

@@ -1,12 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 --> <!-- Generated with glade 3.22.1 -->
<interface domain="sd"> <interface domain="sd">
<requires lib="gtk+" version="3.18"/> <requires lib="gtk+" version="3.18"/>
<object class="GtkDialog" id="HeaderFooterDialog"> <object class="GtkDialog" id="HeaderFooterDialog">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="border_width">6</property> <property name="border_width">6</property>
<property name="title" translatable="yes" context="headerfooterdialog|HeaderFooterDialog">Header and Footer</property> <property name="title" translatable="yes" context="headerfooterdialog|HeaderFooterDialog">Header and Footer</property>
<property name="modal">True</property>
<property name="default_width">0</property>
<property name="default_height">0</property>
<property name="type_hint">dialog</property> <property name="type_hint">dialog</property>
<child>
<placeholder/>
</child>
<child internal-child="vbox"> <child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1"> <object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property> <property name="can_focus">False</property>
@@ -21,6 +27,7 @@
<property name="label" translatable="yes" context="headerfooterdialog|apply_all">Appl_y to All</property> <property name="label" translatable="yes" context="headerfooterdialog|apply_all">Appl_y to All</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property> <property name="has_default">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
@@ -99,6 +106,30 @@
<child> <child>
<placeholder/> <placeholder/>
</child> </child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object> </object>
</child> </child>
<child type="tab"> <child type="tab">
@@ -118,6 +149,30 @@
<child> <child>
<placeholder/> <placeholder/>
</child> </child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object> </object>
<packing> <packing>
<property name="position">1</property> <property name="position">1</property>

17
sd/uiconfig/simpress/ui/headerfootertab.ui
View File

@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 --> <!-- Generated with glade 3.22.1 -->
<interface domain="sd"> <interface domain="sd">
<requires lib="gtk+" version="3.18"/> <requires lib="gtk+" version="3.18"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkBox" id="HeaderFooterTab"> <object class="GtkBox" id="HeaderFooterTab">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
@@ -78,6 +77,7 @@
<object class="GtkEntry" id="header_text"> <object class="GtkEntry" id="header_text">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="activates_default">True</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@@ -136,7 +136,6 @@
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="active">True</property> <property name="active">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">rb_auto</property>
<accessibility> <accessibility>
<relation type="label-for" target="datetime_value"/> <relation type="label-for" target="datetime_value"/>
</accessibility> </accessibility>
@@ -151,6 +150,7 @@
<object class="GtkEntry" id="datetime_value"> <object class="GtkEntry" id="datetime_value">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="activates_default">True</property>
<accessibility> <accessibility>
<relation type="labelled-by" target="rb_fixed"/> <relation type="labelled-by" target="rb_fixed"/>
</accessibility> </accessibility>
@@ -204,7 +204,7 @@
<property name="row_spacing">6</property> <property name="row_spacing">6</property>
<property name="column_spacing">12</property> <property name="column_spacing">12</property>
<child> <child>
<object class="svxcorelo-SvxLanguageBox" id="language_list"> <object class="GtkComboBoxText" id="language_list">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
</object> </object>
@@ -228,7 +228,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkComboBox" id="datetime_format_list"> <object class="GtkComboBoxText" id="datetime_format_list">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
</object> </object>
@@ -328,6 +328,7 @@
<object class="GtkEntry" id="footer_text"> <object class="GtkEntry" id="footer_text">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="activates_default">True</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@@ -409,9 +410,9 @@
<object class="GtkLabel" id="replacement_a"> <object class="GtkLabel" id="replacement_a">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="no_show_all">True</property> <property name="no_show_all">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes" context="headerfootertab|replacement_a">_Page Number</property> <property name="label" translatable="yes" context="headerfootertab|replacement_a">_Page Number</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@@ -423,8 +424,8 @@
<object class="GtkLabel" id="replacement_b"> <object class="GtkLabel" id="replacement_b">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="no_show_all">True</property> <property name="no_show_all">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes" context="headerfootertab|replacement_b">Include on page</property> <property name="label" translatable="yes" context="headerfootertab|replacement_b">Include on page</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@@ -440,7 +441,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="sduilo-PresLayoutPreview" id="preview"> <object class="GtkDrawingArea" id="preview">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">center</property> <property name="halign">center</property>