[Libreoffice-commits] core.git: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
Caolán McNamara
caolanm at redhat.com
Tue Mar 18 09:32:30 PDT 2014
sw/AllLangResTarget_sw.mk | 1
sw/UIConfig_swriter.mk | 1
sw/inc/dbui.hrc | 2
sw/inc/helpid.h | 1
sw/source/ui/dbui/mmlayoutpage.cxx | 130 ++++-----
sw/source/ui/dbui/mmlayoutpage.hxx | 27 --
sw/source/ui/dbui/mmlayoutpage.src | 155 -----------
sw/uiconfig/swriter/ui/mmlayoutpage.ui | 437 +++++++++++++++++++++++++++++++++
8 files changed, 509 insertions(+), 245 deletions(-)
New commits:
commit 50d5b97a776342d3f032f3df2f2f2c90b02d7f34
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Mar 18 16:00:18 2014 +0000
convert wizard layout page to .ui
Change-Id: I40ae0f7dea51bf0b8db60ec6b3cac955e9016af4
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 998137d..99df02b 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -95,7 +95,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/dbui/mailmergewizard.src \
sw/source/ui/dbui/mmaddressblockpage.src \
sw/source/ui/dbui/mmgreetingspage.src \
- sw/source/ui/dbui/mmlayoutpage.src \
sw/source/ui/dbui/mmmergepage.src \
sw/source/ui/dbui/mmoutputpage.src \
sw/source/ui/dbui/mmpreparemergepage.src \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 98b91b1..ebb6682 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -165,6 +165,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/queryshowchangesdialog \
sw/uiconfig/swriter/ui/mmaddressblockpage \
sw/uiconfig/swriter/ui/mmcreatingdialog \
+ sw/uiconfig/swriter/ui/mmlayoutpage \
sw/uiconfig/swriter/ui/mmoutputtypepage \
sw/uiconfig/swriter/ui/mmselectpage \
sw/uiconfig/swriter/ui/mmsalutationpage \
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index 2bf18ec..33996c5 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -39,8 +39,6 @@
#define DLG_MM_ASSIGNFIELDS (RC_DBUI_BEGIN + 20)
-#define DLG_MM_LAYOUT_PAGE (RC_DBUI_BEGIN + 22)
-
#define DLG_MM_MAILBODY (RC_DBUI_BEGIN + 24)
#define DLG_MM_SENDMAILS (RC_DBUI_BEGIN + 25)
#define DLG_MAILMERGECHILD (RC_DBUI_BEGIN + 26)
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 55fe598..c4a7d88 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -372,7 +372,6 @@
#define HID_MM_DBTABLEPREVIEWDIALOG "SW_HID_MM_DBTABLEPREVIEWDIALOG"
#define HID_MM_CREATEADDRESSLIST "SW_HID_MM_CREATEADDRESSLIST"
#define HID_MM_ASSIGNFIELDS "SW_HID_MM_ASSIGNFIELDS"
-#define HID_MM_LAYOUT_PAGE "SW_HID_MM_LAYOUT_PAGE"
#define HID_MM_ADDRESSLIST_HB "SW_HID_MM_ADDRESSLIST_HB"
#define HID_MM_MAILBODY "SW_HID_MM_MAILBODY"
#define HID_MM_SENDMAILS "SW_HID_MM_SENDMAILS"
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index 3dd2016..1863263 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -73,29 +73,27 @@ using namespace ::com::sun::star::view;
#define DEFAULT_ADDRESS_HEIGHT (MM50*7) // 3,5cm
SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) :
- svt::OWizardPage( _pParent, SW_RES(DLG_MM_LAYOUT_PAGE)),
- m_aHeaderFI( this, SW_RES( FI_HEADER )),
- m_aPositionFL( this, SW_RES( FL_POSITION )),
- m_aAlignToBodyCB( this, SW_RES( CB_ALIGN )),
- m_aLeftFT( this, SW_RES( FT_LEFT )),
- m_aLeftMF( this, SW_RES( MF_LEFT )),
- m_aTopFT( this, SW_RES( FT_TOP )),
- m_aTopMF( this, SW_RES( MF_TOP )),
- m_aGreetingLineFL( this, SW_RES( FL_GREETINGLINE )),
- m_aUpFT( this, SW_RES( FT_UP )),
- m_aUpPB( this, SW_RES( MF_UP )),
- m_aDownFT( this, SW_RES( FT_DOWN )),
- m_aDownPB( this, SW_RES( PB_DOWN )),
- m_aExampleContainerWIN( this, SW_RES( WIN_EXAMPLECONTAINER )),
- m_aZoomFT( this, SW_RES( FT_ZOOM )),
- m_aZoomLB( this, SW_RES( LB_ZOOM )),
- m_pExampleFrame(0),
- m_pExampleWrtShell(0),
- m_pAddressBlockFormat(0),
- m_bIsGreetingInserted(false),
- m_pWizard(_pParent)
+ svt::OWizardPage(_pParent, "MMLayoutPage",
+ "modules/swriter/ui/mmlayoutpage.ui")
+ , m_pExampleFrame(0)
+ , m_pExampleWrtShell(0)
+ , m_pAddressBlockFormat(0)
+ , m_bIsGreetingInserted(false)
+ , m_pWizard(_pParent)
{
- FreeResource();
+ get(m_pPosition, "addresspos");
+ get(m_pGreetingLine, "greetingspos");
+ get(m_pAlignToBodyCB, "align");
+ get(m_pLeftFT, "leftft");
+ get(m_pLeftMF, "left");
+ get(m_pTopMF, "top");
+ get(m_pUpPB, "up");
+ get(m_pDownPB, "down");
+ get(m_pExampleContainerWIN, "example");
+ Size aSize(LogicToPixel(Size(124, 159), MAP_APPFONT));
+ m_pExampleContainerWIN->set_width_request(aSize.Width());
+ m_pExampleContainerWIN->set_height_request(aSize.Height());
+ get(m_pZoomLB, "zoom");
const SfxFilter *pSfxFlt = SwIoSystem::GetFilterOfFormat(
OUString( FILTER_XML ),
@@ -120,37 +118,37 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) :
xStore->storeToURL( m_sExampleURL, aValues );
Link aLink(LINK(this, SwMailMergeLayoutPage, PreviewLoadedHdl_Impl));
- m_pExampleFrame = new SwOneExampleFrame( m_aExampleContainerWIN,
+ m_pExampleFrame = new SwOneExampleFrame( *m_pExampleContainerWIN,
EX_SHOW_DEFAULT_PAGE, &aLink, &m_sExampleURL );
- m_aExampleContainerWIN.Show(false);
+ m_pExampleContainerWIN->Show(false);
- m_aLeftMF.SetValue(m_aLeftMF.Normalize(DEFAULT_LEFT_DISTANCE), FUNIT_TWIP);
- m_aTopMF.SetValue(m_aTopMF.Normalize(DEFAULT_TOP_DISTANCE), FUNIT_TWIP);
+ m_pLeftMF->SetValue(m_pLeftMF->Normalize(DEFAULT_LEFT_DISTANCE), FUNIT_TWIP);
+ m_pTopMF->SetValue(m_pTopMF->Normalize(DEFAULT_TOP_DISTANCE), FUNIT_TWIP);
- m_aZoomLB.InsertEntry(OUString("50 %"), 1);
- m_aZoomLB.InsertEntry(OUString("75 %"), 2);
- m_aZoomLB.InsertEntry(OUString("100 %"), 3);
- m_aZoomLB.SelectEntryPos(0); //page size
- m_aZoomLB.SetSelectHdl(LINK(this, SwMailMergeLayoutPage, ZoomHdl_Impl));
+ m_pZoomLB->InsertEntry(OUString("50 %"), 1);
+ m_pZoomLB->InsertEntry(OUString("75 %"), 2);
+ m_pZoomLB->InsertEntry(OUString("100 %"), 3);
+ m_pZoomLB->SelectEntryPos(0); //page size
+ m_pZoomLB->SetSelectHdl(LINK(this, SwMailMergeLayoutPage, ZoomHdl_Impl));
Link aFrameHdl = LINK(this, SwMailMergeLayoutPage, ChangeAddressHdl_Impl);
- m_aLeftMF.SetUpHdl(aFrameHdl);
- m_aLeftMF.SetDownHdl(aFrameHdl);
- m_aLeftMF.SetLoseFocusHdl(aFrameHdl);
- m_aTopMF.SetUpHdl(aFrameHdl);
- m_aTopMF.SetDownHdl(aFrameHdl);
- m_aTopMF.SetLoseFocusHdl(aFrameHdl);
+ m_pLeftMF->SetUpHdl(aFrameHdl);
+ m_pLeftMF->SetDownHdl(aFrameHdl);
+ m_pLeftMF->SetLoseFocusHdl(aFrameHdl);
+ m_pTopMF->SetUpHdl(aFrameHdl);
+ m_pTopMF->SetDownHdl(aFrameHdl);
+ m_pTopMF->SetLoseFocusHdl(aFrameHdl);
FieldUnit eFieldUnit = ::GetDfltMetric(sal_False);
- ::SetFieldUnit( m_aLeftMF, eFieldUnit );
- ::SetFieldUnit( m_aTopMF, eFieldUnit );
+ ::SetFieldUnit( *m_pLeftMF, eFieldUnit );
+ ::SetFieldUnit( *m_pTopMF, eFieldUnit );
Link aUpDownHdl = LINK(this, SwMailMergeLayoutPage, GreetingsHdl_Impl );
- m_aUpPB.SetClickHdl(aUpDownHdl);
- m_aDownPB.SetClickHdl(aUpDownHdl);
- m_aAlignToBodyCB.SetClickHdl(LINK(this, SwMailMergeLayoutPage, AlignToTextHdl_Impl));
- m_aAlignToBodyCB.Check();
+ m_pUpPB->SetClickHdl(aUpDownHdl);
+ m_pDownPB->SetClickHdl(aUpDownHdl);
+ m_pAlignToBodyCB->SetClickHdl(LINK(this, SwMailMergeLayoutPage, AlignToTextHdl_Impl));
+ m_pAlignToBodyCB->Check();
}
SwMailMergeLayoutPage::~SwMailMergeLayoutPage()
@@ -166,18 +164,10 @@ void SwMailMergeLayoutPage::ActivatePage()
sal_Bool bGreetingLine = rConfigItem.IsGreetingLine(sal_False) && !rConfigItem.IsGreetingInserted();
sal_Bool bAddressBlock = rConfigItem.IsAddressBlock() && !rConfigItem.IsAddressInserted();
- m_aPositionFL.Enable(bAddressBlock);
- m_aLeftFT.Enable(bAddressBlock);
- m_aTopFT.Enable(bAddressBlock);
- m_aLeftMF.Enable(bAddressBlock);
- m_aTopMF.Enable(bAddressBlock);
- AlignToTextHdl_Impl( &m_aAlignToBodyCB );
+ m_pPosition->Enable(bAddressBlock);
+ AlignToTextHdl_Impl(m_pAlignToBodyCB);
- m_aGreetingLineFL.Enable(bGreetingLine);
- m_aUpPB.Enable(bGreetingLine);
- m_aDownPB.Enable(bGreetingLine);
- m_aUpFT.Enable(bGreetingLine);
- m_aDownFT.Enable(bGreetingLine);
+ m_pGreetingLine->Enable(bGreetingLine);
//check if greeting and/or address frame have to be inserted/removed
if(m_pExampleWrtShell) // initially there's nothing to check
@@ -209,12 +199,12 @@ void SwMailMergeLayoutPage::ActivatePage()
}
else
{
- long nLeft = static_cast< long >(m_aLeftMF.Denormalize(m_aLeftMF.GetValue(FUNIT_TWIP)));
- long nTop = static_cast< long >(m_aTopMF.Denormalize(m_aTopMF.GetValue(FUNIT_TWIP)));
+ long nLeft = static_cast< long >(m_pLeftMF->Denormalize(m_pLeftMF->GetValue(FUNIT_TWIP)));
+ long nTop = static_cast< long >(m_pTopMF->Denormalize(m_pTopMF->GetValue(FUNIT_TWIP)));
m_pAddressBlockFormat = InsertAddressFrame(
*m_pExampleWrtShell, m_pWizard->GetConfigItem(),
Point(nLeft, nTop),
- m_aAlignToBodyCB.IsChecked(), true);
+ m_pAlignToBodyCB->IsChecked(), true);
}
}
@@ -227,13 +217,13 @@ sal_Bool SwMailMergeLayoutPage::commitPage( ::svt::WizardTypes::CommitPageReason
SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
if(::svt::WizardTypes::eTravelForward == _eReason)
{
- long nLeft = static_cast< long >(m_aLeftMF.Denormalize(m_aLeftMF.GetValue(FUNIT_TWIP)));
- long nTop = static_cast< long >(m_aTopMF.Denormalize(m_aTopMF.GetValue(FUNIT_TWIP)));
+ long nLeft = static_cast< long >(m_pLeftMF->Denormalize(m_pLeftMF->GetValue(FUNIT_TWIP)));
+ long nTop = static_cast< long >(m_pTopMF->Denormalize(m_pTopMF->GetValue(FUNIT_TWIP)));
InsertAddressAndGreeting(
m_pWizard->GetSwView(),
rConfigItem,
Point(nLeft, nTop),
- m_aAlignToBodyCB.IsChecked());
+ m_pAlignToBodyCB->IsChecked());
}
return sal_True;
}
@@ -637,7 +627,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
IMPL_LINK_NOARG(SwMailMergeLayoutPage, PreviewLoadedHdl_Impl)
{
- m_aExampleContainerWIN.Show(true);
+ m_pExampleContainerWIN->Show(true);
Reference< XModel > & xModel = m_pExampleFrame->GetModel();
//now the ViewOptions should be set properly
@@ -657,7 +647,7 @@ IMPL_LINK_NOARG(SwMailMergeLayoutPage, PreviewLoadedHdl_Impl)
m_pAddressBlockFormat = InsertAddressFrame(
*m_pExampleWrtShell, rConfigItem,
Point(DEFAULT_LEFT_DISTANCE, DEFAULT_TOP_DISTANCE),
- m_aAlignToBodyCB.IsChecked(), true);
+ m_pAlignToBodyCB->IsChecked(), true);
}
if(rConfigItem.IsGreetingLine(sal_False))
{
@@ -671,8 +661,8 @@ IMPL_LINK_NOARG(SwMailMergeLayoutPage, PreviewLoadedHdl_Impl)
const SwFmtFrmSize& rPageSize = m_pExampleWrtShell->GetPageDesc(
m_pExampleWrtShell->GetCurPageDesc()).GetMaster().GetFrmSize();
- m_aLeftMF.SetMax(rPageSize.GetWidth() - DEFAULT_LEFT_DISTANCE);
- m_aTopMF.SetMax(rPageSize.GetHeight() - DEFAULT_TOP_DISTANCE);
+ m_pLeftMF->SetMax(rPageSize.GetWidth() - DEFAULT_LEFT_DISTANCE);
+ m_pTopMF->SetMax(rPageSize.GetHeight() - DEFAULT_TOP_DISTANCE);
return 0;
}
@@ -703,14 +693,14 @@ IMPL_LINK_NOARG(SwMailMergeLayoutPage, ChangeAddressHdl_Impl)
{
if(m_pExampleWrtShell && m_pAddressBlockFormat)
{
- long nLeft = static_cast< long >(m_aLeftMF.Denormalize(m_aLeftMF.GetValue(FUNIT_TWIP)));
- long nTop = static_cast< long >(m_aTopMF.Denormalize(m_aTopMF.GetValue(FUNIT_TWIP)));
+ long nLeft = static_cast< long >(m_pLeftMF->Denormalize(m_pLeftMF->GetValue(FUNIT_TWIP)));
+ long nTop = static_cast< long >(m_pTopMF->Denormalize(m_pTopMF->GetValue(FUNIT_TWIP)));
SfxItemSet aSet(m_pExampleWrtShell->GetAttrPool(), RES_ANCHOR, RES_ANCHOR,
RES_VERT_ORIENT, RES_VERT_ORIENT,
RES_HORI_ORIENT, RES_HORI_ORIENT,
0 );
- if(m_aAlignToBodyCB.IsChecked())
+ if(m_pAlignToBodyCB->IsChecked())
aSet.Put(SwFmtHoriOrient( 0, text::HoriOrientation::NONE, text::RelOrientation::PAGE_PRINT_AREA ));
else
aSet.Put(SwFmtHoriOrient( nLeft, text::HoriOrientation::NONE, text::RelOrientation::PAGE_FRAME ));
@@ -722,7 +712,7 @@ IMPL_LINK_NOARG(SwMailMergeLayoutPage, ChangeAddressHdl_Impl)
IMPL_LINK(SwMailMergeLayoutPage, GreetingsHdl_Impl, PushButton*, pButton)
{
- bool bDown = pButton == &m_aDownPB;
+ bool bDown = pButton == m_pDownPB;
bool bMoved = m_pExampleWrtShell->MoveParagraph( bDown ? 1 : -1 );
if (bMoved || bDown)
m_pWizard->GetConfigItem().MoveGreeting(bDown ? 1 : -1 );
@@ -738,8 +728,8 @@ IMPL_LINK(SwMailMergeLayoutPage, GreetingsHdl_Impl, PushButton*, pButton)
IMPL_LINK(SwMailMergeLayoutPage, AlignToTextHdl_Impl, CheckBox*, pBox)
{
sal_Bool bCheck = pBox->IsChecked() && pBox->IsEnabled();
- m_aLeftFT.Enable(!bCheck);
- m_aLeftMF.Enable(!bCheck);
+ m_pLeftFT->Enable(!bCheck);
+ m_pLeftMF->Enable(!bCheck);
ChangeAddressHdl_Impl( 0 );
return 0;
}
diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx
index 10c772e..7f77c5c 100644
--- a/sw/source/ui/dbui/mmlayoutpage.hxx
+++ b/sw/source/ui/dbui/mmlayoutpage.hxx
@@ -24,6 +24,7 @@
#include <vcl/button.hxx>
#include <svtools/stdctrl.hxx>
#include <vcl/field.hxx>
+#include <vcl/layout.hxx>
#include <vcl/lstbox.hxx>
#include <com/sun/star/uno/Reference.h>
@@ -37,26 +38,20 @@ namespace com{ namespace sun{ namespace star{ namespace beans{ class XPropertySe
class SwMailMergeLayoutPage : public svt::OWizardPage
{
- SwBoldFixedInfo m_aHeaderFI;
+ VclContainer* m_pPosition;
- FixedLine m_aPositionFL;
+ CheckBox* m_pAlignToBodyCB;
+ FixedText* m_pLeftFT;
+ MetricField* m_pLeftMF;
+ MetricField* m_pTopMF;
- CheckBox m_aAlignToBodyCB;
- FixedText m_aLeftFT;
- MetricField m_aLeftMF;
- FixedText m_aTopFT;
- MetricField m_aTopMF;
+ VclContainer* m_pGreetingLine;
+ PushButton* m_pUpPB;
+ PushButton* m_pDownPB;
- FixedLine m_aGreetingLineFL;
- FixedText m_aUpFT;
- PushButton m_aUpPB;
- FixedText m_aDownFT;
- PushButton m_aDownPB;
+ Window* m_pExampleContainerWIN;
- Window m_aExampleContainerWIN;
-
- FixedText m_aZoomFT;
- ListBox m_aZoomLB;
+ ListBox* m_pZoomLB;
SwOneExampleFrame* m_pExampleFrame;
SwWrtShell* m_pExampleWrtShell;
diff --git a/sw/source/ui/dbui/mmlayoutpage.src b/sw/source/ui/dbui/mmlayoutpage.src
deleted file mode 100644
index cc54bba..0000000
--- a/sw/source/ui/dbui/mmlayoutpage.src
+++ /dev/null
@@ -1,155 +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 <mmlayoutpage.hrc>
-#include <dbui.hrc>
-#include <helpid.h>
-
-TabPage DLG_MM_LAYOUT_PAGE
-{
- HelpID = HID_MM_LAYOUT_PAGE;
- Size = MAP_APPFONT ( 260 , 250 ) ;
- Hide = TRUE ;
-
- FixedText FI_HEADER
- {
- Pos = MAP_APPFONT ( 6 , 8 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text[ en-US ] = "Adjust layout of address block and salutation";
- };
- FixedLine FL_POSITION
- {
- Pos = MAP_APPFONT ( 6 , 27 ) ;
- Size = MAP_APPFONT ( 118 , 8 ) ;
- Text[ en-US ] = "Address block position";
- };
- CheckBox CB_ALIGN
- {
- HelpID = "sw:CheckBox:DLG_MM_LAYOUT_PAGE:CB_ALIGN";
- Pos = MAP_APPFONT ( 6 , 40 ) ;
- Size = MAP_APPFONT ( 118 , 10 ) ;
- Text[ en-US ] = "Align to text body";
- };
- FixedText FT_LEFT
- {
- Pos = MAP_APPFONT ( 15 , 54 ) ;
- Size = MAP_APPFONT ( 63 , 8 ) ;
- Text[ en-US ] = "From ~left";
- };
- MetricField MF_LEFT
- {
- HelpID = "sw:MetricField:DLG_MM_LAYOUT_PAGE:MF_LEFT";
- Pos = MAP_APPFONT ( 78 , 52 ) ;
- Size = MAP_APPFONT ( 40 , 12 ) ;
- Border = TRUE ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 0 ;
- Maximum = 99999 ;
- DecimalDigits = 2 ;
- Value = 200 ;
- Unit = FUNIT_CM ;
- First = 10 ;
- Last = 99999 ;
- SpinSize = 10 ;
- };
- FixedText FT_TOP
- {
- Pos = MAP_APPFONT ( 15 , 69 ) ;
- Size = MAP_APPFONT ( 62 , 8 ) ;
- Text[ en-US ] = "~From top";
- };
- MetricField MF_TOP
- {
- HelpID = "sw:MetricField:DLG_MM_LAYOUT_PAGE:MF_TOP";
- Pos = MAP_APPFONT ( 78 , 67 ) ;
- Size = MAP_APPFONT ( 40 , 12 ) ;
- Border = TRUE ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 0 ;
- Maximum = 99999 ;
- DecimalDigits = 2 ;
- Value = 200 ;
- Unit = FUNIT_CM ;
- First = 10 ;
- Last = 99999 ;
- SpinSize = 10 ;
- };
- FixedLine FL_GREETINGLINE
- {
- Pos = MAP_APPFONT ( 6 , 85 ) ;
- Size = MAP_APPFONT ( 118 , 8 ) ;
- Text[ en-US ] = "Salutation position";
- };
- FixedText FT_UP
- {
- Pos = MAP_APPFONT ( 15 , 98 ) ;
- Size = MAP_APPFONT ( 45 , 8 ) ;
- Text[ en-US ] = "Move";
- };
- PushButton MF_UP
- {
- HelpID = "sw:PushButton:DLG_MM_LAYOUT_PAGE:MF_UP";
- Pos = MAP_APPFONT ( 68 , 96 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text[ en-US ] = "~Up";
- };
- FixedText FT_DOWN
- {
- Pos = MAP_APPFONT ( 15 , 115 ) ;
- Size = MAP_APPFONT ( 45 , 8 ) ;
- Text[ en-US ] = "Move";
- };
- PushButton PB_DOWN
- {
- HelpID = "sw:PushButton:DLG_MM_LAYOUT_PAGE:PB_DOWN";
- Pos = MAP_APPFONT ( 68 , 113 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text[ en-US ] = "~Down";
- };
- Window WIN_EXAMPLECONTAINER
- {
- Pos = MAP_APPFONT ( 130 , 20 ) ;
- Size = MAP_APPFONT ( 124 , 159 ) ;
- };
- FixedText FT_ZOOM
- {
- Pos = MAP_APPFONT ( 161 , 185 ) ;
- Size = MAP_APPFONT ( 40 , 8 ) ;
- Right = TRUE;
- Text[ en-US ] = "~Zoom";
- };
- ListBox LB_ZOOM
- {
- HelpID = "sw:ListBox:DLG_MM_LAYOUT_PAGE:LB_ZOOM";
- Pos = MAP_APPFONT ( 204 , 182 ) ;
- Size = MAP_APPFONT ( 50 , 50 ) ;
- Border = TRUE;
- DropDown = TRUE;
- StringList [en-US]= \
- { \
- < "Entire page" ; > ; \
- };
- };
-
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/uiconfig/swriter/ui/mmlayoutpage.ui b/sw/uiconfig/swriter/ui/mmlayoutpage.ui
new file mode 100644
index 0000000..840a4f2
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/mmlayoutpage.ui
@@ -0,0 +1,437 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+ <requires lib="gtk+" version="3.0"/>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">999.99000000000001</property>
+ <property name="value">2</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkBox" id="MMLayoutPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">12</property>
+ <child>
+ <object class="GtkFrame" id="addresspos">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkGrid" id="grid8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_From top</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">top:0.00cm</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="top:0.00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="text" translatable="yes">2.00</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="digits">2</property>
+ <property name="value">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="align">
+ <property name="label" translatable="yes">Align to text body</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkSpinButton" id="left:0.00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="text" translatable="yes">2.00</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="digits">2</property>
+ <property name="value">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="leftft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">From _left</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">left:0.00cm</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Address block position</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="greetingspos">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Move</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">up</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Move</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">down</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="up">
+ <property name="label" translatable="yes">_Up</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="down">
+ <property name="label" translatable="yes">_Down</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Salutation position</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkGrid" id="grid6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Zoom</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">zoom</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="zoom">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <items>
+ <item translatable="yes">Entire page</item>
+ </items>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="example">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Adjust layout of address block and salutation</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <widgets>
+ <widget name="label6"/>
+ <widget name="box1"/>
+ <widget name="label4"/>
+ <widget name="label5"/>
+ </widgets>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list