diff options
Diffstat (limited to 'svx')
-rw-r--r-- | svx/AllLangResTarget_svx.mk | 1 | ||||
-rw-r--r-- | svx/inc/helpid.hrc | 2 | ||||
-rw-r--r-- | svx/inc/svx/dialogs.hrc | 2 | ||||
-rw-r--r-- | svx/inc/svx/hdft.hxx | 7 | ||||
-rw-r--r-- | svx/source/dialog/hdft.cxx | 34 | ||||
-rw-r--r-- | svx/source/dialog/hdft.src | 26 | ||||
-rw-r--r-- | svx/uiconfig/ui/headfootformatpage.ui | 696 |
7 files changed, 373 insertions, 395 deletions
diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk index 6591df1dc243..ca50785202c0 100644 --- a/svx/AllLangResTarget_svx.mk +++ b/svx/AllLangResTarget_svx.mk @@ -55,6 +55,7 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\ svx/source/dialog/docrecovery.src \ svx/source/dialog/fontwork.src \ svx/source/dialog/frmsel.src \ + svx/source/dialog/hdft.src \ svx/source/dialog/imapdlg.src \ svx/source/dialog/langbox.src \ svx/source/dialog/language.src \ diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc index a310c7969c8a..b1f1fdeb2273 100644 --- a/svx/inc/helpid.hrc +++ b/svx/inc/helpid.hrc @@ -72,8 +72,6 @@ #define HID_FONTWORK_TBI_STYLE_SLANTX "SVX_HID_FONTWORK_TBI_STYLE_SLANTX" #define HID_FONTWORK_TBI_STYLE_SLANTY "SVX_HID_FONTWORK_TBI_STYLE_SLANTY" #define HID_FONTWORK_TBI_STYLE_UPRIGHT "SVX_HID_FONTWORK_TBI_STYLE_UPRIGHT" -#define HID_FORMAT_FOOTER "SVX_HID_FORMAT_FOOTER" -#define HID_FORMAT_HEADER "SVX_HID_FORMAT_HEADER" // free #define HID_GALLERY_ICONVIEW "SVX_HID_GALLERY_ICONVIEW" #define HID_GALLERY_LISTVIEW "SVX_HID_GALLERY_LISTVIEW" diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc index fa416239192d..d41157c46877 100644 --- a/svx/inc/svx/dialogs.hrc +++ b/svx/inc/svx/dialogs.hrc @@ -159,8 +159,6 @@ #define RID_SVXDLG_SEARCH (RID_SVX_START + 20) // ResId fuer die PageDialog -#define RID_SVXPAGE_FOOTER (RID_SVX_START + 26) -#define RID_SVXPAGE_HEADER (RID_SVX_START + 27) #define RID_SVXQBX_DELETE_HEADFOOT (RID_SVX_START + 28) // ResId's fuer Dialoge aus StarDraw diff --git a/svx/inc/svx/hdft.hxx b/svx/inc/svx/hdft.hxx index 57924c1aedee..bb1d2f507d3d 100644 --- a/svx/inc/svx/hdft.hxx +++ b/svx/inc/svx/hdft.hxx @@ -59,7 +59,6 @@ protected: SvxHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ); - VclFrame* m_pFrm; FixedText* m_pPageLbl; CheckBox* m_pTurnOnBox; CheckBox* m_pCntSharedBox; @@ -77,12 +76,6 @@ protected: SvxPageWindow* m_pBspWin; PushButton* m_pBackgroundBtn; - FixedText* m_pFooterOn; - FixedText* m_pFooterLbl; - FixedText* m_pHeaderOn; - FixedText* m_pHeaderLbl; - FixedText* m_pMsg; - sal_uInt16 nId; SfxItemSet* pBBSet; sal_Bool bDisableQueryBox; diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 3a08520f9f7e..79d0eaf2f834 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -164,9 +164,6 @@ SvxHFPage::SvxHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId bEnableBackgroundSelector ( sal_True ) { - get(m_pFrm,"frameHdrOn"); - get(m_pPageLbl,"labelHeaderFooterFormat"); - get(m_pTurnOnBox,"checkHeaderOn"); get(m_pCntSharedBox,"checkSameLR"); get(m_pCntSharedFirstBox,"checkSameFP"); get(m_pLMEdit,"spinMargLeft"); @@ -182,23 +179,19 @@ SvxHFPage::SvxHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId get(m_pBspWin,"drawingareaPageHF"); get(m_pBackgroundBtn,"buttonMore"); - get(m_pFooterOn,"labelFooterOn"); - get(m_pFooterLbl,"labelFooter"); - get(m_pHeaderOn,"labelHeaderOn"); - get(m_pHeaderLbl,"labelHeader"); - get(m_pMsg,"labelMsg"); - //swap header <-> footer in UI if(nId == SID_ATTR_PAGE_FOOTERSET) { - m_pPageLbl->SetText(m_pFooterLbl->GetText()); - m_pTurnOnBox->SetText(m_pFooterOn->GetText()); + get(m_pPageLbl,"labelFooterFormat"); + get(m_pTurnOnBox, "checkFooterOn"); } else //Header { - m_pPageLbl->SetText(m_pHeaderLbl->GetText()); - m_pTurnOnBox->SetText(m_pHeaderOn->GetText()); + get(m_pPageLbl,"labelHeaderFormat"); + get(m_pTurnOnBox, "checkHeaderOn"); } + m_pTurnOnBox->Show(); + m_pPageLbl->Show(); InitHandler(); m_pBspWin->EnableRTL( sal_False ); @@ -213,21 +206,6 @@ SvxHFPage::SvxHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId SetFieldUnit( *m_pHeightEdit, eFUnit ); SetFieldUnit( *m_pLMEdit, eFUnit ); SetFieldUnit( *m_pRMEdit, eFUnit ); - - m_pTurnOnBox->SetAccessibleRelationMemberOf( m_pFrm ); - m_pCntSharedBox->SetAccessibleRelationMemberOf( m_pFrm ); - m_pCntSharedFirstBox->SetAccessibleRelationMemberOf( m_pFrm ); - m_pLMLbl->SetAccessibleRelationMemberOf( m_pFrm ); - m_pLMEdit->SetAccessibleRelationMemberOf( m_pFrm ); - m_pRMLbl->SetAccessibleRelationMemberOf( m_pFrm ); - m_pRMEdit->SetAccessibleRelationMemberOf( m_pFrm ); - m_pDistFT->SetAccessibleRelationMemberOf( m_pFrm ); - m_pDistEdit->SetAccessibleRelationMemberOf( m_pFrm ); - m_pDynSpacingCB->SetAccessibleRelationMemberOf( m_pFrm ); - m_pHeightFT->SetAccessibleRelationMemberOf( m_pFrm ); - m_pHeightEdit->SetAccessibleRelationMemberOf( m_pFrm ); - m_pHeightDynBtn->SetAccessibleRelationMemberOf( m_pFrm ); - m_pBackgroundBtn->SetAccessibleRelationMemberOf(m_pFrm); } // ----------------------------------------------------------------------- diff --git a/svx/source/dialog/hdft.src b/svx/source/dialog/hdft.src new file mode 100644 index 000000000000..70fd30f176b2 --- /dev/null +++ b/svx/source/dialog/hdft.src @@ -0,0 +1,26 @@ +/* + * 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 <svx/dialogs.hrc> + +QueryBox RID_SVXQBX_DELETE_HEADFOOT +{ + Buttons = WB_YES_NO ; + DefButton = WB_DEF_NO ; + Message [ en-US ] = "Removing headers or footers deletes the contents.\nDo you want to delete this text?" ; +}; diff --git a/svx/uiconfig/ui/headfootformatpage.ui b/svx/uiconfig/ui/headfootformatpage.ui index b6a26bad266d..28234fcb8156 100644 --- a/svx/uiconfig/ui/headfootformatpage.ui +++ b/svx/uiconfig/ui/headfootformatpage.ui @@ -2,11 +2,24 @@ <interface> <!-- interface-requires gtk+ 3.0 --> <!-- interface-requires LibreOffice 1.0 --> + <object class="GtkAdjustment" id="adjustment1"> + <property name="upper">99.989999999999995</property> + <property name="step_increment">0.10000000000000001</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="adjustment2"> + <property name="lower">0.10000000000000001</property> + <property name="upper">99.989999999999995</property> + <property name="value">0.5</property> + <property name="step_increment">0.10000000000000001</property> + <property name="page_increment">10</property> + </object> <object class="GtkGrid" id="HFFormatPage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> <property name="valign">start</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> <property name="border_width">6</property> <property name="row_spacing">6</property> <property name="column_spacing">12</property> @@ -30,19 +43,50 @@ <object class="GtkBox" id="box1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> <property name="valign">start</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkCheckButton" id="checkHeaderOn"> - <property name="label" translatable="yes">Hea_der on</property> + <object class="GtkBox" id="box3"> <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> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkCheckButton" id="checkHeaderOn"> + <property name="label" translatable="yes">Hea_der on</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="no_show_all">True</property> + <property name="hexpand">True</property> + <property name="use_underline">True</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">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="checkFooterOn"> + <property name="label" translatable="yes">_Footer on</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="no_show_all">True</property> + <property name="hexpand">True</property> + <property name="use_underline">True</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> </object> <packing> <property name="expand">False</property> @@ -51,250 +95,270 @@ </packing> </child> <child> - <object class="GtkFrame" id="frameHdrOn"> + <object class="GtkAlignment" id="alignment4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0</property> - <property name="shadow_type">none</property> + <property name="hexpand">True</property> + <property name="left_padding">12</property> <child> - <object class="GtkAlignment" id="alignment4"> + <object class="GtkGrid" id="grid5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> <property name="valign">start</property> - <property name="left_padding">12</property> + <property name="hexpand">True</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkCheckButton" id="checkSameLR"> + <property name="label" translatable="yes">Same _content left/right</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="hexpand">True</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">2</property> + <property name="height">1</property> + </packing> + </child> <child> - <object class="GtkGrid" id="grid5"> + <object class="GtkCheckButton" id="checkSameFP"> + <property name="label" translatable="yes">Same content on first page</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="hexpand">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">1</property> + <property name="width">2</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="labelLeftMarg"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">start</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkCheckButton" id="checkSameLR"> - <property name="label" translatable="yes">Same _content left/right</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="GtkCheckButton" id="checkSameFP"> - <property name="label" translatable="yes">Same content on first page</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</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="labelLeftMarg"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Left margin:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">spinMargLeft:0.00cm</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="GtkSpinButton" id="spinMargLeft:0.00cm"> - <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">2</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="labelRightMarg"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">R_ight margin:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">spinMargRight:0.00cm</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="GtkSpinButton" id="spinMargRight:0.00cm"> - <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">3</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="labelSpacing"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Spacing:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">spinSpacing:0.00cm</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="GtkSpinButton" id="spinSpacing:0.00cm"> - <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">4</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="checkDynSpacing"> - <property name="label" translatable="yes">Use d_ynamic spacing</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">5</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="labelHeight"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Height:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">spinHeight:0.00cm</property> - <property name="ellipsize">end</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="spinHeight:0.00cm"> - <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">6</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> + <property name="hexpand">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Left margin:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">spinMargLeft:0.00cm</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="GtkSpinButton" id="spinMargLeft:0.00cm"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">center</property> + <property name="invisible_char">•</property> + <property name="invisible_char_set">True</property> + <property name="adjustment">adjustment1</property> + <property name="digits">2</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="labelRightMarg"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">R_ight margin:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">spinMargRight:0.00cm</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="GtkSpinButton" id="spinMargRight:0.00cm"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">center</property> + <property name="invisible_char">•</property> + <property name="invisible_char_set">True</property> + <property name="adjustment">adjustment1</property> + <property name="digits">2</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="labelSpacing"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Spacing:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">spinSpacing:0.00cm</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="GtkSpinButton" id="spinSpacing:0.00cm"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">center</property> + <property name="invisible_char">•</property> + <property name="invisible_char_set">True</property> + <property name="adjustment">adjustment1</property> + <property name="digits">2</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="checkDynSpacing"> + <property name="label" translatable="yes">Use d_ynamic spacing</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="hexpand">True</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">5</property> + <property name="width">2</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="labelHeight"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Height:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">spinHeight:0.00cm</property> + <property name="ellipsize">end</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">6</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spinHeight:0.00cm"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">center</property> + <property name="invisible_char">•</property> + <property name="invisible_char_set">True</property> + <property name="adjustment">adjustment2</property> + <property name="digits">2</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">6</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="checkAutofit"> + <property name="label" translatable="yes">_AutoFit height</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="hexpand">True</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">7</property> + <property name="width">2</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkButtonBox" id="buttonbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <property name="layout_style">start</property> <child> - <object class="GtkCheckButton" id="checkAutofit"> - <property name="label" translatable="yes">_AutoFit height</property> + <object class="GtkButton" id="buttonMore"> + <property name="label" translatable="yes">More...</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> + <property name="receives_default">True</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">7</property> - <property name="width">1</property> - <property name="height">1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkButton" id="buttonMore"> - <property name="label" translatable="yes">More...</property> - <property name="visible">True</property> + <object class="GtkButton" id="buttonEdit"> + <property name="label">_Edit...</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="use_underline">True</property> + <property name="xalign">0.51999998092651367</property> + <property name="always_show_image">True</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">8</property> - <property name="width">1</property> - <property name="height">1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">8</property> + <property name="width">2</property> + <property name="height">1</property> + </packing> </child> </object> </child> - <child type="label_item"> - <placeholder/> - </child> </object> <packing> <property name="expand">False</property> @@ -307,14 +371,42 @@ </object> </child> <child type="label"> - <object class="GtkLabel" id="labelHeaderFooterFormat"> + <object class="GtkBox" id="box4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Header</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="labelHeaderFormat"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Header</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="labelFooterFormat"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Footer</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> </child> </object> @@ -326,135 +418,34 @@ </packing> </child> <child> - <object class="GtkGrid" id="grid1"> - <property name="can_focus">False</property> - <child> - <object class="GtkLabel" id="labelFooterOn"> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Footer on</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="labelFooter"> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Footer</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="labelHeaderOn"> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Header on</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="GtkLabel" id="labelHeader"> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Header</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> - <child> - <placeholder/> - </child> - <child> - <object class="GtkLabel" id="labelMsg"> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Removing headers or footers deletes the contents. -Do you want to delete this text?</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> - </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="GtkFrame" id="frame2"> + <object class="GtkAlignment" id="alignment3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="left_padding">6</property> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkBox" id="box2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">6</property> + <property name="hexpand">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkBox" id="box2"> + <object class="svxlo-SvxPageWindow" id="drawingareaPageHF"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="svxlo-SvxPageWindow" id="drawingareaPageHF"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="vexpand">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="buttonEdit"> - <property name="label">gtk-edit</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - <property name="xalign">0.51999998092651367</property> - <property name="always_show_image">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> </object> </child> - <child type="label_item"> - <placeholder/> - </child> </object> <packing> <property name="left_attach">1</property> @@ -463,15 +454,8 @@ Do you want to delete this text?</property> <property name="height">1</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <object class="GtkSizeGroup" id="sizegroup1"> <property name="ignore_hidden">True</property> - <widgets> - <widget name="spinMargLeft:0.00cm"/> - <widget name="frame2"/> - </widgets> </object> </interface> |