Resolves tdf#142499 - Make fat cross cursor optional

Change-Id: I9a9182f8783f951e49cdb8f897578f99281c25d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116858
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
(cherry picked from commit 10ff27cc4f01693865599d24caf7ab80d95232e0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117221
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

10 files changed, 341 insertions, 270 deletions

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 5b3a2043e63b..95c1aed3ab0b 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -398,6 +398,14 @@
           </info>
           <value>true</value>
         </prop>
+        <prop oor:name="ThemedCursor" oor:type="xs:boolean" oor:nillable="false">
+          <!-- UIHints: Tools - Options -Spreadsheets - View - [Section] Window -->
+          <info>
+            <desc>If true, a themed cursor is used (fat cross) otherwise the system default (arrow).</desc>
+            <label>Themed cursor</label>
+          </info>
+          <value>false</value>
+        </prop>
       </group>
       <group oor:name="Other">
         <info>
diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index 313a69ad278e..829fb451442c 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -44,6 +44,7 @@ enum ScViewOption
     VOPT_ANCHOR,
     VOPT_PAGEBREAKS,
     VOPT_SUMMARY,
+    VOPT_THEMEDCURSOR,
     VOPT_CLIPMARKS,
 };
 
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index 45b06b47a1fa..1658cfc65ef7 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -88,22 +88,23 @@ ScViewOptions::~ScViewOptions()
 
 void ScViewOptions::SetDefaults()
 {
-    aOptArr[ VOPT_FORMULAS    ] = false;
-    aOptArr[ VOPT_SYNTAX      ] = false;
-    aOptArr[ VOPT_HELPLINES   ] = false;
-    aOptArr[ VOPT_GRID_ONTOP  ] = false;
-    aOptArr[ VOPT_NOTES       ] = true;
-    aOptArr[ VOPT_NULLVALS    ] = true;
-    aOptArr[ VOPT_VSCROLL     ] = true;
-    aOptArr[ VOPT_HSCROLL     ] = true;
-    aOptArr[ VOPT_TABCONTROLS ] = true;
-    aOptArr[ VOPT_OUTLINER    ] = true;
-    aOptArr[ VOPT_HEADER      ] = true;
-    aOptArr[ VOPT_GRID        ] = true;
-    aOptArr[ VOPT_ANCHOR      ] = true;
-    aOptArr[ VOPT_PAGEBREAKS  ] = true;
-    aOptArr[ VOPT_CLIPMARKS   ] = true;
-    aOptArr[ VOPT_SUMMARY     ] = true;
+    aOptArr[ VOPT_FORMULAS     ] = false;
+    aOptArr[ VOPT_SYNTAX       ] = false;
+    aOptArr[ VOPT_HELPLINES    ] = false;
+    aOptArr[ VOPT_GRID_ONTOP   ] = false;
+    aOptArr[ VOPT_NOTES        ] = true;
+    aOptArr[ VOPT_NULLVALS     ] = true;
+    aOptArr[ VOPT_VSCROLL      ] = true;
+    aOptArr[ VOPT_HSCROLL      ] = true;
+    aOptArr[ VOPT_TABCONTROLS  ] = true;
+    aOptArr[ VOPT_OUTLINER     ] = true;
+    aOptArr[ VOPT_HEADER       ] = true;
+    aOptArr[ VOPT_GRID         ] = true;
+    aOptArr[ VOPT_ANCHOR       ] = true;
+    aOptArr[ VOPT_PAGEBREAKS   ] = true;
+    aOptArr[ VOPT_CLIPMARKS    ] = true;
+    aOptArr[ VOPT_SUMMARY      ] = true;
+    aOptArr[ VOPT_THEMEDCURSOR ] = false;
 
     aModeArr[VOBJ_TYPE_OLE ]  = VOBJ_MODE_SHOW;
     aModeArr[VOBJ_TYPE_CHART] = VOBJ_MODE_SHOW;
@@ -198,6 +199,7 @@ ScTpViewItem* ScTpViewItem::Clone( SfxItemPool * ) const
 #define SCLAYOUTOPT_OUTLINE         8
 #define SCLAYOUTOPT_GRID_ONCOLOR    9
 #define SCLAYOUTOPT_SUMMARY         10
+#define SCLAYOUTOPT_THEMEDCURSOR    11
 
 #define CFGPATH_DISPLAY     "Office.Calc/Content/Display"
 
@@ -236,7 +238,8 @@ Sequence<OUString> ScViewCfg::GetLayoutPropertyNames()
             "Window/SheetTab",          // SCLAYOUTOPT_SHEETTAB
             "Window/OutlineSymbol",     // SCLAYOUTOPT_OUTLINE
             "Line/GridOnColoredCells",  // SCLAYOUTOPT_GRID_ONCOLOR;
-            "Window/SearchSummary"};    // SCLAYOUTOPT_SUMMARY
+            "Window/SearchSummary",     // SCLAYOUTOPT_SUMMARY
+            "Window/ThemedCursor"};     // SCLAYOUTOPT_THEMEDCURSOR
 }
 
 Sequence<OUString> ScViewCfg::GetDisplayPropertyNames()
@@ -330,6 +333,9 @@ ScViewCfg::ScViewCfg() :
                     case SCLAYOUTOPT_SUMMARY:
                         SetOption( VOPT_SUMMARY, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
                         break;
+                    case SCLAYOUTOPT_THEMEDCURSOR:
+                        SetOption( VOPT_THEMEDCURSOR, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
+                        break;
                 }
             }
         }
@@ -497,6 +503,9 @@ IMPL_LINK_NOARG(ScViewCfg, LayoutCommitHdl, ScLinkConfigItem&, void)
             case SCLAYOUTOPT_SUMMARY:
                 pValues[nProp] <<= GetOption( VOPT_SUMMARY );
                 break;
+            case SCLAYOUTOPT_THEMEDCURSOR:
+                pValues[nProp] <<= GetOption( VOPT_THEMEDCURSOR );
+                break;
         }
     }
     aLayoutItem.PutProperties(aNames, aValues);
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index 81057be0feb4..318151b1d558 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -59,7 +59,7 @@ void collectUIInformation( const OUString& aevent )
 FuDraw::FuDraw(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pViewP,
                SdrModel* pDoc, const SfxRequest& rReq)
     : FuPoor(rViewSh, pWin, pViewP, pDoc, rReq)
-    , aNewPointer(PointerStyle::FatCross)
+    , aNewPointer(PointerStyle::Arrow)
     , aOldPointer(PointerStyle::Arrow)
 {
 }
@@ -719,7 +719,10 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
     else if ( IsDetectiveHit( aPnt ) )
         rViewShell.SetActivePointer( PointerStyle::Detective );
     else
-        rViewShell.SetActivePointer( aNewPointer );            //! in Gridwin?
+    {
+        const bool bIsThemed = rViewShell.GetViewData().IsThemedCursor();
+        rViewShell.SetActivePointer( bIsThemed ? PointerStyle::FatCross : PointerStyle::Arrow ); //! in Gridwin?
+    }
 }
 
 bool FuDraw::IsEditingANote() const
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 0306044d4f9f..ee35ce6f6f77 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -54,6 +54,8 @@ class ScTpContentOptions : public SfxTabPage
     std::unique_ptr<weld::CheckButton> m_xTblRegCB;
     std::unique_ptr<weld::CheckButton> m_xOutlineCB;
     std::unique_ptr<weld::CheckButton> m_xSummaryCB;
+    std::unique_ptr<weld::RadioButton> m_xThemedCursorRB;
+    std::unique_ptr<weld::RadioButton> m_xSystemCursorRB;
 
     void    InitGridOpt();
     DECL_LINK( GridHdl, weld::ComboBox&, void );
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index b63b10f0a195..9906071f28ac 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -553,6 +553,7 @@ public:
     bool    IsVScrollMode   () const            { return maOptions.GetOption(VOPT_VSCROLL); }
     bool    IsHScrollMode   () const            { return maOptions.GetOption(VOPT_HSCROLL); }
     bool    IsOutlineMode   () const            { return maOptions.GetOption(VOPT_OUTLINER); }
+    bool    IsThemedCursor  () const            { return maOptions.GetOption(VOPT_THEMEDCURSOR); }
 
     /// Force page size for PgUp/PgDown to overwrite the computation based on m_aVisArea.
     void ForcePageUpDownOffset(tools::Long nTwips) { m_nLOKPageUpDownOffset = nTwips; }
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 994e74822a8e..9af4e81d87e7 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -57,6 +57,8 @@ ScTpContentOptions::ScTpContentOptions(weld::Container* pPage, weld::DialogContr
     , m_xTblRegCB(m_xBuilder->weld_check_button("tblreg"))
     , m_xOutlineCB(m_xBuilder->weld_check_button("outline"))
     , m_xSummaryCB(m_xBuilder->weld_check_button("cbSummary"))
+    , m_xThemedCursorRB(m_xBuilder->weld_radio_button("rbThemedCursor"))
+    , m_xSystemCursorRB(m_xBuilder->weld_radio_button("rbSystemCursor"))
 {
     SetExchangeSupport();
     Link<weld::ComboBox&,void> aSelObjHdl(LINK( this, ScTpContentOptions, SelLbObjHdl ) );
@@ -81,6 +83,7 @@ ScTpContentOptions::ScTpContentOptions(weld::Container* pPage, weld::DialogContr
     m_xGuideLineCB->connect_toggled(aCBHdl);
     m_xRowColHeaderCB->connect_toggled(aCBHdl);
     m_xSummaryCB->connect_toggled(aCBHdl);
+    m_xThemedCursorRB->connect_toggled(aCBHdl);
 
     m_xColorLB->SetSlotId(SID_ATTR_CHAR_COLOR);
     m_xColorLB->SetAutoDisplayColor(SC_STD_GRIDCOLOR);
@@ -118,6 +121,7 @@ bool    ScTpContentOptions::FillItemSet( SfxItemSet* rCoreSet )
         m_xColorLB->IsValueChangedFromSaved() ||
         m_xBreakCB->get_state_changed_from_saved() ||
         m_xSummaryCB->get_state_changed_from_saved() ||
+        m_xThemedCursorRB->get_state_changed_from_saved() ||
         m_xGuideLineCB->get_state_changed_from_saved())
     {
         NamedColor aNamedColor = m_xColorLB->GetSelectedEntry();
@@ -169,6 +173,10 @@ void    ScTpContentOptions::Reset( const SfxItemSet* rCoreSet )
     m_xTblRegCB ->set_active( m_xLocalOptions->GetOption(VOPT_TABCONTROLS) );
     m_xOutlineCB->set_active( m_xLocalOptions->GetOption(VOPT_OUTLINER) );
     m_xSummaryCB->set_active( m_xLocalOptions->GetOption(VOPT_SUMMARY) );
+    if ( m_xLocalOptions->GetOption(VOPT_THEMEDCURSOR) )
+        m_xThemedCursorRB->set_active( true );
+    else
+        m_xSystemCursorRB->set_active( true );
 
     InitGridOpt();
 
@@ -202,6 +210,7 @@ void    ScTpContentOptions::Reset( const SfxItemSet* rCoreSet )
     m_xBreakCB->save_state();
     m_xGuideLineCB->save_state();
     m_xSummaryCB->save_state();
+    m_xThemedCursorRB->save_state();
 }
 
 void ScTpContentOptions::ActivatePage( const SfxItemSet& rSet)
@@ -251,6 +260,7 @@ IMPL_LINK( ScTpContentOptions, CBHdl, weld::Toggleable&, rBtn, void )
     else if ( m_xGuideLineCB.get() == &rBtn )   eOption = VOPT_HELPLINES;
     else if ( m_xRowColHeaderCB.get() == &rBtn )   eOption = VOPT_HEADER;
     else if ( m_xSummaryCB.get()  == &rBtn )   eOption = VOPT_SUMMARY;
+    else if ( m_xThemedCursorRB.get() == &rBtn )   eOption = VOPT_THEMEDCURSOR;
 
     m_xLocalOptions->SetOption( eOption, bChecked );
 }
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index bc4d1006325e..3211e5af581d 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -2041,7 +2041,7 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
 
     rMark.SetMarking(false);
 
-    SetPointer( PointerStyle::FatCross );
+    SetPointer( mrViewData.IsThemedCursor() ? PointerStyle::FatCross : PointerStyle::Arrow );
 
     if (mrViewData.IsFillMode() ||
         ( mrViewData.GetFillMode() == ScFillMode::MATRIX && rMEvt.IsMod1() ))
@@ -2627,7 +2627,7 @@ void ScGridWindow::MouseMove( const MouseEvent& rMEvt )
             bool bAlt = rMEvt.IsMod2();
 
             if (bEditMode)                                  // First has to be in edit mode!
-                SetPointer( PointerStyle::FatCross );
+                SetPointer( mrViewData.IsThemedCursor() ? PointerStyle::FatCross : PointerStyle::Arrow );
             else if ( !bAlt && !nButtonDown && ScGlobal::ShouldOpenURL() &&
                         GetEditUrl(rMEvt.GetPosPixel()) )
                 SetPointer( PointerStyle::RefHand );
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index af7c3dfb19b7..3de36af347d2 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -648,7 +648,7 @@ void ScTabView::ResetBrushDocument()
     if ( HasPaintBrush() )
     {
         SetBrushDocument( nullptr, false );
-        SetActivePointer( PointerStyle::FatCross );   // switch pointers also when ended with escape key
+        SetActivePointer( aViewData.IsThemedCursor() ? PointerStyle::FatCross : PointerStyle::Arrow ); // switch pointers also when ended with escape key
     }
 }
 
diff --git a/sc/uiconfig/scalc/ui/tpviewpage.ui b/sc/uiconfig/scalc/ui/tpviewpage.ui
index 7b409b747a85..0085a13d2ff6 100644
--- a/sc/uiconfig/scalc/ui/tpviewpage.ui
+++ b/sc/uiconfig/scalc/ui/tpviewpage.ui
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.2 -->
 <interface domain="sc">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkBox" id="TpViewPage">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="can-focus">False</property>
+    <property name="border-width">6</property>
     <child>
-      <!-- n-columns=1 n-rows=1 -->
+      <!-- n-columns=2 n-rows=3 -->
       <object class="GtkGrid" id="grid3">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="row_spacing">12</property>
-        <property name="column_spacing">24</property>
+        <property name="can-focus">False</property>
+        <property name="row-spacing">12</property>
+        <property name="column-spacing">24</property>
         <child>
           <object class="GtkFrame" id="frame4">
             <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=1 n-rows=7 -->
               <object class="GtkGrid" id="grid6">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="margin-start">12</property>
                 <property name="margin-top">6</property>
                 <child>
                   <object class="GtkCheckButton" id="formula">
                     <property name="label" translatable="yes" context="tpviewpage|formula">_Formulas</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="draw_indicator">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="formula-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|formula">Specifies whether to show formulas instead of results in the cells.</property>
@@ -41,18 +41,18 @@
                     </child>
                   </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="GtkCheckButton" id="nil">
                     <property name="label" translatable="yes" context="tpviewpage|nil">Zero val_ues</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="draw_indicator">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="nil-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|nil">Specifies whether to show numbers with the value of 0.</property>
@@ -60,18 +60,18 @@
                     </child>
                   </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="GtkCheckButton" id="annot">
                     <property name="label" translatable="yes" context="tpviewpage|annot">_Comment indicator</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="draw_indicator">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="annot-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|annot">Specifies that a small rectangle in the top right corner of the cell indicates that a comment exists. The comment will be shown only when you enable tips under %PRODUCTNAME - General in the Options dialog box.</property>
@@ -79,18 +79,18 @@
                     </child>
                   </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="GtkCheckButton" id="value">
                     <property name="label" translatable="yes" context="tpviewpage|value">Value h_ighlighting</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="draw_indicator">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="value-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|value">Mark the Value highlighting box to show the cell contents in different colors, depending on type. Text cells are formatted in black, formulas in green, number cells in blue, and protected cells are shown with light grey background, no matter how their display is formatted.</property>
@@ -98,18 +98,18 @@
                     </child>
                   </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="GtkCheckButton" id="anchor">
                     <property name="label" translatable="yes" context="tpviewpage|anchor">_Anchor</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="draw_indicator">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="anchor-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|anchor">Specifies whether the anchor icon is displayed when an inserted object, such as a graphic, is selected.</property>
@@ -117,18 +117,18 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">4</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">4</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="clipmark">
                     <property name="label" translatable="yes" context="tpviewpage|clipmark">Te_xt overflow</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="draw_indicator">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="clipmark-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|clipmark">If a cell contains text that is wider than the width of the cell, the text is displayed over empty neighboring cells in the same row. If there is no empty neighboring cell, a small triangle at the cell border indicates that the text continues.</property>
@@ -136,18 +136,18 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">5</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">5</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="rangefind">
                     <property name="label" translatable="yes" context="tpviewpage|rangefind">_Show references in color</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="draw_indicator">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="rangefind-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|rangefind">Specifies that each reference is highlighted in color in the formula. The cell range is also enclosed by a colored border as soon as the cell containing the reference is selected for editing.</property>
@@ -155,8 +155,8 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">6</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">6</property>
                   </packing>
                 </child>
               </object>
@@ -164,7 +164,7 @@
             <child type="label">
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" context="tpviewpage|label4">Display</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -173,31 +173,31 @@
             </child>
           </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="GtkFrame" id="frame5">
             <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=1 n-rows=6 -->
               <object class="GtkGrid" id="grid4">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="margin-start">12</property>
                 <property name="margin-top">6</property>
                 <child>
                   <object class="GtkCheckButton" id="rowcolheader">
                     <property name="label" translatable="yes" context="tpviewpage|rowcolheader">Colu_mn/row headers</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="draw_indicator">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="rowcolheader-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|rowcolheader">Specifies whether to display row and column headers.</property>
@@ -205,18 +205,18 @@
                     </child>
                   </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="GtkCheckButton" id="hscroll">
                     <property name="label" translatable="yes" context="tpviewpage|hscroll">Hori_zontal scroll bar</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="draw_indicator">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="hscroll-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|hscroll">Specifies whether to display a horizontal scrollbar at the bottom of the document window.</property>
@@ -224,18 +224,18 @@
                     </child>
                   </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="GtkCheckButton" id="vscroll">
                     <property name="label" translatable="yes" context="tpviewpage|vscroll">_Vertical scroll bar</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="draw_indicator">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="vscroll-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|vscroll">Specifies whether to display a vertical scrollbar at the right of the document window.</property>
@@ -243,18 +243,18 @@
                     </child>
                   </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="GtkCheckButton" id="tblreg">
                     <property name="label" translatable="yes" context="tpviewpage|tblreg">Sh_eet tabs</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="draw_indicator">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="tblreg-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|tblreg">Specifies whether to display the sheet tabs at the bottom of the spreadsheet document.</property>
@@ -262,18 +262,18 @@
                     </child>
                   </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="GtkCheckButton" id="outline">
                     <property name="label" translatable="yes" context="tpviewpage|outline">_Outline symbols</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="draw_indicator">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="outline-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|outline">If you have defined an outline, the Outline symbols option specifies whether to view the outline symbols at the border of the sheet.</property>
@@ -281,23 +281,23 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">4</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">4</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="cbSummary">
                     <property name="label" translatable="yes" context="tpviewpage|summary">Summary o_n search</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="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
                     <property name="active">True</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="draw-indicator">True</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">5</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">5</property>
                   </packing>
                 </child>
               </object>
@@ -305,7 +305,7 @@
             <child type="label">
               <object class="GtkLabel" id="label5">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" context="tpviewpage|label5">Window</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -314,26 +314,26 @@
             </child>
           </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="GtkFrame" id="frame3">
             <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>
               <object class="GtkCheckButton" id="synczoom">
                 <property name="label" translatable="yes" context="tpviewpage|synczoom">S_ynchronize sheets</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="draw_indicator">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
                 <property name="margin-start">12</property>
                 <property name="margin-top">6</property>
+                <property name="use-underline">True</property>
+                <property name="draw-indicator">True</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="synczoom-atkobject">
                     <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|synczoom">If checked, all sheets are shown with the same zoom factor. If not checked, each sheet can have its own zoom factor.</property>
@@ -344,7 +344,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="tpviewpage|label3">Zoom</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -353,143 +353,179 @@
             </child>
           </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="GtkFrame" id="frame1">
             <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=3 n-rows=5 -->
               <object class="GtkGrid" id="grid5">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="row_spacing">3</property>
+                <property name="can-focus">False</property>
                 <property name="margin-start">12</property>
                 <property name="margin-top">6</property>
+                <property name="row-spacing">3</property>
                 <child>
-                  <!-- n-columns=1 n-rows=1 -->
-                  <object class="GtkGrid" id="grid7">
+                  <object class="GtkCheckButton" id="break">
+                    <property name="label" translatable="yes" context="tpviewpage|break">_Page breaks</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="row_spacing">3</property>
-                    <property name="column_spacing">6</property>
-                    <child>
-                      <object class="GtkMenuButton" id="color">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="receives_default">False</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                        <property name="label" translatable="no"></property>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="color-atkobject">
-                            <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|color">Specifies a color for the grid lines in the current document.</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="grid_label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes" context="tpviewpage|grid_label">_Grid lines:</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">grid</property>
-                        <property name="xalign">0</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="color_label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes" context="tpviewpage|color_label">_Color:</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">color</property>
-                        <property name="xalign">0</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>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="break-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|break">Specifies whether to view the page breaks within a defined print area.</property>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                      </packing>
                     </child>
-                    <child>
-                      <object class="GtkComboBoxText" id="grid">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <items>
-                          <item translatable="yes" context="tpviewpage|grid">Show</item>
-                          <item translatable="yes" context="tpviewpage|grid">Show on colored cells</item>
-                          <item translatable="yes" context="tpviewpage|grid">Hide</item>
-                        </items>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="grid-atkobject">
-                            <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|grid">Specifies when grid lines will be displayed. Default is to display grid lines only on cells that do not have a background color. You can choose to also display grid lines on cells with background color, or to hide them.</property>
-                          </object>
-                        </child>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">3</property>
+                    <property name="width">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="guideline">
+                    <property name="label" translatable="yes" context="tpviewpage|guideline">Helplines _while moving</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>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="guideline-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|guideline">Specifies whether to view guides when moving drawings, frames, graphics and other objects.</property>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                      </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">4</property>
+                    <property name="width">3</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkCheckButton" id="break">
-                    <property name="label" translatable="yes" context="tpviewpage|break">_Page breaks</property>
+                  <object class="GtkLabel" id="grid_label">
                     <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="draw_indicator">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes" context="tpviewpage|grid_label">_Grid lines:</property>
+                    <property name="use-underline">True</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="color_label">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes" context="tpviewpage|color_label">_Color:</property>
+                    <property name="use-underline">True</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBoxText" id="grid">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <items>
+                      <item translatable="yes" context="tpviewpage|grid">Show</item>
+                      <item translatable="yes" context="tpviewpage|grid">Show on colored cells</item>
+                      <item translatable="yes" context="tpviewpage|grid">Hide</item>
+                    </items>
                     <child internal-child="accessible">
-                      <object class="AtkObject" id="break-atkobject">
-                        <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|break">Specifies whether to view the page breaks within a defined print area.</property>
+                      <object class="AtkObject" id="grid-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|grid">Specifies when grid lines will be displayed. Default is to display grid lines only on cells that do not have a background color. You can choose to also display grid lines on cells with background color, or to hide them.</property>
                       </object>
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">0</property>
+                    <property name="width">2</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkCheckButton" id="guideline">
-                    <property name="label" translatable="yes" context="tpviewpage|guideline">Helplines _while moving</property>
+                  <object class="GtkMenuButton" id="color">
                     <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="draw_indicator">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="receives-default">False</property>
+                    <property name="xalign">0</property>
+                    <property name="draw-indicator">True</property>
+                    <child>
+                      <placeholder/>
+                    </child>
                     <child internal-child="accessible">
-                      <object class="AtkObject" id="guideline-atkobject">
-                        <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|guideline">Specifies whether to view guides when moving drawings, frames, graphics and other objects.</property>
+                      <object class="AtkObject" id="color-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|color">Specifies a color for the grid lines in the current document.</property>
                       </object>
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">1</property>
+                    <property name="width">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="lbCursor">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes" context="tpviewpage|labelCursor">Cu_rsor:</property>
+                    <property name="use-underline">True</property>
+                    <property name="mnemonic-widget">rbThemedCursor</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioButton" id="rbThemedCursor">
+                    <property name="label" translatable="yes" context="tpviewpage|radiobuttonThemed">T_hemed</property>
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="tooltip-text" translatable="yes" context="tpviewpage|radiobuttonThemedTip">Show the cursor as defined in the icon theme, typically as fat cross.</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioButton" id="rbSystemCursor">
+                    <property name="label" translatable="yes" context="tpviewpage|radiobuttonSystem">S_ystem</property>
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="tooltip-text" translatable="yes" context="tpviewpage|radiobuttonSystemTip">Show the cursor as system default, typically an arrow pointer.</property>
+                    <property name="use-underline">True</property>
+                    <property name="active">True</property>
+                    <property name="draw-indicator">True</property>
+                    <property name="group">rbThemedCursor</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">2</property>
+                    <property name="top-attach">2</property>
                   </packing>
                 </child>
               </object>
@@ -497,7 +533,7 @@
             <child type="label">
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" context="tpviewpage|label1">Visual Aids</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -506,71 +542,71 @@
             </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="GtkFrame" id="frame2">
             <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">3</property>
-                <property name="column_spacing">3</property>
+                <property name="can-focus">False</property>
                 <property name="margin-start">12</property>
                 <property name="margin-top">6</property>
+                <property name="row-spacing">3</property>
+                <property name="column-spacing">3</property>
                 <child>
                   <object class="GtkLabel" id="objgrf_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes" context="tpviewpage|objgrf_label">Ob_jects/Images:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">objgrf</property>
+                    <property name="use-underline">True</property>
+                    <property name="mnemonic-widget">objgrf</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="diagram_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes" context="tpviewpage|diagram_label">Cha_rts:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">diagram</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes" context="tpviewpage|diagram_label">Char_ts:</property>
+                    <property name="use-underline">True</property>
+                    <property name="mnemonic-widget">diagram</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="draw_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes" context="tpviewpage|draw_label">_Drawing objects:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">draw</property>
+                    <property name="use-underline">True</property>
+                    <property name="mnemonic-widget">draw</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="GtkComboBoxText" id="objgrf">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <items>
                       <item translatable="yes" context="tpviewpage|objgrf">Show</item>
                       <item translatable="yes" context="tpviewpage|objgrf">Hide</item>
@@ -582,14 +618,14 @@
                     </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="GtkComboBoxText" id="diagram">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <items>
                       <item translatable="yes" context="tpviewpage|diagram">Show</item>
                       <item translatable="yes" context="tpviewpage|diagram">Hide</item>
@@ -601,14 +637,14 @@
                     </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="GtkComboBoxText" id="draw">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <items>
                       <item translatable="yes" context="tpviewpage|draw">Show</item>
                       <item translatable="yes" context="tpviewpage|draw">Hide</item>
@@ -620,8 +656,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>
@@ -629,7 +665,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="tpviewpage|label2">Objects</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -638,8 +674,8 @@
             </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>
@@ -665,6 +701,7 @@
       <widget name="objgrf_label"/>
       <widget name="diagram_label"/>
       <widget name="draw_label"/>
+      <widget name="lbCursor"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="sizegroupWidget">