Skip to content

C
core
Kaydet (Commit) eed4786a authored tarafından Katarina Behrens's avatar Katarina Behrens
Dosyalara gözat
Seçenekler

Converted header+footer dialog to .ui 

Change-Id: I431ef88cfbff1848dcf8aa83228f74920cf91fa1
üst 67bb0f97
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 151 additions and 7 deletions
sd/UIConfig_simpress.mk
Dosyayı görüntüle @ eed4786a
...@@ -79,6 +79,8 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\ ...@@ -79,6 +79,8 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/customanimationtexttab \ sd/uiconfig/simpress/ui/customanimationtexttab \
sd/uiconfig/simpress/ui/customslideshows \ sd/uiconfig/simpress/ui/customslideshows \
sd/uiconfig/simpress/ui/definecustomslideshow \ sd/uiconfig/simpress/ui/definecustomslideshow \
sd/uiconfig/simpress/ui/headerfooterdialog \
sd/uiconfig/simpress/ui/headerfootertab \
sd/uiconfig/simpress/ui/masterlayoutdlg \ sd/uiconfig/simpress/ui/masterlayoutdlg \
sd/uiconfig/simpress/ui/optimpressgeneralpage \ sd/uiconfig/simpress/ui/optimpressgeneralpage \
sd/uiconfig/simpress/ui/photoalbum \ sd/uiconfig/simpress/ui/photoalbum \
......
sd/source/ui/dlg/sddlgfact.cxx
Dosyayı görüntüle @ eed4786a
...@@ -356,17 +356,17 @@ void AbstractSdPublishingDlg_Impl::GetParameterSequence( ::com::sun::star::uno:: ...@@ -356,17 +356,17 @@ void AbstractSdPublishingDlg_Impl::GetParameterSequence( ::com::sun::star::uno::
void AbstractHeaderFooterDialog_Impl::ApplyToAll( TabPage* pPage ) void AbstractHeaderFooterDialog_Impl::ApplyToAll( TabPage* pPage )
{ {
pDlg->ApplyToAll( pPage ); pDlg->ApplyToAll();
} }
void AbstractHeaderFooterDialog_Impl::Apply( TabPage* pPage ) void AbstractHeaderFooterDialog_Impl::Apply( TabPage* pPage )
{ {
pDlg->Apply( pPage ); pDlg->Apply( );
} }
void AbstractHeaderFooterDialog_Impl::Cancel( TabPage* pPage ) void AbstractHeaderFooterDialog_Impl::Cancel( TabPage* pPage )
{ {
pDlg->Cancel( pPage ); pDlg->Cancel( );
} }
//-------------- SdAbstractDialogFactory implementation-------------- //-------------- SdAbstractDialogFactory implementation--------------
......
sd/source/ui/inc/headerfooterdlg.hxx
Dosyayı görüntüle @ eed4786a
...@@ -41,11 +41,22 @@ private: ...@@ -41,11 +41,22 @@ private:
DECL_LINK( ActivatePageHdl, TabControl * ); DECL_LINK( ActivatePageHdl, TabControl * );
DECL_LINK( DeactivatePageHdl, void * ); DECL_LINK( DeactivatePageHdl, void * );
TabControl maTabCtrl; DECL_LINK( ClickApplyToAllHdl, void * );
DECL_LINK( ClickApplyHdl, void * );
DECL_LINK( ClickCancelHdl, void * );
TabControl* mpTabCtrl;
HeaderFooterTabPage* mpSlideTabPage; HeaderFooterTabPage* mpSlideTabPage;
HeaderFooterTabPage* mpNotesHandoutsTabPage; HeaderFooterTabPage* mpNotesHandoutsTabPage;
sal_uInt16 mnSlidesId;
sal_uInt16 mnNotesId;
PushButton* maPBApplyToAll;
PushButton* maPBApply;
CancelButton* maPBCancel;
HeaderFooterSettings maSlideSettings; HeaderFooterSettings maSlideSettings;
HeaderFooterSettings maNotesHandoutSettings; HeaderFooterSettings maNotesHandoutSettings;
...@@ -60,9 +71,9 @@ public: ...@@ -60,9 +71,9 @@ public:
HeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ); HeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage );
~HeaderFooterDialog(); ~HeaderFooterDialog();
void ApplyToAll( TabPage* pPage ); void ApplyToAll();
void Apply( TabPage* pPage ); void Apply();
void Cancel( TabPage* pPage ); void Cancel();
virtual short Execute(); virtual short Execute();
}; };
......
sd/uiconfig/simpress/ui/headerfooterdialog.ui 0 → 100644
Dosyayı görüntüle @ eed4786a
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="HeaderFooterDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="apply_all">
<property name="label" translatable="yes">Appl_y to All</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="apply">
<property name="label">gtk-apply</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkButton" id="help">
<property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkNotebook" id="tabs">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
<placeholder/>
</child>
<child type="tab">
<object class="GtkLabel" id="slides">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Slides</property>
</object>
<packing>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<object class="GtkLabel" id="notes">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Notes and Handouts</property>
</object>
<packing>
<property name="position">1</property>
<property name="tab_fill">False</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
<action-widgets>
<action-widget response="0">apply_all</action-widget>
<action-widget response="0">apply</action-widget>
<action-widget response="0">cancel</action-widget>
<action-widget response="0">help</action-widget>
</action-widgets>
</object>
</interface>
sd/uiconfig/simpress/ui/headerfootertab.ui 0 → 100644
Dosyayı görüntüle @ eed4786a
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment