[Libreoffice-commits] core.git: sd/source sd/uiconfig
Rishabh Kumar
kris.kr296 at gmail.com
Fri Aug 5 18:20:13 UTC 2016
sd/source/ui/dlg/dlgpage.cxx | 10 ++++++++++
sd/source/ui/inc/dlgpage.hxx | 2 +-
sd/uiconfig/sdraw/ui/drawpagedialog.ui | 15 +++++++++++++++
3 files changed, 26 insertions(+), 1 deletion(-)
New commits:
commit 5693ee7a41fbe4de337cef3b10294edd670be804
Author: Rishabh Kumar <kris.kr296 at gmail.com>
Date: Fri Aug 5 17:57:49 2016 +0530
[GSoC] Add Transparency tab to background dialog
Change-Id: I33dffe2435c44116842240e4b481947415317b5b
Reviewed-on: https://gerrit.libreoffice.org/27906
Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>
Tested-by: Yousuf Philips <philipz85 at hotmail.com>
Reviewed-by: Rishabh Kumar <kris.kr296 at yahoo.in>
diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx
index bba44fd..e23b832 100644
--- a/sd/source/ui/dlg/dlgpage.cxx
+++ b/sd/source/ui/dlg/dlgpage.cxx
@@ -62,9 +62,13 @@ SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, const SfxIte
mnPage = AddTabPage( "RID_SVXPAGE_PAGE", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), nullptr );
mnArea = AddTabPage( "RID_SVXPAGE_AREA", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_AREA ), nullptr );
+ mnTransparence = AddTabPage( "RID_SVXPAGE_TRANSPARENCE", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_TRANSPARENCE ), nullptr );
if(!bAreaPage) // I have to add the page before I remove it !
+ {
RemoveTabPage( "RID_SVXPAGE_AREA" );
+ RemoveTabPage( "RID_SVXPAGE_TRANSPARENCE" );
+ }
}
void SdPageDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
@@ -89,6 +93,12 @@ void SdPageDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
aSet.Put (SfxUInt16Item(SID_TABPAGE_POS,0));
rPage.PageCreated(aSet);
}
+ else if (nId == mnTransparence)
+ {
+ aSet.Put(SfxUInt16Item(SID_PAGE_TYPE,0));
+ aSet.Put(SfxUInt16Item(SID_DLG_TYPE,1));
+ rPage.PageCreated(aSet);
+ }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/dlgpage.hxx b/sd/source/ui/inc/dlgpage.hxx
index c624ecb..4818c66 100644
--- a/sd/source/ui/inc/dlgpage.hxx
+++ b/sd/source/ui/inc/dlgpage.hxx
@@ -40,7 +40,7 @@ private:
XPatternListRef mpPatternList;
sal_uInt16 mnArea;
sal_uInt16 mnPage;
-
+ sal_uInt16 mnTransparence;
public:
SdPageDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, const SfxItemSet* pAttr, bool bAreaPage = true );
diff --git a/sd/uiconfig/sdraw/ui/drawpagedialog.ui b/sd/uiconfig/sdraw/ui/drawpagedialog.ui
index f43e406..087cc4b 100644
--- a/sd/uiconfig/sdraw/ui/drawpagedialog.ui
+++ b/sd/uiconfig/sdraw/ui/drawpagedialog.ui
@@ -99,6 +99,7 @@
<property name="label" translatable="yes">Page</property>
</object>
<packing>
+ <property name="position">0</property>
<property name="tab_fill">False</property>
</packing>
</child>
@@ -116,6 +117,20 @@
<property name="tab_fill">False</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="RID_SVXPAGE_TRANSPARENCE">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Transparency</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
More information about the Libreoffice-commits
mailing list