tdf#108139 Remove Preview column from Application Colors config page

Change-Id: Id342814f3a724a0534cd6fd43b49139af52c1d03
Reviewed-on: https://gerrit.libreoffice.org/42362
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>

3 files changed, 13 insertions, 615 deletions

diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 998ceaedbdfa..eb47a81dee74 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -90,18 +90,16 @@ struct
     const char *pText;
     //color listbox
     const char *pColor;
-    //preview box
-    const char *pPreview;
     // has checkbox?
     bool bCheckBox;
 }
 const vEntryInfo[] =
 {
     #define IDS(Name) \
-        SAL_STRINGIFY(Name), SAL_STRINGIFY(Name##_lb), SAL_STRINGIFY(Name##_wn), false
+        SAL_STRINGIFY(Name), SAL_STRINGIFY(Name##_lb), false
 
     #define IDS_CB(Name) \
-        SAL_STRINGIFY(Name), SAL_STRINGIFY(Name##_lb), SAL_STRINGIFY(Name##_wn), true
+        SAL_STRINGIFY(Name), SAL_STRINGIFY(Name##_lb), true
 
     // The list of these entries (enum ColorConfigEntry) are in colorcfg.hxx.
 
@@ -203,7 +201,7 @@ private:
     };
 
     // Entry -- a color config entry:
-    // text (checkbox) + color list box + preview box
+    // text (checkbox) + color list box
     class Entry
     {
     public:
@@ -218,12 +216,12 @@ private:
         void SetTextColor (Color C) { m_pText->SetTextColor(C); }
     public:
         void SetLinks (Link<Button*,void> const&, Link<SvxColorListBox&,void> const&, Link<Control&,void> const&);
-        void Update (ColorConfigEntry, ColorConfigValue const&);
+        void Update (ColorConfigValue const&);
         void Update (ExtendedColorConfigValue const&);
-        void ColorChanged (ColorConfigEntry, ColorConfigValue&);
+        void ColorChanged (ColorConfigValue&);
         void ColorChanged (ExtendedColorConfigValue&);
     public:
-        long GetTop () const { return m_pPreview->GetPosPixel().Y(); }
+        long GetTop () const { return m_pColorList->GetPosPixel().Y(); }
         unsigned GetHeight () const { return m_pColorList->GetSizePixel().Height(); }
     public:
         bool Is (CheckBox const * pBox) const { return m_pText.get() == pBox; }
@@ -232,7 +230,6 @@ private:
         {
             m_pText.disposeAndClear();
             m_pColorList.disposeAndClear();
-            m_pPreview.disposeAndClear();
         }
     private:
         bool m_bOwnsWidgets;
@@ -240,12 +237,8 @@ private:
         VclPtr<Control> m_pText;
         // color list box
         VclPtr<SvxColorListBox> m_pColorList;
-        // color preview box
-        VclPtr<vcl::Window> m_pPreview;
         // default color
         Color m_aDefaultColor;
-    private:
-        void SetColor (Color);
     };
 
     // vChapters -- groups (group headers)
@@ -331,7 +324,6 @@ ColorConfigWindow_Impl::Entry::Entry(ColorConfigWindow_Impl& rParent, unsigned i
             nCheckBoxLabelOffset);
     }
     rParent.get(m_pColorList, vEntryInfo[iEntry].pColor);
-    rParent.get(m_pPreview, vEntryInfo[iEntry].pPreview);
 
     if (!bShow)
         Hide();
@@ -353,11 +345,6 @@ ColorConfigWindow_Impl::Entry::Entry( vcl::Window *pGrid, unsigned nYPos,
     m_pColorList->set_grid_left_attach(1);
     m_pColorList->set_grid_top_attach(nYPos);
 
-    m_pPreview = VclPtr<vcl::Window>::Create(pGrid, WB_BORDER);
-    m_pPreview->set_grid_left_attach(2);
-    m_pPreview->set_grid_top_attach(nYPos);
-    m_pPreview->set_margin_right(6);
-
     Show();
 }
 
@@ -367,7 +354,6 @@ ColorConfigWindow_Impl::Entry::~Entry()
     {
         m_pText.disposeAndClear();
         m_pColorList.disposeAndClear();
-        m_pPreview.disposeAndClear();
     }
 }
 
@@ -375,14 +361,12 @@ void ColorConfigWindow_Impl::Entry::Show()
 {
     m_pText->Show();
     m_pColorList->Show();
-    m_pPreview->Show();
 }
 
 void ColorConfigWindow_Impl::Entry::Hide()
 {
     m_pText->Hide();
     m_pColorList->Hide();
-    m_pPreview->Hide();
 }
 
 // SetAppearance()
@@ -393,8 +377,6 @@ void ColorConfigWindow_Impl::Entry::SetAppearance(Wallpaper const& rTextWall)
 {
     // text (and optionally checkbox)
     m_pText->SetBackground(rTextWall);
-    // preview
-    m_pPreview->SetBorderStyle(WindowBorderStyle::MONO);
     // color list
     m_pColorList->SetSlotId(SID_ATTR_CHAR_COLOR);
     m_pColorList->SetAutoDisplayColor(m_aDefaultColor);
@@ -416,13 +398,10 @@ void ColorConfigWindow_Impl::Entry::SetLinks(
 
 // updates a default color config entry
 void ColorConfigWindow_Impl::Entry::Update (
-    ColorConfigEntry aColorEntry, ColorConfigValue const& rValue
+    ColorConfigValue const& rValue
 ) {
     Color aColor(rValue.nColor);
     m_pColorList->SelectEntry(aColor);
-    if (aColor.GetColor() == COL_AUTO)
-        aColor = ColorConfig::GetDefaultColor(aColorEntry);
-    m_pPreview->SetBackground(Wallpaper(aColor));
     if (CheckBox* pCheckBox = dynamic_cast<CheckBox*>(m_pText.get()))
         pCheckBox->Check(rValue.bIsVisible);
 }
@@ -436,19 +415,14 @@ void ColorConfigWindow_Impl::Entry::Update (
         m_pColorList->SelectEntry(Color(COL_AUTO));
     else
         m_pColorList->SelectEntry(aColor);
-    SetColor(aColor);
 }
 
 // color of a default entry has changed
 void ColorConfigWindow_Impl::Entry::ColorChanged (
-    ColorConfigEntry aColorEntry,
     ColorConfigValue& rValue
 ) {
     Color aColor = m_pColorList->GetSelectEntryColor();
     rValue.nColor = aColor.GetColor();
-    if (aColor.GetColor() == COL_AUTO)
-        aColor = ColorConfig::GetDefaultColor(aColorEntry);
-    SetColor(aColor);
 }
 
 // color of an extended entry has changed
@@ -460,15 +434,7 @@ void ColorConfigWindow_Impl::Entry::ColorChanged (
     if (aColor.GetColor() == COL_AUTO)
     {
         rValue.setColor(rValue.getDefaultColor());
-        aColor.SetColor(rValue.getColor());
     }
-    SetColor(aColor);
-}
-
-void ColorConfigWindow_Impl::Entry::SetColor (Color aColor)
-{
-    m_pPreview->SetBackground(Wallpaper(aColor));
-    m_pPreview->Invalidate();
 }
 
 
@@ -622,12 +588,10 @@ void ColorConfigWindow_Impl::AdjustHeaderBar()
     unsigned const nX0 = 0;
     unsigned const nX1 = get<vcl::Window>("doccolor")->GetPosPixel().X();
     unsigned const nX2 = get<vcl::Window>("doccolor_lb")->GetPosPixel().X();
-    unsigned const nX3 = get<vcl::Window>("doccolor_wn")->GetPosPixel().X();
-    unsigned const nX4 = m_pHeaderHB->GetSizePixel().Width();
+    unsigned const nX3 = m_pHeaderHB->GetSizePixel().Width();
     m_pHeaderHB->SetItemSize(1, nX1 - nX0);
     m_pHeaderHB->SetItemSize(2, nX2 - nX1);
     m_pHeaderHB->SetItemSize(3, nX3 - nX2);
-    m_pHeaderHB->SetItemSize(4, nX4 - nX3);
 }
 
 void ColorConfigWindow_Impl::AdjustScrollBar()
@@ -666,7 +630,7 @@ void ColorConfigWindow_Impl::Update (
     {
         ColorConfigEntry const aColorEntry = static_cast<ColorConfigEntry>(i);
         vEntries[i]->Update(
-            aColorEntry, pConfig->GetColorValue(aColorEntry)
+            pConfig->GetColorValue(aColorEntry)
         );
     }
 
@@ -724,7 +688,7 @@ void ColorConfigWindow_Impl::ColorHdl(
         {
             ColorConfigEntry const aColorEntry = static_cast<ColorConfigEntry>(i);
             ColorConfigValue aValue = pConfig->GetColorValue(aColorEntry);
-            vEntries[i]->ColorChanged(aColorEntry, aValue);
+            vEntries[i]->ColorChanged(aValue);
             pConfig->SetColorValue(aColorEntry, aValue);
             break;
         }
@@ -819,7 +783,7 @@ public:
     virtual void dispose() override;
 
     void InitHeaderBar(const OUString &rOn, const OUString &rUIElems,
-        const OUString &rColorSetting, const OUString &rPreview);
+        const OUString &rColorSetting);
     void SetConfig (EditableColorConfig& rConfig) { pColorConfig = &rConfig; }
     void SetExtendedConfig (EditableExtendedColorConfig& rConfig) { pExtColorConfig = &rConfig; }
     void Update ();
@@ -872,14 +836,13 @@ ColorConfigCtrl_Impl::ColorConfigCtrl_Impl(vcl::Window* pParent)
 }
 
 void ColorConfigCtrl_Impl::InitHeaderBar(const OUString &rOn, const OUString &rUIElems,
-    const OUString &rColorSetting, const OUString &rPreview)
+    const OUString &rColorSetting)
 {
     // filling
     const HeaderBarItemBits nHeadBits = HeaderBarItemBits::VCENTER | HeaderBarItemBits::FIXED | HeaderBarItemBits::FIXEDPOS;
     m_pHeaderHB->InsertItem(1, rOn, 0, nHeadBits | HeaderBarItemBits::CENTER);
     m_pHeaderHB->InsertItem(2, rUIElems, 0, nHeadBits | HeaderBarItemBits::LEFT);
     m_pHeaderHB->InsertItem(3, rColorSetting, 0, nHeadBits | HeaderBarItemBits::LEFT);
-    m_pHeaderHB->InsertItem(4, rPreview, 0, nHeadBits | HeaderBarItemBits::LEFT);
     m_pHeaderHB->set_height_request(GetTextHeight() + 6);
 }
 
@@ -1020,8 +983,7 @@ SvxColorOptionsTabPage::SvxColorOptionsTabPage(
     m_pColorConfigCT->InitHeaderBar(
         get<vcl::Window>("on")->GetText(),
         get<vcl::Window>("uielements")->GetText(),
-        get<vcl::Window>("colorsetting")->GetText(),
-        get<vcl::Window>("preview")->GetText());
+        get<vcl::Window>("colorsetting")->GetText());
 
     m_pColorSchemeLB->SetSelectHdl(LINK(this, SvxColorOptionsTabPage, SchemeChangedHdl_Impl));
     Link<Button*,void> aLk = LINK(this, SvxColorOptionsTabPage, SaveDeleteHdl_Impl );
diff --git a/cui/uiconfig/ui/colorconfigwin.ui b/cui/uiconfig/ui/colorconfigwin.ui
index dbcbb89dbeb0..5b70eb49bf3f 100644
--- a/cui/uiconfig/ui/colorconfigwin.ui
+++ b/cui/uiconfig/ui/colorconfigwin.ui
@@ -48,30 +48,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="doccolor_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkDrawingArea" id="docboundaries_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">2</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="docboundaries_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -108,18 +84,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="appback_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">3</property>
-      </packing>
-    </child>
-    <child>
       <object class="GtkLabel" id="appback">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -158,18 +122,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="objboundaries_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">4</property>
-      </packing>
-    </child>
-    <child>
       <object class="GtkCheckButton" id="tblboundaries">
         <property name="label" translatable="yes" context="colorconfigwin|tblboundaries">Table boundaries</property>
         <property name="visible">True</property>
@@ -195,18 +147,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="tblboundaries_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">5</property>
-      </packing>
-    </child>
-    <child>
       <object class="GtkLabel" id="font">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -230,18 +170,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="font_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">6</property>
-      </packing>
-    </child>
-    <child>
       <object class="GtkCheckButton" id="unvisitedlinks">
         <property name="label" translatable="yes" context="colorconfigwin|unvisitedlinks">Unvisited links</property>
         <property name="visible">True</property>
@@ -267,18 +195,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="unvisitedlinks_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">7</property>
-      </packing>
-    </child>
-    <child>
       <object class="GtkCheckButton" id="visitedlinks">
         <property name="label" translatable="yes" context="colorconfigwin|visitedlinks">Visited links</property>
         <property name="visible">True</property>
@@ -304,18 +220,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="visitedlinks_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">8</property>
-      </packing>
-    </child>
-    <child>
       <object class="GtkLabel" id="autospellcheck">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -342,18 +246,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="autospellcheck_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">9</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="autospellcheck_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -423,18 +315,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="writergrid_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">13</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="field_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -445,18 +325,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="field_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">14</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="index_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -467,18 +335,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="index_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">15</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="script_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -502,18 +358,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="script_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">16</property>
-      </packing>
-    </child>
-    <child>
       <object class="GtkCheckButton" id="field">
         <property name="label" translatable="yes" context="colorconfigwin|field">Field shadings</property>
         <property name="visible">True</property>
@@ -569,18 +413,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="section_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">17</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="hdft_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -604,18 +436,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="hdft_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">18</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="pagebreak_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -639,18 +459,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="pagebreak_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">19</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="direct_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -674,18 +482,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="direct_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">20</property>
-      </packing>
-    </child>
-    <child>
       <object class="GtkLabel" id="html">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -725,18 +521,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="sgml_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">22</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="htmlcomment_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -760,18 +544,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="htmlcomment_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">23</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="htmlkeyword_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -795,18 +567,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="htmlkeyword_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">24</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="unknown_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -830,18 +590,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="unknown_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">25</property>
-      </packing>
-    </child>
-    <child>
       <object class="GtkLabel" id="calc">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -881,18 +629,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="calcgrid_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">27</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="brk_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -916,18 +652,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="brk_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">28</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="brkmanual_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -951,18 +675,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="brkmanual_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">29</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="brkauto_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -986,18 +698,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="brkauto_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">30</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="det_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -1021,18 +721,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="det_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">31</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="deterror_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -1056,18 +744,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="deterror_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">32</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="ref_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -1091,18 +767,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="ref_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">33</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="notes_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -1126,18 +790,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="notes_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">34</property>
-      </packing>
-    </child>
-    <child>
       <object class="GtkLabel" id="draw">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -1177,18 +829,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="drawgrid_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">36</property>
-      </packing>
-    </child>
-    <child>
       <object class="GtkLabel" id="basic">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -1228,18 +868,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="basicid_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">38</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="basiccomment_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -1263,18 +891,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="basiccomment_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">39</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="basicnumber_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -1298,18 +914,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="basicnumber_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">40</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="basicstring_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -1333,18 +937,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="basicstring_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">41</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="basicop_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -1368,18 +960,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="basicop_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">42</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="basickeyword_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -1403,18 +983,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="basickeyword_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">43</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="error_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -1438,18 +1006,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="error_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">44</property>
-      </packing>
-    </child>
-    <child>
       <object class="GtkLabel" id="sql">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -1489,18 +1045,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="sqlid_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">46</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="sqlnumber_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -1524,18 +1068,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="sqlnumber_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">47</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="sqlstring_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -1559,18 +1091,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="sqlstring_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">48</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="sqlop_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -1594,18 +1114,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="sqlop_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">49</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="sqlkeyword_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -1629,18 +1137,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="sqlkeyword_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">50</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="sqlparam_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -1664,18 +1160,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="sqlparam_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">51</property>
-      </packing>
-    </child>
-    <child>
       <object class="svxcorelo-SvxColorListBox" id="sqlcomment_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -1699,42 +1183,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkDrawingArea" id="sqlcomment_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">52</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkDrawingArea" id="smarttags_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">10</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkDrawingArea" id="shadows_wn:border">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="hexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">11</property>
-      </packing>
-    </child>
-    <child>
       <object class="GtkCheckButton" id="shadows">
         <property name="label" translatable="yes" context="colorconfigwin|shadows">Shadows</property>
         <property name="visible">True</property>
diff --git a/cui/uiconfig/ui/optappearancepage.ui b/cui/uiconfig/ui/optappearancepage.ui
index 7dad23e72945..8ac7d47d8976 100644
--- a/cui/uiconfig/ui/optappearancepage.ui
+++ b/cui/uiconfig/ui/optappearancepage.ui
@@ -150,18 +150,6 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="preview">
-                        <property name="width_request">100</property>
-                        <property name="can_focus">False</property>
-                        <property name="no_show_all">True</property>
-                        <property name="label" translatable="yes" context="optappearancepage|preview">Preview</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">3</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
                       <object class="GtkLabel" id="on">
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>