[Libreoffice-commits] core.git: 5 commits - sfx2/source svtools/source sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
Caolán McNamara
caolanm at redhat.com
Thu Aug 15 01:51:04 PDT 2013
sfx2/source/doc/objmisc.cxx | 2
svtools/source/svhtml/parhtml.cxx | 4
sw/AllLangResTarget_sw.mk | 1
sw/UIConfig_swriter.mk | 1
sw/inc/envelp.hrc | 7 -
sw/inc/helpid.h | 2
sw/inc/swabstdlg.hxx | 2
sw/source/filter/html/htmlbas.cxx | 2
sw/source/ui/app/appenv.cxx | 2
sw/source/ui/dialog/swdlgfact.cxx | 18 ---
sw/source/ui/dialog/swdlgfact.hxx | 2
sw/source/ui/envelp/envlop.hrc | 32 ------
sw/source/ui/envelp/envlop.src | 64 -------------
sw/source/ui/envelp/envlop1.cxx | 38 +++----
sw/source/ui/inc/envlop.hxx | 3
sw/uiconfig/swriter/ui/envdialog.ui | 177 ++++++++++++++++++++++++++++++++++++
16 files changed, 204 insertions(+), 153 deletions(-)
New commits:
commit 5166f28e797aec47a8a48213203ebd6a7ee06302
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 15 09:40:09 2013 +0100
original code inserted sSaveToken at the start of aToken
prior to 33eeb70011b34a3b04a74b2237d1d6fdde030c35
Change-Id: I61070c0d04152e544ff329fc3428cb4f5a06e791
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index 1b5ec96..a73a031 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -1823,7 +1823,7 @@ int HTMLParser::FilterXMP( int nToken )
{
UnescapeToken();
sSaveToken += " ";
- aToken = " " + aToken;
+ aToken = sSaveToken + aToken;
}
else
aToken = sSaveToken;
commit 1e01f51fb6e2101721cda02cf944d3d472ef03e5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 15 09:32:32 2013 +0100
original code compared length to >= 2
prior to 33eeb70011b34a3b04a74b2237d1d6fdde030c35
Change-Id: I7eaf8a9e85351d5023332c3a5805096a9db43136
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index cf62456..7d64f2a 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -183,7 +183,7 @@ void SwHTMLParser::EndScript()
void SwHTMLParser::AddScriptSource()
{
// Hier merken wir und nur ein par Strings
- if( !aToken.isEmpty() > 2 &&
+ if( aToken.getLength() > 2 &&
(HTML_SL_STARBASIC==eScriptLang && aToken[ 0 ] == '\'') )
{
sal_Int32 nPos = -1;
commit 76c615c177fab1d1bdaae38dd312c02e0f3b9396
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 15 09:28:24 2013 +0100
single arg Erase erased to eol
prior to 33eeb70011b34a3b04a74b2237d1d6fdde030c35
Change-Id: I4c30e6746a62e4035cf019b3186003498f7bdde3
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index 9c40438..1b5ec96 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -1197,7 +1197,7 @@ int HTMLParser::_GetNextToken()
SetLineNr( nCLineNr );
SetLinePos( nCLinePos );
ClearTxtConvContext();
- aToken = aToken.replaceAt( nCStrLen, 1, "" );
+ aToken = aToken.copy(0, nCStrLen);
nNextCh = '>';
}
}
commit 32514ab76dc9eebeaf79d1bd843ca9157595781a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 15 09:25:55 2013 +0100
this used to be CompareIgnoreCaseToAscii
prior to 33eeb70011b34a3b04a74b2237d1d6fdde030c35
Change-Id: I20d25cf6bd4479b9b98b04aec6124d94c272bc26
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index d7b6c0b..3b09a22 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1626,7 +1626,7 @@ void SfxHeaderAttributes_Impl::SetAttributes()
void SfxHeaderAttributes_Impl::SetAttribute( const SvKeyValue& rKV )
{
String aValue = rKV.GetValue();
- if( rKV.GetKey() == "refresh" && !rKV.GetValue().isEmpty() )
+ if( rKV.GetKey().equalsIgnoreAsciiCase("refresh") && !rKV.GetValue().isEmpty() )
{
sal_uInt32 nTime = aValue.GetToken( 0, ';' ).ToInt32() ;
String aURL = comphelper::string::strip(aValue.GetToken( 1, ';' ), ' ');
commit 2cba0b8f744c832ab91e7786c4a1d3ad13d04c43
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 15 08:51:34 2013 +0100
convert envelope dialog to .ui
Change-Id: If079caaabb94497605245b3da5eb865f2bf0adec
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 0876fc2..775b558 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -97,7 +97,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/docvw/access.src \
sw/source/ui/docvw/docvw.src \
sw/source/ui/envelp/envelp.src \
- sw/source/ui/envelp/envlop.src \
sw/source/ui/envelp/envprt.src \
sw/source/ui/envelp/label.src \
sw/source/ui/envelp/labfmt.src \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 36bfc1f..576896f 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -86,6 +86,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/editsectiondialog \
sw/uiconfig/swriter/ui/endnotepage \
sw/uiconfig/swriter/ui/envaddresspage \
+ sw/uiconfig/swriter/ui/envdialog \
sw/uiconfig/swriter/ui/envformatpage \
sw/uiconfig/swriter/ui/envprinterpage \
sw/uiconfig/swriter/ui/exchangedatabases \
diff --git a/sw/inc/envelp.hrc b/sw/inc/envelp.hrc
index ae75783..7ab5d3d 100644
--- a/sw/inc/envelp.hrc
+++ b/sw/inc/envelp.hrc
@@ -26,13 +26,6 @@
// Dialoge --------------------------------------------------------------------
-#define DLG_ENV (RC_ENVELP_BEGIN )
-#define DLG_LAB (RC_ENVELP_BEGIN + 1)
-
-#define TP_ENV_ENV (RC_ENVELP_BEGIN + 2)
-#define TP_ENV_FMT (RC_ENVELP_BEGIN + 3)
-#define TP_ENV_PRT (RC_ENVELP_BEGIN + 4)
-
#define DLG_MAILMERGE (RC_ENVELP_BEGIN + 8)
#define DLG_SYNC_BTN (RC_ENVELP_BEGIN + 9)
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index e28e4d1..b2ed7ac 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -313,9 +313,7 @@
#define HID_FORMAT_PAGE "SW_HID_FORMAT_PAGE"
#define HID_CONFIG_MENU "SW_HID_CONFIG_MENU"
#define HID_NAVIGATION_PI "SW_HID_NAVIGATION_PI"
-#define HID_ENVELOP_PRINT "SW_HID_ENVELOP_PRINT"
#define HID_NAVIGATION_IMGBTN "SW_HID_NAVIGATION_IMGBTN"
-#define HID_ENVELOP_INSERT "SW_HID_ENVELOP_INSERT"
#define HID_TEXT_TOOLBOX "SW_HID_TEXT_TOOLBOX"
#define HID_TABLE_TOOLBOX "SW_HID_TABLE_TOOLBOX"
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index b0578c1..3042195 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -353,7 +353,7 @@ public:
//add for DropDownFieldDialog
virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog(Window *pParent, SwWrtShell &rSh,
SwField* pField, sal_Bool bNextButton = sal_False) = 0;
- virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert,int nResId ) = 0; //add for SwEnvDlg
+ virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert ) = 0; //add for SwEnvDlg
virtual AbstractSwLabDlg* CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet, //add for SwLabDlg
diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx
index 7805d04..372b814 100644
--- a/sw/source/ui/app/appenv.cxx
+++ b/sw/source/ui/app/appenv.cxx
@@ -211,7 +211,7 @@ void SwModule::InsertEnv( SfxRequest& rReq )
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- pDlg = pFact->CreateSwEnvDlg( pParent, aSet, pOldSh, pTempPrinter, !bEnvChange, DLG_ENV );
+ pDlg = pFact->CreateSwEnvDlg( pParent, aSet, pOldSh, pTempPrinter, !bEnvChange );
OSL_ENSURE(pDlg, "Dialogdiet fail!");
nMode = pDlg->Execute();
}
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index bf4e6b3..43edbae 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -773,22 +773,10 @@ AbstractDropDownFieldDialog * SwAbstractDialogFactory_Impl::CreateDropDownField
SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet,
SwWrtShell* pWrtSh, Printer* pPrt,
- sal_Bool bInsert,int nResId ) //add for SwEnvDlg
+ sal_Bool bInsert ) //add for SwEnvDlg
{
- SfxTabDialog* pDlg=NULL;
- switch ( nResId )
- {
- case DLG_ENV :
- pDlg = new SwEnvDlg( pParent, rSet, pWrtSh,pPrt, bInsert );
- break;
-
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractTabDialog_Impl( pDlg );
- return 0;
+ SfxTabDialog* pDlg = new SwEnvDlg( pParent, rSet, pWrtSh,pPrt, bInsert );
+ return new AbstractTabDialog_Impl( pDlg );
}
AbstractSwLabDlg* SwAbstractDialogFactory_Impl::CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet, //add for SwLabDlg
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 34d8a8a..4dbc08e 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -457,7 +457,7 @@ public:
//add for DropDownFieldDialog
virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog (Window *pParent, SwWrtShell &rSh,
SwField* pField, sal_Bool bNextButton = sal_False);
- virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert,int nResId ); //add for SwEnvDlg
+ virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert ); //add for SwEnvDlg
virtual AbstractSwLabDlg* CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet, //add for SwLabDlg
SwNewDBMgr* pNewDBMgr, bool bLabel);
diff --git a/sw/source/ui/envelp/envlop.hrc b/sw/source/ui/envelp/envlop.hrc
deleted file mode 100644
index 69e61d0..0000000
--- a/sw/source/ui/envelp/envlop.hrc
+++ /dev/null
@@ -1,32 +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 .
- */
-
-#ifndef _ENVLOP_HRC
-#define _ENVLOP_HRC
-
-#include "envelp.hrc"
-
-// local resources *********************************************************
-
-#define ST_INSERT 13
-#define ST_CHANGE 14
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/envelp/envlop.src b/sw/source/ui/envelp/envlop.src
deleted file mode 100644
index 53a28e8..0000000
--- a/sw/source/ui/envelp/envlop.src
+++ /dev/null
@@ -1,64 +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 "envlop.hrc"
-#include "helpid.h"
- // DLG_ENV ------------------------------------------------------------------
-TabDialog DLG_ENV
-{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Text [ en-US ] = "Envelope" ;
- Moveable = TRUE ;
- TabControl 1
- {
- OutputSize = TRUE ;
- PageList =
- {
- PageItem
- {
- Identifier = TP_ENV_ENV ;
- Text [ en-US ] = "Envelope" ;
- PageResID = TP_ENV_ENV ;
- };
- PageItem
- {
- Identifier = TP_ENV_FMT ;
- PageResID = TP_ENV_FMT ;
- Text [ en-US ] = "Format";
- };
- PageItem
- {
- Identifier = TP_ENV_PRT ;
- Text [ en-US ] = "Printer" ;
- PageResID = TP_ENV_PRT ;
- };
- };
- };
- String ST_INSERT
- {
- Text [ en-US ] = "~Insert" ;
- };
- String ST_CHANGE
- {
- Text [ en-US ] = "~Modify" ;
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index f6838d8..ed41fcf 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -34,7 +34,6 @@
#include "poolfmt.hxx"
#include "view.hxx"
-#include "envlop.hrc"
#include <comphelper/processfactory.hxx>
#include <unomid.h>
@@ -142,31 +141,24 @@ void SwEnvPreview::Paint(const Rectangle &)
}
SwEnvDlg::SwEnvDlg(Window* pParent, const SfxItemSet& rSet,
- SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert) :
-
- SfxTabDialog(pParent, SW_RES(DLG_ENV), &rSet, sal_False, &aEmptyStr),
- sInsert(SW_RES(ST_INSERT)),
- sChange(SW_RES(ST_CHANGE)),
- aEnvItem((const SwEnvItem&) rSet.Get(FN_ENVELOP)),
- pSh(pWrtSh),
- pPrinter(pPrt),
- pAddresseeSet(0),
- pSenderSet(0)
+ SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert)
+ : SfxTabDialog(pParent, "EnvDialog",
+ "modules/swriter/ui/envdialog.ui", &rSet)
+ , aEnvItem((const SwEnvItem&) rSet.Get(FN_ENVELOP))
+ , pSh(pWrtSh)
+ , pPrinter(pPrt)
+ , pAddresseeSet(0)
+ , pSenderSet(0)
+ , m_nEnvPrintId(0)
{
- FreeResource();
-
- GetOKButton().SetText(String(SW_RES(STR_BTN_NEWDOC)));
- GetOKButton().SetHelpId(HID_ENVELOP_PRINT);
- GetOKButton().SetHelpText(aEmptyStr); // in order for generated help text to get used
- if (GetUserButton())
+ if (!bInsert)
{
- GetUserButton()->SetText(bInsert ? sInsert : sChange);
- GetUserButton()->SetHelpId(HID_ENVELOP_INSERT);
+ GetUserButton()->SetText(get<PushButton>("modify")->GetText());
}
- AddTabPage(TP_ENV_ENV, SwEnvPage ::Create, 0);
- AddTabPage(TP_ENV_FMT, SwEnvFmtPage::Create, 0);
- AddTabPage(TP_ENV_PRT, SwEnvPrtPage::Create, 0);
+ AddTabPage("envelope", SwEnvPage ::Create, 0);
+ AddTabPage("format", SwEnvFmtPage::Create, 0);
+ m_nEnvPrintId = AddTabPage("printer", SwEnvPrtPage::Create, 0);
}
SwEnvDlg::~SwEnvDlg()
@@ -177,7 +169,7 @@ SwEnvDlg::~SwEnvDlg()
void SwEnvDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage)
{
- if (nId == TP_ENV_PRT)
+ if (nId == m_nEnvPrintId)
{
((SwEnvPrtPage*)&rPage)->SetPrt(pPrinter);
}
diff --git a/sw/source/ui/inc/envlop.hxx b/sw/source/ui/inc/envlop.hxx
index 43a69d9..23e8ab5 100644
--- a/sw/source/ui/inc/envlop.hxx
+++ b/sw/source/ui/inc/envlop.hxx
@@ -63,13 +63,12 @@ friend class SwEnvFmtPage;
friend class SwEnvPrtPage;
friend class SwEnvPreview;
- String sInsert;
- String sChange;
SwEnvItem aEnvItem;
SwWrtShell *pSh;
Printer *pPrinter;
SfxItemSet *pAddresseeSet;
SfxItemSet *pSenderSet;
+ sal_uInt16 m_nEnvPrintId;
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
virtual short Ok();
diff --git a/sw/uiconfig/swriter/ui/envdialog.ui b/sw/uiconfig/swriter/ui/envdialog.ui
new file mode 100644
index 0000000..9f072d5
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/envdialog.ui
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="EnvDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Envelope</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">_New Document</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="user">
+ <property name="label">_Insert</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="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="modify">
+ <property name="label">_Modify</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="no_show_all">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="reset">
+ <property name="label">gtk-revert-to-saved</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkNotebook" id="tabcontrol">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="envelope">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Envelope</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="format">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Format</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="printer">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Printer</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">ok</action-widget>
+ <action-widget response="0">user</action-widget>
+ <action-widget response="0">modify</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ <action-widget response="0">help</action-widget>
+ <action-widget response="0">reset</action-widget>
+ </action-widgets>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list