cui/source/inc/dbregister.hxx | 160 ++++++++++++------------ cui/uiconfig/ui/connectortabpage.ui | 232 ++++++++++++++++++------------------ sc/source/ui/inc/scuitphfedit.hxx | 3 solenv/clang-format/excludelist | 1 4 files changed, 199 insertions(+), 197 deletions(-)
New commits: commit e654d1db9f569b8ffea0b5a67fd0bc7fd1a91a3f Author: Michael Weghorn <[email protected]> AuthorDate: Fri Oct 3 23:54:52 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Oct 4 10:10:12 2025 +0200 sc: Add missing include Addresses this error shown in Qt Creator when opening sc/source/ui/inc/scuitphfedit.hxx: scuitphfedit.hxx:60:44: Unknown type name 'ScPageHFItem'; did you mean 'SvxPageItem'? (fixes available) pageitem.hxx:50:21: 'SvxPageItem' declared here Change-Id: Id3e1ef5c4bc7790155686e859dc82eade9fdb65b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191839 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index 246f2bd49d95..534bc8e3bed8 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -20,6 +20,9 @@ #pragma once #include "tphfedit.hxx" + +#include <attrib.hxx> + #include <sfx2/tabdlg.hxx> #include <vcl/customweld.hxx> #include <vcl/weld.hxx> commit d32709885dd457ca4fb83d66323b334218465035 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Oct 3 23:08:02 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Oct 4 10:10:06 2025 +0200 clang-format cui/source/inc/dbregister.hxx This in particular gets rid of an extra level of indentation. Change-Id: I895df7649f09237bb49384c185b3e3b5f5823927 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191838 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 55c5952bd413..43a5280a8920 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -25,87 +25,87 @@ namespace svx { - - class DbRegistrationOptionsPage : public SfxTabPage - { - private: - size_t m_nOldCount; - bool m_bModified; - - std::unique_ptr<weld::Button> m_xNew; - std::unique_ptr<weld::Button> m_xEdit; - std::unique_ptr<weld::Button> m_xDelete; - std::unique_ptr<weld::TreeView> m_xPathBox; - std::unique_ptr<weld::TreeIter> m_xIter; - - DECL_LINK( NewHdl, weld::Button&, void ); - DECL_LINK( EditHdl, weld::Button&, void ); - DECL_LINK( DeleteHdl, weld::Button&, void ); - DECL_LINK( PathBoxDoubleClickHdl, weld::TreeView&, bool); - - DECL_LINK( PathSelect_Impl, weld::TreeView&, void); - - DECL_LINK( HeaderSelect_Impl, int, void ); - DECL_LINK( NameValidator, const OUString&, bool); - - /** inserts a new entry in the tablistbox - @param _sName - The name of the entry. - @param _sLocation - The location of the file. - */ - void insertNewEntry( const OUString& _sName,const OUString& _sLocation, const bool bReadOnly ); - - /** opens the LinkDialog to create a register pair - @param sOldName - The old name of the entry may be empty. - @param sOldLocation - The old location of the entry may be empty. - @param nEntry - The entry to remove if the entry will be changed - */ - void openLinkDialog(const OUString& sOldName, const OUString& sOldLocation, int nEntry = -1); - - public: - DbRegistrationOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); - virtual ~DbRegistrationOptionsPage() override; - - static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet ); - - virtual OUString GetAllStrings() override; - - virtual bool FillItemSet( SfxItemSet* rSet ) override; - virtual void Reset( const SfxItemSet* rSet ) override; - virtual void FillUserData() override; - }; - - /** helper for DatabaseRegistrationDialog - - Necessary so that DatabaseRegistrationDialog is self-contained, i.e. always reflects - the current registration state. +class DbRegistrationOptionsPage : public SfxTabPage +{ +private: + size_t m_nOldCount; + bool m_bModified; + + std::unique_ptr<weld::Button> m_xNew; + std::unique_ptr<weld::Button> m_xEdit; + std::unique_ptr<weld::Button> m_xDelete; + std::unique_ptr<weld::TreeView> m_xPathBox; + std::unique_ptr<weld::TreeIter> m_xIter; + + DECL_LINK(NewHdl, weld::Button&, void); + DECL_LINK(EditHdl, weld::Button&, void); + DECL_LINK(DeleteHdl, weld::Button&, void); + DECL_LINK(PathBoxDoubleClickHdl, weld::TreeView&, bool); + + DECL_LINK(PathSelect_Impl, weld::TreeView&, void); + + DECL_LINK(HeaderSelect_Impl, int, void); + DECL_LINK(NameValidator, const OUString&, bool); + + /** inserts a new entry in the tablistbox + @param _sName + The name of the entry. + @param _sLocation + The location of the file. */ - class RegistrationItemSetHolder - { - private: - SfxItemSet m_aRegistrationItems; - - protected: - RegistrationItemSetHolder( SfxItemSet _aMasterSet ); - ~RegistrationItemSetHolder(); - - protected: - const SfxItemSet& getRegistrationItems() const { return m_aRegistrationItems; } - }; - - class DatabaseRegistrationDialog :public RegistrationItemSetHolder - ,public SfxSingleTabDialogController - { - public: - DatabaseRegistrationDialog(weld::Window* pParent, const SfxItemSet& rAttr); - - virtual short run() override; - }; -} + void insertNewEntry(const OUString& _sName, const OUString& _sLocation, const bool bReadOnly); + + /** opens the LinkDialog to create a register pair + @param sOldName + The old name of the entry may be empty. + @param sOldLocation + The old location of the entry may be empty. + @param nEntry + The entry to remove if the entry will be changed + */ + void openLinkDialog(const OUString& sOldName, const OUString& sOldLocation, int nEntry = -1); + +public: + DbRegistrationOptionsPage(weld::Container* pPage, weld::DialogController* pController, + const SfxItemSet& rSet); + virtual ~DbRegistrationOptionsPage() override; + + static std::unique_ptr<SfxTabPage> + Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet); + + virtual OUString GetAllStrings() override; + + virtual bool FillItemSet(SfxItemSet* rSet) override; + virtual void Reset(const SfxItemSet* rSet) override; + virtual void FillUserData() override; +}; +/** helper for DatabaseRegistrationDialog + + Necessary so that DatabaseRegistrationDialog is self-contained, i.e. always reflects + the current registration state. +*/ +class RegistrationItemSetHolder +{ +private: + SfxItemSet m_aRegistrationItems; + +protected: + RegistrationItemSetHolder(SfxItemSet _aMasterSet); + ~RegistrationItemSetHolder(); + +protected: + const SfxItemSet& getRegistrationItems() const { return m_aRegistrationItems; } +}; + +class DatabaseRegistrationDialog : public RegistrationItemSetHolder, + public SfxSingleTabDialogController +{ +public: + DatabaseRegistrationDialog(weld::Window* pParent, const SfxItemSet& rAttr); + + virtual short run() override; +}; +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index edbd40b13355..023acc5ad588 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -2270,7 +2270,6 @@ cui/source/inc/cuioptgenrl.hxx cui/source/inc/cuisrchdlg.hxx cui/source/inc/cuitabarea.hxx cui/source/inc/cuitabline.hxx -cui/source/inc/dbregister.hxx cui/source/inc/defdlgname.hxx cui/source/inc/grfpage.hxx cui/source/inc/hangulhanjadlg.hxx commit 72e398e1dd980dd9d8deed2b25aa32803355794b Author: Michael Weghorn <[email protected]> AuthorDate: Fri Oct 3 22:54:20 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Oct 4 10:09:58 2025 +0200 cui: Resave connectortabpage.ui with glade 3.40 This is used by SvxConnectionPage. The dialog using the .ui file can be triggered as follows: * start Draw * in the sidebar on the left, select "Connectors" * insert a connector by clicking into the draw page * with the connector selected, open the context menu * select the "Connector" context menu entry Change-Id: I308a817bf3ce49455c3a02a458f76da5dd50f206 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191837 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/cui/uiconfig/ui/connectortabpage.ui b/cui/uiconfig/ui/connectortabpage.ui index d82e643f4629..fc723fc6cae7 100644 --- a/cui/uiconfig/ui/connectortabpage.ui +++ b/cui/uiconfig/ui/connectortabpage.ui @@ -1,70 +1,70 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.36.0 --> +<!-- Generated with glade 3.40.0 --> <interface domain="cui"> <requires lib="gtk+" version="3.20"/> <object class="GtkAdjustment" id="adjustment1"> <property name="lower">-100</property> <property name="upper">100</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkAdjustment" id="adjustment2"> <property name="lower">-100</property> <property name="upper">100</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkAdjustment" id="adjustment3"> <property name="lower">-100</property> <property name="upper">100</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkAdjustment" id="adjustment4"> <property name="upper">100</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkAdjustment" id="adjustment5"> <property name="upper">100</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkAdjustment" id="adjustment6"> <property name="upper">100</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkAdjustment" id="adjustment7"> <property name="upper">100</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkBox" id="ConnectorTabPage"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="border_width">6</property> + <property name="border-width">6</property> <property name="spacing">12</property> <child> <object class="GtkBox" id="box2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkBox" id="box3"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="FT_TYPE"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="connectortabpage|FT_TYPE">_Type:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">LB_TYPE</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">LB_TYPE</property> <property name="xalign">0</property> </object> <packing> @@ -76,7 +76,7 @@ <child> <object class="GtkComboBoxText" id="LB_TYPE"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child internal-child="accessible"> <object class="AtkObject" id="LB_TYPE-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="connectortabpage|extended_tip|LB_TYPE">Lists the types of connectors that are available.</property> @@ -99,68 +99,68 @@ <child> <object class="GtkFrame" id="FL_DELTA"> <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="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=3 --> <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> + <property name="can-focus">False</property> <property name="margin-start">12</property> <property name="margin-top">6</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> <child> <object class="GtkLabel" id="FT_LINE_1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="connectortabpage|FT_LINE_1">Line _1:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">MTR_FLD_LINE_1</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">MTR_FLD_LINE_1</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="FT_LINE_2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="connectortabpage|FT_LINE_2">Line _2:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">MTR_FLD_LINE_2</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">MTR_FLD_LINE_2</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkLabel" id="FT_LINE_3"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="connectortabpage|FT_LINE_3">Line _3:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">MTR_FLD_LINE_3</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">MTR_FLD_LINE_3</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkSpinButton" id="MTR_FLD_LINE_1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> + <property name="can-focus">True</property> + <property name="activates-default">True</property> + <property name="truncate-multiline">True</property> <property name="adjustment">adjustment1</property> <property name="digits">2</property> - <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="MTR_FLD_LINE_1-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="connectortabpage|extended_tip|MTR_FLD_LINE_1">Enter a skew value for Line 1.</property> @@ -168,18 +168,18 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkSpinButton" id="MTR_FLD_LINE_2"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> + <property name="can-focus">True</property> + <property name="activates-default">True</property> + <property name="truncate-multiline">True</property> <property name="adjustment">adjustment2</property> <property name="digits">2</property> - <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="MTR_FLD_LINE_2-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="connectortabpage|extended_tip|MTR_FLD_LINE_2">Enter a skew value for Line 2.</property> @@ -187,18 +187,18 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="left-attach">1</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkSpinButton" id="MTR_FLD_LINE_3"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> + <property name="can-focus">True</property> + <property name="activates-default">True</property> + <property name="truncate-multiline">True</property> <property name="adjustment">adjustment3</property> <property name="digits">2</property> - <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="MTR_FLD_LINE_3-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="connectortabpage|extended_tip|MTR_FLD_LINE_3">Enter a skew value for Line 3.</property> @@ -206,8 +206,8 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="left-attach">1</property> + <property name="top-attach">2</property> </packing> </child> </object> @@ -215,7 +215,7 @@ <child type="label"> <object class="GtkLabel" id="label2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="connectortabpage|label2">Line Skew</property> <property name="xalign">0</property> <attributes> @@ -233,82 +233,82 @@ <child> <object class="GtkFrame" id="FL_DISTANCE"> <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="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=4 --> <object class="GtkGrid" id="grid3"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> + <property name="can-focus">False</property> <property name="margin-start">12</property> <property name="margin-top">6</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> <child> <object class="GtkLabel" id="FT_HORZ_1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="connectortabpage|FT_HORZ_1">_Begin horizontal:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">MTR_FLD_HORZ_1</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">MTR_FLD_HORZ_1</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="FT_HORZ_2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="connectortabpage|FT_HORZ_2">End _horizontal:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">MTR_FLD_HORZ_2</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">MTR_FLD_HORZ_2</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkLabel" id="FT_VERT_1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="connectortabpage|FT_VERT_1">Begin _vertical:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">MTR_FLD_VERT_1</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">MTR_FLD_VERT_1</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkLabel" id="FT_VERT_2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="connectortabpage|FT_VERT_2">_End vertical:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">MTR_FLD_VERT_2</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">MTR_FLD_VERT_2</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="left-attach">0</property> + <property name="top-attach">3</property> </packing> </child> <child> <object class="GtkSpinButton" id="MTR_FLD_HORZ_1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> + <property name="can-focus">True</property> + <property name="activates-default">True</property> + <property name="truncate-multiline">True</property> <property name="adjustment">adjustment4</property> <property name="digits">2</property> - <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="MTR_FLD_HORZ_1-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="connectortabpage|extended_tip|MTR_FLD_HORZ_1">Enter the amount of horizontal space you want at the beginning of the connector.</property> @@ -316,18 +316,18 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkSpinButton" id="MTR_FLD_HORZ_2"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> + <property name="can-focus">True</property> + <property name="activates-default">True</property> + <property name="truncate-multiline">True</property> <property name="adjustment">adjustment5</property> <property name="digits">2</property> - <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="MTR_FLD_HORZ_2-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="connectortabpage|extended_tip|MTR_FLD_HORZ_2">Enter the amount of horizontal space you want at the end of the connector.</property> @@ -335,18 +335,18 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="left-attach">1</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkSpinButton" id="MTR_FLD_VERT_1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> + <property name="can-focus">True</property> + <property name="activates-default">True</property> + <property name="truncate-multiline">True</property> <property name="adjustment">adjustment6</property> <property name="digits">2</property> - <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="MTR_FLD_VERT_1-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="connectortabpage|extended_tip|MTR_FLD_VERT_1">Enter the amount of vertical space you want at the beginning of the connector.</property> @@ -354,18 +354,18 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="left-attach">1</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkSpinButton" id="MTR_FLD_VERT_2"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> + <property name="can-focus">True</property> + <property name="activates-default">True</property> + <property name="truncate-multiline">True</property> <property name="adjustment">adjustment7</property> <property name="digits">2</property> - <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="MTR_FLD_VERT_2-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="connectortabpage|extended_tip|MTR_FLD_VERT_2">Enter the amount of vertical space you want at the end of the connector.</property> @@ -373,8 +373,8 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> + <property name="left-attach">1</property> + <property name="top-attach">3</property> </packing> </child> </object> @@ -382,7 +382,7 @@ <child type="label"> <object class="GtkLabel" id="label3"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="connectortabpage|label3">Line Spacing</property> <property name="xalign">0</property> <attributes> @@ -407,22 +407,22 @@ <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">never</property> - <property name="shadow_type">in</property> + <property name="hscrollbar-policy">never</property> + <property name="vscrollbar-policy">never</property> + <property name="shadow-type">in</property> <child> <object class="GtkViewport"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkDrawingArea" id="CTL_PREVIEW"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property> - <property name="tooltip_text" translatable="yes" context="connectortabpage|CTL_PREVIEW|tooltip_text">Preview</property> + <property name="tooltip-text" translatable="yes" context="connectortabpage|CTL_PREVIEW|tooltip_text">Preview</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <child internal-child="accessible">
