[Libreoffice-commits] core.git: cui/uiconfig svx/inc svx/source svx/uiconfig svx/UI_svx.mk sw/uiconfig sw/UI_swriter.mk
Caolán McNamara
caolanm at redhat.com
Thu Feb 21 06:27:26 PST 2013
cui/uiconfig/ui/acceptrejectchanges.ui | 447 --------------------------
svx/UI_svx.mk | 1
svx/inc/helpid.hrc | 1
svx/inc/svx/ctredlin.hxx | 42 +-
svx/inc/svx/dialogs.hrc | 3
svx/inc/svx/svxids.hrc | 1
svx/source/dialog/ctredlin.cxx | 416 +++++++++++-------------
svx/source/dialog/ctredlin.hrc | 23 -
svx/source/dialog/ctredlin.src | 244 --------------
svx/source/dialog/sdstring.src | 13
svx/uiconfig/ui/redlinecontrol.ui | 206 +++++++++++
svx/uiconfig/ui/redlinefilterpage.ui | 393 ++++++++++++++++++++++
sw/UI_swriter.mk | 1
sw/uiconfig/swriter/ui/acceptrejectchanges.ui | 75 ++++
14 files changed, 906 insertions(+), 960 deletions(-)
New commits:
commit a3f891168341da8de9085b4f71f6d17eebbe1297
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 20 16:59:49 2013 +0000
split up redline dialog and adapt filter page code
Change-Id: Id6fab654b4c92aaba753e7099923efb135a0bdd8
diff --git a/cui/uiconfig/ui/acceptrejectchanges.ui b/cui/uiconfig/ui/acceptrejectchanges.ui
deleted file mode 100644
index 64bff8e..0000000
--- a/cui/uiconfig/ui/acceptrejectchanges.ui
+++ /dev/null
@@ -1,447 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
- <!-- interface-requires gtk+ 3.0 -->
- <object class="GtkAction" id="action1"/>
- <object class="GtkAction" id="action2"/>
- <object class="GtkWindow" id="Accept or Reject Changes">
- <property name="can_focus">False</property>
- <child>
- <object class="GtkNotebook" id="notebook1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <child>
- <object class="GtkBox" id="box1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkBox" id="box2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkBox" id="box3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">30</property>
- <child>
- <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">Action</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Author</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Date</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Comment</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="shadow_type">in</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkButton" id="button1">
- <property name="label" translatable="yes">_Accept</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button2">
- <property name="label" translatable="yes">_Reject</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button3">
- <property name="label" translatable="yes">A_ccept All</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</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>
- <child>
- <object class="GtkButton" id="button4">
- <property name="label" translatable="yes">R_eject All</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">List</property>
- </object>
- <packing>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="grid1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
- <child>
- <object class="GtkGrid" id="grid2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
- <child>
- <object class="GtkComboBoxText" id="comboboxtext1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">a_nd</property>
- <property name="use_underline">True</property>
- <property name="ellipsize">end</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="spinbutton1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="spinbutton2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage" id="image2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="spinbutton3">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</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>
- <child>
- <object class="GtkSpinButton" id="spinbutton4">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</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>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton1">
- <property name="label" translatable="yes">_Date</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton2">
- <property name="label" translatable="yes">_Author</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton3">
- <property name="label" translatable="yes">A_ction</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton4">
- <property name="label" translatable="yes">C_omment</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="comboboxtext2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="comboboxtext3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="entry1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</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>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Filter</property>
- </object>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
-</interface>
diff --git a/svx/UI_svx.mk b/svx/UI_svx.mk
index 4abcd55..df3d0b4 100644
--- a/svx/UI_svx.mk
+++ b/svx/UI_svx.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_UI_add_uifiles,svx,\
svx/uiconfig/ui/asianphoneticguidedialog \
svx/uiconfig/ui/chineseconversiondialog \
svx/uiconfig/ui/compressgraphicdialog \
+ svx/uiconfig/ui/redlinefilterpage \
))
# vim: set noet sw=4 ts=4:
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index d8ae9eb..b4a2737 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -168,7 +168,6 @@
#define HID_REDLINING_FILTER_LB_ACTION "SVX_HID_REDLINING_FILTER_LB_ACTION"
#define HID_REDLINING_FILTER_LB_AUTOR "SVX_HID_REDLINING_FILTER_LB_AUTOR"
#define HID_REDLINING_FILTER_LB_DATE "SVX_HID_REDLINING_FILTER_LB_DATE"
-#define HID_REDLINING_FILTER_PAGE "SVX_HID_REDLINING_FILTER_PAGE"
#define HID_REDLINING_FILTER_TF_DATE "SVX_HID_REDLINING_FILTER_TF_DATE"
#define HID_REDLINING_FILTER_TF_DATE2 "SVX_HID_REDLINING_FILTER_TF_DATE2"
#define HID_REDLINING_TABCONTROL "SVX_HID_REDLINING_TABCONTROL"
diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx
index 4268adc..2ce91fc 100644
--- a/svx/inc/svx/ctredlin.hxx
+++ b/svx/inc/svx/ctredlin.hxx
@@ -173,26 +173,24 @@ private:
Link aModifyComLink;
SvxRedlinTable* pRedlinTable;
- CheckBox aCbDate;
- ListBox aLbDate;
- DateField aDfDate;
- TimeField aTfDate;
- ImageButton aIbClock;
- FixedText aFtDate2;
- DateField aDfDate2;
- TimeField aTfDate2;
- ImageButton aIbClock2;
- CheckBox aCbAuthor;
- ListBox aLbAuthor;
- CheckBox aCbRange;
- Edit aEdRange;
- PushButton aBtnRange;
- ListBox aLbAction;
- CheckBox aCbComment;
- Edit aEdComment;
- String aActionStr;
- String aRangeStr;
- String aStrMyName;
+ CheckBox* m_pCbDate;
+ ListBox* m_pLbDate;
+ DateField* m_pDfDate;
+ TimeField* m_pTfDate;
+ PushButton* m_pIbClock;
+ FixedText* m_pFtDate2;
+ DateField* m_pDfDate2;
+ TimeField* m_pTfDate2;
+ PushButton* m_pIbClock2;
+ CheckBox* m_pCbAuthor;
+ ListBox* m_pLbAuthor;
+ CheckBox* m_pCbRange;
+ Edit* m_pEdRange;
+ PushButton* m_pBtnRange;
+ CheckBox* m_pCbAction;
+ ListBox* m_pLbAction;
+ CheckBox* m_pCbComment;
+ Edit* m_pEdComment;
sal_Bool bModified;
DECL_LINK( SelDateHdl, ListBox* );
@@ -215,7 +213,6 @@ public:
virtual void DeactivatePage();
void SetRedlinTable(SvxRedlinTable*);
- String GetMyName() const;
Date GetFirstDate() const;
void SetFirstDate(const Date &aDate);
Time GetFirstTime() const;
@@ -319,7 +316,6 @@ private:
String aTitle3;
String aTitle4;
String aTitle5;
- String aStrMyName;
long nDistance;
Size aMinSize;
@@ -333,8 +329,6 @@ protected:
public:
SvxTPView( Window * pParent);
- String GetMyName() const;
-
void InsertWriterHeader();
void InsertCalcHeader();
SvxRedlinTable* GetTableControl();
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index 8fe6bb5..0e83191 100644
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -349,6 +349,9 @@
#define RID_SVXSTR_CENTERED (RID_SVX_START + 306)
#define RID_SVXSTR_NOTCENTERED (RID_SVX_START + 307)
+#define RID_SVXSTR_VIEW (RID_SVX_START + 308)
+#define RID_SVXSTR_FILTER (RID_SVX_START + 309)
+
// String-Arrays
#define RID_SVXSTR_TEXTENCODING_TABLE (RID_SVX_START + 312)
diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc
index 2f06246..d18dfcf 100644
--- a/svx/inc/svx/svxids.hrc
+++ b/svx/inc/svx/svxids.hrc
@@ -620,7 +620,6 @@
#define SID_FM_NEW ( SID_SVX_START + 638 )
#define SID_FM_DELETE ( SID_SVX_START + 639 )
#define SID_FM_NEW_FORM ( SID_SVX_START + 640 )
-#define SID_REDLIN_FILTER_PAGE ( SID_SVX_START + 642 )
#define SID_REDLIN_VIEW_PAGE ( SID_SVX_START + 643 )
#define SID_3D_WIN ( SID_SVX_START + 644 )
#define SID_3D_STATE ( SID_SVX_START + 645 )
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 86c86ca..b9f5faf 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -28,6 +28,7 @@
#include <editeng/unolingu.hxx>
#include <svx/dialmgr.hxx>
+#include "svx/dialogs.hrc"
#include "ctredlin.hrc"
#include <svx/ctredlin.hxx>
#include "helpid.hrc"
@@ -497,8 +498,7 @@ SvxTPView::SvxTPView( Window * pParent)
aTitle2 ( SVX_RES( STR_TITLE2 ) ),
aTitle3 ( SVX_RES( STR_TITLE3 ) ),
aTitle4 ( SVX_RES( STR_TITLE4 ) ),
- aTitle5 ( SVX_RES( STR_TITLE5 ) ),
- aStrMyName ( SVX_RES( STR_VIEW) )
+ aTitle5 ( SVX_RES( STR_TITLE5 ) )
{
aViewData.SetAccessibleName(String(SVX_RES(STR_TREE)));
FreeResource();
@@ -520,11 +520,6 @@ SvxTPView::SvxTPView( Window * pParent)
aViewData.SetTabs(nStaticTabs);
}
-String SvxTPView::GetMyName() const
-{
- return aStrMyName;
-}
-
void SvxTPView::Resize()
{
Size aSize=GetOutputSizePixel();
@@ -670,90 +665,75 @@ IMPL_LINK( SvxTPView, PbClickHdl, PushButton*, pPushB )
//----------------------------------------------------------------------------
SvxTPFilter::SvxTPFilter( Window * pParent)
- : TabPage( pParent, SVX_RES(SID_REDLIN_FILTER_PAGE)),
- pRedlinTable(NULL),
- aCbDate ( this, SVX_RES( CB_DATE ) ),
- aLbDate ( this, SVX_RES( LB_DATE ) ),
- aDfDate ( this, SVX_RES( DF_DATE ) ),
- aTfDate ( this, SVX_RES( TF_DATE ) ),
- aIbClock ( this, SVX_RES( IB_CLOCK ) ),
- aFtDate2 ( this, SVX_RES( FT_DATE2 ) ),
- aDfDate2 ( this, SVX_RES( DF_DATE2 ) ),
- aTfDate2 ( this, SVX_RES( TF_DATE2 ) ),
- aIbClock2 ( this, SVX_RES( IB_CLOCK2) ),
- aCbAuthor ( this, SVX_RES( CB_AUTOR ) ),
- aLbAuthor ( this, SVX_RES( LB_AUTOR ) ),
- aCbRange ( this, SVX_RES( CB_RANGE ) ),
- aEdRange ( this, SVX_RES( ED_RANGE ) ),
- aBtnRange ( this, SVX_RES( BTN_REF ) ),
- aLbAction ( this, SVX_RES( LB_ACTION ) ),
- aCbComment ( this, SVX_RES( CB_COMMENT) ),
- aEdComment ( this, SVX_RES( ED_COMMENT) ),
- aActionStr ( SVX_RES( STR_ACTION) ),
- aStrMyName ( SVX_RES( STR_FILTER) ),
- bModified (sal_False)
-{
- aLbDate.SetAccessibleName( String( SVX_RES( STR_DATE_COMBOX) ) );
- aDfDate.SetAccessibleName( String( SVX_RES( STR_DATE_SPIN) ) );
- aTfDate.SetAccessibleName( String( SVX_RES( STR_DATE_TIME_SPIN) ) );
- aDfDate2.SetAccessibleName( String( SVX_RES( STR_DATE_SPIN1) ) );
- aTfDate2.SetAccessibleName( String( SVX_RES( STR_DATE_TIME_SPIN1) ) );
- aLbAuthor.SetAccessibleName(aCbAuthor.GetText());
- aLbAction.SetAccessibleName( String( SVX_RES( STR_ACTION) ) );
- aEdComment.SetAccessibleName(aCbComment.GetText());
- FreeResource();
-
- aDfDate.SetShowDateCentury( sal_True );
- aDfDate2.SetShowDateCentury( sal_True );
-
- aRangeStr=aCbRange.GetText();
- aLbDate.SelectEntryPos(0);
- aLbDate.SetSelectHdl( LINK( this, SvxTPFilter, SelDateHdl ) );
- aIbClock.SetClickHdl( LINK( this, SvxTPFilter, TimeHdl) );
- aIbClock2.SetClickHdl( LINK( this, SvxTPFilter,TimeHdl) );
- aBtnRange.SetClickHdl( LINK( this, SvxTPFilter, RefHandle));
+ : TabPage(pParent, "RedlineFilterPage", "svx/ui/redlinefilterpage.ui")
+ , pRedlinTable(NULL)
+ , bModified(false)
+{
+ get(m_pCbDate, "date");
+ get(m_pLbDate, "datecond");
+ get(m_pDfDate, "startdate");
+ get(m_pTfDate, "starttime");
+ get(m_pIbClock, "startclock");
+ get(m_pFtDate2, "and");
+ get(m_pDfDate2, "enddate");
+ get(m_pTfDate2, "endtime");
+ get(m_pIbClock2, "endclock");
+ get(m_pCbAuthor, "author");
+ get(m_pLbAuthor, "authorlist");
+ get(m_pCbRange, "range");
+ get(m_pEdRange, "rangeedit");
+ get(m_pBtnRange, "dotdotdot");
+ get(m_pCbAction, "action");
+ get(m_pLbAction, "actionlist");
+ get(m_pCbComment, "comment");
+ get(m_pEdComment, "commentedit");
+
+ m_pLbAuthor->SetAccessibleName(m_pCbAuthor->GetText());
+ m_pEdComment->SetAccessibleName(m_pCbComment->GetText());
+
+ m_pDfDate->SetShowDateCentury( sal_True );
+ m_pDfDate2->SetShowDateCentury( sal_True );
+
+ m_pLbDate->SelectEntryPos(0);
+ m_pLbDate->SetSelectHdl( LINK( this, SvxTPFilter, SelDateHdl ) );
+ m_pIbClock->SetClickHdl( LINK( this, SvxTPFilter, TimeHdl) );
+ m_pIbClock2->SetClickHdl( LINK( this, SvxTPFilter,TimeHdl) );
+ m_pBtnRange->SetClickHdl( LINK( this, SvxTPFilter, RefHandle));
Link aLink=LINK( this, SvxTPFilter, RowEnableHdl) ;
- aCbDate.SetClickHdl(aLink);
- aCbAuthor.SetClickHdl(aLink);
- aCbRange.SetClickHdl(aLink);
- aCbComment.SetClickHdl(aLink);
+ m_pCbDate->SetClickHdl(aLink);
+ m_pCbAuthor->SetClickHdl(aLink);
+ m_pCbRange->SetClickHdl(aLink);
+ m_pCbAction->SetClickHdl(aLink);
+ m_pCbComment->SetClickHdl(aLink);
Link a2Link=LINK( this, SvxTPFilter, ModifyDate);
- aDfDate.SetModifyHdl(a2Link);
- aTfDate.SetModifyHdl(a2Link);
- aDfDate2.SetModifyHdl(a2Link);
- aTfDate2.SetModifyHdl(a2Link);
+ m_pDfDate->SetModifyHdl(a2Link);
+ m_pTfDate->SetModifyHdl(a2Link);
+ m_pDfDate2->SetModifyHdl(a2Link);
+ m_pTfDate2->SetModifyHdl(a2Link);
Link a3Link=LINK( this, SvxTPFilter, ModifyHdl);
- aEdRange.SetModifyHdl(a3Link);
- aEdComment.SetModifyHdl(a3Link);
- aLbAction.SetSelectHdl(a3Link);
- aLbAuthor.SetSelectHdl(a3Link);
+ m_pEdRange->SetModifyHdl(a3Link);
+ m_pEdComment->SetModifyHdl(a3Link);
+ m_pLbAction->SetSelectHdl(a3Link);
+ m_pLbAuthor->SetSelectHdl(a3Link);
- RowEnableHdl(&aCbDate);
- RowEnableHdl(&aCbAuthor);
- RowEnableHdl(&aCbRange);
- RowEnableHdl(&aCbComment);
+ RowEnableHdl(m_pCbDate);
+ RowEnableHdl(m_pCbAuthor);
+ RowEnableHdl(m_pCbRange);
+ RowEnableHdl(m_pCbAction);
+ RowEnableHdl(m_pCbComment);
Date aDate( Date::SYSTEM );
Time aTime( Time::SYSTEM );
- aDfDate.SetDate(aDate);
- aTfDate.SetTime(aTime);
- aDfDate2.SetDate(aDate);
- aTfDate2.SetTime(aTime);
+ m_pDfDate->SetDate(aDate);
+ m_pTfDate->SetTime(aTime);
+ m_pDfDate2->SetDate(aDate);
+ m_pTfDate2->SetTime(aTime);
HideRange();
ShowAction();
bModified=sal_False;
-
- aLbDate.SetAccessibleRelationLabeledBy(&aCbDate);
- aLbAuthor.SetAccessibleRelationLabeledBy(&aCbAuthor);
- aLbAction.SetAccessibleRelationLabeledBy(&aCbRange);
- aEdRange.SetAccessibleRelationLabeledBy(&aCbRange);
- aBtnRange.SetAccessibleRelationLabeledBy(&aCbRange);
- aEdComment.SetAccessibleRelationLabeledBy(&aCbComment);
- aDfDate2.SetAccessibleRelationLabeledBy(&aDfDate2);
- aTfDate2.SetAccessibleRelationLabeledBy(&aTfDate2);
}
void SvxTPFilter::SetRedlinTable(SvxRedlinTable* pTable)
@@ -761,11 +741,6 @@ void SvxTPFilter::SetRedlinTable(SvxRedlinTable* pTable)
pRedlinTable=pTable;
}
-String SvxTPFilter::GetMyName() const
-{
- return aStrMyName;
-}
-
void SvxTPFilter::ShowDateFields(sal_uInt16 nKind)
{
String aEmpty;
@@ -781,14 +756,14 @@ void SvxTPFilter::ShowDateFields(sal_uInt16 nKind)
break;
case FLT_DATE_EQUAL:
EnableDateLine1(sal_True);
- aTfDate.Disable();
- aTfDate.SetText(aEmpty);
+ m_pTfDate->Disable();
+ m_pTfDate->SetText(aEmpty);
EnableDateLine2(sal_False);
break;
case FLT_DATE_NOTEQUAL:
EnableDateLine1(sal_True);
- aTfDate.Disable();
- aTfDate.SetText(aEmpty);
+ m_pTfDate->Disable();
+ m_pTfDate->SetText(aEmpty);
EnableDateLine2(sal_False);
break;
case FLT_DATE_BETWEEN:
@@ -804,215 +779,215 @@ void SvxTPFilter::ShowDateFields(sal_uInt16 nKind)
void SvxTPFilter::EnableDateLine1(sal_Bool bFlag)
{
- if(bFlag && aCbDate.IsChecked())
+ if(bFlag && m_pCbDate->IsChecked())
{
- aDfDate.Enable();
- aTfDate.Enable();
- aIbClock.Enable();
+ m_pDfDate->Enable();
+ m_pTfDate->Enable();
+ m_pIbClock->Enable();
}
else
{
- aDfDate.Disable();
- aTfDate.Disable();
- aIbClock.Disable();
+ m_pDfDate->Disable();
+ m_pTfDate->Disable();
+ m_pIbClock->Disable();
}
}
void SvxTPFilter::EnableDateLine2(sal_Bool bFlag)
{
String aEmpty;
- if(bFlag && aCbDate.IsChecked())
+ if(bFlag && m_pCbDate->IsChecked())
{
- aFtDate2.Enable();
- aDfDate2.Enable();
- aTfDate2.Enable();
- aIbClock2.Enable();
+ m_pFtDate2->Enable();
+ m_pDfDate2->Enable();
+ m_pTfDate2->Enable();
+ m_pIbClock2->Enable();
}
else
{
- aFtDate2.Disable();
- aDfDate2.Disable();
- aDfDate2.SetText(aEmpty);
- aTfDate2.Disable();
- aTfDate2.SetText(aEmpty);
- aIbClock2.Disable();
+ m_pFtDate2->Disable();
+ m_pDfDate2->Disable();
+ m_pDfDate2->SetText(aEmpty);
+ m_pTfDate2->Disable();
+ m_pTfDate2->SetText(aEmpty);
+ m_pIbClock2->Disable();
}
}
Date SvxTPFilter::GetFirstDate() const
{
- return aDfDate.GetDate();
+ return m_pDfDate->GetDate();
}
void SvxTPFilter::SetFirstDate(const Date &aDate)
{
- aDfDate.SetDate(aDate);
+ m_pDfDate->SetDate(aDate);
}
Time SvxTPFilter::GetFirstTime() const
{
- return aTfDate.GetTime();
+ return m_pTfDate->GetTime();
}
void SvxTPFilter::SetFirstTime(const Time &aTime)
{
- aTfDate.SetTime(aTime);
+ m_pTfDate->SetTime(aTime);
}
Date SvxTPFilter::GetLastDate() const
{
- return aDfDate2.GetDate();
+ return m_pDfDate2->GetDate();
}
void SvxTPFilter::SetLastDate(const Date &aDate)
{
- aDfDate2.SetDate(aDate);
+ m_pDfDate2->SetDate(aDate);
}
Time SvxTPFilter::GetLastTime() const
{
- return aTfDate2.GetTime();
+ return m_pTfDate2->GetTime();
}
void SvxTPFilter::SetLastTime(const Time &aTime)
{
- aTfDate2.SetTime(aTime);
+ m_pTfDate2->SetTime(aTime);
}
void SvxTPFilter::SetDateMode(sal_uInt16 nMode)
{
- aLbDate.SelectEntryPos(nMode);
- SelDateHdl(&aLbDate);
+ m_pLbDate->SelectEntryPos(nMode);
+ SelDateHdl(m_pLbDate);
}
sal_uInt16 SvxTPFilter::GetDateMode()
{
- return (sal_uInt16) aLbDate.GetSelectEntryPos();
+ return (sal_uInt16) m_pLbDate->GetSelectEntryPos();
}
void SvxTPFilter::ClearAuthors()
{
- aLbAuthor.Clear();
+ m_pLbAuthor->Clear();
}
void SvxTPFilter::InsertAuthor( const String& rString, sal_uInt16 nPos)
{
- aLbAuthor.InsertEntry(rString,nPos);
+ m_pLbAuthor->InsertEntry(rString,nPos);
}
String SvxTPFilter::GetSelectedAuthor() const
{
- return aLbAuthor.GetSelectEntry();
+ return m_pLbAuthor->GetSelectEntry();
}
void SvxTPFilter::SelectedAuthorPos(sal_uInt16 nPos)
{
- aLbAuthor.SelectEntryPos(nPos);
+ m_pLbAuthor->SelectEntryPos(nPos);
}
sal_uInt16 SvxTPFilter::SelectAuthor(const String& aString)
{
- aLbAuthor.SelectEntry(aString);
- return aLbAuthor.GetSelectEntryPos();
+ m_pLbAuthor->SelectEntry(aString);
+ return m_pLbAuthor->GetSelectEntryPos();
}
void SvxTPFilter::SetRange(const String& rString)
{
- aEdRange.SetText(rString);
+ m_pEdRange->SetText(rString);
}
String SvxTPFilter::GetRange() const
{
- return aEdRange.GetText();
+ return m_pEdRange->GetText();
}
void SvxTPFilter::SetFocusToRange()
{
- aEdRange.GrabFocus();
+ m_pEdRange->GrabFocus();
}
void SvxTPFilter::HideRange(sal_Bool bHide)
{
- if(bHide)
+ if (bHide)
{
- aCbRange.Hide();
- aEdRange.Hide();
- aBtnRange.Hide();
+ m_pCbRange->Hide();
+ m_pEdRange->Hide();
+ m_pBtnRange->Hide();
}
else
{
- ShowAction(sal_False);
- aCbRange.SetText(aRangeStr);
- aCbRange.Show();
- aEdRange.Show();
- aBtnRange.Show();
+ ShowAction(false);
+ m_pCbRange->Show();
+ m_pEdRange->Show();
+ m_pBtnRange->Show();
}
}
void SvxTPFilter::SetComment(const String &rComment)
{
- aEdComment.SetText(rComment);
+ m_pEdComment->SetText(rComment);
}
String SvxTPFilter::GetComment()const
{
- return aEdComment.GetText();
+ return m_pEdComment->GetText();
}
sal_Bool SvxTPFilter::IsDate()
{
- return aCbDate.IsChecked();
+ return m_pCbDate->IsChecked();
}
sal_Bool SvxTPFilter::IsAuthor()
{
- return aCbAuthor.IsChecked();
+ return m_pCbAuthor->IsChecked();
}
sal_Bool SvxTPFilter::IsRange()
{
- return aCbRange.IsChecked();
+ return m_pCbRange->IsChecked();
}
+
sal_Bool SvxTPFilter::IsAction()
{
- return aCbRange.IsChecked();
+ return m_pCbAction->IsChecked();
}
sal_Bool SvxTPFilter::IsComment()
{
- return aCbComment.IsChecked();
+ return m_pCbComment->IsChecked();
}
void SvxTPFilter::CheckDate(sal_Bool bFlag)
{
- aCbDate.Check(bFlag);
- RowEnableHdl(&aCbDate);
+ m_pCbDate->Check(bFlag);
+ RowEnableHdl(m_pCbDate);
bModified=sal_False;
}
void SvxTPFilter::CheckAuthor(sal_Bool bFlag)
{
- aCbAuthor.Check(bFlag);
- RowEnableHdl(&aCbAuthor);
+ m_pCbAuthor->Check(bFlag);
+ RowEnableHdl(m_pCbAuthor);
bModified=sal_False;
}
void SvxTPFilter::CheckRange(sal_Bool bFlag)
{
- aCbRange.Check(bFlag);
- RowEnableHdl(&aCbRange);
+ m_pCbRange->Check(bFlag);
+ RowEnableHdl(m_pCbRange);
bModified=sal_False;
}
void SvxTPFilter::CheckAction(sal_Bool bFlag)
{
- aCbRange.Check(bFlag);
- RowEnableHdl(&aCbRange);
+ m_pCbAction->Check(bFlag);
+ RowEnableHdl(m_pCbAction);
bModified=sal_False;
}
void SvxTPFilter::CheckComment(sal_Bool bFlag)
{
- aCbComment.Check(bFlag);
- RowEnableHdl(&aCbComment);
+ m_pCbComment->Check(bFlag);
+ RowEnableHdl(m_pCbComment);
bModified=sal_False;
}
@@ -1020,59 +995,58 @@ void SvxTPFilter::ShowAction(sal_Bool bShow)
{
if(!bShow)
{
- aCbRange.Hide();
- aLbAction.Hide();
- aCbRange.SetHelpId(HID_REDLINING_FILTER_CB_RANGE);
+ m_pCbAction->Hide();
+ m_pLbAction->Hide();
}
else
{
HideRange();
- aCbRange.SetText(aActionStr);
- aCbRange.SetHelpId(HID_REDLINING_FILTER_CB_ACTION);
- aCbRange.Show();
- aLbAction.Show();
-
+ m_pCbAction->Show();
+ m_pLbAction->Show();
}
}
ListBox* SvxTPFilter::GetLbAction()
{
- return &aLbAction;
+ return m_pLbAction;
}
IMPL_LINK( SvxTPFilter, SelDateHdl, ListBox*, pLb )
{
- ShowDateFields((sal_uInt16)aLbDate.GetSelectEntryPos());
+ ShowDateFields((sal_uInt16)m_pLbDate->GetSelectEntryPos());
ModifyHdl(pLb);
return 0;
}
IMPL_LINK( SvxTPFilter, RowEnableHdl, CheckBox*, pCB )
{
- if(pCB==&aCbDate)
+ if (pCB == m_pCbDate)
{
- aLbDate.Enable(aCbDate.IsChecked());
- aLbDate.Invalidate();
+ m_pLbDate->Enable(m_pCbDate->IsChecked());
+ m_pLbDate->Invalidate();
EnableDateLine1(sal_False);
EnableDateLine2(sal_False);
- if(aCbDate.IsChecked()) SelDateHdl(&aLbDate);
+ if(m_pCbDate->IsChecked()) SelDateHdl(m_pLbDate);
+ }
+ else if (pCB == m_pCbAuthor)
+ {
+ m_pLbAuthor->Enable(m_pCbAuthor->IsChecked());
+ m_pLbAuthor->Invalidate();
}
- else if(pCB==&aCbAuthor)
+ else if (pCB == m_pCbRange)
{
- aLbAuthor.Enable(aCbAuthor.IsChecked());
- aLbAuthor.Invalidate();
+ m_pEdRange->Enable(m_pCbRange->IsChecked());
+ m_pBtnRange->Enable(m_pCbRange->IsChecked());
}
- else if(pCB==&aCbRange)
+ else if (pCB == m_pCbAction)
{
- aLbAction.Enable(aCbRange.IsChecked());
- aLbAction.Invalidate();
- aEdRange.Enable(aCbRange.IsChecked());
- aBtnRange.Enable(aCbRange.IsChecked());
+ m_pLbAction->Enable(m_pCbAction->IsChecked());
+ m_pLbAction->Invalidate();
}
- else if(pCB==&aCbComment)
+ else if (pCB == m_pCbComment)
{
- aEdComment.Enable(aCbComment.IsChecked());
- aEdComment.Invalidate();
+ m_pEdComment->Enable(m_pCbComment->IsChecked());
+ m_pEdComment->Invalidate();
}
ModifyHdl(pCB);
@@ -1083,17 +1057,17 @@ IMPL_LINK( SvxTPFilter, TimeHdl, ImageButton*,pIB )
{
Date aDate( Date::SYSTEM );
Time aTime( Time::SYSTEM );
- if(pIB==&aIbClock)
+ if (pIB == m_pIbClock)
{
- aDfDate.SetDate(aDate);
- aTfDate.SetTime(aTime);
+ m_pDfDate->SetDate(aDate);
+ m_pTfDate->SetTime(aTime);
}
- else if(pIB==&aIbClock2)
+ else if (pIB == m_pIbClock2)
{
- aDfDate2.SetDate(aDate);
- aTfDate2.SetTime(aTime);
+ m_pDfDate2->SetDate(aDate);
+ m_pTfDate2->SetTime(aTime);
}
- ModifyHdl(&aDfDate);
+ ModifyHdl(m_pDfDate);
return 0;
}
@@ -1101,24 +1075,24 @@ IMPL_LINK( SvxTPFilter, ModifyHdl, void*, pCtr)
{
if(pCtr!=NULL)
{
- if(pCtr==&aCbDate || pCtr==&aLbDate ||
- pCtr==&aDfDate || pCtr==&aTfDate ||
- pCtr==&aIbClock || pCtr==&aFtDate2||
- pCtr==&aDfDate2 || pCtr==&aTfDate2||
- pCtr==&aIbClock2)
+ if (pCtr == m_pCbDate || pCtr == m_pLbDate ||
+ pCtr == m_pDfDate || pCtr == m_pTfDate ||
+ pCtr == m_pIbClock || pCtr == m_pFtDate2 ||
+ pCtr == m_pDfDate2 || pCtr == m_pTfDate2 ||
+ pCtr == m_pIbClock2)
{
aModifyDateLink.Call(this);
}
- else if(pCtr==&aCbAuthor || pCtr==&aLbAuthor)
+ else if (pCtr == m_pCbAuthor || pCtr == m_pLbAuthor)
{
aModifyAuthorLink.Call(this);
}
- else if(pCtr==&aCbRange || pCtr==&aEdRange ||
- pCtr==&aBtnRange )
+ else if (pCtr == m_pCbRange || pCtr == m_pLbAction || pCtr == m_pEdRange ||
+ pCtr == m_pBtnRange)
{
aModifyRefLink.Call(this);
}
- else if(pCtr==&aCbComment || pCtr==&aEdComment)
+ else if (pCtr == m_pCbComment || pCtr == m_pEdComment)
{
aModifyComLink.Call(this);
}
@@ -1137,16 +1111,16 @@ void SvxTPFilter::DeactivatePage()
{
pRedlinTable->SetFilterDate(IsDate());
pRedlinTable->SetDateTimeMode(GetDateMode());
- pRedlinTable->SetFirstDate(aDfDate.GetDate());
- pRedlinTable->SetLastDate(aDfDate2.GetDate());
- pRedlinTable->SetFirstTime(aTfDate.GetTime());
- pRedlinTable->SetLastTime(aTfDate2.GetTime());
+ pRedlinTable->SetFirstDate(m_pDfDate->GetDate());
+ pRedlinTable->SetLastDate(m_pDfDate2->GetDate());
+ pRedlinTable->SetFirstTime(m_pTfDate->GetTime());
+ pRedlinTable->SetLastTime(m_pTfDate2->GetTime());
pRedlinTable->SetFilterAuthor(IsAuthor());
pRedlinTable->SetAuthor(GetSelectedAuthor());
pRedlinTable->SetFilterComment(IsComment());
- utl::SearchParam aSearchParam( aEdComment.GetText(),
+ utl::SearchParam aSearchParam( m_pEdComment->GetText(),
utl::SearchParam::SRCH_REGEXP,sal_False,sal_False,sal_False );
pRedlinTable->SetCommentParams(&aSearchParam);
@@ -1163,12 +1137,12 @@ void SvxTPFilter::DeactivatePage()
void SvxTPFilter::Enable( bool bEnable, bool bChild)
{
TabPage::Enable(bEnable,bChild);
- if(aCbDate.IsEnabled())
+ if(m_pCbDate->IsEnabled())
{
- RowEnableHdl(&aCbDate);
- RowEnableHdl(&aCbAuthor);
- RowEnableHdl(&aCbRange);
- RowEnableHdl(&aCbComment);
+ RowEnableHdl(m_pCbDate);
+ RowEnableHdl(m_pCbAuthor);
+ RowEnableHdl(m_pCbRange);
+ RowEnableHdl(m_pCbComment);
}
}
void SvxTPFilter::Disable( bool bChild)
@@ -1181,40 +1155,40 @@ IMPL_LINK( SvxTPFilter, ModifyDate, void*,pTF)
Date aDate( Date::SYSTEM );
Time aTime(0);
- if(&aDfDate==pTF)
+ if (m_pDfDate==pTF)
{
- if(aDfDate.GetText().isEmpty())
- aDfDate.SetDate(aDate);
+ if(m_pDfDate->GetText().isEmpty())
+ m_pDfDate->SetDate(aDate);
if(pRedlinTable!=NULL)
- pRedlinTable->SetFirstDate(aDfDate.GetDate());
+ pRedlinTable->SetFirstDate(m_pDfDate->GetDate());
}
- else if(&aDfDate2==pTF)
+ else if (m_pDfDate2==pTF)
{
- if(aDfDate2.GetText().isEmpty())
- aDfDate2.SetDate(aDate);
+ if(m_pDfDate2->GetText().isEmpty())
+ m_pDfDate2->SetDate(aDate);
if(pRedlinTable!=NULL)
- pRedlinTable->SetLastDate(aDfDate2.GetDate());
+ pRedlinTable->SetLastDate(m_pDfDate2->GetDate());
}
- else if(&aTfDate==pTF)
+ else if (m_pTfDate==pTF)
{
- if(aTfDate.GetText().isEmpty())
- aTfDate.SetTime(aTime);
+ if(m_pTfDate->GetText().isEmpty())
+ m_pTfDate->SetTime(aTime);
if(pRedlinTable!=NULL)
- pRedlinTable->SetFirstTime(aTfDate.GetTime());
+ pRedlinTable->SetFirstTime(m_pTfDate->GetTime());
}
- else if(&aTfDate2==pTF)
+ else if (m_pTfDate2==pTF)
{
- if(aTfDate2.GetText().isEmpty())
- aTfDate2.SetTime(aTime);
+ if(m_pTfDate2->GetText().isEmpty())
+ m_pTfDate2->SetTime(aTime);
if(pRedlinTable!=NULL)
- pRedlinTable->SetLastTime(aTfDate2.GetTime());
+ pRedlinTable->SetLastTime(m_pTfDate2->GetTime());
}
- ModifyHdl(&aDfDate);
+ ModifyHdl(m_pDfDate);
return 0;
}
@@ -1240,8 +1214,8 @@ SvxAcceptChgCtr::SvxAcceptChgCtr( Window* pParent, const ResId& rResId )
pTPView=new SvxTPView(&aTCAccept);
aMinSize=pTPView->GetMinSizePixel();
- aTCAccept.InsertPage( TP_VIEW, pTPView->GetMyName());
- aTCAccept.InsertPage( TP_FILTER, pTPFilter->GetMyName());
+ aTCAccept.InsertPage( TP_VIEW, SVX_RESSTR(RID_SVXSTR_VIEW));
+ aTCAccept.InsertPage( TP_FILTER, SVX_RESSTR(RID_SVXSTR_FILTER));
aTCAccept.SetTabPage( TP_VIEW, pTPView);
aTCAccept.SetTabPage( TP_FILTER, pTPFilter);
aTCAccept.SetHelpId(HID_REDLINING_TABCONTROL);
diff --git a/svx/source/dialog/ctredlin.hrc b/svx/source/dialog/ctredlin.hrc
index c4b3df0..603c52c 100644
--- a/svx/source/dialog/ctredlin.hrc
+++ b/svx/source/dialog/ctredlin.hrc
@@ -16,32 +16,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <svx/svxids.hrc> // ->SID_REDLIN_FILTER_PAGE
- // ->SID_REDLIN_VIEW_PAGE
+#include <svx/svxids.hrc> // ->SID_REDLIN_VIEW_PAGE
#define TP_FILTER 11
#define TP_VIEW 12
-#define LB_DATE 1
-#define DF_DATE 2
-#define TF_DATE 3
-#define LB_AUTOR 4
-#define ED_RANGE 5
-#define IB_CLOCK 6
-#define BTN_REF 7
-#define CB_DATE 8
-#define CB_AUTOR 9
-#define CB_RANGE 10
-#define FT_DATE2 12
-#define DF_DATE2 13
-#define TF_DATE2 14
-#define IB_CLOCK2 15
-#define STR_FILTER 16
-#define STR_ACTION 17
-#define LB_ACTION 18
-#define CB_COMMENT 19
-#define ED_COMMENT 20
-
#define DG_VIEW 2
#define PB_ACCEPT 3
#define PB_ACCEPTALL 4
diff --git a/svx/source/dialog/ctredlin.src b/svx/source/dialog/ctredlin.src
index 3fa624e..57035a9 100644
--- a/svx/source/dialog/ctredlin.src
+++ b/svx/source/dialog/ctredlin.src
@@ -21,246 +21,6 @@
#define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } ;
-TabPage SID_REDLIN_FILTER_PAGE
-{
- String STR_FILTER
- {
- Text [ en-US ] = "Filter" ;
- };
- HelpId = HID_REDLINING_FILTER_PAGE ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 261 , 86 ) ;
- Hide = TRUE ;
- CheckBox CB_DATE
- {
- Pos = MAP_APPFONT ( 6 , 8 ) ;
- Size = MAP_APPFONT ( 50 , 10 ) ;
- TabStop = TRUE ;
- HelpId = HID_REDLINING_FILTER_CB_DATE ;
- Text [ en-US ] = "~Date" ;
- };
- ListBox LB_DATE
- {
- HelpId = HID_REDLINING_FILTER_LB_DATE ;
- Border = TRUE ;
- Disable = TRUE ;
- Pos = MAP_APPFONT ( 60 , 6 ) ;
- Size = MAP_APPFONT ( 78 , 99 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- StringList [ en-US ] =
- {
- < "earlier than" ; Default ; > ;
- < "since" ; Default ; > ;
- < "equal to " ; Default ; > ;
- < "not equal to" ; Default ; > ;
- < "between" ; Default ; > ;
- < "since saving" ; Default ; > ;
- };
- };
- DateField DF_DATE
- {
- HelpId = HID_REDLINING_FILTER_DF_DATE ;
- Disable = TRUE ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 144 , 6 ) ;
- Size = MAP_APPFONT ( 57 , 12 ) ;
- TabStop = TRUE ;
- Spin = TRUE ;
- Repeat = TRUE ;
- Minimum = Date
- {
- Year = 1985 ;
- Month = 12 ;
- Day = 31 ;
- };
- Maximum = Date
- {
- Year = 2050 ;
- Month = 12 ;
- Day = 31 ;
- };
- };
- TimeField TF_DATE
- {
- HelpId = HID_REDLINING_FILTER_TF_DATE ;
- Disable = TRUE ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 203 , 6 ) ;
- Size = MAP_APPFONT ( 35 , 12 ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- };
- ImageButton IB_CLOCK
- {
- HelpId = HID_REDLINING_FILTER_IB_CLOCK ;
- Disable = TRUE ;
- Pos = MAP_APPFONT ( 240 , 5 ) ;
- Size = MAP_APPFONT ( 13 , 15 ) ;
- TabStop = TRUE ;
- ButtonImage = Image
- {
- ImageBitmap = Bitmap { File = "time.bmp" ; };
- MASKCOLOR
- };
- QuickHelpText [ en-US ] = "Set Start Date/Time" ;
- };
- FixedText FT_DATE2
- {
- Pos = MAP_APPFONT ( 60 , 24 ) ;
- Size = MAP_APPFONT ( 78 , 8 ) ;
- Right = TRUE ;
- Disable = TRUE ;
- Text [ en-US ] = "and" ;
- };
- DateField DF_DATE2
- {
- HelpId = HID_REDLINING_FILTER_DF_DATE2 ;
- Border = TRUE ;
- Disable = TRUE ;
- Pos = MAP_APPFONT ( 144 , 22 ) ;
- Size = MAP_APPFONT ( 57 , 12 ) ;
- TabStop = TRUE ;
- Spin = TRUE ;
- Repeat = TRUE ;
- Minimum = Date
- {
- Year = 1985 ;
- Month = 12 ;
- Day = 31 ;
- };
- Maximum = Date
- {
- Year = 2050 ;
- Month = 12 ;
- Day = 31 ;
- };
- };
- TimeField TF_DATE2
- {
- HelpId = HID_REDLINING_FILTER_TF_DATE2 ;
- Border = TRUE ;
- Disable = TRUE ;
- Pos = MAP_APPFONT ( 203 , 22 ) ;
- Size = MAP_APPFONT ( 35 , 12 ) ;
- TabStop = TRUE ;
- Spin = TRUE ;
- Repeat = TRUE ;
- };
- ImageButton IB_CLOCK2
- {
- HelpId = HID_REDLINING_FILTER_IB_CLOCK2 ;
- Disable = TRUE ;
- Pos = MAP_APPFONT ( 240 , 21 ) ;
- Size = MAP_APPFONT ( 13 , 15 ) ;
- TabStop = TRUE ;
- ButtonImage = Image
- {
- ImageBitmap = Bitmap { File = "time.bmp" ; };
- MASKCOLOR
- };
- QuickHelpText [ en-US ] = "Set End Date/Time" ;
- };
- CheckBox CB_AUTOR
- {
- HelpId = HID_REDLINING_FILTER_CB_AUTOR ;
- Pos = MAP_APPFONT ( 6 , 40 ) ;
- Size = MAP_APPFONT ( 50 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~Author" ;
- };
- ListBox LB_AUTOR
- {
- HelpId = HID_REDLINING_FILTER_LB_AUTOR ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 60 , 38 ) ;
- Size = MAP_APPFONT ( 178 , 100 ) ;
- TabStop = TRUE ;
- Disable = TRUE ;
- DropDown = TRUE ;
- };
- CheckBox CB_RANGE
- {
- HelpId = HID_REDLINING_FILTER_CB_RANGE ;
- Pos = MAP_APPFONT ( 6 , 56 ) ;
- Size = MAP_APPFONT ( 50 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~Range" ;
- };
- Edit ED_RANGE
- {
- HelpId = HID_REDLINING_FILTER_ED_RANGE ;
- Disable = TRUE ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 60 , 54 ) ;
- Size = MAP_APPFONT ( 178 , 12 ) ;
- TabStop = TRUE ;
- };
- String STR_ACTION
- {
- Text [ en-US ] = "A~ction" ;
- };
- ListBox LB_ACTION
- {
- HelpId = HID_REDLINING_FILTER_LB_ACTION ;
- Border = TRUE ;
- Hide = TRUE ;
- Disable = TRUE ;
- Pos = MAP_APPFONT ( 60 , 54 ) ;
- Size = MAP_APPFONT ( 178 , 100 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- };
- PushButton BTN_REF
- {
- HelpId = HID_REDLINING_FILTER_BTN_REF ;
- Pos = MAP_APPFONT ( 240 , 54 ) ;
- Size = MAP_APPFONT ( 12 , 12 ) ;
- Disable = TRUE ;
- TabStop = TRUE ;
- QuickHelpText [ en-US ] = "Set Reference" ;
- Text [ en-US ] = "..." ;
- };
- CheckBox CB_COMMENT
- {
- HelpId = HID_REDLINING_FILTER_CB_COMMENT ;
- Pos = MAP_APPFONT ( 6 , 72 ) ;
- Size = MAP_APPFONT ( 50 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Comment";
- };
- Edit ED_COMMENT
- {
- HelpId = HID_REDLINING_FILTER_ED_COMMENT ;
- Disable = TRUE ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 60 , 70 ) ;
- Size = MAP_APPFONT ( 178 , 12 ) ;
- TabStop = TRUE ;
- };
- String STR_DATE_COMBOX
- {
- Text [ en-US ] = "Date Condition" ;
- };
- String STR_DATE_SPIN
- {
- Text [ en-US ] = "Start Date" ;
- };
- String STR_DATE_SPIN1
- {
- Text [ en-US ] = "End Date" ;
- };
- String STR_DATE_TIME_SPIN
- {
- Text [ en-US ] = "Start Time" ;
- };
- String STR_DATE_TIME_SPIN1
- {
- Text [ en-US ] = "End Time" ;
- };
-};
TabPage SID_REDLIN_VIEW_PAGE
{
HelpId = HID_REDLINING_VIEW_PAGE ;
@@ -268,10 +28,6 @@ TabPage SID_REDLIN_VIEW_PAGE
SVLook = TRUE ;
Size = MAP_APPFONT ( 270 , 126 ) ;
Hide = TRUE ;
- String STR_VIEW
- {
- Text [ en-US ] = "List" ;
- };
Control DG_VIEW
{
HelpId = HID_REDLINING_VIEW_DG_VIEW ;
diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src
index 0bcfd86..2977274 100644
--- a/svx/source/dialog/sdstring.src
+++ b/svx/source/dialog/sdstring.src
@@ -1992,15 +1992,28 @@ String RID_SVXSTR_GALLERY_THEMEITEMS
{
Text [ en-US ] = "Theme Items";
};
+
String RID_SVXSTR_GALLERY_THEMENAME
{
Text [ en-US ] = "Theme Name";
};
+
String RID_SVXSTR_GALLERY_FILESFOUND
{
Text [ en-US ] = "Files Found";
};
+
String RID_SVXSTR_GALLERY_PREVIEW
{
Text [ en-US ] = "Preview";
};
+
+String RID_SVXSTR_FILTER
+{
+ Text [ en-US ] = "Filter" ;
+};
+
+String RID_SVXSTR_VIEW
+{
+ Text [ en-US ] = "List" ;
+};
diff --git a/svx/uiconfig/ui/redlinecontrol.ui b/svx/uiconfig/ui/redlinecontrol.ui
new file mode 100644
index 0000000..50a8f5b
--- /dev/null
+++ b/svx/uiconfig/ui/redlinecontrol.ui
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkNotebook" id="notebook1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</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">6</property>
+ <child>
+ <object class="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkBox" id="box3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">30</property>
+ <child>
+ <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">Action</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Author</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Date</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Comment</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButtonBox" id="buttonbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <property name="layout_style">spread</property>
+ <child>
+ <object class="GtkButton" id="button1">
+ <property name="label" translatable="yes">_Accept</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button2">
+ <property name="label" translatable="yes">_Reject</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button3">
+ <property name="label" translatable="yes">A_ccept All</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</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>
+ <child>
+ <object class="GtkButton" id="button4">
+ <property name="label" translatable="yes">R_eject All</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">List</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Filter</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ </object>
+</interface>
diff --git a/svx/uiconfig/ui/redlinefilterpage.ui b/svx/uiconfig/ui/redlinefilterpage.ui
new file mode 100644
index 0000000..38d1bfd
--- /dev/null
+++ b/svx/uiconfig/ui/redlinefilterpage.ui
@@ -0,0 +1,393 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="lower">19851231</property>
+ <property name="upper">20501231</property>
+ <property name="value">19851231</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">sc/res/time.png</property>
+ </object>
+ <object class="GtkGrid" id="RedlineFilterPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="border_width">6</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkCheckButton" id="date">
+ <property name="label" translatable="yes">_Date</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <accessibility>
+ <relation type="label-for" target="datecond"/>
+ </accessibility>
+ </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="GtkCheckButton" id="author">
+ <property name="label" translatable="yes">_Author</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <accessibility>
+ <relation type="label-for" target="authorlist"/>
+ </accessibility>
+ </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="action">
+ <property name="label" translatable="yes">A_ction</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <accessibility>
+ <relation type="label-for" target="actionlist"/>
+ </accessibility>
+ </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="comment">
+ <property name="label" translatable="yes">C_omment</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <accessibility>
+ <relation type="label-for" target="commentedit"/>
+ </accessibility>
+ </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="GtkComboBoxText" id="authorlist">
+ <property name="visible">True</property>
+ <property name="sensitive">False</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>
+ <accessibility>
+ <relation type="labelled-by" target="author"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">3</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="actionlist">
+ <property name="visible">True</property>
+ <property name="sensitive">False</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>
+ <accessibility>
+ <relation type="labelled-by" target="action"/>
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="actionlist-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Action</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="width">3</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="commentedit">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="comment"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">5</property>
+ <property name="width">3</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="starttime:hh:mm">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="starttime:hh:mm-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Start Time</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="endtime:hh:mm">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="endtime:hh:mm-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">End Time</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="enddate:yy:mm:dd">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment1</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="enddate:yy:mm:dd-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">End Date</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="and">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">a_nd</property>
+ <property name="use_underline">True</property>
+ <property name="ellipsize">end</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="GtkSpinButton" id="startdate:yy:mm:dd">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment1</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="startdate:yy:mm:dd-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Start Date</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="datecond">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ <accessibility>
+ <relation type="labelled-by" target="date"/>
+ </accessibility>
+ <items>
+ <item translatable="yes">earlier than</item>
+ <item translatable="yes">since</item>
+ <item translatable="yes">equal to</item>
+ <item translatable="yes">not equal to</item>
+ <item translatable="yes">between</item>
+ <item translatable="yes">since saving</item>
+ </items>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="datecond-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Date Condition</property>
+ </object>
+ </child>
+ </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="GtkButton" id="startclock">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="image">image1</property>
+ </object>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="endclock">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="image">image1</property>
+ </object>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="range">
+ <property name="label" translatable="yes">_Range</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <accessibility>
+ <relation type="label-for" target="rangeedit"/>
+ </accessibility>
+ </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="GtkButton" id="dotdotdot">
+ <property name="label">...</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes">Set Reference</property>
+ </object>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="rangeedit">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="range"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ <property name="width">3</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+</interface>
diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk
index d410de6..9bdc71f 100644
--- a/sw/UI_swriter.mk
+++ b/sw/UI_swriter.mk
@@ -10,6 +10,7 @@
$(eval $(call gb_UI_UI,modules/swriter))
$(eval $(call gb_UI_add_uifiles,modules/swriter,\
+ sw/uiconfig/swriter/ui/acceptrejectchanges \
sw/uiconfig/swriter/ui/autoformattable \
sw/uiconfig/swriter/ui/autotext \
sw/uiconfig/swriter/ui/bibliographyentry \
diff --git a/sw/uiconfig/swriter/ui/acceptrejectchanges.ui b/sw/uiconfig/swriter/ui/acceptrejectchanges.ui
new file mode 100644
index 0000000..2ebcf11
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/acceptrejectchanges.ui
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="AcceptRejectChangesDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Accept or Reject Changes</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkNotebook" id="notebook1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">List</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Filter</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list