[Libreoffice-commits] core.git: sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk

Faisal M. Al-Otaibi fmalotaibi at kacst.edu.sa
Mon Jun 10 02:59:00 PDT 2013


 sc/UIConfig_scalc.mk                  |    1 
 sc/inc/helpids.h                      |    1 
 sc/inc/sc.hrc                         |    1 
 sc/source/ui/inc/optdlg.hrc           |   21 -
 sc/source/ui/inc/tpview.hxx           |   37 +-
 sc/source/ui/optdlg/tpview.cxx        |  186 ++++++-------
 sc/source/ui/src/optdlg.src           |  179 -------------
 sc/source/ui/src/scstring.src         |   15 +
 sc/uiconfig/scalc/ui/scgeneralpage.ui |  460 ++++++++++++++++++++++++++++++++++
 9 files changed, 582 insertions(+), 319 deletions(-)

New commits:
commit 813e8bc2268d74a2e7ce2d9f1cb5ae9c412086a6
Author: Faisal M. Al-Otaibi <fmalotaibi at kacst.edu.sa>
Date:   Mon Jun 10 11:53:21 2013 +0200

    Convert sc general option page to .ui format
    
    Change-Id: I06487f74b8dfdf27b067c1bdb6e47a5fa8babf30

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 8fc9e35..9e7fb46 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -85,6 +85,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
 	sc/uiconfig/scalc/ui/optdefaultpage \
 	sc/uiconfig/scalc/ui/printeroptions \
 	sc/uiconfig/scalc/ui/protectsheetdlg \
+	sc/uiconfig/scalc/ui/scgeneralpage \
 	sc/uiconfig/scalc/ui/sheetprintpage \
 	sc/uiconfig/scalc/ui/rightfooterdialog \
 	sc/uiconfig/scalc/ui/rightheaderdialog \
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index afef8bb..15086f9 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -68,7 +68,6 @@
 #define HID_SCPAGE_SUBT_GROUP3                                  "SC_HID_SCPAGE_SUBT_GROUP3"
 
 #define HID_SCPAGE_CONTENT                                      "SC_HID_SCPAGE_CONTENT"
-#define HID_SCPAGE_LAYOUT                                       "SC_HID_SCPAGE_LAYOUT"
 
 #define HID_SC_NAVIGATOR                                        "SC_HID_SC_NAVIGATOR"
 
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 7b823b0..e98448c 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -830,6 +830,7 @@
 #define SCSTR_ORIENTATION_BOTTOMTOP (STR_START + 111)
 #define SCSTR_ORIENTATION_STANDARD  (STR_START + 112)
 #define SCSTR_AUTHOR                (STR_START + 113)
+#define SCSTR_UNIT                  (STR_START + 114)
 
 // accessibility
 
diff --git a/sc/source/ui/inc/optdlg.hrc b/sc/source/ui/inc/optdlg.hrc
index 4103d54..d815de1 100644
--- a/sc/source/ui/inc/optdlg.hrc
+++ b/sc/source/ui/inc/optdlg.hrc
@@ -77,16 +77,11 @@
 #define CB_SYNCZOOM         35
 
 // TP_LAYOUT
-#define GB_LINK                 1
-#define RB_ALWAYS               2
-#define RB_REQUEST              3
-#define RB_NEVER                4
 #define CB_DOCONLY              5
 #define CB_MERGE_PARA_DIST      6
 #define GB_COMPAT               7
 #define CB_AUTO_UPDATE_FIELDS   8
 #define CB_AUTO_UPDATE_CHARTS   9
-#define FT_UPDATE_LINKS         10
 
 #define GB_WINDOW       50
 #define CB_ROWCOLHEADER 51
@@ -98,30 +93,14 @@
 #define FT_COLOR        58
 #define LB_COLOR        59
 #define CB_GUIDELINE    60
-#define GB_UNIT         61
-#define LB_UNIT         62
-#define ST_UNIT         63
-#define MF_TAB          65
 #define CB_PAGEBREAKS   66
-#define FT_TAB          69
-#define FT_UNIT         70
 #define FL_SEPARATOR1   71
 #define FL_SEPARATOR2   72
-#define FL_SEPARATOR    73
 #define FT_GRID         74
 #define LB_GRID         75
 
 // TP_INPUT
-#define GB_OPTIONS      70
-#define CB_ALIGN        71
-#define LB_ALIGN        72
-#define CB_EDITMODE     73
-#define CB_FORMAT       74
 #define CB_RFIND        75
-#define CB_EXPREF       76
-#define CB_MARKHDR      77
-#define CB_TEXTFMT      78
-#define CB_REPLWARN     79
 
 
 // TP_FORMULA
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 0bb22a5..7f786cb 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -103,28 +103,21 @@ public:
 class ScDocument;
 class ScTpLayoutOptions : public SfxTabPage
 {
-    FixedLine       aUnitGB;
-    FixedText       aUnitFT;
-    ListBox         aUnitLB;
-    FixedText       aTabFT;
-    MetricField     aTabMF;
-
-    FixedLine       aSeparatorFL;
-    FixedLine       aLinkGB;
-    FixedText       aLinkFT;
-    RadioButton     aAlwaysRB;
-    RadioButton     aRequestRB;
-    RadioButton     aNeverRB;
-
-    FixedLine       aOptionsGB;
-    CheckBox        aAlignCB;
-    ListBox         aAlignLB;
-    CheckBox        aEditModeCB;
-    CheckBox        aFormatCB;
-    CheckBox        aExpRefCB;
-    CheckBox        aMarkHdrCB;
-    CheckBox        aTextFmtCB;
-    CheckBox        aReplWarnCB;
+    ListBox*        m_pUnitLB;
+    MetricField*    m_pTabMF;
+
+    RadioButton*    m_pAlwaysRB;
+    RadioButton*    m_pRequestRB;
+    RadioButton*    m_pNeverRB;
+
+    CheckBox*       m_pAlignCB;
+    ListBox*        m_pAlignLB;
+    CheckBox*       m_pEditModeCB;
+    CheckBox*       m_pFormatCB;
+    CheckBox*       m_pExpRefCB;
+    CheckBox*       m_pMarkHdrCB;
+    CheckBox*       m_pTextFmtCB;
+    CheckBox*       m_pReplWarnCB;
 
     SvxStringArray  aUnitArr;
 
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 7f0130f..27d286f 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -375,38 +375,32 @@ IMPL_LINK( ScTpContentOptions, GridHdl, ListBox*, pLb )
 
 ScTpLayoutOptions::ScTpLayoutOptions(   Window* pParent,
                                         const SfxItemSet&   rArgSet ) :
-    SfxTabPage(pParent, ScResId( RID_SCPAGE_LAYOUT ), rArgSet),
-    aUnitGB( this,          ScResId(GB_UNIT           )),
-    aUnitFT( this,          ScResId(FT_UNIT           )),
-    aUnitLB( this,          ScResId(LB_UNIT           )),
-    aTabFT( this,           ScResId( FT_TAB           )),
-    aTabMF( this,           ScResId( MF_TAB           )),
-    aSeparatorFL( this,     ScResId( FL_SEPARATOR         )),
-    aLinkGB     (this, ScResId(GB_LINK  )),
-    aLinkFT(this, ScResId(FT_UPDATE_LINKS )),
-    aAlwaysRB   (this, ScResId(RB_ALWAYS    )),
-    aRequestRB  (this, ScResId(RB_REQUEST   )),
-    aNeverRB    (this, ScResId(RB_NEVER )),
-
-    aOptionsGB( this,       ScResId( GB_OPTIONS   )),
-    aAlignCB  ( this,       ScResId( CB_ALIGN       )),
-    aAlignLB  ( this,       ScResId( LB_ALIGN       )),
-    aEditModeCB( this,      ScResId( CB_EDITMODE    )),
-    aFormatCB( this,        ScResId( CB_FORMAT  )),
-    aExpRefCB( this,        ScResId( CB_EXPREF    )),
-    aMarkHdrCB( this,       ScResId( CB_MARKHDR   )),
-    aTextFmtCB( this,       ScResId( CB_TEXTFMT   )),
-    aReplWarnCB( this,      ScResId( CB_REPLWARN  )),
-    aUnitArr(               ScResId(ST_UNIT           )),
+    SfxTabPage( pParent, "ScGeneralPage",
+                "modules/scalc/ui/scgeneralpage.ui", rArgSet),
+    aUnitArr(               ScResId(SCSTR_UNIT           )),
     pDoc(NULL)
 {
-    FreeResource();
-    aSeparatorFL.SetStyle( aSeparatorFL.GetStyle() | WB_VERT );
+    get( m_pUnitLB, "unitlb");
+    get( m_pTabMF, "tabmf");
+
+    get( m_pAlwaysRB, "alwaysrb");
+    get( m_pRequestRB, "requestrb");
+    get( m_pNeverRB, "neverrb");
+
+    get( m_pAlignCB, "aligncb");
+    get( m_pAlignLB, "alignlb");
+    get( m_pEditModeCB, "editmodecb");
+    get( m_pFormatCB, "formatcb");
+    get( m_pExpRefCB, "exprefcb");
+    get( m_pMarkHdrCB, "markhdrcb");
+    get( m_pTextFmtCB, "textfmtcb");
+    get( m_pReplWarnCB, "replwarncb");
+
     SetExchangeSupport();
 
-    aUnitLB.    SetSelectHdl( LINK( this, ScTpLayoutOptions, MetricHdl ) );
+    m_pUnitLB->SetSelectHdl( LINK( this, ScTpLayoutOptions, MetricHdl ) );
 
-    aAlignCB.SetClickHdl(LINK(this, ScTpLayoutOptions, AlignHdl));
+    m_pAlignCB->SetClickHdl(LINK(this, ScTpLayoutOptions, AlignHdl));
 
 
     for ( sal_uInt16 i = 0; i < aUnitArr.Count(); ++i )
@@ -423,8 +417,8 @@ ScTpLayoutOptions::ScTpLayoutOptions(   Window* pParent,
             case FUNIT_INCH:
             {
                 // nur diese Metriken benutzen
-                sal_uInt16 nPos = aUnitLB.InsertEntry( sMetric );
-                aUnitLB.SetEntryData( nPos, (void*)(sal_IntPtr)eFUnit );
+                sal_uInt16 nPos = m_pUnitLB->InsertEntry( sMetric );
+                m_pUnitLB->SetEntryData( nPos, (void*)(sal_IntPtr)eFUnit );
             }
             break;
             default:
@@ -454,35 +448,35 @@ SfxTabPage* ScTpLayoutOptions::Create( Window*          pParent,
 sal_Bool    ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet )
 {
     sal_Bool bRet = sal_True;
-    const sal_uInt16 nMPos = aUnitLB.GetSelectEntryPos();
-    if ( nMPos != aUnitLB.GetSavedValue() )
+    const sal_uInt16 nMPos = m_pUnitLB->GetSelectEntryPos();
+    if ( nMPos != m_pUnitLB->GetSavedValue() )
     {
-        sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)aUnitLB.GetEntryData( nMPos );
+        sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pUnitLB->GetEntryData( nMPos );
         rCoreSet.Put( SfxUInt16Item( SID_ATTR_METRIC,
                                      (sal_uInt16)nFieldUnit ) );
         bRet = sal_True;
     }
 
-    if(aTabMF.GetText() != aTabMF.GetSavedValue())
+    if(m_pTabMF->GetText() != m_pTabMF->GetSavedValue())
     {
         rCoreSet.Put(SfxUInt16Item(SID_ATTR_DEFTABSTOP,
-                    sal::static_int_cast<sal_uInt16>( aTabMF.Denormalize(aTabMF.GetValue(FUNIT_TWIP)) )));
+                    sal::static_int_cast<sal_uInt16>( m_pTabMF->Denormalize(m_pTabMF->GetValue(FUNIT_TWIP)) )));
         bRet = sal_True;
     }
 
     ScLkUpdMode nSet=LM_ALWAYS;
 
-    if(aRequestRB.IsChecked())
+    if(m_pRequestRB->IsChecked())
     {
         nSet=LM_ON_DEMAND;
     }
-    else if(aNeverRB.IsChecked())
+    else if(m_pNeverRB->IsChecked())
     {
         nSet=LM_NEVER;
     }
 
-    if(aRequestRB.IsChecked() != aRequestRB.GetSavedValue() ||
-            aNeverRB.IsChecked() != aNeverRB.GetSavedValue() )
+    if(m_pRequestRB->IsChecked() != m_pRequestRB->GetSavedValue() ||
+            m_pNeverRB->IsChecked() != m_pNeverRB->GetSavedValue() )
     {
         if(pDoc)
             pDoc->SetLinkMode(nSet);
@@ -491,52 +485,52 @@ sal_Bool    ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet )
         SC_MOD()->SetAppOptions(aAppOptions);
         bRet = sal_True;
     }
-    if(aAlignCB.GetSavedValue() != aAlignCB.IsChecked())
+    if(m_pAlignCB->GetSavedValue() != m_pAlignCB->IsChecked())
     {
-        rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_SELECTION, aAlignCB.IsChecked()));
+        rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_SELECTION, m_pAlignCB->IsChecked()));
         bRet = sal_True;
     }
 
-    if(aAlignLB.GetSavedValue() != aAlignLB.GetSelectEntryPos())
+    if(m_pAlignLB->GetSavedValue() != m_pAlignLB->GetSelectEntryPos())
     {
-        rCoreSet.Put(SfxUInt16Item(SID_SC_INPUT_SELECTIONPOS, aAlignLB.GetSelectEntryPos()));
+        rCoreSet.Put(SfxUInt16Item(SID_SC_INPUT_SELECTIONPOS, m_pAlignLB->GetSelectEntryPos()));
         bRet = sal_True;
     }
 
-    if(aEditModeCB.GetSavedValue() != aEditModeCB.IsChecked())
+    if(m_pEditModeCB->GetSavedValue() != m_pEditModeCB->IsChecked())
     {
-        rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_EDITMODE, aEditModeCB.IsChecked()));
+        rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_EDITMODE, m_pEditModeCB->IsChecked()));
         bRet = sal_True;
     }
 
-    if(aFormatCB.GetSavedValue() != aFormatCB.IsChecked())
+    if(m_pFormatCB->GetSavedValue() != m_pFormatCB->IsChecked())
     {
-        rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_FMT_EXPAND, aFormatCB.IsChecked()));
+        rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_FMT_EXPAND, m_pFormatCB->IsChecked()));
         bRet = sal_True;
     }
 
 
-    if(aExpRefCB.GetSavedValue() != aExpRefCB.IsChecked())
+    if(m_pExpRefCB->GetSavedValue() != m_pExpRefCB->IsChecked())
     {
-        rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_REF_EXPAND, aExpRefCB.IsChecked()));
+        rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_REF_EXPAND, m_pExpRefCB->IsChecked()));
         bRet = sal_True;
     }
 
-    if(aMarkHdrCB.GetSavedValue() != aMarkHdrCB.IsChecked())
+    if(m_pMarkHdrCB->GetSavedValue() != m_pMarkHdrCB->IsChecked())
     {
-        rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_MARK_HEADER, aMarkHdrCB.IsChecked()));
+        rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_MARK_HEADER, m_pMarkHdrCB->IsChecked()));
         bRet = sal_True;
     }
 
-    if(aTextFmtCB.GetSavedValue() != aTextFmtCB.IsChecked())
+    if(m_pTextFmtCB->GetSavedValue() != m_pTextFmtCB->IsChecked())
     {
-        rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_TEXTWYSIWYG, aTextFmtCB.IsChecked()));
+        rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_TEXTWYSIWYG, m_pTextFmtCB->IsChecked()));
         bRet = sal_True;
     }
 
-    if( aReplWarnCB.GetSavedValue() != aReplWarnCB.IsChecked() )
+    if( m_pReplWarnCB->GetSavedValue() != m_pReplWarnCB->IsChecked() )
     {
-        rCoreSet.Put( SfxBoolItem( SID_SC_INPUT_REPLCELLSWARN, aReplWarnCB.IsChecked() ) );
+        rCoreSet.Put( SfxBoolItem( SID_SC_INPUT_REPLCELLSWARN, m_pReplWarnCB->IsChecked() ) );
         bRet = sal_True;
     }
 
@@ -545,31 +539,31 @@ sal_Bool    ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet )
 
 void    ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet )
 {
-    aUnitLB.SetNoSelection();
+    m_pUnitLB->SetNoSelection();
     if ( rCoreSet.GetItemState( SID_ATTR_METRIC ) >= SFX_ITEM_AVAILABLE )
     {
         const SfxUInt16Item& rItem = (SfxUInt16Item&)rCoreSet.Get( SID_ATTR_METRIC );
         FieldUnit eFieldUnit = (FieldUnit)rItem.GetValue();
 
-        for ( sal_uInt16 i = 0; i < aUnitLB.GetEntryCount(); ++i )
+        for ( sal_uInt16 i = 0; i < m_pUnitLB->GetEntryCount(); ++i )
         {
-            if ( (FieldUnit)(sal_IntPtr)aUnitLB.GetEntryData( i ) == eFieldUnit )
+            if ( (FieldUnit)(sal_IntPtr)m_pUnitLB->GetEntryData( i ) == eFieldUnit )
             {
-                aUnitLB.SelectEntryPos( i );
+                m_pUnitLB->SelectEntryPos( i );
                 break;
             }
         }
-        ::SetFieldUnit(aTabMF, eFieldUnit);
+        ::SetFieldUnit(*m_pTabMF, eFieldUnit);
     }
-    aUnitLB.SaveValue();
+    m_pUnitLB->SaveValue();
 
     const SfxPoolItem* pItem;
     if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_ATTR_DEFTABSTOP, false, &pItem))
-        aTabMF.SetValue(aTabMF.Normalize(((SfxUInt16Item*)pItem)->GetValue()), FUNIT_TWIP);
-    aTabMF.SaveValue();
+        m_pTabMF->SetValue(m_pTabMF->Normalize(((SfxUInt16Item*)pItem)->GetValue()), FUNIT_TWIP);
+    m_pTabMF->SaveValue();
 
-    aUnitLB         .SaveValue();
-    aTabMF          .SaveValue();
+    m_pUnitLB       ->SaveValue();
+    m_pTabMF        ->SaveValue();
 
     ScLkUpdMode nSet=LM_UNKNOWN;
 
@@ -586,53 +580,53 @@ void    ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet )
 
     switch(nSet)
     {
-        case LM_ALWAYS:     aAlwaysRB.  Check();    break;
-        case LM_NEVER:      aNeverRB.   Check();    break;
-        case LM_ON_DEMAND:  aRequestRB. Check();    break;
+        case LM_ALWAYS:     m_pAlwaysRB->  Check();    break;
+        case LM_NEVER:      m_pNeverRB->   Check();    break;
+        case LM_ON_DEMAND:  m_pRequestRB-> Check();    break;
         default:
         {
             // added to avoid warnings
         }
     }
     if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_SELECTION, false, &pItem))
-        aAlignCB.Check(((const SfxBoolItem*)pItem)->GetValue());
+        m_pAlignCB->Check(((const SfxBoolItem*)pItem)->GetValue());
 
     if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_SELECTIONPOS, false, &pItem))
-        aAlignLB.SelectEntryPos(((const SfxUInt16Item*)pItem)->GetValue());
+        m_pAlignLB->SelectEntryPos(((const SfxUInt16Item*)pItem)->GetValue());
 
     if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_EDITMODE, false, &pItem))
-        aEditModeCB.Check(((const SfxBoolItem*)pItem)->GetValue());
+        m_pEditModeCB->Check(((const SfxBoolItem*)pItem)->GetValue());
 
     if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_FMT_EXPAND, false, &pItem))
-        aFormatCB.Check(((const SfxBoolItem*)pItem)->GetValue());
+        m_pFormatCB->Check(((const SfxBoolItem*)pItem)->GetValue());
 
 
     if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_REF_EXPAND, false, &pItem))
-        aExpRefCB.Check(((const SfxBoolItem*)pItem)->GetValue());
+        m_pExpRefCB->Check(((const SfxBoolItem*)pItem)->GetValue());
 
     if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_MARK_HEADER, false, &pItem))
-        aMarkHdrCB.Check(((const SfxBoolItem*)pItem)->GetValue());
+        m_pMarkHdrCB->Check(((const SfxBoolItem*)pItem)->GetValue());
 
     if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_TEXTWYSIWYG, false, &pItem))
-        aTextFmtCB.Check(((const SfxBoolItem*)pItem)->GetValue());
+        m_pTextFmtCB->Check(((const SfxBoolItem*)pItem)->GetValue());
 
     if( SFX_ITEM_SET == rCoreSet.GetItemState( SID_SC_INPUT_REPLCELLSWARN, false, &pItem ) )
-        aReplWarnCB.Check( ( (const SfxBoolItem*)pItem)->GetValue() );
-
-    aAlignCB    .SaveValue();
-    aAlignLB    .SaveValue();
-    aEditModeCB .SaveValue();
-    aFormatCB   .SaveValue();
-
-    aExpRefCB   .SaveValue();
-    aMarkHdrCB  .SaveValue();
-    aTextFmtCB  .SaveValue();
-    aReplWarnCB .SaveValue();
-    AlignHdl(&aAlignCB);
-
-    aAlwaysRB.SaveValue();
-    aNeverRB.SaveValue();
-    aRequestRB.SaveValue();
+        m_pReplWarnCB->Check( ( (const SfxBoolItem*)pItem)->GetValue() );
+
+    m_pAlignCB    ->SaveValue();
+    m_pAlignLB    ->SaveValue();
+    m_pEditModeCB ->SaveValue();
+    m_pFormatCB   ->SaveValue();
+
+    m_pExpRefCB   ->SaveValue();
+    m_pMarkHdrCB  ->SaveValue();
+    m_pTextFmtCB  ->SaveValue();
+    m_pReplWarnCB ->SaveValue();
+    AlignHdl(m_pAlignCB);
+
+    m_pAlwaysRB->SaveValue();
+    m_pNeverRB->SaveValue();
+    m_pRequestRB->SaveValue();
 }
 
 void    ScTpLayoutOptions::ActivatePage( const SfxItemSet& /* rCoreSet */ )
@@ -648,14 +642,14 @@ int ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP )
 
 IMPL_LINK_NOARG(ScTpLayoutOptions, MetricHdl)
 {
-    const sal_uInt16 nMPos = aUnitLB.GetSelectEntryPos();
+    const sal_uInt16 nMPos = m_pUnitLB->GetSelectEntryPos();
     if(nMPos != USHRT_MAX)
     {
-        FieldUnit eFieldUnit = (FieldUnit)(sal_IntPtr)aUnitLB.GetEntryData( nMPos );
+        FieldUnit eFieldUnit = (FieldUnit)(sal_IntPtr)m_pUnitLB->GetEntryData( nMPos );
         sal_Int64 nVal =
-            aTabMF.Denormalize( aTabMF.GetValue( FUNIT_TWIP ) );
-        ::SetFieldUnit( aTabMF, eFieldUnit );
-        aTabMF.SetValue( aTabMF.Normalize( nVal ), FUNIT_TWIP );
+            m_pTabMF->Denormalize( m_pTabMF->GetValue( FUNIT_TWIP ) );
+        ::SetFieldUnit( *m_pTabMF, eFieldUnit );
+        m_pTabMF->SetValue( m_pTabMF->Normalize( nVal ), FUNIT_TWIP );
     }
 
     return 0;
@@ -663,7 +657,7 @@ IMPL_LINK_NOARG(ScTpLayoutOptions, MetricHdl)
 
 IMPL_LINK( ScTpLayoutOptions, AlignHdl, CheckBox*, pBox )
 {
-    aAlignLB.Enable(pBox->IsChecked());
+    m_pAlignLB->Enable(pBox->IsChecked());
     return 0;
 }
 
diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src
index 89dcfe4..16fe5b9 100644
--- a/sc/source/ui/src/optdlg.src
+++ b/sc/source/ui/src/optdlg.src
@@ -538,183 +538,4 @@ TabPage RID_SCPAGE_CONTENT
     };
 };
 
-TabPage RID_SCPAGE_LAYOUT
-{
-    HelpId = HID_SCPAGE_LAYOUT ;
-    SVLook = TRUE ;
-    Hide = TRUE ;
-    Pos = MAP_APPFONT ( 0 , 0 ) ;
-    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-    FixedLine GB_UNIT
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 115 , 8 ) ;
-        Text [ en-US ] = "Metrics";
-    };
-    FixedText FT_UNIT
-    {
-        Pos = MAP_APPFONT ( 12 , 16 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
-        Text [ en-US ] = "Measurement ~unit";
-    };
-    ListBox LB_UNIT
-    {
-        HelpID = "sc:ListBox:RID_SCPAGE_LAYOUT:LB_UNIT";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 14 ) ;
-        Size = MAP_APPFONT ( 46 , 52 ) ;
-        DropDown = TRUE ;
-    };
-    StringArray ST_UNIT
-    {
-        ItemList [ en-US ] =
-        {
-            < "Millimeter" ; FUNIT_MM ; > ;
-            < "Centimeter" ; FUNIT_CM ; > ;
-            < "Meter" ; FUNIT_M ; > ;
-            < "Kilometer" ; FUNIT_KM ; > ;
-            < "Inch" ; FUNIT_INCH ; > ;
-            < "Foot" ; FUNIT_FOOT ; > ;
-            < "Miles" ; FUNIT_MILE ; > ;
-            < "Pica" ; FUNIT_PICA ; > ;
-            < "Point" ; FUNIT_POINT ; > ;
-        };
-    };
-    FixedText FT_TAB
-    {
-        Pos = MAP_APPFONT ( 12 , 32 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
-        Text [ en-US ] = "~Tab stops";
-    };
-    MetricField MF_TAB
-    {
-        HelpID = "sc:MetricField:RID_SCPAGE_LAYOUT:MF_TAB";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 30 ) ;
-        Size = MAP_APPFONT ( 46 , 12 ) ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_CM ;
-        SpinSize = 10 ;
-        Minimum = 50 ;
-        Maximum = 9999 ;
-        First = 50 ;
-        Last = 2000 ;
-    };
-    FixedLine FL_SEPARATOR
-    {
-        Pos = MAP_APPFONT ( 124 , 14 ) ;
-        Size = MAP_APPFONT ( 1 , 49 ) ;
-    };
-    FixedLine GB_LINK
-    {
-        Pos = MAP_APPFONT ( 127 , 3 ) ;
-        Size = MAP_APPFONT ( 127 , 8 ) ;
-        Text [ en-US ] = "Updating";
-    };
-    FixedText FT_UPDATE_LINKS
-    {
-        Pos = MAP_APPFONT ( 133 , 14 ) ;
-        Size = MAP_APPFONT ( 121 , 8 ) ;
-        Text [ en-US ] = "Update links when opening";
-    };
-    RadioButton RB_ALWAYS
-    {
-        HelpID = "sc:RadioButton:RID_SCPAGE_LAYOUT:RB_ALWAYS";
-        Pos = MAP_APPFONT ( 139 , 25 ) ;
-        Size = MAP_APPFONT ( 112 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Always";
-    };
-    RadioButton RB_REQUEST
-    {
-        HelpID = "sc:RadioButton:RID_SCPAGE_LAYOUT:RB_REQUEST";
-        Pos = MAP_APPFONT ( 139 , 39 ) ;
-        Size = MAP_APPFONT ( 112 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~On request";
-    };
-    RadioButton RB_NEVER
-    {
-        HelpID = "sc:RadioButton:RID_SCPAGE_LAYOUT:RB_NEVER";
-        Pos = MAP_APPFONT ( 139 , 53 ) ;
-        Size = MAP_APPFONT ( 112 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Never";
-    };
-    FixedLine GB_OPTIONS
-    {
-        Pos = MAP_APPFONT ( 6 , 69 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Input settings";
-    };
-    CheckBox CB_ALIGN
-    {
-        HelpID = "sc:CheckBox:RID_SCPAGE_LAYOUT:CB_ALIGN";
-        Pos = MAP_APPFONT ( 12 , 82 ) ;
-        Size = MAP_APPFONT ( 175 , 10 ) ;
-        Text [ en-US ] = "Press Enter to ~move selection" ;
-    };
-    ListBox LB_ALIGN
-    {
-        HelpID = "sc:ListBox:RID_SCPAGE_LAYOUT:LB_ALIGN";
-        Pos = MAP_APPFONT ( 191 , 80 ) ;
-        Size = MAP_APPFONT ( 60 , 60 ) ;
-        Border = TRUE ;
-        DropDown = TRUE ;
-         // Reihenfolge der Strings wie enum ScDirection
-        StringList [ en-US ] =
-        {
-            < "Down" ; Default ; > ;
-            < "Right" ; Default ; > ;
-            < "Up" ; Default ; > ;
-            < "Left" ; Default ; > ;
-        };
-    };
-    CheckBox CB_EDITMODE
-    {
-        HelpID = "sc:CheckBox:RID_SCPAGE_LAYOUT:CB_EDITMODE";
-        Pos = MAP_APPFONT ( 12 , 96 ) ;
-        Size = MAP_APPFONT ( 239 , 10 ) ;
-        Text [ en-US ] = "Press Enter to switch to ~edit mode" ;
-    };
-    CheckBox CB_FORMAT
-    {
-        HelpID = "sc:CheckBox:RID_SCPAGE_LAYOUT:CB_FORMAT";
-        Pos = MAP_APPFONT ( 12 , 110 ) ;
-        Size = MAP_APPFONT ( 239 , 10 ) ;
-        Text [ en-US ] = "Expand ~formatting" ;
-    };
-    CheckBox CB_EXPREF
-    {
-        HelpID = "sc:CheckBox:RID_SCPAGE_LAYOUT:CB_EXPREF";
-        Pos = MAP_APPFONT ( 12 , 124 ) ;
-        Size = MAP_APPFONT ( 239 , 10 ) ;
-        Text [ en-US ] = "Expand ~references when new columns/rows are inserted" ;
-    };
-    CheckBox CB_MARKHDR
-    {
-        HelpID = "sc:CheckBox:RID_SCPAGE_LAYOUT:CB_MARKHDR";
-        Pos = MAP_APPFONT ( 12 , 138 ) ;
-        Size = MAP_APPFONT ( 239 , 10 ) ;
-        Text [ en-US ] = "Highlight sele~ction in column/row headers" ;
-    };
-    CheckBox CB_TEXTFMT
-    {
-        HelpID = "sc:CheckBox:RID_SCPAGE_LAYOUT:CB_TEXTFMT";
-        Pos = MAP_APPFONT ( 12 , 152 ) ;
-        Size = MAP_APPFONT ( 239 , 10 ) ;
-        Text [ en-US ] = "Use printer metrics for text formatting";
-    };
-    CheckBox CB_REPLWARN
-    {
-        HelpID = "sc:CheckBox:RID_SCPAGE_LAYOUT:CB_REPLWARN";
-        Pos = MAP_APPFONT ( 12 , 166 ) ;
-        Size = MAP_APPFONT ( 239 , 10 ) ;
-        Text [ en-US ] = "Show overwrite ~warning when pasting data";
-    };
-};
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src
index 6c7a67f..76212d3 100644
--- a/sc/source/ui/src/scstring.src
+++ b/sc/source/ui/src/scstring.src
@@ -854,4 +854,19 @@ String SCSTR_AUTHOR
     Text [ en-US ] = "By author" ;
 };
 
+StringArray SCSTR_UNIT
+{
+    ItemList [ en-US ] =
+    {
+        < "Millimeter" ; FUNIT_MM ; > ;
+        < "Centimeter" ; FUNIT_CM ; > ;
+        < "Meter" ; FUNIT_M ; > ;
+        < "Kilometer" ; FUNIT_KM ; > ;
+        < "Inch" ; FUNIT_INCH ; > ;
+        < "Foot" ; FUNIT_FOOT ; > ;
+        < "Miles" ; FUNIT_MILE ; > ;
+        < "Pica" ; FUNIT_PICA ; > ;
+        < "Point" ; FUNIT_POINT ; > ;
+    };
+};
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/uiconfig/scalc/ui/scgeneralpage.ui b/sc/uiconfig/scalc/ui/scgeneralpage.ui
new file mode 100644
index 0000000..c8ed614
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/scgeneralpage.ui
@@ -0,0 +1,460 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="lower">5</property>
+    <property name="upper">200</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">1</property>
+  </object>
+  <object class="GtkBox" id="ScGeneralPage">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="orientation">vertical</property>
+    <property name="spacing">6</property>
+    <child>
+      <object class="GtkBox" id="box2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="spacing">6</property>
+        <property name="homogeneous">True</property>
+        <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>
+            <child>
+              <object class="GtkAlignment" id="alignment1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="top_padding">6</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <object class="GtkGrid" id="grid1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="row_spacing">6</property>
+                    <property name="column_spacing">12</property>
+                    <property name="column_homogeneous">True</property>
+                    <child>
+                      <object class="GtkLabel" id="label4">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0.039999999105930328</property>
+                        <property name="label" translatable="yes">Measurement _unit</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">unitlb</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label5">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">_Tab stops</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">tabmf:0,00mm</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" id="tabmf:0,00mm">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">•</property>
+                        <property name="invisible_char_set">True</property>
+                        <property name="adjustment">adjustment1</property>
+                        <property name="digits">2</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBoxText" id="unitlb">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="row_span_column">7</property>
+                        <property name="entry_text_column">0</property>
+                        <property name="id_column">1</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Metrics</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="padding">6</property>
+            <property name="position">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>
+            <child>
+              <object class="GtkAlignment" id="alignment2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="top_padding">6</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <object class="GtkGrid" id="grid2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="row_spacing">6</property>
+                    <property name="column_spacing">12</property>
+                    <child>
+                      <object class="GtkLabel" id="label6">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Update links when opening</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkAlignment" id="alignment4">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_left">12</property>
+                        <child>
+                          <object class="GtkBox" id="box3">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="orientation">vertical</property>
+                            <child>
+                              <object class="GtkRadioButton" id="alwaysrb">
+                                <property name="label" translatable="yes">_Always</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">requestrb</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkRadioButton" id="requestrb">
+                                <property name="label" translatable="yes">_On request</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">neverrb</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkRadioButton" id="neverrb">
+                                <property name="label" translatable="yes">_Never</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">alwaysrb</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Updating</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="padding">6</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </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>
+        <child>
+          <object class="GtkAlignment" id="alignment3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="top_padding">6</property>
+            <property name="left_padding">12</property>
+            <child>
+              <object class="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>
+                <child>
+                  <object class="GtkCheckButton" id="editmodecb">
+                    <property name="label" translatable="yes">Press Enter to switch to _edit mode</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="formatcb">
+                    <property name="label" translatable="yes">Expand _formatting</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="exprefcb">
+                    <property name="label" translatable="yes">Expand _references when new columns/rows are inserted</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">3</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="markhdrcb">
+                    <property name="label" translatable="yes">Highlight sele_ction in column/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="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">4</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="textfmtcb">
+                    <property name="label" translatable="yes">Use printer metrics for text formatting</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">5</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="replwarncb">
+                    <property name="label" translatable="yes">Show overwrite _warning when pasting data</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">6</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBoxText" id="alignlb">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="row_span_column">7</property>
+                    <property name="entry_text_column">0</property>
+                    <property name="id_column">1</property>
+                    <items>
+                      <item translatable="yes">Down</item>
+                      <item translatable="yes">Right</item>
+                      <item translatable="yes">Up</item>
+                      <item translatable="yes">Left</item>
+                    </items>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="aligncb">
+                    <property name="label" translatable="yes">Press Enter to _move selection</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="label3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Input settings</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="padding">6</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+  </object>
+</interface>


More information about the Libreoffice-commits mailing list