[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UI_swriter.mk

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Aug 20 03:15:56 PDT 2012


 sw/AllLangResTarget_sw.mk               |    1 
 sw/UI_swriter.mk                        |    1 
 sw/inc/globals.hrc                      |    1 
 sw/inc/helpid.h                         |    1 
 sw/source/ui/inc/linenum.hxx            |   47 --
 sw/source/ui/misc/linenum.cxx           |  162 +++-----
 sw/source/ui/misc/linenum.hrc           |   43 --
 sw/source/ui/misc/linenum.src           |  262 --------------
 sw/uiconfig/swriter/ui/linenumbering.ui |  581 ++++++++++++++++++++++++++++++++
 9 files changed, 663 insertions(+), 436 deletions(-)

New commits:
commit 064c21aec9245148e90290afd00c46b0999d19c4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Aug 20 10:54:19 2012 +0100

    Convert of LineNumberingDialog dialog from .res to .ui format
    
    A representative commit for full conversion of a dialog to .ui format,
    see 4add66152cd6c1c9f4f39be35d8d016cb5b11080 of helpcontent2 for
    matching help content updating
    
    Change-Id: I062e401b5ef670de03f57b1feed7ae9138faff07

diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 26ae747..566ce4b 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -159,7 +159,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
     sw/source/ui/misc/glossary.src \
     sw/source/ui/misc/insfnote.src \
     sw/source/ui/misc/insrule.src \
-    sw/source/ui/misc/linenum.src \
     sw/source/ui/misc/num.src \
     sw/source/ui/misc/numberingtypelistbox.src \
     sw/source/ui/misc/outline.src \
diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk
index f1419eb..9a561f1 100644
--- a/sw/UI_swriter.mk
+++ b/sw/UI_swriter.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_UI_UI,modules/swriter))
 
 $(eval $(call gb_UI_add_uifiles,modules/swriter,\
+	sw/uiconfig/swriter/ui/linenumbering \
 	sw/uiconfig/swriter/ui/titlepage \
 ))
 
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index e6ed9dc..a229bc8 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -172,7 +172,6 @@
 
 #define TP_REDLINE_OPT              (RC_GLOBALS_BEGIN +  74)
 
-#define DLG_LINENUMBERING           (RC_GLOBALS_BEGIN +  75)
 #define TP_OUTLINE_NUM              (RC_GLOBALS_BEGIN +  76)
 
 #define TP_OPTINSERT_PAGE           (RC_GLOBALS_BEGIN +  77)
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index ffafba2..fb12c5c 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -264,7 +264,6 @@
 #define HID_FOOTNOTE_OPTIONS                                    "SW_HID_FOOTNOTE_OPTIONS"
 #define HID_ENDNOTE_OPTIONS                                     "SW_HID_ENDNOTE_OPTIONS"
 #define HID_REDLINE_OPT                                         "SW_HID_REDLINE_OPT"
-#define HID_LINENUMBERING                                       "SW_HID_LINENUMBERING"
 #define HID_REDLINE_ACCEPT                                      "SW_HID_REDLINE_ACCEPT"
 #define HID_EDIT_FLD_DB                                         "SW_HID_EDIT_FLD_DB"
 #define HID_EDIT_FLD_DOKINF                                     "SW_HID_EDIT_FLD_DOKINF"
diff --git a/sw/source/ui/inc/linenum.hxx b/sw/source/ui/inc/linenum.hxx
index 8e22638..b529692 100644
--- a/sw/source/ui/inc/linenum.hxx
+++ b/sw/source/ui/inc/linenum.hxx
@@ -30,8 +30,7 @@
 
 #include <sfx2/basedlgs.hxx>
 #include <vcl/button.hxx>
-#include <vcl/field.hxx>
-#include <vcl/fixed.hxx>
+#include <vcl/layout.hxx>
 #include <vcl/lstbox.hxx>
 #include <numberingtypelistbox.hxx>
 
@@ -43,34 +42,20 @@ class SwLineNumberingDlg : public SfxModalDialog
 {
 private:
     SwWrtShell* pSh;
-
-    CheckBox        aNumberingOnCB;
-    FixedLine       aDisplayFL;
-    FixedText       aCharStyleFT;
-    ListBox         aCharStyleLB;
-    FixedText       aFormatFT;
-    SwNumberingTypeListBox   aFormatLB;
-    FixedText       aPosFT;
-    ListBox         aPosLB;
-    FixedText       aOffsetFT;
-    MetricField     aOffsetMF;
-    FixedText       aNumIntervalFT;
-    NumericField    aNumIntervalNF;
-    FixedText       aNumRowsFT;
-    FixedLine       aDivisorFL;
-    FixedText       aDivisorFT;
-    Edit            aDivisorED;
-    FixedText       aDivIntervalFT;
-    NumericField    aDivIntervalNF;
-    FixedText       aDivRowsFT;
-    FixedLine       aCountFL;
-    CheckBox        aCountEmptyLinesCB;
-    CheckBox        aCountFrameLinesCB;
-    CheckBox        aRestartEachPageCB;
-
-    OKButton        aOkPB;
-    CancelButton    aCancelPB;
-    HelpButton      aHelpPB;
+    VclContainer* m_pBodyContent;
+    Window* m_pDivIntervalFT;
+    NumericField* m_pDivIntervalNF;
+    Window* m_pDivRowsFT;
+    NumericField* m_pNumIntervalNF;
+    ListBox* m_pCharStyleLB;
+    SwNumberingTypeListBox* m_pFormatLB;
+    ListBox* m_pPosLB;
+    MetricField* m_pOffsetMF;
+    Edit* m_pDivisorED;
+    CheckBox* m_pCountEmptyLinesCB;
+    CheckBox* m_pCountFrameLinesCB;
+    CheckBox* m_pRestartEachPageCB;
+    CheckBox* m_pNumberingOnCB;
 
     DECL_LINK(OKHdl, void *);
     DECL_LINK(LineOnOffHdl, void * = 0);
@@ -79,7 +64,7 @@ private:
 public:
     SwWrtShell* GetWrtShell() const { return pSh; }
 
-     SwLineNumberingDlg(SwView *pVw);
+    SwLineNumberingDlg(SwView *pVw);
     ~SwLineNumberingDlg();
 };
 
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index ed57ce1..c28c631 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -44,113 +44,103 @@
 
 #include "fldbas.hxx"
 #include "lineinfo.hxx"
-#include "globals.hrc"
-#include "linenum.hrc"
 #include "linenum.hxx"
 #include "uitool.hxx"
 
 #include <IDocumentStylePoolAccess.hxx>
 
-SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw) :
-    SfxModalDialog(&pVw->GetViewFrame()->GetWindow(), SW_RES(DLG_LINENUMBERING)),
-    pSh(pVw->GetWrtShellPtr()),
-    aNumberingOnCB      ( this, SW_RES( CB_NUMBERING_ON )),
-    aDisplayFL          ( this, SW_RES( FL_DISPLAY )),
-    aCharStyleFT        ( this, SW_RES( FT_CHAR_STYLE )),
-    aCharStyleLB        ( this, SW_RES( LB_CHAR_STYLE )),
-    aFormatFT           ( this, SW_RES( FT_FORMAT )),
-    aFormatLB           ( this, SW_RES( LB_FORMAT ), INSERT_NUM_EXTENDED_TYPES),
-    aPosFT              ( this, SW_RES( FT_POS )),
-    aPosLB              ( this, SW_RES( LB_POS )),
-    aOffsetFT           ( this, SW_RES( FT_OFFSET )),
-    aOffsetMF           ( this, SW_RES( MF_OFFSET )),
-    aNumIntervalFT      ( this, SW_RES( FT_NUM_INVERVAL )),
-    aNumIntervalNF      ( this, SW_RES( NF_NUM_INVERVAL )),
-    aNumRowsFT          ( this, SW_RES( FT_NUM_ROWS )),
-    aDivisorFL          ( this, SW_RES( FL_DIVISOR )),
-    aDivisorFT          ( this, SW_RES( FT_DIVISOR )),
-    aDivisorED          ( this, SW_RES( ED_DIVISOR )),
-    aDivIntervalFT      ( this, SW_RES( FT_DIV_INTERVAL )),
-    aDivIntervalNF      ( this, SW_RES( NF_DIV_INTERVAL )),
-    aDivRowsFT          ( this, SW_RES( FT_DIV_ROWS )),
-    aCountFL            ( this, SW_RES( FL_COUNT )),
-    aCountEmptyLinesCB  ( this, SW_RES( CB_COUNT_EMPTYLINES )),
-    aCountFrameLinesCB  ( this, SW_RES( CB_COUNT_FRAMELINES )),
-    aRestartEachPageCB  ( this, SW_RES( CB_RESTART_PAGE )),
-    aOkPB               ( this, SW_RES( PB_OK )),
-    aCancelPB           ( this, SW_RES( PB_CANCEL )),
-    aHelpPB             ( this, SW_RES( PB_HELP ))
+SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw)
+    : SfxModalDialog( &pVw->GetViewFrame()->GetWindow(), rtl::OString("LineNumberingDialog"),
+        rtl::OUString("modules/swriter/ui/linenumbering.ui") )
+    , pSh(pVw->GetWrtShellPtr())
 {
-    String sIntervalName = aDivIntervalFT.GetAccessibleName();
+    m_pBodyContent = static_cast<VclContainer*>(m_pUIBuilder->get_by_name("content"));
+    m_pDivIntervalFT = m_pUIBuilder->get_by_name("every");
+    m_pDivIntervalNF = static_cast<NumericField*>(m_pUIBuilder->get_by_name("linesspin"));
+    m_pDivRowsFT = m_pUIBuilder->get_by_name("lines");
+    m_pNumIntervalNF = static_cast<NumericField*>(m_pUIBuilder->get_by_name("intervalspin"));
+    m_pCharStyleLB = static_cast<ListBox*>(m_pUIBuilder->get_by_name("styledropdown"));
+    m_pFormatLB = static_cast<SwNumberingTypeListBox*>(m_pUIBuilder->get_by_name("formatdropdown"));
+    m_pPosLB = static_cast<ListBox*>(m_pUIBuilder->get_by_name("positiondropdown"));
+    m_pOffsetMF = static_cast<MetricField*>(m_pUIBuilder->get_by_name("spacingspin"));
+    m_pDivisorED = static_cast<Edit*>(m_pUIBuilder->get_by_name("textentry"));
+    m_pCountEmptyLinesCB = static_cast<CheckBox*>(m_pUIBuilder->get_by_name("blanklines"));
+    m_pCountFrameLinesCB = static_cast<CheckBox*>(m_pUIBuilder->get_by_name("linesintextframes"));
+    m_pRestartEachPageCB = static_cast<CheckBox*>(m_pUIBuilder->get_by_name("restarteverynewpage"));
+    m_pNumberingOnCB = static_cast<CheckBox*>(m_pUIBuilder->get_by_name("shownumbering"));
+
+    String sIntervalName = m_pDivIntervalFT->GetAccessibleName();
     sIntervalName += String::CreateFromAscii("(");
-    sIntervalName += aDivRowsFT.GetAccessibleName();
+    sIntervalName += m_pDivRowsFT->GetAccessibleName();
     sIntervalName += String::CreateFromAscii(")");
-    aDivIntervalNF.SetAccessibleName(sIntervalName);
-    sIntervalName = aNumIntervalFT.GetAccessibleName();
+    m_pDivIntervalNF->SetAccessibleName(sIntervalName);
+
+    Window *pNumIntervalFT = m_pUIBuilder->get_by_name("interval");
+    Window *pNumRowsFT = m_pUIBuilder->get_by_name("intervallines");
+    sIntervalName = pNumIntervalFT->GetAccessibleName();
     sIntervalName += String::CreateFromAscii("(");
-    sIntervalName += aNumRowsFT.GetAccessibleName();
+    sIntervalName += pNumRowsFT->GetAccessibleName();
     sIntervalName += String::CreateFromAscii(")");
-    aNumIntervalNF.SetAccessibleName(sIntervalName);
-
-    FreeResource();
+    m_pNumIntervalNF->SetAccessibleName(sIntervalName);
 
     // char styles
-    ::FillCharStyleListBox(aCharStyleLB, pSh->GetView().GetDocShell());
+    ::FillCharStyleListBox(*m_pCharStyleLB, pSh->GetView().GetDocShell());
 
     const SwLineNumberInfo &rInf = pSh->GetLineNumberInfo();
     IDocumentStylePoolAccess* pIDSPA = pSh->getIDocumentStylePoolAccess();
 
     String sStyleName(rInf.GetCharFmt( *pIDSPA )->GetName());
-    const sal_uInt16 nPos = aCharStyleLB.GetEntryPos(sStyleName);
+    const sal_uInt16 nPos = m_pCharStyleLB->GetEntryPos(sStyleName);
 
     if (nPos != LISTBOX_ENTRY_NOTFOUND)
-        aCharStyleLB.SelectEntryPos(nPos);
+        m_pCharStyleLB->SelectEntryPos(nPos);
     else
     {
         if (sStyleName.Len())
         {
-            aCharStyleLB.InsertEntry(sStyleName);
-            aCharStyleLB.SelectEntry(sStyleName);
+            m_pCharStyleLB->InsertEntry(sStyleName);
+            m_pCharStyleLB->SelectEntry(sStyleName);
         }
     }
 
     // format
     sal_uInt16 nSelFmt = rInf.GetNumType().GetNumberingType();
 
-    aFormatLB.SelectNumberingType(nSelFmt);
+    m_pFormatLB->SelectNumberingType(nSelFmt);
 
     // position
-    aPosLB.SelectEntryPos((sal_uInt16)rInf.GetPos());
+    m_pPosLB->SelectEntryPos((sal_uInt16)rInf.GetPos());
 
     // offset
     sal_uInt16 nOffset = rInf.GetPosFromLeft();
     if (nOffset == USHRT_MAX)
         nOffset = 0;
 
-    aOffsetMF.SetValue(aOffsetMF.Normalize(nOffset), FUNIT_TWIP);
+    m_pOffsetMF->SetValue(m_pOffsetMF->Normalize(nOffset), FUNIT_TWIP);
 
     // numbering offset
-    aNumIntervalNF.SetValue(rInf.GetCountBy());
+    m_pNumIntervalNF->SetValue(rInf.GetCountBy());
 
     // divider
-    aDivisorED.SetText(rInf.GetDivider());
+    m_pDivisorED->SetText(rInf.GetDivider());
 
     // divider offset
-    aDivIntervalNF.SetValue(rInf.GetDividerCountBy());
+    m_pDivIntervalNF->SetValue(rInf.GetDividerCountBy());
 
     // count
-    aCountEmptyLinesCB.Check(rInf.IsCountBlankLines());
-    aCountFrameLinesCB.Check(rInf.IsCountInFlys());
-    aRestartEachPageCB.Check(rInf.IsRestartEachPage());
+    m_pCountEmptyLinesCB->Check(rInf.IsCountBlankLines());
+    m_pCountFrameLinesCB->Check(rInf.IsCountInFlys());
+    m_pRestartEachPageCB->Check(rInf.IsRestartEachPage());
 
-    aNumberingOnCB.Check(rInf.IsPaintLineNumbers());
+    m_pNumberingOnCB->Check(rInf.IsPaintLineNumbers());
 
-    aNumberingOnCB.SetClickHdl(LINK(this, SwLineNumberingDlg, LineOnOffHdl));
-    aDivisorED.SetModifyHdl(LINK(this, SwLineNumberingDlg, ModifyHdl));
+    m_pNumberingOnCB->SetClickHdl(LINK(this, SwLineNumberingDlg, LineOnOffHdl));
+    m_pDivisorED->SetModifyHdl(LINK(this, SwLineNumberingDlg, ModifyHdl));
     ModifyHdl();
     LineOnOffHdl();
 
-    aOkPB.SetClickHdl(LINK(this, SwLineNumberingDlg, OKHdl));
+    PushButton *pOkPB = static_cast<PushButton*>(m_pUIBuilder->get_by_name("ok"));
+    pOkPB->SetClickHdl(LINK(this, SwLineNumberingDlg, OKHdl));
 }
 
 SwLineNumberingDlg::~SwLineNumberingDlg()
@@ -162,7 +152,7 @@ IMPL_LINK_NOARG(SwLineNumberingDlg, OKHdl)
     SwLineNumberInfo aInf(pSh->GetLineNumberInfo());
 
     // char styles
-    String sCharFmtName(aCharStyleLB.GetSelectEntry());
+    String sCharFmtName(m_pCharStyleLB->GetSelectEntry());
     SwCharFmt *pCharFmt = pSh->FindCharFmtByName(sCharFmtName);
 
     if (!pCharFmt)
@@ -180,30 +170,30 @@ IMPL_LINK_NOARG(SwLineNumberingDlg, OKHdl)
 
     // format
     SvxNumberType aType;
-    aType.SetNumberingType(aFormatLB.GetSelectedNumberingType());
+    aType.SetNumberingType(m_pFormatLB->GetSelectedNumberingType());
     aInf.SetNumType(aType);
 
     // position
-    aInf.SetPos((LineNumberPosition)aPosLB.GetSelectEntryPos());
+    aInf.SetPos((LineNumberPosition)m_pPosLB->GetSelectEntryPos());
 
     // offset
-    aInf.SetPosFromLeft((sal_uInt16)aOffsetMF.Denormalize(aOffsetMF.GetValue(FUNIT_TWIP)));
+    aInf.SetPosFromLeft((sal_uInt16)m_pOffsetMF->Denormalize(m_pOffsetMF->GetValue(FUNIT_TWIP)));
 
     // numbering offset
-    aInf.SetCountBy((sal_uInt16)aNumIntervalNF.GetValue());
+    aInf.SetCountBy((sal_uInt16)m_pNumIntervalNF->GetValue());
 
     // divider
-    aInf.SetDivider(aDivisorED.GetText());
+    aInf.SetDivider(m_pDivisorED->GetText());
 
     // divider offset
-    aInf.SetDividerCountBy((sal_uInt16)aDivIntervalNF.GetValue());
+    aInf.SetDividerCountBy((sal_uInt16)m_pDivIntervalNF->GetValue());
 
     // count
-    aInf.SetCountBlankLines(aCountEmptyLinesCB.IsChecked());
-    aInf.SetCountInFlys(aCountFrameLinesCB.IsChecked());
-    aInf.SetRestartEachPage(aRestartEachPageCB.IsChecked());
+    aInf.SetCountBlankLines(m_pCountEmptyLinesCB->IsChecked());
+    aInf.SetCountInFlys(m_pCountFrameLinesCB->IsChecked());
+    aInf.SetRestartEachPage(m_pRestartEachPageCB->IsChecked());
 
-    aInf.SetPaintLineNumbers(aNumberingOnCB.IsChecked());
+    aInf.SetPaintLineNumbers(m_pNumberingOnCB->IsChecked());
 
     pSh->SetLineNumberInfo(aInf);
 
@@ -217,11 +207,11 @@ IMPL_LINK_NOARG(SwLineNumberingDlg, OKHdl)
  --------------------------------------------------------------------*/
 IMPL_LINK_NOARG(SwLineNumberingDlg, ModifyHdl)
 {
-    sal_Bool bHasValue = aDivisorED.GetText().Len() != 0;
+    bool bHasValue = m_pDivisorED->GetText().Len() != 0;
 
-    aDivIntervalFT.Enable(bHasValue);
-    aDivIntervalNF.Enable(bHasValue);
-    aDivRowsFT.Enable(bHasValue);
+    m_pDivIntervalFT->Enable(bHasValue);
+    m_pDivIntervalNF->Enable(bHasValue);
+    m_pDivRowsFT->Enable(bHasValue);
 
     return 0;
 }
@@ -231,31 +221,9 @@ IMPL_LINK_NOARG(SwLineNumberingDlg, ModifyHdl)
  --------------------------------------------------------------------*/
 IMPL_LINK_NOARG(SwLineNumberingDlg, LineOnOffHdl)
 {
-    sal_Bool bEnable = aNumberingOnCB.IsChecked();
-
-    aCharStyleFT.Enable(bEnable);
-    aCharStyleLB.Enable(bEnable);
-    aFormatFT.Enable(bEnable);
-    aFormatLB.Enable(bEnable);
-    aPosFT.Enable(bEnable);
-    aPosLB.Enable(bEnable);
-    aOffsetFT.Enable(bEnable);
-    aOffsetMF.Enable(bEnable);
-    aNumIntervalFT.Enable(bEnable);
-    aNumIntervalNF.Enable(bEnable);
-    aNumRowsFT.Enable(bEnable);
-    aDisplayFL.Enable(bEnable);
-    aDivisorFT.Enable(bEnable);
-    aDivisorED.Enable(bEnable);
-    aDivIntervalFT.Enable(bEnable);
-    aDivIntervalNF.Enable(bEnable);
-    aDivRowsFT.Enable(bEnable);
-    aDivisorFL.Enable(bEnable);
-    aCountEmptyLinesCB.Enable(bEnable);
-    aCountFrameLinesCB.Enable(bEnable);
-    aRestartEachPageCB.Enable(bEnable);
-    aCountFL.Enable(bEnable);
-
+    bool bEnable = m_pNumberingOnCB->IsChecked();
+    m_pBodyContent->Enable(bEnable);
+    ModifyHdl();
     return 0;
 }
 
diff --git a/sw/source/ui/misc/linenum.hrc b/sw/source/ui/misc/linenum.hrc
deleted file mode 100644
index 714a69b..0000000
--- a/sw/source/ui/misc/linenum.hrc
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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 .
- */
-#define CB_NUMBERING_ON     1
-#define FT_CHAR_STYLE       2
-#define LB_CHAR_STYLE       3
-#define FT_FORMAT           4
-#define LB_FORMAT           5
-#define FT_POS              6
-#define LB_POS              7
-#define FT_OFFSET           8
-#define MF_OFFSET           9
-#define FT_NUM_INVERVAL     10
-#define NF_NUM_INVERVAL     11
-#define FT_NUM_ROWS         12
-#define FL_DISPLAY          13
-#define FT_DIVISOR          14
-#define ED_DIVISOR          15
-#define FT_DIV_INTERVAL     16
-#define NF_DIV_INTERVAL     17
-#define FT_DIV_ROWS         18
-#define FL_DIVISOR          19
-#define CB_COUNT_EMPTYLINES 20
-#define CB_COUNT_FRAMELINES 21
-#define FL_COUNT            22
-#define CB_RESTART_PAGE     23
-#define PB_OK               24
-#define PB_CANCEL           25
-#define PB_HELP             26
diff --git a/sw/source/ui/misc/linenum.src b/sw/source/ui/misc/linenum.src
deleted file mode 100644
index 345c52f..0000000
--- a/sw/source/ui/misc/linenum.src
+++ /dev/null
@@ -1,262 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-/* StarView ressource file */
-
-#ifndef _SFX_HRC
-#include <sfx2/sfx.hrc>
-#endif
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
-#include "globals.hrc"
-#include "misc.hrc"
-#include "linenum.hrc"
-#include "helpid.h"
-/**************************************************************************/
-/*                                                                        */
-/**************************************************************************/
-ModalDialog DLG_LINENUMBERING
-{
-    HelpID = HID_LINENUMBERING ;
-    SVLook = TRUE ;
-    Hide = TRUE ;
-    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-    CheckBox CB_NUMBERING_ON
-    {
-        HelpID = "sw:CheckBox:TP_LINENUMBERING:CB_NUMBERING_ON";
-        Pos = MAP_APPFONT ( 12 , 6 ) ;
-        Size = MAP_APPFONT ( 242 , 8 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Show numbering" ;
-    };
-    FixedText FT_CHAR_STYLE
-    {
-        Pos = MAP_APPFONT ( 12 , 30 ) ;
-        Size = MAP_APPFONT ( 80 , 8 ) ;
-        Text [ en-US ] = "~Character Style" ;
-    };
-    ListBox LB_CHAR_STYLE
-    {
-        HelpID = "sw:ListBox:TP_LINENUMBERING:LB_CHAR_STYLE";
-        Pos = MAP_APPFONT ( 100 , 30 ) ;
-        Size = MAP_APPFONT ( 148 , 80 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        Sort = TRUE ;
-    };
-    FixedText FT_FORMAT
-    {
-        Pos = MAP_APPFONT ( 12 , 46 ) ;
-        Size = MAP_APPFONT ( 80 , 8 ) ;
-        Text [ en-US ] = "F~ormat" ;
-    };
-    ListBox LB_FORMAT
-    {
-        HelpID = "sw:ListBox:TP_LINENUMBERING:LB_FORMAT";
-        Pos = MAP_APPFONT ( 100 , 44 ) ;
-        Size = MAP_APPFONT ( 148 , 80 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-    };
-    FixedText FT_POS
-    {
-        Pos = MAP_APPFONT ( 12 , 62 ) ;
-        Size = MAP_APPFONT ( 80 , 8 ) ;
-        Text [ en-US ] = "Position" ;
-    };
-    ListBox LB_POS
-    {
-        HelpID = "sw:ListBox:TP_LINENUMBERING:LB_POS";
-        Pos = MAP_APPFONT ( 100 , 60 ) ;
-        Size = MAP_APPFONT ( 148 , 60 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        StringList [ en-US ] =
-        {
-            < "Left" ; > ;
-            < "Right" ; > ;
-            < "Inner" ; > ;
-            < "Outer" ; > ;
-        };
-    };
-    FixedText FT_OFFSET
-    {
-        Pos = MAP_APPFONT ( 12 , 78 ) ;
-        Size = MAP_APPFONT ( 80 , 8 ) ;
-        Text [ en-US ] = "Spacing" ;
-    };
-    MetricField MF_OFFSET
-    {
-        HelpID = "sw:MetricField:TP_LINENUMBERING:MF_OFFSET";
-        Pos = MAP_APPFONT ( 100 , 76 ) ;
-        Size = MAP_APPFONT ( 45 , 12 ) ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 0 ;
-        Maximum = 9999 ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_CM ;
-        First = 0 ;
-        Last = 9999 ;
-        SpinSize = 10 ;
-    };
-    FixedText FT_NUM_INVERVAL
-    {
-        Pos = MAP_APPFONT ( 12 , 94 ) ;
-        Size = MAP_APPFONT ( 80 , 8 ) ;
-        Text [ en-US ] = "Interval" ;
-    };
-    NumericField NF_NUM_INVERVAL
-    {
-        HelpID = "sw:NumericField:TP_LINENUMBERING:NF_NUM_INVERVAL";
-        Pos = MAP_APPFONT ( 100 , 92 ) ;
-        Size = MAP_APPFONT ( 30 , 12 ) ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 1 ;
-        Maximum = 1000 ;
-        First = 1 ;
-        Last = 1000 ;
-        SpinSize = 1 ;
-    };
-    FixedText FT_NUM_ROWS
-    {
-        Pos = MAP_APPFONT ( 136 , 94 ) ;
-        Size = MAP_APPFONT ( 80 , 10 ) ;
-        Text [ en-US ] = "lines" ;
-    };
-    FixedLine FL_DISPLAY
-    {
-        Pos = MAP_APPFONT ( 6 , 17 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "View" ;
-    };
-    FixedText FT_DIVISOR
-    {
-        Pos = MAP_APPFONT ( 12 , 123 ) ;
-        Size = MAP_APPFONT ( 30 , 8 ) ;
-        Text [ en-US ] = "Text" ;
-    };
-    Edit ED_DIVISOR
-    {
-        HelpID = "sw:Edit:TP_LINENUMBERING:ED_DIVISOR";
-        Pos = MAP_APPFONT ( 45 , 121 ) ;
-        Size = MAP_APPFONT ( 76 , 12 ) ;
-        Left = TRUE ;
-        Border = TRUE ;
-    };
-    FixedText FT_DIV_INTERVAL
-    {
-        Pos = MAP_APPFONT ( 12 , 139 ) ;
-        Size = MAP_APPFONT ( 30 , 8 ) ;
-         //        Disable = TRUE ;
-        Text [ en-US ] = "Every" ;
-    };
-    NumericField NF_DIV_INTERVAL
-    {
-        HelpID = "sw:NumericField:TP_LINENUMBERING:NF_DIV_INTERVAL";
-        Pos = MAP_APPFONT ( 45 , 137 ) ;
-        Size = MAP_APPFONT ( 30 , 12 ) ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 0 ;
-        Maximum = 1000 ;
-        First = 0 ;
-        Last = 1000 ;
-        SpinSize = 1 ;
-         //        Disable = TRUE ;
-    };
-    FixedText FT_DIV_ROWS
-    {
-        Pos = MAP_APPFONT ( 78 , 139 ) ;
-        Size = MAP_APPFONT ( 40 , 8 ) ;
-        Text [ en-US ] = "Lines" ;
-    };
-    FixedLine FL_DIVISOR
-    {
-        Pos = MAP_APPFONT ( 6 , 110 ) ;
-        Size = MAP_APPFONT ( 121 , 8 ) ;
-        Text [ en-US ] = "Separator" ;
-    };
-    CheckBox CB_COUNT_EMPTYLINES
-    {
-        HelpID = "sw:CheckBox:TP_LINENUMBERING:CB_COUNT_EMPTYLINES";
-        Pos = MAP_APPFONT ( 139 , 121 ) ;
-        Size = MAP_APPFONT ( 110 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Blank lines" ;
-    };
-    CheckBox CB_COUNT_FRAMELINES
-    {
-        HelpID = "sw:CheckBox:TP_LINENUMBERING:CB_COUNT_FRAMELINES";
-        Pos = MAP_APPFONT ( 139 , 135 ) ;
-        Size = MAP_APPFONT ( 110 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Lines in text frames" ;
-    };
-    CheckBox CB_RESTART_PAGE
-    {
-        HelpID = "sw:CheckBox:TP_LINENUMBERING:CB_RESTART_PAGE";
-        Pos = MAP_APPFONT ( 139 , 149 );
-        Size = MAP_APPFONT ( 110 , 10 );
-        TabStop = TRUE;
-        Text [ en-US ] = "~Restart every new page";
-    };
-    FixedLine FL_COUNT
-    {
-        Pos = MAP_APPFONT ( 133 , 110 ) ;
-        Size = MAP_APPFONT ( 121 , 8 ) ;
-        Text [ en-US ] = "Count" ;
-    };
-    OKButton PB_OK
-    {
-        Pos = MAP_APPFONT ( 54 , 170 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        DefButton = TRUE ;
-    };
-    CancelButton PB_CANCEL
-    {
-        Pos = MAP_APPFONT ( 107 , 170 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        DefButton = TRUE ;
-    };
-    HelpButton PB_HELP
-    {
-        Pos = MAP_APPFONT ( 160 , 170 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-    };
-    Text [ en-US ] = "Line Numbering" ;
-};
diff --git a/sw/uiconfig/swriter/ui/linenumbering.ui b/sw/uiconfig/swriter/ui/linenumbering.ui
new file mode 100644
index 0000000..35a8965
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/linenumbering.ui
@@ -0,0 +1,581 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkDialog" id="LineNumberingDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">5</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>
+        <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="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</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="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</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="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</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>
+          </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="GtkBox" id="box1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">4</property>
+            <child>
+              <object class="GtkAlignment" id="alignment4">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <object class="GtkCheckButton" id="shownumbering">
+                    <property name="label" translatable="yes">Show numbering</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="halign">start</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="content">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkFrame" id="frame1">
+                    <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="alignment1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkGrid" id="grid2">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="row_spacing">4</property>
+                            <property name="column_spacing">8</property>
+                            <child>
+                              <object class="GtkLabel" id="characterstyle">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Character Style</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="format">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Format</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="GtkLabel" id="position">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Position</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">2</property>
+                                <property name="width">1</property>
+                                <property name="height">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="spacing">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Spacing</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">3</property>
+                                <property name="width">1</property>
+                                <property name="height">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="interval">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Interval</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">4</property>
+                                <property name="width">1</property>
+                                <property name="height">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkComboBox" id="styledropdown">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="hexpand">True</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">0</property>
+                                <property name="width">2</property>
+                                <property name="height">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="SwNumberingTypeListBox" id="formatdropdown">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="hexpand">True</property>
+                                <property name="type">16</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">1</property>
+                                <property name="width">2</property>
+                                <property name="height">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkComboBox" id="positiondropdown">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="hexpand">True</property>
+                                <property name="model">positionstore</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">2</property>
+                                <property name="width">2</property>
+                                <property name="height">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkSpinButton" id="spacingspin">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="halign">start</property>
+                                <property name="invisible_char">●</property>
+                                <property name="invisible_char_set">True</property>
+                                <property name="adjustment">spacingadjustment</property>
+                                <property name="digits">2</property>
+                                <property name="pattern">0.00cm</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">3</property>
+                                <property name="width">2</property>
+                                <property name="height">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="box4">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="spacing">4</property>
+                                <child>
+                                  <object class="GtkSpinButton" id="intervalspin">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">●</property>
+                                    <property name="invisible_char_set">True</property>
+                                    <property name="adjustment">intervaladjustment</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="intervallines">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">lines</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">4</property>
+                                <property name="width">2</property>
+                                <property name="height">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="view">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">View</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="box3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkFrame" id="frame2">
+                        <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="left_padding">12</property>
+                            <child>
+                              <object class="GtkGrid" id="grid1">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="column_spacing">6</property>
+                                <child>
+                                  <object class="GtkLabel" id="text">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Text</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="every">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Every</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="GtkEntry" id="textentry">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">●</property>
+                                    <property name="invisible_char_set">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="top_attach">0</property>
+                                    <property name="width">2</property>
+                                    <property name="height">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="lines">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Lines</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">2</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="width">1</property>
+                                    <property name="height">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinButton" id="linesspin">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">●</property>
+                                    <property name="invisible_char_set">True</property>
+                                    <property name="adjustment">lineadjustment</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="separator">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Separator</property>
+                            <property name="use_markup">True</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkFrame" id="frame3">
+                        <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="left_padding">12</property>
+                            <child>
+                              <object class="GtkBox" id="box5">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="orientation">vertical</property>
+                                <child>
+                                  <object class="GtkCheckButton" id="blanklines">
+                                    <property name="label" translatable="yes">Blank lines</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="active">True</property>
+                                    <property name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="linesintextframes">
+                                    <property name="label" translatable="yes">Lines in text frames</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="restarteverynewpage">
+                                    <property name="label" translatable="yes">Restart every new page</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="yalign">0.60000002384185791</property>
+                                    <property name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child type="label">
+                          <object class="GtkLabel" id="count">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="ypad">1</property>
+                            <property name="label" translatable="yes">Count</property>
+                            <property name="use_markup">True</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</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-widgets>
+  </object>
+  <object class="GtkAdjustment" id="intervaladjustment">
+    <property name="lower">1</property>
+    <property name="upper">1000</property>
+    <property name="value">5</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="lineadjustment">
+    <property name="upper">1000</property>
+    <property name="value">3</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkListStore" id="positionstore">
+    <columns>
+      <!-- column-name positions -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Left</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Right</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Inner</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Outer</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkAdjustment" id="spacingadjustment">
+    <property name="upper">9999</property>
+    <property name="value">0.5</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+</interface>


More information about the Libreoffice-commits mailing list