[Libreoffice-commits] core.git: cui/uiconfig sd/AllLangResTarget_sd.mk sd/source sd/uiconfig sd/UIConfig_sdraw.mk
Olivier Hallot
olivier.hallot at edx.srv.br
Mon Sep 30 04:04:44 PDT 2013
cui/uiconfig/ui/areadialog.ui | 7
cui/uiconfig/ui/textdialog.ui | 5
sd/AllLangResTarget_sd.mk | 1
sd/UIConfig_sdraw.mk | 1
sd/source/ui/dlg/prltempl.cxx | 149 +++++++--------
sd/source/ui/dlg/prltempl.src | 152 ---------------
sd/source/ui/inc/prltempl.hxx | 16 +
sd/uiconfig/sdraw/ui/drawprtldialog.ui | 315 +++++++++++++++++++++++++++++++++
8 files changed, 410 insertions(+), 236 deletions(-)
New commits:
commit 6e8db06aa7f35bc6908545986554cedeeb8f7371
Author: Olivier Hallot <olivier.hallot at edx.srv.br>
Date: Sat Sep 28 23:21:31 2013 +0200
Convert Draw object & background dialog to new UI
Conflicts:
sd/UIConfig_sdraw.mk
Change-Id: I5625420bb374c03da0095065444787d082df8038
Reviewed-on: https://gerrit.libreoffice.org/6066
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/cui/uiconfig/ui/areadialog.ui b/cui/uiconfig/ui/areadialog.ui
index 2e6f26a..707fb9c 100644
--- a/cui/uiconfig/ui/areadialog.ui
+++ b/cui/uiconfig/ui/areadialog.ui
@@ -3,13 +3,14 @@
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="AreaDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Area</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">2</property>
+ <property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
@@ -84,6 +85,8 @@
<object class="GtkNotebook" id="tabcontrol">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<child>
<placeholder/>
</child>
diff --git a/cui/uiconfig/ui/textdialog.ui b/cui/uiconfig/ui/textdialog.ui
index 8434d9f..dae1143 100644
--- a/cui/uiconfig/ui/textdialog.ui
+++ b/cui/uiconfig/ui/textdialog.ui
@@ -3,13 +3,14 @@
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="TextDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Text</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">2</property>
+ <property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index f177ed1..c3ce48d 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -53,7 +53,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
sd/source/ui/dlg/morphdlg.src \
sd/source/ui/dlg/navigatr.src \
sd/source/ui/dlg/PaneDockingWindow.src \
- sd/source/ui/dlg/prltempl.src \
sd/source/ui/dlg/RemoteDialog.src \
sd/source/ui/dlg/sdpreslt.src \
sd/source/ui/dlg/tpaction.src \
diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk
index 8446921..6ff0334 100644
--- a/sd/UIConfig_sdraw.mk
+++ b/sd/UIConfig_sdraw.mk
@@ -71,6 +71,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\
sd/uiconfig/sdraw/ui/drawchardialog \
sd/uiconfig/sdraw/ui/drawparadialog \
sd/uiconfig/sdraw/ui/drawpagedialog \
+ sd/uiconfig/sdraw/ui/drawprtldialog \
sd/uiconfig/sdraw/ui/insertlayer \
sd/uiconfig/sdraw/ui/paranumberingtab \
sd/uiconfig/sdraw/ui/printeroptions \
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 3476358..4200f13 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -20,6 +20,7 @@
#include <editeng/outliner.hxx>
#include <svx/dialogs.hrc>
+#include <svx/svxdlg.hxx>
#include <editeng/flstitem.hxx>
#include <svx/drawitem.hxx>
#include <svl/style.hxx>
@@ -53,7 +54,9 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
SfxStyleSheetBase& rStyleBase,
PresentationObjects _ePO,
SfxStyleSheetBasePool* pSSPool ) :
- SfxTabDialog ( pParent, DlgId ),
+ SfxTabDialog ( pParent
+ , "DrawPRTLDialog"
+ , "modules/sdraw/ui/drawprtldialog.ui"),
mpDocShell ( pDocSh ),
ePO ( _ePO ),
aInputSet ( *rStyleBase.GetItemSet().GetPool(), SID_PARAM_NUM_PRESET, SID_PARAM_CUR_NUM_LEVEL ),
@@ -112,20 +115,12 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
else
SetInputSet( pOrgSet );
- FreeResource();
-
- SvxColorListItem aColorListItem(*( (const SvxColorListItem*)
- ( mpDocShell->GetItem( SID_COLOR_TABLE ) ) ) );
- SvxGradientListItem aGradientListItem(*( (const SvxGradientListItem*)
- ( mpDocShell->GetItem( SID_GRADIENT_LIST ) ) ) );
- SvxBitmapListItem aBitmapListItem(*( (const SvxBitmapListItem*)
- ( mpDocShell->GetItem( SID_BITMAP_LIST ) ) ) );
- SvxHatchListItem aHatchListItem(*( (const SvxHatchListItem*)
- ( mpDocShell->GetItem( SID_HATCH_LIST ) ) ) );
- SvxDashListItem aDashListItem(*( (const SvxDashListItem*)
- ( mpDocShell->GetItem( SID_DASH_LIST ) ) ) );
- SvxLineEndListItem aLineEndListItem(*( (const SvxLineEndListItem*)
- ( mpDocShell->GetItem( SID_LINEEND_LIST ) ) ) );
+ SvxColorListItem aColorListItem(*( (const SvxColorListItem*) ( mpDocShell->GetItem( SID_COLOR_TABLE ) ) ) );
+ SvxGradientListItem aGradientListItem(*( (const SvxGradientListItem*) ( mpDocShell->GetItem( SID_GRADIENT_LIST ) ) ) );
+ SvxBitmapListItem aBitmapListItem(*( (const SvxBitmapListItem*) ( mpDocShell->GetItem( SID_BITMAP_LIST ) ) ) );
+ SvxHatchListItem aHatchListItem(*( (const SvxHatchListItem*) ( mpDocShell->GetItem( SID_HATCH_LIST ) ) ) );
+ SvxDashListItem aDashListItem(*( (const SvxDashListItem*) ( mpDocShell->GetItem( SID_DASH_LIST ) ) ) );
+ SvxLineEndListItem aLineEndListItem(*( (const SvxLineEndListItem*) ( mpDocShell->GetItem( SID_LINEEND_LIST ) ) ) );
pColorTab = aColorListItem.GetColorList();
pDashList = aDashListItem.GetDashList();
@@ -134,42 +129,46 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
pHatchingList = aHatchListItem.GetHatchList();
pBitmapList = aBitmapListItem.GetBitmapList();
- switch( DlgId.GetId() )
+ SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
+ OSL_ENSURE(pFact, "Dialogdiet fail!");
+
+ mnLine = AddTabPage( "RID_SVXPAGE_LINE", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_LINE ), 0 );
+ mnArea = AddTabPage( "RID_SVXPAGE_AREA", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_AREA ), 0 );
+ mnShadow = AddTabPage( "RID_SVXPAGE_SHADOW", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_SHADOW ), 0 );
+ mnTransparency = AddTabPage( "RID_SVXPAGE_TRANSPARENCE", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_TRANSPARENCE ), 0 );
+ mnFont = AddTabPage( "RID_SVXPAGE_CHAR_NAME", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), 0 );
+ mnEffects = AddTabPage( "RID_SVXPAGE_CHAR_EFFECTS", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), 0 );
+ mnParagr = AddTabPage( "RID_SVXPAGE_STD_PARAGRAPH", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_STD_PARAGRAPH ), 0 );
+ mnTextAtt = AddTabPage( "RID_SVXPAGE_TEXTATTR", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_TEXTATTR ), 0 );
+ mnBullet = AddTabPage( "RID_SVXPAGE_PICK_BULLET", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PICK_BULLET ), 0 );
+ mnNum = AddTabPage( "RID_SVXPAGE_PICK_SINGLE_NUM", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PICK_SINGLE_NUM ), 0 );
+ mnBitmap = AddTabPage( "RID_SVXPAGE_PICK_BMP", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PICK_BMP ), 0 );
+ mnOptions = AddTabPage( "RID_SVXPAGE_NUM_OPTIONS", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUM_OPTIONS ), 0 );
+ mnTab = AddTabPage( "RID_SVXPAGE_TABULATOR", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_TABULATOR ), 0 );
+ mnAsian = AddTabPage( "RID_SVXPAGE_PARA_ASIAN", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PARA_ASIAN ), 0 );
+ mnAlign = AddTabPage( "RID_SVXPAGE_ALIGN_PARAGRAPH", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGN_PARAGRAPH ), 0 );
+
+ SvtCJKOptions aCJKOptions;
+ if( !aCJKOptions.IsAsianTypographyEnabled() )
+ RemoveTabPage( "RID_SVXPAGE_PARA_ASIAN" );
+
+ if (DlgId.GetId() == TAB_PRES_LAYOUT_TEMPLATE_BACKGROUND)
{
- case TAB_PRES_LAYOUT_TEMPLATE:
- {
- AddTabPage( RID_SVXPAGE_LINE);
- AddTabPage( RID_SVXPAGE_AREA);
- AddTabPage( RID_SVXPAGE_SHADOW);
- AddTabPage( RID_SVXPAGE_TRANSPARENCE);
- AddTabPage( RID_SVXPAGE_CHAR_NAME );
- AddTabPage( RID_SVXPAGE_CHAR_EFFECTS );
- AddTabPage( RID_SVXPAGE_STD_PARAGRAPH );
- AddTabPage( RID_SVXPAGE_TEXTATTR );
- AddTabPage( RID_SVXPAGE_PICK_BULLET );
- AddTabPage( RID_SVXPAGE_PICK_SINGLE_NUM );
- AddTabPage( RID_SVXPAGE_PICK_BMP );
- AddTabPage( RID_SVXPAGE_NUM_OPTIONS );
- AddTabPage( RID_SVXPAGE_TABULATOR );
- }
- break;
-
- case TAB_PRES_LAYOUT_TEMPLATE_BACKGROUND: // background
- AddTabPage( RID_SVXPAGE_AREA);
- break;
- }
-
- // the tabpages Alignment, Tabs and Asian Typography are very
- // useful, except for the background style
- if( DlgId.GetId() != TAB_PRES_LAYOUT_TEMPLATE_BACKGROUND )
- {
- SvtCJKOptions aCJKOptions;
- if( aCJKOptions.IsAsianTypographyEnabled() )
- AddTabPage( RID_SVXPAGE_PARA_ASIAN );
- else
- RemoveTabPage( RID_SVXPAGE_PARA_ASIAN );
-
- AddTabPage( RID_SVXPAGE_ALIGN_PARAGRAPH );
+ RemoveTabPage( "RID_SVXPAGE_LINE");
+
+ RemoveTabPage( "RID_SVXPAGE_SHADOW");
+ RemoveTabPage( "RID_SVXPAGE_TRANSPARENCE");
+ RemoveTabPage( "RID_SVXPAGE_CHAR_NAME");
+ RemoveTabPage( "RID_SVXPAGE_CHAR_EFFECTS");
+ RemoveTabPage( "RID_SVXPAGE_STD_PARAGRAPH");
+ RemoveTabPage( "RID_SVXPAGE_TEXTATTR");
+ RemoveTabPage( "RID_SVXPAGE_PICK_BULLET");
+ RemoveTabPage( "RID_SVXPAGE_PICK_SINGLE_NUM");
+ RemoveTabPage( "RID_SVXPAGE_PICK_BMP");
+ RemoveTabPage( "RID_SVXPAGE_NUM_OPTIONS");
+ RemoveTabPage( "RID_SVXPAGE_TABULATOR");
+ RemoveTabPage( "RID_SVXPAGE_ALIGN_PARAGRAPH");
+ RemoveTabPage( "RID_SVXPAGE_PARA_ASIAN" );
}
// set title and add corresponding pages to dialog
@@ -232,21 +231,19 @@ SdPresLayoutTemplateDlg::~SdPresLayoutTemplateDlg()
// -----------------------------------------------------------------------
void SdPresLayoutTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
-{ SfxAllItemSet aSet(*(aInputSet.GetPool()));
- switch( nId )
- {
- case RID_SVXPAGE_LINE:
+{
+ SfxAllItemSet aSet(*(aInputSet.GetPool()));
+
+ if (nId == mnLine)
{
aSet.Put (SvxColorListItem(pColorTab,SID_COLOR_TABLE));
aSet.Put (SvxDashListItem(pDashList,SID_DASH_LIST));
aSet.Put (SvxLineEndListItem(pLineEndList,SID_LINEEND_LIST));
aSet.Put (SfxUInt16Item(SID_DLG_TYPE,nDlgType));
-
- rPage.PageCreated(aSet);
+ rPage.PageCreated(aSet);
}
- break;
- case RID_SVXPAGE_AREA:
+ else if (nId == mnArea)
{
aSet.Put (SvxColorListItem(pColorTab,SID_COLOR_TABLE));
aSet.Put (SvxGradientListItem(pGradientList,SID_GRADIENT_LIST));
@@ -256,41 +253,35 @@ void SdPresLayoutTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
aSet.Put (SfxUInt16Item(SID_DLG_TYPE,nDlgType));
aSet.Put (SfxUInt16Item(SID_TABPAGE_POS,nPos));
rPage.PageCreated(aSet);
-
}
- break;
- case RID_SVXPAGE_SHADOW:
- aSet.Put (SvxColorListItem(pColorTab,SID_COLOR_TABLE));
- aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,nPageType));
- aSet.Put (SfxUInt16Item(SID_DLG_TYPE,nDlgType));
- rPage.PageCreated(aSet);
- break;
-
- case RID_SVXPAGE_TRANSPARENCE:
+ else if (nId == mnShadow)
+ {
+ aSet.Put (SvxColorListItem(pColorTab,SID_COLOR_TABLE));
aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,nPageType));
aSet.Put (SfxUInt16Item(SID_DLG_TYPE,nDlgType));
rPage.PageCreated(aSet);
- break;
+ }
- case RID_SVXPAGE_CHAR_NAME:
+ else if (nId == mnTransparency)
{
- SvxFontListItem aItem(*( (const SvxFontListItem*)
- ( mpDocShell->GetItem( SID_ATTR_CHAR_FONTLIST) ) ) );
+ aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,nPageType));
+ aSet.Put (SfxUInt16Item(SID_DLG_TYPE,nDlgType));
+ rPage.PageCreated(aSet);
+ }
+ else if (nId == mnFont)
+ {
+ SvxFontListItem aItem(*( (const SvxFontListItem*)( mpDocShell->GetItem( SID_ATTR_CHAR_FONTLIST) ) ) );
aSet.Put (SvxFontListItem( aItem.GetFontList(), SID_ATTR_CHAR_FONTLIST));
rPage.PageCreated(aSet);
}
- break;
- case RID_SVXPAGE_CHAR_EFFECTS:
+ else if (nId == mnEffects)
+ {
aSet.Put (SfxUInt16Item(SID_DISABLE_CTL,DISABLE_CASEMAP));
rPage.PageCreated(aSet);
- break;
-
- case RID_SVXPAGE_STD_PARAGRAPH:
- break;
- }
+ }
}
const SfxItemSet* SdPresLayoutTemplateDlg::GetOutputItemSet() const
diff --git a/sd/source/ui/dlg/prltempl.src b/sd/source/ui/dlg/prltempl.src
deleted file mode 100644
index e04c276..0000000
--- a/sd/source/ui/dlg/prltempl.src
+++ /dev/null
@@ -1,152 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "prltempl.hrc"
-#include <svx/dialogs.hrc>
-TabDialog TAB_PRES_LAYOUT_TEMPLATE
-{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 289 , 176 ) ;
- Text [ en-US ] = "Presentation Layout" ;
- Moveable = TRUE ;
- TabControl 1
- {
- OutputSize = TRUE ;
- Pos = MAP_APPFONT ( 3 , 3 ) ;
- Size = MAP_APPFONT ( 260 , 135 ) ;
- PageList =
- {
- PageItem
- {
- Identifier = RID_SVXPAGE_LINE ;
- Text [ en-US ] = "Line" ;
- PageResID = RID_SVXPAGE_LINE ;
- };
- PageItem
- {
- Identifier = RID_SVXPAGE_AREA ;
- Text [ en-US ] = "Area" ;
- PageResID = RID_SVXPAGE_AREA ;
- };
- PageItem
- {
- Identifier = RID_SVXPAGE_SHADOW ;
- PageResID = RID_SVXPAGE_SHADOW ;
- Text [ en-US ] = "Shadow" ;
- };
- PageItem
- {
- Identifier = RID_SVXPAGE_TRANSPARENCE ;
- Text [ en-US ] = "Transparency";
- };
- PageItem
- {
- Identifier = RID_SVXPAGE_CHAR_NAME ;
- Text [ en-US ] = "Font" ;
- PageResID = RID_SVXPAGE_CHAR_NAME;
- };
- PageItem
- {
- Identifier = RID_SVXPAGE_CHAR_EFFECTS ;
- Text [ en-US ] = "Font Effects" ;
- PageResID = RID_SVXPAGE_CHAR_EFFECTS ;
- };
- PageItem
- {
- Identifier = RID_SVXPAGE_STD_PARAGRAPH ;
- Text [ en-US ] = "Indents & Spacing" ;
- PageResID = RID_SVXPAGE_STD_PARAGRAPH ;
- };
- PageItem
- {
- Identifier = RID_SVXPAGE_TEXTATTR ;
- PageResID = RID_SVXPAGE_TEXTATTR ;
- Text [ en-US ] = "Text" ;
- };
- PageItem
- {
- Identifier = RID_SVXPAGE_PICK_BULLET ;
- PageResID = RID_SVXPAGE_PICK_BULLET ;
- Text [ en-US ] = "Bullets" ;
- };
- PageItem
- {
- Identifier = RID_SVXPAGE_PICK_SINGLE_NUM ;
- PageResID = RID_SVXPAGE_PICK_SINGLE_NUM ;
- Text [ en-US ] = "Numbering type" ;
- };
- PageItem
- {
- Identifier = RID_SVXPAGE_PICK_BMP ;
- PageResID = RID_SVXPAGE_PICK_BMP ;
- Text [ en-US ] = "Graphics" ;
- };
- PageItem
- {
- Identifier = RID_SVXPAGE_NUM_OPTIONS ;
- PageResID = RID_SVXPAGE_NUM_OPTIONS ;
- Text [ en-US ] = "Customize" ;
- };
- PageItem
- {
- Identifier = RID_SVXPAGE_ALIGN_PARAGRAPH ;
- PageResID = RID_SVXPAGE_ALIGN_PARAGRAPH ;
- Text [ en-US ] = "Alignment" ;
- };
- PageItem
- {
- Identifier = RID_SVXPAGE_PARA_ASIAN ;
- PageResID = RID_SVXPAGE_PARA_ASIAN ;
- Text[ en-US ] = "Asian Typography";
- };
- PageItem
- {
- Identifier = RID_SVXPAGE_TABULATOR ;
- PageResID = RID_SVXPAGE_TABULATOR ;
- Text [ en-US ] = "Tabs" ;
- };
- };
- };
-};
-
-TabDialog TAB_PRES_LAYOUT_TEMPLATE_BACKGROUND
-{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 289 , 176 ) ;
- Moveable = TRUE ;
- TabControl 1
- {
- OutputSize = TRUE ;
- Pos = MAP_APPFONT ( 3 , 3 ) ;
- Size = MAP_APPFONT ( 260 , 135 ) ;
- PageList =
- {
- PageItem
- {
- Identifier = RID_SVXPAGE_AREA ;
- Text [ en-US ] = "Area" ;
- PageResID = RID_SVXPAGE_AREA ;
- };
- };
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx
index 2f9a13c..7904b1d 100644
--- a/sd/source/ui/inc/prltempl.hxx
+++ b/sd/source/ui/inc/prltempl.hxx
@@ -51,6 +51,22 @@ private:
sal_uInt16 nDlgType;
sal_uInt16 nPos;
+ sal_uInt16 mnLine;
+ sal_uInt16 mnArea;
+ sal_uInt16 mnShadow;
+ sal_uInt16 mnTransparency;
+ sal_uInt16 mnFont;
+ sal_uInt16 mnEffects;
+ sal_uInt16 mnParagr;
+ sal_uInt16 mnTextAtt;
+ sal_uInt16 mnBullet;
+ sal_uInt16 mnNum;
+ sal_uInt16 mnBitmap;
+ sal_uInt16 mnOptions;
+ sal_uInt16 mnTab;
+ sal_uInt16 mnAsian;
+ sal_uInt16 mnAlign;
+
ChangeType nColorTableState;
ChangeType nBitmapListState;
ChangeType nGradientListState;
diff --git a/sd/uiconfig/sdraw/ui/drawprtldialog.ui b/sd/uiconfig/sdraw/ui/drawprtldialog.ui
new file mode 100644
index 0000000..681092b
--- /dev/null
+++ b/sd/uiconfig/sdraw/ui/drawprtldialog.ui
@@ -0,0 +1,315 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="DrawPRTLDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Presentation Layout</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="ok">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">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">0</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_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="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">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="reset">
+ <property name="label">gtk-revert-to-saved</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="tabcontrol">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="RID_SVXPAGE_LINE">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Line</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="RID_SVXPAGE_AREA">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Area</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="RID_SVXPAGE_SHADOW">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Shadow</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ <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">3</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="RID_SVXPAGE_CHAR_NAME">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Font</property>
+ </object>
+ <packing>
+ <property name="position">4</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="RID_SVXPAGE_CHAR_EFFECTS">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Font Effects</property>
+ </object>
+ <packing>
+ <property name="position">5</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="RID_SVXPAGE_STD_PARAGRAPH">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Indents & Spacing</property>
+ </object>
+ <packing>
+ <property name="position">6</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="RID_SVXPAGE_TEXTATTR">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Text</property>
+ </object>
+ <packing>
+ <property name="position">7</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="RID_SVXPAGE_PICK_BULLET">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Bullets</property>
+ </object>
+ <packing>
+ <property name="position">8</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="RID_SVXPAGE_PICK_SINGLE_NUM">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Numbering type</property>
+ </object>
+ <packing>
+ <property name="position">9</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="RID_SVXPAGE_PICK_BMP">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Graphics</property>
+ </object>
+ <packing>
+ <property name="position">10</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="RID_SVXPAGE_NUM_OPTIONS">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Customize</property>
+ </object>
+ <packing>
+ <property name="position">11</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="RID_SVXPAGE_ALIGN_PARAGRAPH">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Alignment</property>
+ </object>
+ <packing>
+ <property name="position">12</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="RID_SVXPAGE_PARA_ASIAN">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Asian Typography</property>
+ </object>
+ <packing>
+ <property name="position">13</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="RID_SVXPAGE_TABULATOR">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Tabs</property>
+ </object>
+ <packing>
+ <property name="position">14</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">ok</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ <action-widget response="0">help</action-widget>
+ <action-widget response="0">reset</action-widget>
+ </action-widgets>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list