[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk

Csikós Tamás csks.tomi at gmail.com
Thu Jul 4 03:19:24 PDT 2013


 cui/UIConfig_cui.mk            |    1 
 cui/source/options/opthtml.cxx |  204 ++++++------
 cui/source/options/opthtml.hxx |   44 +-
 cui/uiconfig/ui/opthtmlpage.ui |  647 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 760 insertions(+), 136 deletions(-)

New commits:
commit 1be8236b688617f93cfaf23fe647632ce53b5ff1
Author: Csikós Tamás <csks.tomi at gmail.com>
Date:   Wed Jul 3 16:42:23 2013 +0200

    modern widgetlayout for opthtml
    
    Change-Id: Ibad69d5d9512c1199c6cca3930c1b04f0af4987c
    Reviewed-on: https://gerrit.libreoffice.org/4707
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 4ef51d6..2f30c25 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
 	cui/uiconfig/ui/optfltrpage \
 	cui/uiconfig/ui/optfontspage \
 	cui/uiconfig/ui/optgeneralpage \
+    cui/uiconfig/ui/opthtmlpage \
 	cui/uiconfig/ui/optjsearchpage \
 	cui/uiconfig/ui/optlanguagespage \
 	cui/uiconfig/ui/optmemorypage \
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index 9993030..5f53228 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -20,7 +20,6 @@
 #include <svtools/langtab.hxx>
 #include <svtools/htmlcfg.hxx>
 #include "opthtml.hxx"
-#include "opthtml.hrc"
 #include <cuires.hrc>
 #include "helpid.hrc"
 #include <dialmgr.hxx>
@@ -44,40 +43,27 @@ const sal_uInt16 aExportToPosArr[] =
 // -----------------------------------------------------------------------
 
 OfaHtmlTabPage::OfaHtmlTabPage(Window* pParent, const SfxItemSet& rSet) :
-        SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_HTMLOPT ), rSet ),
-    aFontSizeGB     ( this, CUI_RES( GB_FONTSIZE       ) ),
-    aSize1FT        ( this, CUI_RES( FT_SIZE1          ) ),
-    aSize1NF        ( this, CUI_RES( NF_SIZE1          ) ),
-    aSize2FT        ( this, CUI_RES( FT_SIZE2          ) ),
-    aSize2NF        ( this, CUI_RES( NF_SIZE2          ) ),
-    aSize3FT        ( this, CUI_RES( FT_SIZE3          ) ),
-    aSize3NF        ( this, CUI_RES( NF_SIZE3          ) ),
-    aSize4FT        ( this, CUI_RES( FT_SIZE4          ) ),
-    aSize4NF        ( this, CUI_RES( NF_SIZE4          ) ),
-    aSize5FT        ( this, CUI_RES( FT_SIZE5          ) ),
-    aSize5NF        ( this, CUI_RES( NF_SIZE5          ) ),
-    aSize6FT        ( this, CUI_RES( FT_SIZE6          ) ),
-    aSize6NF        ( this, CUI_RES( NF_SIZE6          ) ),
-    aSize7FT        ( this, CUI_RES( FT_SIZE7          ) ),
-    aSize7NF        ( this, CUI_RES( NF_SIZE7          ) ),
-    aImportGB       ( this, CUI_RES( GB_IMPORT     ) ),
-    aNumbersEnglishUSCB ( this, CUI_RES( CB_NUMBERS_ENGLISH_US ) ),
-    aUnknownTagCB   ( this, CUI_RES( CB_UNKNOWN_TAGS ) ),
-    aIgnoreFontNamesCB( this, CUI_RES( CB_IGNORE_FONTNAMES ) ),
-    aExportGB       ( this, CUI_RES( GB_EXPORT       ) ),
-    aExportLB       ( this, CUI_RES( LB_EXPORT       ) ),
-    aStarBasicCB    ( this, CUI_RES( CB_STARBASIC    ) ),
-    aStarBasicWarningCB(this, CUI_RES( CB_STARBASIC_WARNING    ) ),
-    aPrintExtensionCB( this,CUI_RES(CB_PRINT_EXTENSION )),
-    aSaveGrfLocalCB ( this, CUI_RES( CB_LOCAL_GRF    ) ),
-    aCharSetFT      ( this, CUI_RES( FT_CHARSET      ) ),
-    aCharSetLB      ( this, CUI_RES( LB_CHARSET      ) )
-
+SfxTabPage( pParent, "OptHtmlPage" , "cui/ui/opthtmlpage.ui", rSet )
 {
-    FreeResource();
+    get(aSize1NF,"size1");
+    get(aSize2NF,"size2");
+    get(aSize3NF,"size3");
+    get(aSize4NF,"size4");
+    get(aSize5NF,"size5");
+    get(aSize6NF,"size6");
+    get(aSize7NF,"size7");
+    get(aNumbersEnglishUSCB,"numbersenglishus");
+    get(aUnknownTagCB,"unknowntag");
+    get(aIgnoreFontNamesCB,"ignorefontnames");
+    get(aExportLB,"export");
+    get(aStarBasicCB,"starbasic");
+    get(aStarBasicWarningCB,"starbasicwarning");
+    get(aPrintExtensionCB,"printextension");
+    get(aSaveGrfLocalCB,"savegrflocal");
+    get(aCharSetLB,"charset");
 
     // replace placeholder with UI string from language list
-    String aText( aNumbersEnglishUSCB.GetText());
+    /*String aText( aNumbersEnglishUSCB->GetText());
     String aPlaceholder( RTL_CONSTASCII_USTRINGPARAM( "%ENGLISHUSLOCALE"));
     xub_StrLen nPos;
     if ((nPos = aText.Search( aPlaceholder)) != STRING_NOTFOUND)
@@ -87,15 +73,15 @@ OfaHtmlTabPage::OfaHtmlTabPage(Window* pParent, const SfxItemSet& rSet) :
         if (rStr.Len())
         {
             aText.Replace( nPos, aPlaceholder.Len(), rStr);
-            aNumbersEnglishUSCB.SetText( aText);
+            aNumbersEnglishUSCB->SetText( aText);
         }
-    }
+    }*/
 
-    aExportLB.SetSelectHdl(LINK(this, OfaHtmlTabPage, ExportHdl_Impl));
-    aStarBasicCB.SetClickHdl(LINK(this, OfaHtmlTabPage, CheckBoxHdl_Impl));
+    aExportLB->SetSelectHdl(LINK(this, OfaHtmlTabPage, ExportHdl_Impl));
+    aStarBasicCB->SetClickHdl(LINK(this, OfaHtmlTabPage, CheckBoxHdl_Impl));
 
     // initialize the characterset listbox
-    aCharSetLB.FillWithMimeAndSelectBest();
+    aCharSetLB->FillWithMimeAndSelectBest();
 }
 
 OfaHtmlTabPage::~OfaHtmlTabPage()
@@ -111,47 +97,47 @@ SfxTabPage* OfaHtmlTabPage::Create( Window* pParent,
 sal_Bool OfaHtmlTabPage::FillItemSet( SfxItemSet& )
 {
     SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
-    if(aSize1NF.GetSavedValue() != aSize1NF.GetText())
-        rHtmlOpt.SetFontSize(0, (sal_uInt16)aSize1NF.GetValue());
-    if(aSize2NF.GetSavedValue() != aSize2NF.GetText())
-        rHtmlOpt.SetFontSize(1, (sal_uInt16)aSize2NF.GetValue());
-    if(aSize3NF.GetSavedValue() != aSize3NF.GetText())
-        rHtmlOpt.SetFontSize(2, (sal_uInt16)aSize3NF.GetValue());
-    if(aSize4NF.GetSavedValue() != aSize4NF.GetText())
-        rHtmlOpt.SetFontSize(3, (sal_uInt16)aSize4NF.GetValue());
-    if(aSize5NF.GetSavedValue() != aSize5NF.GetText())
-        rHtmlOpt.SetFontSize(4, (sal_uInt16)aSize5NF.GetValue());
-    if(aSize6NF.GetSavedValue() != aSize6NF.GetText())
-        rHtmlOpt.SetFontSize(5, (sal_uInt16)aSize6NF.GetValue());
-    if(aSize7NF.GetSavedValue() != aSize7NF.GetText())
-        rHtmlOpt.SetFontSize(6, (sal_uInt16)aSize7NF.GetValue());
+    if(aSize1NF->GetSavedValue() != aSize1NF->GetText())
+        rHtmlOpt.SetFontSize(0, (sal_uInt16)aSize1NF->GetValue());
+    if(aSize2NF->GetSavedValue() != aSize2NF->GetText())
+        rHtmlOpt.SetFontSize(1, (sal_uInt16)aSize2NF->GetValue());
+    if(aSize3NF->GetSavedValue() != aSize3NF->GetText())
+        rHtmlOpt.SetFontSize(2, (sal_uInt16)aSize3NF->GetValue());
+    if(aSize4NF->GetSavedValue() != aSize4NF->GetText())
+        rHtmlOpt.SetFontSize(3, (sal_uInt16)aSize4NF->GetValue());
+    if(aSize5NF->GetSavedValue() != aSize5NF->GetText())
+        rHtmlOpt.SetFontSize(4, (sal_uInt16)aSize5NF->GetValue());
+    if(aSize6NF->GetSavedValue() != aSize6NF->GetText())
+        rHtmlOpt.SetFontSize(5, (sal_uInt16)aSize6NF->GetValue());
+    if(aSize7NF->GetSavedValue() != aSize7NF->GetText())
+        rHtmlOpt.SetFontSize(6, (sal_uInt16)aSize7NF->GetValue());
 
-    if(aNumbersEnglishUSCB.IsChecked() != aNumbersEnglishUSCB.GetSavedValue())
-        rHtmlOpt.SetNumbersEnglishUS(aNumbersEnglishUSCB.IsChecked());
+    if(aNumbersEnglishUSCB->IsChecked() != aNumbersEnglishUSCB->GetSavedValue())
+        rHtmlOpt.SetNumbersEnglishUS(aNumbersEnglishUSCB->IsChecked());
 
-    if(aUnknownTagCB.IsChecked() != aUnknownTagCB.GetSavedValue())
-        rHtmlOpt.SetImportUnknown(aUnknownTagCB.IsChecked());
+    if(aUnknownTagCB->IsChecked() != aUnknownTagCB->GetSavedValue())
+        rHtmlOpt.SetImportUnknown(aUnknownTagCB->IsChecked());
 
-    if(aIgnoreFontNamesCB.IsChecked() != aIgnoreFontNamesCB.GetSavedValue())
-        rHtmlOpt.SetIgnoreFontFamily(aIgnoreFontNamesCB.IsChecked());
+    if(aIgnoreFontNamesCB->IsChecked() != aIgnoreFontNamesCB->GetSavedValue())
+        rHtmlOpt.SetIgnoreFontFamily(aIgnoreFontNamesCB->IsChecked());
 
-    if(aExportLB.GetSelectEntryPos() != aExportLB.GetSavedValue())
-        rHtmlOpt.SetExportMode(aPosToExportArr[aExportLB.GetSelectEntryPos()]);
+    if(aExportLB->GetSelectEntryPos() != aExportLB->GetSavedValue())
+        rHtmlOpt.SetExportMode(aPosToExportArr[aExportLB->GetSelectEntryPos()]);
 
-    if(aStarBasicCB.IsChecked() != aStarBasicCB.GetSavedValue())
-        rHtmlOpt.SetStarBasic(aStarBasicCB.IsChecked());
+    if(aStarBasicCB->IsChecked() != aStarBasicCB->GetSavedValue())
+        rHtmlOpt.SetStarBasic(aStarBasicCB->IsChecked());
 
-    if(aStarBasicWarningCB.IsChecked() != aStarBasicWarningCB.GetSavedValue())
-        rHtmlOpt.SetStarBasicWarning(aStarBasicWarningCB.IsChecked());
+    if(aStarBasicWarningCB->IsChecked() != aStarBasicWarningCB->GetSavedValue())
+        rHtmlOpt.SetStarBasicWarning(aStarBasicWarningCB->IsChecked());
 
-    if(aSaveGrfLocalCB.IsChecked() != aSaveGrfLocalCB.GetSavedValue())
-        rHtmlOpt.SetSaveGraphicsLocal(aSaveGrfLocalCB.IsChecked());
+    if(aSaveGrfLocalCB->IsChecked() != aSaveGrfLocalCB->GetSavedValue())
+        rHtmlOpt.SetSaveGraphicsLocal(aSaveGrfLocalCB->IsChecked());
 
-    if(aPrintExtensionCB.IsChecked() != aPrintExtensionCB.GetSavedValue())
-        rHtmlOpt.SetPrintLayoutExtension(aPrintExtensionCB.IsChecked());
+    if(aPrintExtensionCB->IsChecked() != aPrintExtensionCB->GetSavedValue())
+        rHtmlOpt.SetPrintLayoutExtension(aPrintExtensionCB->IsChecked());
 
-    if( aCharSetLB.GetSelectTextEncoding() != rHtmlOpt.GetTextEncoding() )
-        rHtmlOpt.SetTextEncoding( aCharSetLB.GetSelectTextEncoding() );
+    if( aCharSetLB->GetSelectTextEncoding() != rHtmlOpt.GetTextEncoding() )
+        rHtmlOpt.SetTextEncoding( aCharSetLB->GetSelectTextEncoding() );
 
     return sal_False;
 }
@@ -159,49 +145,49 @@ sal_Bool OfaHtmlTabPage::FillItemSet( SfxItemSet& )
 void OfaHtmlTabPage::Reset( const SfxItemSet& )
 {
     SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
-    aSize1NF.SetValue(rHtmlOpt.GetFontSize(0));
-    aSize2NF.SetValue(rHtmlOpt.GetFontSize(1));
-    aSize3NF.SetValue(rHtmlOpt.GetFontSize(2));
-    aSize4NF.SetValue(rHtmlOpt.GetFontSize(3));
-    aSize5NF.SetValue(rHtmlOpt.GetFontSize(4));
-    aSize6NF.SetValue(rHtmlOpt.GetFontSize(5));
-    aSize7NF.SetValue(rHtmlOpt.GetFontSize(6));
-    aNumbersEnglishUSCB.Check(rHtmlOpt.IsNumbersEnglishUS());
-    aUnknownTagCB.Check(rHtmlOpt.IsImportUnknown());
-    aIgnoreFontNamesCB.Check(rHtmlOpt.IsIgnoreFontFamily());
+    aSize1NF->SetValue(rHtmlOpt.GetFontSize(0));
+    aSize2NF->SetValue(rHtmlOpt.GetFontSize(1));
+    aSize3NF->SetValue(rHtmlOpt.GetFontSize(2));
+    aSize4NF->SetValue(rHtmlOpt.GetFontSize(3));
+    aSize5NF->SetValue(rHtmlOpt.GetFontSize(4));
+    aSize6NF->SetValue(rHtmlOpt.GetFontSize(5));
+    aSize7NF->SetValue(rHtmlOpt.GetFontSize(6));
+    aNumbersEnglishUSCB->Check(rHtmlOpt.IsNumbersEnglishUS());
+    aUnknownTagCB->Check(rHtmlOpt.IsImportUnknown());
+    aIgnoreFontNamesCB->Check(rHtmlOpt.IsIgnoreFontFamily());
     sal_uInt16 nExport = rHtmlOpt.GetExportMode();
     if( nExport >= SAL_N_ELEMENTS( aExportToPosArr ) )
         nExport = 3;    // default for bad config entry is NS 4.0
     sal_uInt16 nPosArr = aExportToPosArr[ nExport ];
-    aExportLB.SelectEntryPos( nPosArr );
-    aExportLB.SaveValue();
-
-    ExportHdl_Impl(&aExportLB);
-
-    aStarBasicCB .Check(rHtmlOpt.IsStarBasic());
-    aStarBasicWarningCB .Check(rHtmlOpt.IsStarBasicWarning());
-    aStarBasicWarningCB.Enable(!aStarBasicCB.IsChecked());
-    aSaveGrfLocalCB.Check(rHtmlOpt.IsSaveGraphicsLocal());
-    aPrintExtensionCB.Check(rHtmlOpt.IsPrintLayoutExtension());
-
-    aPrintExtensionCB.SaveValue();
-    aStarBasicCB .SaveValue();
-    aStarBasicWarningCB .SaveValue();
-    aSaveGrfLocalCB.SaveValue();
-    aSize1NF.SaveValue();
-    aSize2NF.SaveValue();
-    aSize3NF.SaveValue();
-    aSize4NF.SaveValue();
-    aSize5NF.SaveValue();
-    aSize6NF.SaveValue();
-    aSize7NF.SaveValue();
-    aNumbersEnglishUSCB.SaveValue();
-    aUnknownTagCB.SaveValue();
-    aIgnoreFontNamesCB.SaveValue();
+    aExportLB->SelectEntryPos( nPosArr );
+    aExportLB->SaveValue();
+
+    ExportHdl_Impl(aExportLB);
+
+    aStarBasicCB->Check(rHtmlOpt.IsStarBasic());
+    aStarBasicWarningCB->Check(rHtmlOpt.IsStarBasicWarning());
+    aStarBasicWarningCB->Enable(!aStarBasicCB->IsChecked());
+    aSaveGrfLocalCB->Check(rHtmlOpt.IsSaveGraphicsLocal());
+    aPrintExtensionCB->Check(rHtmlOpt.IsPrintLayoutExtension());
+
+    aPrintExtensionCB->SaveValue();
+    aStarBasicCB->SaveValue();
+    aStarBasicWarningCB->SaveValue();
+    aSaveGrfLocalCB->SaveValue();
+    aSize1NF->SaveValue();
+    aSize2NF->SaveValue();
+    aSize3NF->SaveValue();
+    aSize4NF->SaveValue();
+    aSize5NF->SaveValue();
+    aSize6NF->SaveValue();
+    aSize7NF->SaveValue();
+    aNumbersEnglishUSCB->SaveValue();
+    aUnknownTagCB->SaveValue();
+    aIgnoreFontNamesCB->SaveValue();
 
     if( !rHtmlOpt.IsDefaultTextEncoding() &&
-        aCharSetLB.GetSelectTextEncoding() != rHtmlOpt.GetTextEncoding() )
-        aCharSetLB.SelectTextEncoding( rHtmlOpt.GetTextEncoding() );
+        aCharSetLB->GetSelectTextEncoding() != rHtmlOpt.GetTextEncoding() )
+        aCharSetLB->SelectTextEncoding( rHtmlOpt.GetTextEncoding() );
 }
 
 IMPL_LINK(OfaHtmlTabPage, ExportHdl_Impl, ListBox*, pBox)
@@ -212,9 +198,9 @@ IMPL_LINK(OfaHtmlTabPage, ExportHdl_Impl, ListBox*, pBox)
         case HTML_CFG_MSIE:
         case HTML_CFG_NS40  :
         case HTML_CFG_WRITER :
-            aPrintExtensionCB.Enable(sal_True);
+            aPrintExtensionCB->Enable(sal_True);
         break;
-        default: aPrintExtensionCB.Enable(sal_False);
+        default: aPrintExtensionCB->Enable(sal_False);
     }
 
     return 0;
@@ -222,7 +208,7 @@ IMPL_LINK(OfaHtmlTabPage, ExportHdl_Impl, ListBox*, pBox)
 
 IMPL_LINK(OfaHtmlTabPage, CheckBoxHdl_Impl, CheckBox*, pBox)
 {
-    aStarBasicWarningCB.Enable(!pBox->IsChecked());
+    aStarBasicWarningCB->Enable(!pBox->IsChecked());
     return 0;
 }
 
diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx
index 861ad5f..3bd46a7 100644
--- a/cui/source/options/opthtml.hxx
+++ b/cui/source/options/opthtml.hxx
@@ -29,35 +29,25 @@
 
 class OfaHtmlTabPage : public SfxTabPage
 {
-    FixedLine       aFontSizeGB;
-    FixedText       aSize1FT;
-    NumericField    aSize1NF;
-    FixedText       aSize2FT;
-    NumericField    aSize2NF;
-    FixedText       aSize3FT;
-    NumericField    aSize3NF;
-    FixedText       aSize4FT;
-    NumericField    aSize4NF;
-    FixedText       aSize5FT;
-    NumericField    aSize5NF;
-    FixedText       aSize6FT;
-    NumericField    aSize6NF;
-    FixedText       aSize7FT;
-    NumericField    aSize7NF;
 
-    FixedLine       aImportGB;
-    CheckBox        aNumbersEnglishUSCB;
-    CheckBox        aUnknownTagCB;
-    CheckBox        aIgnoreFontNamesCB;
+    NumericField*    aSize1NF;
+    NumericField*    aSize2NF;
+    NumericField*    aSize3NF;
+    NumericField*    aSize4NF;
+    NumericField*    aSize5NF;
+    NumericField*    aSize6NF;
+    NumericField*    aSize7NF;
 
-    FixedLine       aExportGB;
-    ListBox         aExportLB;
-    CheckBox        aStarBasicCB;
-    CheckBox        aStarBasicWarningCB;
-    CheckBox        aPrintExtensionCB;
-    CheckBox        aSaveGrfLocalCB;
-    FixedText       aCharSetFT;
-    SvxTextEncodingBox aCharSetLB;
+    CheckBox*        aNumbersEnglishUSCB;
+    CheckBox*        aUnknownTagCB;
+    CheckBox*        aIgnoreFontNamesCB;
+
+    ListBox*         aExportLB;
+    CheckBox*        aStarBasicCB;
+    CheckBox*        aStarBasicWarningCB;
+    CheckBox*        aPrintExtensionCB;
+    CheckBox*        aSaveGrfLocalCB;
+    SvxTextEncodingBox* aCharSetLB;
 
     DECL_LINK(ExportHdl_Impl, ListBox*);
     DECL_LINK(CheckBoxHdl_Impl, CheckBox*);
diff --git a/cui/uiconfig/ui/opthtmlpage.ui b/cui/uiconfig/ui/opthtmlpage.ui
new file mode 100644
index 0000000..5672399
--- /dev/null
+++ b/cui/uiconfig/ui/opthtmlpage.ui
@@ -0,0 +1,647 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkAdjustment" id="adjustsize1">
+    <property name="lower">1</property>
+    <property name="upper">50</property>
+    <property name="value">7</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustsize2">
+    <property name="lower">1</property>
+    <property name="upper">50</property>
+    <property name="value">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustsize3">
+    <property name="lower">1</property>
+    <property name="upper">50</property>
+    <property name="value">12</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustsize4">
+    <property name="lower">1</property>
+    <property name="upper">50</property>
+    <property name="value">14</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustsize5">
+    <property name="lower">1</property>
+    <property name="upper">50</property>
+    <property name="value">18</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustsize6">
+    <property name="lower">1</property>
+    <property name="upper">50</property>
+    <property name="value">24</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustsize7">
+    <property name="lower">1</property>
+    <property name="upper">50</property>
+    <property name="value">36</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkBox" id="OptHtmlPage">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="border_width">12</property>
+    <property name="spacing">12</property>
+    <child>
+      <object class="GtkBox" id="box1">
+        <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">12</property>
+        <child>
+          <object class="GtkFrame" id="frame1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</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="hexpand">True</property>
+                <property name="vexpand">True</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="hexpand">True</property>
+                    <property name="row_spacing">6</property>
+                    <property name="column_spacing">12</property>
+                    <child>
+                      <object class="GtkLabel" id="size7FT">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Size _7</property>
+                        <property name="mnemonic_widget">size7</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="GtkSpinButton" id="size7">
+                        <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">adjustsize7</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">6</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="size6FT">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Size _6</property>
+                        <property name="mnemonic_widget">size6</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="GtkSpinButton" id="size6">
+                        <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">adjustsize6</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">5</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="size5FT">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Size _5</property>
+                        <property name="mnemonic_widget">size5</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="GtkSpinButton" id="size5">
+                        <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">adjustsize5</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">4</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="size4FT">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Size _4</property>
+                        <property name="mnemonic_widget">size4</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="GtkSpinButton" id="size4">
+                        <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">adjustsize4</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">3</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="size3FT">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Size _3</property>
+                        <property name="mnemonic_widget">size3</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="GtkSpinButton" id="size3">
+                        <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">adjustsize3</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">2</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="size2FT">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Size _2</property>
+                        <property name="mnemonic_widget">size2</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="size2">
+                        <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">adjustsize2</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="GtkLabel" id="size1FT">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Size _1</property>
+                        <property name="mnemonic_widget">size1</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="GtkSpinButton" id="size1">
+                        <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">adjustsize1</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">Font sizes</property>
+                <attributes>
+                  <attribute name="weight" value="semibold"/>
+                </attributes>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkBox" id="box2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">12</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">12</property>
+        <child>
+          <object class="GtkFrame" id="frame2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</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="hexpand">True</property>
+                <property name="vexpand">True</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="hexpand">True</property>
+                    <property name="row_spacing">6</property>
+                    <child>
+                      <object class="GtkCheckButton" id="ignorefontnames">
+                        <property name="label" translatable="yes">Ignore _font settings</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="hexpand">True</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="unknowntag">
+                        <property name="label" translatable="yes">_Import unknown HTML tags as fields</property>
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="receives_default">False</property>
+                         <property name="hexpand">True</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="numbersenglishus">
+                         <property name="label" translatable="yes">_Use 'English (USA)' locale for numbers</property>
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="receives_default">False</property>
+                         <property name="hexpand">True</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>
+                   </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">Import</property>
+                <attributes>
+                  <attribute name="weight" value="semibold"/>
+                </attributes>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkFrame" id="frame3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</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="hexpand">True</property>
+                <property name="vexpand">True</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="hexpand">True</property>
+                    <property name="row_spacing">6</property>
+                    <child>
+                      <object class="GtkGrid" id="grid4">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <property name="row_spacing">6</property>
+                        <property name="column_spacing">12</property>
+                        <child>
+                          <object class="GtkLabel" id="charsetFT">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                            <property name="hexpand">True</property>
+                            <property name="label" translatable="yes">Character _set:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">charset</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="svxlo-SvxTextEncodingBox" id="charset">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="hexpand">True</property>
+                            <!--<property name="entry_text_column">0</property>
+                            <property name="id_column">1</property>
+                            <items>
+                              <item translatable="no">Arabic (DOS/OS2-864)</item>
+                              <item translatable="no">Arabic (ISO-8859-6)</item>
+                              <item translatable="no">Arabic (Windows-1256)</item>
+                              <item translatable="no">Baltic (ISO-8859-4)</item>
+                              <item translatable="no">Baltic (Windows-1257)</item>
+                              <item translatable="no">Chinese simplified (GB-2312)</item>
+                              <item translatable="no">Chinese simplified (GB-18030)</item>
+                              <item translatable="no">Chinese simplified (GBK/GB-2312-80)</item>
+                              <item translatable="no">Chinese simplified (ISO-2022/CN)</item>
+                              <item translatable="no">Chinese traditional (Big5)</item>
+                              <item translatable="no">Chinese traditional (BIG5-HKSCS)</item>
+                              <item translatable="no">Chinese traditional (GBT-12345)</item>
+                              <item translatable="no">Cyrillic (DOS/OS2-866/Russian)</item>
+                              <item translatable="no">Cyrillic (KOI8-R)</item>
+                              <item translatable="no">Cyrillic (PT154)</item>
+                              <item translatable="no">Cyrillic (KOI8-U)</item>
+                              <item translatable="no">Cyrillic (Windows-1251)</item>
+                              <item translatable="no">Eastern Europe (DOS/OS2-852)</item>
+                              <item translatable="no">Eartern Europe (ISO-8859-2)</item>
+                              <item translatable="no">Eartern Europe (ISO-8859-13)</item>
+                              <item translatable="no">Eartern Europe (Windows-1250/WinLatin 2)</item>
+                              <item translatable="no">Greek (ISO-8859-7)</item>
+                              <item translatable="no">Greek (Windows-1253)</item>
+                              <item translatable="no">Hebrew (DOS/OS2-862)</item>
+                              <item translatable="no">Hebrew (ISO-8859-8)</item>
+                              <item translatable="no">Greek (ISO-8859-7)</item>
+                              <item translatable="no">Japanese (EUC-JP)</item>
+                              <item translatable="no">Japanese (ISO-2022-JP)</item>
+                              <item translatable="no">Japanese (Shtif-JIS)</item>
+                              <item translatable="no">Korean (EUC-KR)</item>
+                              <item translatable="no">Korean (ICO-2022-KR)</item>
+                              <item translatable="no">Korean (Windows-Johab-1361)</item>
+                              <item translatable="no">Latin 3 (ISO-8859-3)</item>
+                              <item translatable="no">Thai (ISO-8859-11/TIS-620)</item>
+                              <item translatable="no">Thai (Windows-874)</item>
+                              <item translatable="no">Turkish (ISO-8859-9)</item>
+                              <item translatable="no">Turkish (Windows-1254)</item>
+                              <item translatable="no">Unicode (UTF-7)</item>
+                              <item translatable="no">Unicode (UTF-8)</item>
+                              <item translatable="no">Western Europe (Apple Macintosh)</item>
+                              <item translatable="no">Western Europe (ASCII/US)</item>
+                              <item translatable="no">Western Europe (DOS/OS2-437/US)</item>
+                              <item translatable="no">Western Europe (DOS/OS2-850/International)</item>
+                              <item translatable="no">Western Europe (DOS/OS2-860/Portuguese)</item>
+                              <item translatable="no">Western Europe (DOS/OS2-861/Icelandic)</item>
+                              <item translatable="no">Western Europe (DOS/OS2-863/French (Can.))</item>
+                              <item translatable="no">Western Europe (DOS/OS2-865/Nordic)</item>
+                              <item translatable="no">Western Europe (ISO-8859-1)</item>
+                              <item translatable="no">Western Europe (ISO-8859-14)</item>
+                              <item translatable="no">Western Europe (ISO-8859-15/EURO)</item>
+                              <item translatable="no">Western Europe (Windows-1252/WinLatin-1)</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>
+                      </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="savegrflocal">
+                        <property name="label" translatable="yes">_Copy local graphics to Internet</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="hexpand">True</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="printextension">
+                        <property name="label" translatable="yes">_Print layout</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="hexpand">True</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="starbasicwarning">
+                        <property name="label" translatable="yes">Display _warning</property>
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="receives_default">False</property>
+                         <property name="hexpand">True</property>
+                         <property name="margin_left">12</property>
+                         <property name="use_underline">True</property>
+                         <property name="xalign">0</property>
+                         <property name="draw_indicator">True</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">0</property>
+                         <property name="top_attach">2</property>
+                         <property name="width">1</property>
+                         <property name="height">1</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkCheckButton" id="starbasic">
+                         <property name="label" translatable="yes">LibreOffice _Basic</property>
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="receives_default">False</property>
+                         <property name="hexpand">True</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="GtkComboBoxText" id="export">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="entry_text_column">0</property>
+                        <property name="id_column">1</property>
+                        <property name="hexpand">True</property>
+                        <items>
+                          <item translatable="no">Microsoft Internet Explorer</item>
+                          <item translatable="no">Mozilla Firefox</item>
+                          <item translatable="no">LibreOffice Writer</item>
+                        </items>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                   </object>
+                 </child>
+               </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">Export</property>
+                <attributes>
+                  <attribute name="weight" value="semibold"/>
+                </attributes>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>


More information about the Libreoffice-commits mailing list