diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-05-31 12:57:17 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-31 13:03:07 +0100 |
commit | f00db76911d4fdc53a737e1b9d4ffe6ae31bc97e (patch) | |
tree | f67a4a06dab68e13e771343b5c6d48ea95271a43 | |
parent | 8120e95e2b8f685f5c951cd316ac443a14dba79a (diff) |
some cunning to get these tabpages previews in the same place
Change-Id: I9c4c74ae692f1ddd6ddadd6ecfb8332b4082187c
-rw-r--r-- | cui/source/tabpages/paragrph.cxx | 32 | ||||
-rw-r--r-- | cui/uiconfig/ui/paragalignpage.ui | 578 | ||||
-rw-r--r-- | cui/uiconfig/ui/paraindentspacing.ui | 663 |
3 files changed, 665 insertions, 608 deletions
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index b910f7a79055..29949aec17d7 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -634,6 +634,34 @@ int SvxStdParagraphTabPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } +namespace +{ + //these tab pages both have the same basic layout with a preview on the + //right, get both of their non-preview areas to request the same size + //so that the preview appears in the same place in each one so + //flipping between tabs isn't distracting as it jumps around + void setPreviewsToSamePlace(Window *pParent, VclBuilderContainer *pPage) + { + for (Window* pChild = pParent->GetWindow(WINDOW_FIRSTCHILD); pChild; + pChild = pChild->GetWindow(WINDOW_NEXT)) + { + VclBuilderContainer *pPeer = dynamic_cast<VclBuilderContainer*>(pChild); + if (pPeer != pPage) + { + Window *pOtherGrid = pPeer->get<Window>("maingrid"); + Window *pOurGrid = pPage->get<Window>("maingrid"); + if (pOtherGrid && pOurGrid) + { + boost::shared_ptr< VclSizeGroup > xGroup(new VclSizeGroup); + pOtherGrid->add_to_size_group(xGroup); + pOurGrid->add_to_size_group(xGroup); + } + } + } + } +} + + // ----------------------------------------------------------------------- SvxStdParagraphTabPage::SvxStdParagraphTabPage( Window* pParent, const SfxItemSet& rAttr ) : @@ -678,6 +706,8 @@ SvxStdParagraphTabPage::SvxStdParagraphTabPage( Window* pParent, const SfxItemS Init_Impl(); m_pFLineIndent->SetMin(-9999); // is set to 0 on default + + setPreviewsToSamePlace(pParent, this); } SvxStdParagraphTabPage::~SvxStdParagraphTabPage() @@ -1068,6 +1098,8 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSe m_pPropertiesFL->Show(); } } + + setPreviewsToSamePlace(pParent, this); } SvxParaAlignTabPage::~SvxParaAlignTabPage() diff --git a/cui/uiconfig/ui/paragalignpage.ui b/cui/uiconfig/ui/paragalignpage.ui index 178f7c3cbf56..011941436f67 100644 --- a/cui/uiconfig/ui/paragalignpage.ui +++ b/cui/uiconfig/ui/paragalignpage.ui @@ -37,156 +37,167 @@ <property name="left_attach">1</property> <property name="top_attach">0</property> <property name="width">1</property> - <property name="height">3</property> + <property name="height">1</property> </packing> </child> <child> - <object class="GtkFrame" id="frame1"> + <object class="GtkGrid" id="maingrid"> <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="row_spacing">12</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkFrame" id="frame1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkGrid" id="grid1"> + <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkRadioButton" id="radioBTN_LEFTALIGN"> - <property name="label" translatable="yes">_Left</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="active">True</property> - <property name="draw_indicator">True</property> - <property name="group">radioBTN_RIGHTALIGN</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="GtkRadioButton" id="radioBTN_RIGHTALIGN"> - <property name="label" translatable="yes">_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> - <property name="group">radioBTN_CENTERALIGN</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="GtkRadioButton" id="radioBTN_CENTERALIGN"> - <property name="label" translatable="yes">_Center</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="relief">none</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">radioBTN_JUSTIFYALIGN</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> + <property name="top_padding">6</property> + <property name="left_padding">12</property> <child> - <object class="GtkRadioButton" id="radioBTN_JUSTIFYALIGN"> - <property name="label" translatable="yes">_Justified</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="group">radioBTN_LEFTALIGN</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="GtkCheckButton" id="checkCB_EXPAND"> - <property name="label" translatable="yes">_Expand single word</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="margin_left">12</property> - <property name="relief">none</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="GtkCheckButton" id="checkCB_SNAP"> - <property name="label" translatable="yes">_Snap to text grid (if active)</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="margin_left">12</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">6</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box4"> + <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> + <property name="row_spacing">6</property> <child> - <object class="GtkBox" id="box1"> + <object class="GtkRadioButton" id="radioBTN_LEFTALIGN"> + <property name="label" translatable="yes">_Left</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="group">radioBTN_RIGHTALIGN</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="GtkRadioButton" id="radioBTN_RIGHTALIGN"> + <property name="label" translatable="yes">_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> + <property name="group">radioBTN_CENTERALIGN</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="GtkRadioButton" id="radioBTN_CENTERALIGN"> + <property name="label" translatable="yes">_Center</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">radioBTN_JUSTIFYALIGN</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="GtkRadioButton" id="radioBTN_JUSTIFYALIGN"> + <property name="label" translatable="yes">_Justified</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="group">radioBTN_LEFTALIGN</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="GtkCheckButton" id="checkCB_EXPAND"> + <property name="label" translatable="yes">_Expand single word</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="margin_left">12</property> + <property name="relief">none</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="GtkCheckButton" id="checkCB_SNAP"> + <property name="label" translatable="yes">_Snap to text grid (if active)</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="margin_left">12</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">6</property> + <property name="width">1</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="orientation">vertical</property> + <property name="spacing">12</property> <child> - <object class="GtkLabel" id="labelLB_LASTLINE"> + <object class="GtkBox" id="box1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Last line:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">comboLB_LASTLINE</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="labelLB_LASTLINE"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_left">12</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Last line:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">comboLB_LASTLINE</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -194,43 +205,111 @@ <property name="position">0</property> </packing> </child> + <child> + <object class="GtkComboBox" id="comboLB_LASTLINE"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="model">liststoreLB_LASTLINE</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> - <property name="fill">True</property> - <property name="position">0</property> + <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="comboLB_LASTLINE"> + <object class="GtkBox" id="box5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="model">liststoreLB_LASTLINE</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkLabel" id="labelST_RIGHTALIGN_ASIAN"> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Righ_t/Bottom</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="GtkLabel" id="labelST_LEFTALIGN_ASIAN"> + <property name="can_focus">False</property> + <property name="xpad">5</property> + <property name="label" translatable="yes">_Left/Top</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> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">0</property> + <property name="top_attach">7</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">4</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Options</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frameFL_VERTALIGN"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> <child> - <object class="GtkBox" id="box5"> + <object class="GtkBox" id="box2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="homogeneous">True</property> + <property name="spacing">12</property> <child> - <object class="GtkLabel" id="labelST_RIGHTALIGN_ASIAN"> + <object class="GtkLabel" id="labelFT_VERTALIGN"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Righ_t/Bottom</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Alignment:</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">comboLB_VERTALIGN</property> </object> <packing> <property name="expand">False</property> @@ -239,11 +318,10 @@ </packing> </child> <child> - <object class="GtkLabel" id="labelST_LEFTALIGN_ASIAN"> + <object class="GtkComboBox" id="comboLB_VERTALIGN"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xpad">5</property> - <property name="label" translatable="yes">_Left/Top</property> - <property name="use_underline">True</property> + <property name="model">liststoreLB_VERTALIGN</property> </object> <packing> <property name="expand">False</property> @@ -252,163 +330,97 @@ </packing> </child> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">7</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> </object> </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Options</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkFrame" id="frameFL_VERTALIGN"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkAlignment" id="alignment2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> - <child> - <object class="GtkBox" id="box2"> + <child type="label"> + <object class="GtkLabel" id="labelFL_VERTALIGN"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="labelFT_VERTALIGN"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Alignment:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">comboLB_VERTALIGN</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="comboLB_VERTALIGN"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">liststoreLB_VERTALIGN</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="label" translatable="yes">Text-to-text</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> </child> - <child type="label"> - <object class="GtkLabel" id="labelFL_VERTALIGN"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Text-to-text</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkFrame" id="framePROPERTIES"> - <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> + <object class="GtkFrame" id="framePROPERTIES"> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkBox" id="box3"> + <object class="GtkAlignment" id="alignment3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Text direction:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">comboLB_TEXTDIRECTION</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> + <property name="top_padding">6</property> + <property name="left_padding">12</property> <child> - <object class="svxlo-FrameDirectionListBox" id="comboLB_TEXTDIRECTION"> + <object class="GtkBox" id="box3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="entry_text_column">0</property> - <property name="id_column">1</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Text direction:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">comboLB_TEXTDIRECTION</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="svxlo-FrameDirectionListBox" id="comboLB_TEXTDIRECTION"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="entry_text_column">0</property> + <property name="id_column">1</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> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> </object> </child> + <child type="label"> + <object class="GtkLabel" id="labelFL_PROPERTIES"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Properties</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> </object> - </child> - <child type="label"> - <object class="GtkLabel" id="labelFL_PROPERTIES"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Properties</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </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">2</property> + <property name="top_attach">0</property> <property name="width">1</property> <property name="height">1</property> </packing> diff --git a/cui/uiconfig/ui/paraindentspacing.ui b/cui/uiconfig/ui/paraindentspacing.ui index 50166841ab4f..82df1ba9e41b 100644 --- a/cui/uiconfig/ui/paraindentspacing.ui +++ b/cui/uiconfig/ui/paraindentspacing.ui @@ -11,199 +11,66 @@ <property name="row_spacing">12</property> <property name="column_spacing">24</property> <child> - <object class="GtkFrame" id="frame1"> + <object class="GtkAlignment" id="alignment5"> <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="margin_top">24</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="svxlo-SvxParaPrevWindow" id="drawingareaWN_EXAMPLE"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> - <child> - <object class="GtkGrid" id="grid2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="labelFT_LEFTINDENT"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Before text:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">spinED_LEFTINDENT:0cm</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="labelFT_RIGHTINDENT"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">After _text:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">spinED_RIGHTINDENT:0cm</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="labelFT_FLINEINDENT"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_First line:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">spinED_FLINEINDENT:0cm</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="GtkCheckButton" id="checkCB_AUTO"> - <property name="label" translatable="yes">_Automatic</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">3</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="svxlo-SvxRelativeField" id="spinED_LEFTINDENT:0cm"> - <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">adjustmentspinED_INDENT</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="svxlo-SvxRelativeField" id="spinED_RIGHTINDENT:0cm"> - <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">adjustmentspinED_INDENT</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> - <object class="svxlo-SvxRelativeField" id="spinED_FLINEINDENT:0cm"> - <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">adjustmentspinED_INDENT</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="labelST_LINEDIST_ABS"> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Fixed</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> + <property name="halign">center</property> + <property name="valign">start</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="drawingareaWN_EXAMPLE-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Example</property> </object> </child> </object> </child> - <child type="label"> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Indent</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - </child> </object> <packing> - <property name="left_attach">0</property> + <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="GtkFrame" id="frame2"> + <object class="GtkGrid" id="maingrid"> <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="row_spacing">12</property> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkFrame" id="frame1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkBox" id="box2"> + <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> <child> - <object class="GtkGrid" id="grid1"> + <object class="GtkGrid" id="grid4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="row_spacing">6</property> <property name="column_spacing">12</property> <child> - <object class="GtkLabel" id="labelFT_TOPDIST"> + <object class="GtkLabel" id="labelFT_LEFTINDENT"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Ab_ove paragraph:</property> + <property name="label" translatable="yes">_Before text:</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">spinED_TOPDIST:0cm</property> + <property name="mnemonic_widget">spinED_LEFTINDENT:0cm</property> </object> <packing> <property name="left_attach">0</property> @@ -213,13 +80,13 @@ </packing> </child> <child> - <object class="GtkLabel" id="labelFT_BOTTOMDIST"> + <object class="GtkLabel" id="labelFT_RIGHTINDENT"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Below _paragraph:</property> + <property name="label" translatable="yes">After _text:</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">spinED_BOTTOMDIST:0cm</property> + <property name="mnemonic_widget">spinED_RIGHTINDENT:0cm</property> </object> <packing> <property name="left_attach">0</property> @@ -229,12 +96,45 @@ </packing> </child> <child> - <object class="svxlo-SvxRelativeField" id="spinED_TOPDIST:0cm"> + <object class="GtkLabel" id="labelFT_FLINEINDENT"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_First line:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">spinED_FLINEINDENT:0cm</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="GtkCheckButton" id="checkCB_AUTO"> + <property name="label" translatable="yes">_Automatic</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">3</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="svxlo-SvxRelativeField" id="spinED_LEFTINDENT:0cm"> <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">adjustmentED_DIST</property> + <property name="adjustment">adjustmentspinED_INDENT</property> </object> <packing> <property name="left_attach">1</property> @@ -244,12 +144,12 @@ </packing> </child> <child> - <object class="svxlo-SvxRelativeField" id="spinED_BOTTOMDIST:0cm"> + <object class="svxlo-SvxRelativeField" id="spinED_RIGHTINDENT:0cm"> <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">adjustmentED_DIST</property> + <property name="adjustment">adjustmentspinED_INDENT</property> </object> <packing> <property name="left_attach">1</property> @@ -258,77 +158,141 @@ <property name="height">1</property> </packing> </child> + <child> + <object class="svxlo-SvxRelativeField" id="spinED_FLINEINDENT:0cm"> + <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">adjustmentspinED_INDENT</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="labelST_LINEDIST_ABS"> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Fixed</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> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="checkCB_CONTEXTUALSPACING"> - <property name="label" translatable="yes">Don't add space between paragraphs of the same style</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="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> </object> </child> + <child type="label"> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Indent</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> </child> - <child type="label"> - <object class="GtkLabel" id="labelFL_VERTALIGN"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Spacing</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkFrame" id="framePROPERTIES"> - <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"> + <object class="GtkFrame" id="frame2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkGrid" id="grid3"> + <object class="GtkAlignment" id="alignment2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="column_spacing">12</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> <child> - <object class="GtkBox" id="box3"> + <object class="GtkBox" id="box2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkComboBox" id="comboLB_LINEDIST"> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="model">liststoreLB_LINEDIST</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="labelFT_TOPDIST"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Ab_ove paragraph:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">spinED_TOPDIST:0cm</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="labelFT_BOTTOMDIST"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Below _paragraph:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">spinED_BOTTOMDIST:0cm</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="svxlo-SvxRelativeField" id="spinED_TOPDIST:0cm"> + <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">adjustmentED_DIST</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="svxlo-SvxRelativeField" id="spinED_BOTTOMDIST:0cm"> + <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">adjustmentED_DIST</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> <packing> <property name="expand">False</property> @@ -337,10 +301,13 @@ </packing> </child> <child> - <object class="GtkLabel" id="labelFT_LINEDIST"> + <object class="GtkCheckButton" id="checkCB_CONTEXTUALSPACING"> + <property name="label" translatable="yes">Don't add space between paragraphs of the same style</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">of</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="expand">False</property> @@ -349,145 +316,191 @@ </packing> </child> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="labelFL_VERTALIGN"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Spacing</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="framePROPERTIES"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> <child> - <object class="GtkBox" id="box1"> + <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <property name="column_spacing">12</property> <child> - <object class="GtkSpinButton" id="spinED_LINEDISTPERCENT:0%"> + <object class="GtkBox" id="box3"> <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">adjustmentLINEDISTPERCENT</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkComboBox" id="comboLB_LINEDIST"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="model">liststoreLB_LINEDIST</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="labelFT_LINEDIST"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">of</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> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> - <object class="GtkSpinButton" id="spinED_LINEDISTMETRIC:0cm"> + <object class="GtkBox" id="box1"> <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">adjustmentED_LINEDISTMETRIC</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkSpinButton" id="spinED_LINEDISTPERCENT:0%"> + <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">adjustmentLINEDISTPERCENT</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spinED_LINEDISTMETRIC:0cm"> + <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">adjustmentED_LINEDISTMETRIC</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> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> </object> </child> + <child type="label"> + <object class="GtkLabel" id="labelFL_PROPERTIES"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Line spacing</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> </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 type="label"> - <object class="GtkLabel" id="labelFL_PROPERTIES"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Line spacing</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - </child> - </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="GtkFrame" id="frameFL_REGISTER"> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment4"> - <property name="visible">True</property> + <object class="GtkFrame" id="frameFL_REGISTER"> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkCheckButton" id="checkCB_REGISTER"> - <property name="label" translatable="yes">A_ctivate</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 class="GtkAlignment" id="alignment4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkCheckButton" id="checkCB_REGISTER"> + <property name="label" translatable="yes">A_ctivate</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> + </child> </object> </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Register-true</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - </child> - </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="GtkAlignment" id="alignment5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">24</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <child> - <object class="svxlo-SvxParaPrevWindow" id="drawingareaWN_EXAMPLE"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="valign">start</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="drawingareaWN_EXAMPLE-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes">Example</property> + <child type="label"> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Register-true</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> </child> </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> </object> <packing> - <property name="left_attach">1</property> + <property name="left_attach">0</property> <property name="top_attach">0</property> <property name="width">1</property> - <property name="height">4</property> + <property name="height">1</property> </packing> </child> </object> |