diff options
author | Katarina Behrens <Katarina.Behrens@cib.de> | 2015-12-04 18:38:31 +0100 |
---|---|---|
committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2015-12-04 19:15:31 +0100 |
commit | f84accc996d718596277c079fa1afb588f2efee5 (patch) | |
tree | 66ca95a442ed96b3966e5c90cd142fd9dd563c9a | |
parent | 66c59f555e099bc93a053d925ba524b93c681872 (diff) |
UI for text chaining in text boxes, first cut
does nothing so far
Change-Id: Iab271c0d97e2195835169edf7272838a04491560
-rw-r--r-- | cui/Library_cui.mk | 1 | ||||
-rw-r--r-- | cui/UIConfig_cui.mk | 1 | ||||
-rw-r--r-- | cui/source/inc/textanim.hxx | 1 | ||||
-rw-r--r-- | cui/source/inc/textchaining.hxx | 26 | ||||
-rw-r--r-- | cui/source/tabpages/textanim.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/textchaining.cxx | 41 | ||||
-rw-r--r-- | cui/uiconfig/ui/textchainingtabpage.ui | 95 | ||||
-rw-r--r-- | cui/uiconfig/ui/textdialog.ui | 14 |
8 files changed, 181 insertions, 0 deletions
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 85a9bf034549..3c6876caca68 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -193,6 +193,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\ cui/source/tabpages/tabstpge \ cui/source/tabpages/textanim \ cui/source/tabpages/textattr \ + cui/source/tabpages/textchaining \ cui/source/tabpages/tparea \ cui/source/tabpages/tpbitmap \ cui/source/tabpages/tpcolor \ diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk index 36f59421afe8..077a02a018ab 100644 --- a/cui/UIConfig_cui.mk +++ b/cui/UIConfig_cui.mk @@ -193,6 +193,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\ cui/uiconfig/ui/swpossizepage \ cui/uiconfig/ui/textattrtabpage \ cui/uiconfig/ui/textanimtabpage \ + cui/uiconfig/ui/textchainingtabpage \ cui/uiconfig/ui/textdialog \ cui/uiconfig/ui/textflowpage \ cui/uiconfig/ui/thesaurus \ diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx index c76c39d93a3d..4093ecc05eb6 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.hxx @@ -95,6 +95,7 @@ class SvxTextTabDialog : public SfxTabDialog { sal_uInt16 m_nTextId; sal_uInt16 m_nTextAnimId; + sal_uInt16 m_nTextChainId; private: const SdrView* pView; diff --git a/cui/source/inc/textchaining.hxx b/cui/source/inc/textchaining.hxx new file mode 100644 index 000000000000..86e73a36f924 --- /dev/null +++ b/cui/source/inc/textchaining.hxx @@ -0,0 +1,26 @@ +#ifndef INCLUDED_CUI_SOURCE_INC_TEXTFLOW_HXX +#define INCLUDED_CUI_SOURCE_INC_TEXTFLOW_HXX + +#include <sfx2/tabdlg.hxx> +#include <svx/svdattr.hxx> + +class SdrView; + +class SvxTextChainingPage : public SfxTabPage +{ +private: + static const sal_uInt16 pRanges[]; + +public: + SvxTextChainingPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); + virtual ~SvxTextChainingPage(); + virtual void dispose() override; + + static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); + static const sal_uInt16* GetRanges() { return pRanges; } + + virtual bool FillItemSet( SfxItemSet* ) override; + virtual void Reset( const SfxItemSet * ) override; +}; + +#endif diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 64bf0e17da0c..a62160ca0582 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -25,6 +25,7 @@ #include "textanim.hxx" #include "textattr.hxx" +#include "textchaining.hxx" #include <dialmgr.hxx> #include "svx/dlgutil.hxx" @@ -52,6 +53,7 @@ SvxTextTabDialog::SvxTextTabDialog( vcl::Window* pParent, { m_nTextId = AddTabPage( "RID_SVXPAGE_TEXTATTR", SvxTextAttrPage::Create, nullptr); m_nTextAnimId = AddTabPage( "RID_SVXPAGE_TEXTANIMATION", SvxTextAnimationPage::Create, nullptr); + m_nTextChainId = AddTabPage( "RID_SVXPAGE_TEXTCHAINING", SvxTextChainingPage::Create, nullptr); } /************************************************************************* diff --git a/cui/source/tabpages/textchaining.cxx b/cui/source/tabpages/textchaining.cxx new file mode 100644 index 000000000000..c857178e6ddb --- /dev/null +++ b/cui/source/tabpages/textchaining.cxx @@ -0,0 +1,41 @@ +#include <textchaining.hxx> + +const sal_uInt16 SvxTextChainingPage::pRanges[] = +{ + SDRATTR_MISC_FIRST + , SDRATTR_TEXT_HORZADJUST + , SDRATTR_TEXT_WORDWRAP + , SDRATTR_TEXT_AUTOGROWSIZE + , 0 +}; + +SvxTextChainingPage::SvxTextChainingPage(vcl::Window* pWindow, const SfxItemSet& rInAttrs) + : SfxTabPage(pWindow,"TextChainingPage","cui/ui/textchainingtabpage.ui", &rInAttrs) +{ + SfxItemPool* pPool = rInAttrs.GetPool(); +} + +SvxTextChainingPage::~SvxTextChainingPage() +{ + disposeOnce(); +} + +void SvxTextChainingPage::dispose() +{ +} + +void SvxTextChainingPage::Reset( const SfxItemSet* rAttrs ) +{ +} + +bool SvxTextChainingPage::FillItemSet( SfxItemSet* rAttrs) +{ + return true; +} + +VclPtr<SfxTabPage> SvxTextChainingPage::Create( vcl::Window* pWindow, + const SfxItemSet* rAttrs ) +{ + return VclPtr<SvxTextChainingPage>::Create( pWindow, *rAttrs ); +} + diff --git a/cui/uiconfig/ui/textchainingtabpage.ui b/cui/uiconfig/ui/textchainingtabpage.ui new file mode 100644 index 000000000000..f5cb4f2dfdb7 --- /dev/null +++ b/cui/uiconfig/ui/textchainingtabpage.ui @@ -0,0 +1,95 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> +<interface> + <requires lib="gtk+" version="3.12"/> + <object class="GtkBox" id="box1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">baseline</property> + <property name="border_width">6</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkFrame" id="frame1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid" id="grid1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> + <child> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Previous link:</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Next link:</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="combobox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="combobox2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">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">Text Box Links</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> +</interface> diff --git a/cui/uiconfig/ui/textdialog.ui b/cui/uiconfig/ui/textdialog.ui index 8c7ec8553b53..05bdc9e42392 100644 --- a/cui/uiconfig/ui/textdialog.ui +++ b/cui/uiconfig/ui/textdialog.ui @@ -117,6 +117,20 @@ <property name="tab_fill">False</property> </packing> </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <object class="GtkLabel" id="RID_SVXPAGE_TEXTCHAINING"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Text Chaining</property> + </object> + <packing> + <property name="position">2</property> + <property name="tab_fill">False</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> |