mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make SwMarkPreview available through .ui format

Browse Source 
+ move getting size from ctor to Paint
+ add possibility for border to font preview
+ add possibility for setting initial text via .ui for font preview
+ move old .src combobox contents into .ui and re-enable code

Change-Id: I0470da54c6764d67bccd5828cce9b11d2e7df3b3
This commit is contained in:
Caolán McNamara 2013-07-11 08:42:19 +01:00
parent b67b78abb5
commit dd3bb0aa49
12 changed files with 287 additions and 498 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
extras/source/glade/libreoffice-catalog.xml.in
View File

@ -127,6 +127,18 @@
icon-name="widget-gtk-combobox"/>
<glade-widget-class title="Font Preview" name="svxlo-SvxFontPrevWindow"
generic-name="Font Preview Window" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea">
<properties>
<property id="text" name="Label">
<parameter-spec>
<type>GParamString</type>
</parameter-spec>
</property>
</properties>
</glade-widget-class>
<glade-widget-class title="Mark Preview" name="swuilo-SwMarkPreview"
generic-name="Mark Preview Window" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
<glade-widget-class title="Show Math Symbol" name="smlo-SmShowSymbol"
generic-name="Show Math Symbol" parent="GtkDrawingArea"

2
include/svx/fntctrl.hxx
View File

@ -49,7 +49,7 @@ private:
public:
SvxFontPrevWindow( Window* pParent, const ResId& rId );
SvxFontPrevWindow(Window* pParent);
SvxFontPrevWindow(Window* pParent, WinBits nStyle);
virtual ~SvxFontPrevWindow();
virtual void StateChanged( StateChangedType nStateChange );

13
svx/source/dialog/fntctrl.cxx
View File

@ -506,15 +506,20 @@ SvxFontPrevWindow::SvxFontPrevWindow( Window* pParent, const ResId& rId ) :
Init();
}
SvxFontPrevWindow::SvxFontPrevWindow(Window* pParent) :
Window(pParent)
SvxFontPrevWindow::SvxFontPrevWindow(Window* pParent, WinBits nStyle)
: Window(pParent, nStyle)
{
m_aInitialSize = LogicToPixel(Size(70 , 27), MapMode(MAP_APPFONT));
Init();
}
extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFontPrevWindow(Window *pParent, VclBuilder::stringmap &)
extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFontPrevWindow(Window *pParent, VclBuilder::stringmap &rMap)
{
SvxFontPrevWindow *pWindow = new SvxFontPrevWindow(pParent);
WinBits nWinStyle = 0;
OString sBorder = VclBuilder::extractCustomProperty(rMap);
if (!sBorder.isEmpty())
nWinStyle |= WB_BORDER;
SvxFontPrevWindow *pWindow = new SvxFontPrevWindow(pParent, nWinStyle);
return pWindow;
}

1
sw/AllLangResTarget_sw.mk
View File

@ -74,7 +74,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/config/optcomp.src \
sw/source/ui/config/optdlg.src \
sw/source/ui/config/optload.src \
sw/source/ui/config/redlopt.src \
sw/source/ui/dbui/addresslistdialog.src \
sw/source/ui/dbui/createaddresslistdialog.src \
sw/source/ui/dbui/customizeaddresslistdialog.src \

2
sw/inc/globals.hrc
View File

@ -185,7 +185,7 @@
#define TP_OPTSHDWCRSR (RC_GLOBALS_BEGIN + 70)
#define TP_NUMPARA (RC_GLOBALS_BEGIN + 73)
#define TP_REDLINE_OPT (RC_GLOBALS_BEGIN + 74)
#define TP_OPTCAPTION_PAGE (RC_GLOBALS_BEGIN + 78)
#define DLG_SVXTEST_NUM_BULLET (RC_GLOBALS_BEGIN + 79)

1
sw/inc/helpid.h
View File

@ -162,7 +162,6 @@
#define HID_FLD_FUNC "SW_HID_FLD_FUNC"
#define HID_FLD_REF "SW_HID_FLD_REF"
#define HID_REDLINE_OPT "SW_HID_REDLINE_OPT"
#define HID_EDIT_FLD_DB "SW_HID_EDIT_FLD_DB"
#define HID_EDIT_FLD_DOKINF "SW_HID_EDIT_FLD_DOKINF"
#define HID_EDIT_FLD_VAR "SW_HID_EDIT_FLD_VAR"

80
sw/source/ui/config/optpage.cxx
View File

@ -41,7 +41,6 @@
#include <viewopt.hxx>
#include <globals.hrc>
#include <config.hrc>
#include <redlopt.hrc>
#include <optdlg.hrc>
#include <swwrtshitem.hxx>
#include <unomid.h>
@ -1485,38 +1484,22 @@ static sal_uInt16 aChangedAttrMap[] = { 0, 1, 2, 3, 4, 6, 7, 8, 9, 10 };
/*-----------------------------------------------------------------------
Description: Preview of selection
-----------------------------------------------------------------------*/
SwMarkPreview::SwMarkPreview( Window *pParent, const ResId& rResID ) :
SwMarkPreview::SwMarkPreview( Window *pParent, WinBits nWinBits ) :
Window(pParent, rResID),
Window(pParent, nWinBits),
m_aTransCol( COL_TRANSPARENT ),
m_aMarkCol( COL_LIGHTRED ),
nMarkPos(0)
{
m_aInitialSize = LogicToPixel(Size(70 , 27), MapMode(MAP_APPFONT));
InitColors();
SetMapMode(MAP_PIXEL);
}
const Size aSz(GetOutputSizePixel());
// Page
aPage.SetSize(Size(aSz.Width() - 3, aSz.Height() - 3));
sal_uLong nOutWPix = aPage.GetWidth();
sal_uLong nOutHPix = aPage.GetHeight();
// PrintArea
sal_uLong nLBorder = 8;
sal_uLong nRBorder = 8;
sal_uLong nTBorder = 4;
sal_uLong nBBorder = 4;
aLeftPagePrtArea = Rectangle(Point(nLBorder, nTBorder), Point((nOutWPix - 1) - nRBorder, (nOutHPix - 1) - nBBorder));
sal_uInt16 nWidth = (sal_uInt16)aLeftPagePrtArea.GetWidth();
sal_uInt16 nKorr = (nWidth & 1) != 0 ? 0 : 1;
aLeftPagePrtArea.SetSize(Size(nWidth / 2 - (nLBorder + nRBorder) / 2 + nKorr, aLeftPagePrtArea.GetHeight()));
aRightPagePrtArea = aLeftPagePrtArea;
aRightPagePrtArea.Move(aLeftPagePrtArea.GetWidth() + nLBorder + nRBorder + 1, 0);
extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwMarkPreview(Window *pParent, VclBuilder::stringmap &)
{
return new SwMarkPreview(pParent, 0);
}
SwMarkPreview::~SwMarkPreview()
@ -1547,6 +1530,28 @@ void SwMarkPreview::DataChanged( const DataChangedEvent& rDCEvt )
void SwMarkPreview::Paint(const Rectangle &/*rRect*/)
{
const Size aSz(GetOutputSizePixel());
// Page
aPage.SetSize(Size(aSz.Width() - 3, aSz.Height() - 3));
sal_uLong nOutWPix = aPage.GetWidth();
sal_uLong nOutHPix = aPage.GetHeight();
// PrintArea
sal_uLong nLBorder = 8;
sal_uLong nRBorder = 8;
sal_uLong nTBorder = 4;
sal_uLong nBBorder = 4;
aLeftPagePrtArea = Rectangle(Point(nLBorder, nTBorder), Point((nOutWPix - 1) - nRBorder, (nOutHPix - 1) - nBBorder));
sal_uInt16 nWidth = (sal_uInt16)aLeftPagePrtArea.GetWidth();
sal_uInt16 nKorr = (nWidth & 1) != 0 ? 0 : 1;
aLeftPagePrtArea.SetSize(Size(nWidth / 2 - (nLBorder + nRBorder) / 2 + nKorr, aLeftPagePrtArea.GetHeight()));
aRightPagePrtArea = aLeftPagePrtArea;
aRightPagePrtArea.Move(aLeftPagePrtArea.GetWidth() + nLBorder + nRBorder + 1, 0);
// draw shadow
Rectangle aShadow(aPage);
aShadow += Point(3, 3);
@ -1636,6 +1641,11 @@ void SwMarkPreview::DrawRect(const Rectangle &rRect, const Color &rFillColor, co
Window::DrawRect(rRect);
}
Size SwMarkPreview::GetOptimalSize() const
{
return m_aInitialSize;
}
namespace
{
void lcl_FillRedlineAttrListBox(
@ -1656,11 +1666,8 @@ namespace
SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( Window* pParent,
const SfxItemSet& rSet )
: SfxTabPage(pParent, "OptRedLinePage", "modules/swriter/ui/optredlinepage.ui" , rSet)
// ,sAuthor ( SW_RES( STR_AUTHOR )),
// sNone ( SW_RES( STR_NOTHING ))
, sNone(SW_RESSTR(SW_STR_NONE))
{
get(pInsertLB,"insert");
get(pInsertColorLB,"insertcolor");
get(pInsertedPreviewWN,"insertedpreview");
@ -1677,21 +1684,21 @@ SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( Window* pParent,
get(pMarkColorLB,"markcolor");
get(pMarkPreviewWN,"markpreview");
//FreeResource();
/*
for(sal_uInt16 i = 0; i < pInsertLB->GetEntryCount(); i++)
sAuthor = get<Window>("byauthor")->GetText();
for (sal_uInt16 i = 0; i < pInsertLB->GetEntryCount(); ++i)
{
String sEntry(pInsertLB->GetEntry(i));
OUString sEntry(pInsertLB->GetEntry(i));
pDeletedLB->InsertEntry(sEntry);
pChangedLB->InsertEntry(sEntry);
};*/
/*
};
// remove strikethrough from insert and change and underline + double
// underline from delete
pInsertLB->RemoveEntry(5);
pChangedLB->RemoveEntry(5);
pDeletedLB->RemoveEntry(4);
pDeletedLB->RemoveEntry(3);*/
pDeletedLB->RemoveEntry(3);
Link aLk = LINK(this, SwRedlineOptionsTabPage, AttribHdl);
pInsertLB->SetSelectHdl( aLk );
@ -1868,7 +1875,6 @@ void SwRedlineOptionsTabPage::Reset( const SfxItemSet& )
pDeletedColorLB->SetUpdateMode(sal_False);
pChangedColorLB->SetUpdateMode(sal_False);
pMarkColorLB->SetUpdateMode(sal_False);
/*
pInsertColorLB->InsertEntry(sNone);
pDeletedColorLB->InsertEntry(sNone);
pChangedColorLB->InsertEntry(sNone);
@ -1876,7 +1882,7 @@ void SwRedlineOptionsTabPage::Reset( const SfxItemSet& )
pInsertColorLB->InsertEntry(sAuthor);
pDeletedColorLB->InsertEntry(sAuthor);
pChangedColorLB->InsertEntry(sAuthor);
*/
XColorListRef pColorLst = XColorList::GetStdColorList();
sal_uInt16 i;
for( i = 0; i < pColorLst->Count(); ++i )

48
sw/source/ui/config/redlopt.hrc
View File

@ -1,48 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#define FT_INS_ATTR 1
#define LB_INS_ATTR 2
#define FT_INS_COL 3
#define LB_INS_COL 4
#define WIN_INS 5
#define FT_DEL_ATTR 6
#define LB_DEL_ATTR 7
#define FT_DEL_COL 8
#define LB_DEL_COL 9
#define WIN_DEL 10
#define FT_CHG_ATTR 11
#define LB_CHG_ATTR 12
#define FT_CHG_COL 13
#define LB_CHG_COL 14
#define WIN_CHG 15
#define FL_TE 16
#define FT_MARKPOS 17
#define LB_MARKPOS 18
#define FT_LC_COL 19
#define LB_LC_COL 20
#define WIN_MARK 21
#define FL_LC 22
#define STR_AUTHOR 23
#define STR_NOTHING 24
#define FT_CHG_CHANGE 25
#define FT_CHG_DELETE 26
#define FT_CHG_INSERT 27
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

234
sw/source/ui/config/redlopt.src
View File

@ -1,234 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
/* StarView resource file */
#include <sfx2/sfx.hrc>
#include <svx/dialogs.hrc>
#include "globals.hrc"
#include "config.hrc"
#include "redlopt.hrc"
#include "helpid.h"
TabPage TP_REDLINE_OPT
{
HelpID = HID_REDLINE_OPT ;
SVLook = TRUE ;
Hide = TRUE ;
Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_TE
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text [ en-US ] = "Text display" ;
};
FixedText FT_CHG_INSERT
{
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 70 , 8 ) ;
Text [ en-US ] = "Insertions";
};
FixedText FT_INS_ATTR
{
Pos = MAP_APPFONT ( 18 , 25 ) ;
Size = MAP_APPFONT ( 70 , 8 ) ;
Text [ en-US ] = "Attributes";
};
ListBox LB_INS_ATTR
{
HelpID = "sw:ListBox:TP_REDLINE_OPT:LB_INS_ATTR";
Pos = MAP_APPFONT ( 90 , 25 ) ;
Size = MAP_APPFONT ( 80 , 80 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
StringList [ en-US ] =
{
< "[None]" ; > ;
< "Bold" ; > ;
< "Italic" ; > ;
< "Underlined" ; > ;
< "Underlined: double" ; > ;
< "Strikethrough" ; > ;
< "Uppercase" ; > ;
< "Lowercase" ; > ;
< "Small caps" ; > ;
< "Title font" ; > ;
< "Background color" ; > ;
};
};
FixedText FT_INS_COL
{
Pos = MAP_APPFONT ( 18 , 42 ) ;
Size = MAP_APPFONT ( 70 , 8 ) ;
Text [ en-US ] = "Color" ;
};
ListBox LB_INS_COL
{
HelpID = "sw:ListBox:TP_REDLINE_OPT:LB_INS_COL";
Pos = MAP_APPFONT ( 90 , 40 ) ;
Size = MAP_APPFONT ( 80 , 80 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
};
Window WIN_INS
{
Border = TRUE ;
Pos = MAP_APPFONT ( 178 , 25 ) ;
Size = MAP_APPFONT ( 70 , 27 ) ;
Text [ en-US ] = "Insert";
};
FixedText FT_CHG_DELETE
{
Pos = MAP_APPFONT ( 12 , 58 ) ;
Size = MAP_APPFONT ( 70 , 8 ) ;
Text [ en-US ] = "Deletions";
};
FixedText FT_DEL_ATTR
{
Pos = MAP_APPFONT ( 18 , 69 ) ;
Size = MAP_APPFONT ( 70 , 8 ) ;
Text [ en-US ] = "Attributes";
};
ListBox LB_DEL_ATTR
{
HelpID = "sw:ListBox:TP_REDLINE_OPT:LB_DEL_ATTR";
Pos = MAP_APPFONT ( 90 , 67 ) ;
Size = MAP_APPFONT ( 80 , 80 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
};
FixedText FT_DEL_COL
{
Pos = MAP_APPFONT ( 18 , 84 ) ;
Size = MAP_APPFONT ( 70 , 8 ) ;
Text [ en-US ] = "Color";
};
ListBox LB_DEL_COL
{
HelpID = "sw:ListBox:TP_REDLINE_OPT:LB_DEL_COL";
Pos = MAP_APPFONT ( 90 , 82 ) ;
Size = MAP_APPFONT ( 80 , 80 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
};
Window WIN_DEL
{
Border = TRUE ;
Pos = MAP_APPFONT ( 178 , 67 ) ;
Size = MAP_APPFONT ( 70 , 27 ) ;
Text [ en-US ] = "Delete";
};
FixedText FT_CHG_CHANGE
{
Pos = MAP_APPFONT ( 12 , 100 ) ;
Size = MAP_APPFONT ( 70 , 8 ) ;
Text [ en-US ] = "Changed attributes";
};
FixedText FT_CHG_ATTR
{
Pos = MAP_APPFONT ( 18 , 113 ) ;
Size = MAP_APPFONT ( 70 , 8 ) ;
Text [ en-US ] = "Attributes";
};
ListBox LB_CHG_ATTR
{
HelpID = "sw:ListBox:TP_REDLINE_OPT:LB_CHG_ATTR";
Pos = MAP_APPFONT ( 90 , 111 ) ;
Size = MAP_APPFONT ( 80 , 80 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
};
FixedText FT_CHG_COL
{
Pos = MAP_APPFONT ( 18 , 128 ) ;
Size = MAP_APPFONT ( 70 , 8 ) ;
Text [ en-US ] = "Color";
};
ListBox LB_CHG_COL
{
HelpID = "sw:ListBox:TP_REDLINE_OPT:LB_CHG_COL";
Pos = MAP_APPFONT ( 90 , 126 ) ;
Size = MAP_APPFONT ( 80 , 80 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
};
Window WIN_CHG
{
Border = TRUE ;
Pos = MAP_APPFONT ( 178 , 111 ) ;
Size = MAP_APPFONT ( 70 , 27 ) ;
Text [ en-US ] = "Attributes";
};
FixedLine FL_LC
{
Pos = MAP_APPFONT ( 6 , 144 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text [ en-US ] = "Lines changed" ;
};
FixedText FT_MARKPOS
{
Pos = MAP_APPFONT ( 12 , 157 ) ;
Size = MAP_APPFONT ( 70 , 8 ) ;
Text [ en-US ] = "Mar~k" ;
};
ListBox LB_MARKPOS
{
HelpID = "sw:ListBox:TP_REDLINE_OPT:LB_MARKPOS";
Pos = MAP_APPFONT ( 90 , 155 ) ;
Size = MAP_APPFONT ( 80 , 80 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
StringList [ en-US ] =
{
< "[None]" ; > ;
< "Left margin" ; > ;
< "Right margin" ; > ;
< "Outer margin" ; > ;
< "Inner margin" ; > ;
};
};
FixedText FT_LC_COL
{
Pos = MAP_APPFONT ( 12 , 172 ) ;
Size = MAP_APPFONT ( 70 , 8 ) ;
Text [ en-US ] = "~Color" ;
};
ListBox LB_LC_COL
{
HelpID = "sw:ListBox:TP_REDLINE_OPT:LB_LC_COL";
Pos = MAP_APPFONT ( 90 , 170 ) ;
Size = MAP_APPFONT ( 80 , 80 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
};
Window WIN_MARK
{
Pos = MAP_APPFONT ( 178 , 155 ) ;
Size = MAP_APPFONT ( 70 , 27 ) ;
};
String STR_AUTHOR
{
Text [ en-US ] = "By author" ;
};
String STR_NOTHING
{
Text [ en-US ] = "[None]" ;
};
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

1
sw/source/ui/dialog/swdlgfact.cxx
View File

@ -1301,7 +1301,6 @@ CreateTabPage SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nI
pRet = SwShdwCrsrOptionsTabPage::Create;
break;
case RID_SW_TP_REDLINE_OPT :
case TP_REDLINE_OPT :
pRet = SwRedlineOptionsTabPage::Create;
break;
case RID_SW_TP_OPTTEST_PAGE :

9
sw/source/ui/inc/optpage.hxx
View File

@ -300,6 +300,8 @@ public:
-----------------------------------------------------------------------*/
class SwMarkPreview : public Window
{
Size m_aInitialSize;
Color m_aBgCol; // background
Color m_aTransCol; // transparency
Color m_aMarkCol; // marks
@ -325,11 +327,12 @@ protected:
virtual void DataChanged( const DataChangedEvent& rDCEvt );
public:
SwMarkPreview(Window* pParent, const ResId& rResID);
SwMarkPreview(Window* pParent, WinBits nWinBits);
virtual ~SwMarkPreview();
inline void SetColor(const Color& rCol) { m_aMarkCol = rCol; }
inline void SetMarkPos(sal_uInt16 nPos) { nMarkPos = nPos; }
virtual Size GetOptimalSize() const;
};
/*-----------------------------------------------------------------------
@ -353,8 +356,8 @@ class SwRedlineOptionsTabPage : public SfxTabPage
ColorListBox* pMarkColorLB;
SwMarkPreview* pMarkPreviewWN;
//String sAuthor;
//String sNone;
OUString sAuthor;
OUString sNone;
SwRedlineOptionsTabPage( Window* pParent, const SfxItemSet& rSet );
~SwRedlineOptionsTabPage();

382
sw/uiconfig/swriter/ui/optredlinepage.ui
View File

@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkBox" id="OptRedLinePage">
<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>
<property name="border_width">6</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
@ -44,37 +45,9 @@
</packing>
</child>
<child>
<object class="GtkComboBox" id="insert">
<object class="svtlo-ColorListBox" id="insertcolor">
<property name="visible">True</property>
<property name="can_focus">False</property>
<items>
<item>[None]</item>
<item>Bold</item>
<item>Italic</item>
<item>Underlined</item>
<item>Underlined: double</item>
<item>Uppercase</item>
<item>Lowercase</item>
<item>Small caps</item>
<item>Title font</item>
<item>Background color</item>
</items>
</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="GtkComboBox" id="insertcolor">
<property name="visible">True</property>
<property name="can_focus">False</property>
<items>
<item>[None]</item>
<item>By Author</item>
</items>
</object>
<packing>
<property name="left_attach">1</property>
@ -84,36 +57,9 @@
</packing>
</child>
<child>
<object class="GtkComboBox" id="deleted">
<object class="svtlo-ColorListBox" id="deletedcolor">
<property name="visible">True</property>
<property name="can_focus">False</property>
<items>
<item>[None]</item>
<item>Bold</item>
<item>Italic</item>
<item>Strikethrough</item>
<item>Uppercase</item>
<item>Lowercase</item>
<item>Small caps</item>
<item>Title font</item>
<item>Background color</item>
</items>
</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="GtkComboBox" id="deletedcolor">
<property name="visible">True</property>
<property name="can_focus">False</property>
<items>
<item>[None]</item>
<item>By Author</item>
</items>
</object>
<packing>
<property name="left_attach">1</property>
@ -126,18 +72,6 @@
<object class="GtkComboBox" id="changed">
<property name="visible">True</property>
<property name="can_focus">False</property>
<items>
<item>[None]</item>
<item>Bold</item>
<item>Italic</item>
<item>Underlined</item>
<item>Underlined: double</item>
<item>Uppercase</item>
<item>Lowercase</item>
<item>Small caps</item>
<item>Title font</item>
<item>Background color</item>
</items>
</object>
<packing>
<property name="left_attach">1</property>
@ -147,13 +81,9 @@
</packing>
</child>
<child>
<object class="GtkComboBox" id="changedcolor">
<object class="svtlo-ColorListBox" id="changedcolor">
<property name="visible">True</property>
<property name="can_focus">False</property>
<items>
<item>[None]</item>
<item>By Author</item>
</items>
</object>
<packing>
<property name="left_attach">1</property>
@ -163,14 +93,62 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="insert_label">
<object class="svxlo-SvxFontPrevWindow" id="insertedpreview:border">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Attributes:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">insert</property>
<property name="hexpand">True</property>
<property name="text">Insert</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">2</property>
</packing>
</child>
<child>
<object class="svxlo-SvxFontPrevWindow" id="deletedpreview:border">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="text">Delete</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">4</property>
<property name="width">1</property>
<property name="height">2</property>
</packing>
</child>
<child>
<object class="svxlo-SvxFontPrevWindow" id="changedpreview:border">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="text">Attributes</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">7</property>
<property name="width">1</property>
<property name="height">2</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkLabel" id="insert_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Attributes:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">insert</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">0</property>
@ -180,14 +158,20 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="insertcolor_label">
<object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Co_lor:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">insertcolor</property>
<property name="left_padding">12</property>
<child>
<object class="GtkLabel" id="insertcolor_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Co_lor:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">insertcolor</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">0</property>
@ -197,28 +181,20 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="label3">
<object class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Deletions</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
<property name="width">3</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="deleted_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Attri_butes:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">deleted</property>
<property name="left_padding">12</property>
<child>
<object class="GtkLabel" id="deleted_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Attri_butes:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">deleted</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">0</property>
@ -228,14 +204,20 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="deletedcolor_label">
<object class="GtkAlignment" id="alignment7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Col_or:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">deletedcolor</property>
<property name="left_padding">12</property>
<child>
<object class="GtkLabel" id="deletedcolor_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Col_or:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">deletedcolor</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">0</property>
@ -245,14 +227,20 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="changed_label">
<object class="GtkAlignment" id="alignment8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Attrib_utes:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">changed</property>
<property name="left_padding">12</property>
<child>
<object class="GtkLabel" id="changed_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Attrib_utes:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">changed</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">0</property>
@ -262,14 +250,20 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="changedcolor_label">
<object class="GtkAlignment" id="alignment9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Colo_r:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">changedcolor</property>
<property name="left_padding">12</property>
<child>
<object class="GtkLabel" id="changedcolor_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Colo_r:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">changedcolor</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">0</property>
@ -293,42 +287,56 @@
</packing>
</child>
<child>
<object class="svxlo-SvxFontPrevWindow" id="insertedpreview">
<property name="height_request">30</property>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Deletions</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
<property name="width">3</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="insert">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<items>
<item translatable="yes">[None]</item>
<item translatable="yes">Bold</item>
<item translatable="yes">Italic</item>
<item translatable="yes">Underlined</item>
<item translatable="yes">Underlined: double</item>
<item translatable="yes">Strikethrough</item>
<item translatable="yes">Uppercase</item>
<item translatable="yes">Lowercase</item>
<item translatable="yes">Small caps</item>
<item translatable="yes">Title font</item>
<item translatable="yes">Background color</item>
</items>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">2</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="svxlo-SvxFontPrevWindow" id="deletedpreview">
<property name="height_request">30</property>
<object class="GtkComboBox" id="deleted">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="left_attach">1</property>
<property name="top_attach">4</property>
<property name="width">1</property>
<property name="height">2</property>
</packing>
</child>
<child>
<object class="svxlo-SvxFontPrevWindow" id="changedpreview">
<property name="height_request">30</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">7</property>
<property name="width">1</property>
<property name="height">2</property>
<property name="height">1</property>
</packing>
</child>
</object>
@ -375,26 +383,7 @@
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkComboBox" id="markpos">
<property name="visible">True</property>
<property name="can_focus">False</property>
<items>
<item>[None]</item>
<item>Left margin</item>
<item>Right margin</item>
<item>Outer margin</item>
<item>Inner margin</item>
</items>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="markcolor">
<object class="svtlo-ColorListBox" id="markcolor">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
@ -438,9 +427,10 @@
</packing>
</child>
<child>
<object class="GtkDrawingArea" id="markpreview">
<object class="swuilo-SwMarkPreview" id="markpreview">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">2</property>
@ -449,6 +439,27 @@
<property name="height">2</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="markpos">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<items>
<item translatable="yes">[None]</item>
<item translatable="yes">Left margin</item>
<item translatable="yes">Right margin</item>
<item translatable="yes">Outer margin</item>
<item translatable="yes">Inner margin</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>
</child>
</object>
@ -470,5 +481,42 @@
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="byauthor">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="label" translatable="yes">By author</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<object class="GtkSizeGroup" id="sizegroup1">
<widgets>
<widget name="alignment3"/>
<widget name="alignment4"/>
<widget name="alignment5"/>
<widget name="alignment7"/>
<widget name="alignment8"/>
<widget name="alignment9"/>
<widget name="markpos_label"/>
<widget name="markcolor_label"/>
</widgets>
</object>
<object class="GtkSizeGroup" id="sizegroup2">
<widgets>
<widget name="insertcolor"/>
<widget name="deletedcolor"/>
<widget name="changed"/>
<widget name="changedcolor"/>
<widget name="insert"/>
<widget name="deleted"/>
<widget name="markcolor"/>
<widget name="markpos"/>
</widgets>
</object>
</interface>