Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
11de6f79
Kaydet (Commit)
11de6f79
authored
Eyl 17, 2012
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
convert code to use new text<->table dialog
Change-Id: I1f38f764901a2526d30561cedfa8495f8e326180
üst
ae6e2448
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
140 additions
and
401 deletions
+140
-401
AllLangResTarget_sw.mk
sw/AllLangResTarget_sw.mk
+0
-1
UI_swriter.mk
sw/UI_swriter.mk
+1
-0
swabstdlg.hxx
sw/inc/swabstdlg.hxx
+1
-1
app.src
sw/source/ui/app/app.src
+10
-0
swdlgfact.cxx
sw/source/ui/dialog/swdlgfact.cxx
+3
-15
swdlgfact.hxx
sw/source/ui/dialog/swdlgfact.hxx
+1
-1
app.hrc
sw/source/ui/inc/app.hrc
+2
-3
convert.hxx
sw/source/ui/inc/convert.hxx
+14
-21
table.hrc
sw/source/ui/inc/table.hrc
+1
-1
basesh.cxx
sw/source/ui/shells/basesh.cxx
+1
-2
convert.cxx
sw/source/ui/table/convert.cxx
+67
-98
convert.hrc
sw/source/ui/table/convert.hrc
+0
-39
convert.src
sw/source/ui/table/convert.src
+0
-189
converttexttable.ui
sw/uiconfig/swriter/ui/converttexttable.ui
+39
-30
No files found.
sw/AllLangResTarget_sw.mk
Dosyayı görüntüle @
11de6f79
...
...
@@ -172,7 +172,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/shells/shells.src \
sw/source/ui/smartmenu/stmenu.src \
sw/source/ui/table/chartins.src \
sw/source/ui/table/convert.src \
sw/source/ui/table/mergetbl.src \
sw/source/ui/table/rowht.src \
sw/source/ui/table/table.src \
...
...
sw/UI_swriter.mk
Dosyayı görüntüle @
11de6f79
...
...
@@ -11,6 +11,7 @@ $(eval $(call gb_UI_UI,modules/swriter))
$(eval $(call gb_UI_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/columnwidth \
sw/uiconfig/swriter/ui/converttexttable \
sw/uiconfig/swriter/ui/inserttable \
sw/uiconfig/swriter/ui/linenumbering \
sw/uiconfig/swriter/ui/printeroptions \
...
...
sw/inc/swabstdlg.hxx
Dosyayı görüntüle @
11de6f79
...
...
@@ -366,7 +366,7 @@ public:
virtual
VclAbstractDialog
*
CreateSwChangeDBDlg
(
SwView
&
rVw
,
int
nResId
)
=
0
;
//add for SwChangeDBDlg
virtual
SfxAbstractTabDialog
*
CreateSwCharDlg
(
Window
*
pParent
,
SwView
&
pVw
,
const
SfxItemSet
&
rCoreSet
,
int
nResId
,
// add for SwCharDlg
const
String
*
pFmtStr
=
0
,
sal_Bool
bIsDrwTxtDlg
=
sal_False
)
=
0
;
virtual
AbstractSwConvertTableDlg
*
CreateSwConvertTableDlg
(
SwView
&
rView
,
int
nResId
,
bool
bToTable
)
=
0
;
//add for SwConvertTableDlg
virtual
AbstractSwConvertTableDlg
*
CreateSwConvertTableDlg
(
SwView
&
rView
,
bool
bToTable
)
=
0
;
//add for SwConvertTableDlg
virtual
VclAbstractDialog
*
CreateSwCaptionDialog
(
Window
*
pParent
,
SwView
&
rV
,
int
nResId
)
=
0
;
//add for SwCaptionDialog
virtual
AbstractSwInsertDBColAutoPilot
*
CreateSwInsertDBColAutoPilot
(
SwView
&
rView
,
// add for SwInsertDBColAutoPilot
...
...
sw/source/ui/app/app.src
Dosyayı görüntüle @
11de6f79
...
...
@@ -560,6 +560,16 @@ String STR_STATUSBAR_WORDCOUNT
Text [ en-US ] = "Words: $1 Selected: $2";
};
String STR_CONVERT_TEXT_TABLE
{
Text [ en-US ] = "Convert Text to Table" ;
};
String STR_SYMBOL
{
Text [ en-US ] = "Symbol" ;
};
ToolBox RID_MODULE_TOOLBOX
{
HelpID = HID_MODULE_TOOLBOX ;
...
...
sw/source/ui/dialog/swdlgfact.cxx
Dosyayı görüntüle @
11de6f79
...
...
@@ -772,22 +772,10 @@ SfxAbstractTabDialog * SwAbstractDialogFactory_Impl::CreateSwCharDlg(Window* pP
}
AbstractSwConvertTableDlg
*
SwAbstractDialogFactory_Impl
::
CreateSwConvertTableDlg
(
SwView
&
rView
,
int
nResId
,
bool
bToTable
)
AbstractSwConvertTableDlg
*
SwAbstractDialogFactory_Impl
::
CreateSwConvertTableDlg
(
SwView
&
rView
,
bool
bToTable
)
{
SwConvertTableDlg
*
pDlg
=
NULL
;
switch
(
nResId
)
{
case
DLG_CONV_TEXT_TABLE
:
pDlg
=
new
SwConvertTableDlg
(
rView
,
bToTable
);
break
;
default
:
break
;
}
if
(
pDlg
)
return
new
AbstractSwConvertTableDlg_Impl
(
pDlg
);
return
0
;
SwConvertTableDlg
*
pDlg
=
new
SwConvertTableDlg
(
rView
,
bToTable
);
return
new
AbstractSwConvertTableDlg_Impl
(
pDlg
);
}
VclAbstractDialog
*
SwAbstractDialogFactory_Impl
::
CreateSwCaptionDialog
(
Window
*
pParent
,
SwView
&
rV
,
int
nResId
)
...
...
sw/source/ui/dialog/swdlgfact.hxx
Dosyayı görüntüle @
11de6f79
...
...
@@ -449,7 +449,7 @@ public:
virtual
VclAbstractDialog
*
CreateSwChangeDBDlg
(
SwView
&
rVw
,
int
nResId
);
//add for SwChangeDBDlg
virtual
SfxAbstractTabDialog
*
CreateSwCharDlg
(
Window
*
pParent
,
SwView
&
pVw
,
const
SfxItemSet
&
rCoreSet
,
int
nResId
,
// add for SwCharDlg
const
String
*
pFmtStr
=
0
,
sal_Bool
bIsDrwTxtDlg
=
sal_False
);
virtual
AbstractSwConvertTableDlg
*
CreateSwConvertTableDlg
(
SwView
&
rView
,
int
nResId
,
bool
bToTable
);
//add for SwConvertTableDlg
virtual
AbstractSwConvertTableDlg
*
CreateSwConvertTableDlg
(
SwView
&
rView
,
bool
bToTable
);
//add for SwConvertTableDlg
virtual
VclAbstractDialog
*
CreateSwCaptionDialog
(
Window
*
pParent
,
SwView
&
rV
,
int
nResId
);
//add for SwCaptionDialog
virtual
AbstractSwInsertDBColAutoPilot
*
CreateSwInsertDBColAutoPilot
(
SwView
&
rView
,
// add for SwInsertDBColAutoPilot
...
...
sw/source/ui/inc/app.hrc
Dosyayı görüntüle @
11de6f79
...
...
@@ -85,14 +85,13 @@
#define MN_SUB_ALIGN (RC_APP_BEGIN + 50)
#define STR_WRITER_DOCUMENT_FULLTYPE (RC_APP_BEGIN + 100)
#define STR_CONVERT_TEXT_TABLE (RC_APP_BEGIN + 101)
#define STR_ABSTRACT_TITLE (RC_APP_BEGIN + 102)
#define STR_DONT_ASK_AGAIN (RC_APP_BEGIN + 103)
// --> OD 2008-04-14 #outlinelevel#
#define STR_OUTLINE_NUMBERING (RC_APP_BEGIN + 104)
//#outline level,zhaojianwei
#define STR_FDLG_OUTLINE_LEVEL (RC_APP_BEGIN + 105)
#define STR_FDLG_STYLE (RC_APP_BEGIN + 106)
//<-end,zhaojianwei
#define STR_SYMBOL (RC_APP_BEGIN + 107)
// Status bar strings
#define STR_STATUSBAR_WORDCOUNT_NO_SELECTION (RC_APP_BEGIN + 110)
...
...
sw/source/ui/inc/convert.hxx
Dosyayı görüntüle @
11de6f79
...
...
@@ -42,31 +42,24 @@ struct SwInsertTableOptions;
class
SwConvertTableDlg
:
public
SfxModalDialog
{
RadioButton
aTabBtn
;
RadioButton
aSemiBtn
;
RadioButton
aParaBtn
;
RadioButton
aOtherBtn
;
Edit
aOtherEd
;
CheckBox
aKeepColumn
;
FixedLine
aDelimFL
;
RadioButton
*
mpTabBtn
;
RadioButton
*
mpSemiBtn
;
RadioButton
*
mpParaBtn
;
RadioButton
*
mpOtherBtn
;
Edit
*
mpOtherEd
;
CheckBox
*
mpKeepColumn
;
CheckBox
aHeaderCB
;
CheckBox
aRepeatHeaderCB
;
VclContainer
*
mpOptions
;
FixedText
aRepeatHeaderFT
;
// "dummy" to build before and after FT
FixedText
aRepeatHeaderBeforeFT
;
NumericField
aRepeatHeaderNF
;
FixedText
aRepeatHeaderAfterFT
;
TextControlCombo
aRepeatHeaderCombo
;
CheckBox
*
mpHeaderCB
;
CheckBox
*
mpRepeatHeaderCB
;
FixedLine
aOptionsFL
;
CheckBox
aDontSplitCB
;
CheckBox
aBorderCB
;
PushButton
aAutoFmtBtn
;
VclContainer
*
mpRepeatRows
;
NumericField
*
mpRepeatHeaderNF
;
OKButton
aOkBtn
;
C
ancelButton
aCancelBtn
;
HelpButton
aHelp
Btn
;
CheckBox
*
mpDontSplitCB
;
C
heckBox
*
mpBorderCB
;
PushButton
*
mpAutoFmt
Btn
;
String
sConvertTextTable
;
SwTableAutoFmt
*
pTAutoFmt
;
...
...
sw/source/ui/inc/table.hrc
Dosyayı görüntüle @
11de6f79
...
...
@@ -19,7 +19,7 @@
#include "rcid.hrc"
#define DLG_FORMAT_TABLE (RC_TABLE_BEGIN + 1)
#define DLG_CONV_TEXT_TABLE (RC_TABLE_BEGIN + 2)
#define DLG_ROW_HEIGHT (RC_TABLE_BEGIN + 4)
...
...
sw/source/ui/shells/basesh.cxx
Dosyayı görüntüle @
11de6f79
...
...
@@ -837,8 +837,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
SwAbstractDialogFactory
*
pFact
=
SwAbstractDialogFactory
::
Create
();
OSL_ENSURE
(
pFact
,
"SwAbstractDialogFactory fail!"
);
AbstractSwConvertTableDlg
*
pDlg
=
pFact
->
CreateSwConvertTableDlg
(
GetView
(),
DLG_CONV_TEXT_TABLE
,
bToTable
);
AbstractSwConvertTableDlg
*
pDlg
=
pFact
->
CreateSwConvertTableDlg
(
GetView
(),
bToTable
);
OSL_ENSURE
(
pDlg
,
"Dialogdiet fail!"
);
if
(
RET_OK
==
pDlg
->
Execute
()
)
{
...
...
sw/source/ui/table/convert.cxx
Dosyayı görüntüle @
11de6f79
...
...
@@ -40,8 +40,8 @@
#include "view.hxx"
#include "tblafmt.hxx"
#include "app.hrc"
#include "table.hrc"
#include "convert.hrc"
#include "swabstdlg.hxx"
namespace
swui
...
...
@@ -58,21 +58,21 @@ void SwConvertTableDlg::GetValues( sal_Unicode& rDelim,
SwInsertTableOptions
&
rInsTblOpts
,
SwTableAutoFmt
const
*&
prTAFmt
)
{
if
(
aTabBtn
.
IsChecked
()
)
if
(
mpTabBtn
->
IsChecked
()
)
{
//0x0b mustn't be set when re-converting table into text
bIsKeepColumn
=
!
aKeepColumn
.
IsVisible
()
||
aKeepColumn
.
IsChecked
();
bIsKeepColumn
=
!
mpKeepColumn
->
IsVisible
()
||
mpKeepColumn
->
IsChecked
();
rDelim
=
bIsKeepColumn
?
0x09
:
0x0b
;
nSaveButtonState
=
0
;
}
else
if
(
aSemiBtn
.
IsChecked
()
)
else
if
(
mpSemiBtn
->
IsChecked
()
)
{
rDelim
=
';'
;
nSaveButtonState
=
1
;
}
else
if
(
aOtherBtn
.
IsChecked
()
&&
aOtherEd
.
GetText
().
Len
()
)
else
if
(
mpOtherBtn
->
IsChecked
()
&&
mpOtherEd
->
GetText
().
Len
()
)
{
uOther
=
aOtherEd
.
GetText
().
GetChar
(
0
);
uOther
=
mpOtherEd
->
GetText
().
GetChar
(
0
);
rDelim
=
uOther
;
nSaveButtonState
=
3
;
}
...
...
@@ -80,7 +80,7 @@ void SwConvertTableDlg::GetValues( sal_Unicode& rDelim,
{
nSaveButtonState
=
2
;
rDelim
=
cParaDelim
;
if
(
aOtherBtn
.
IsChecked
())
if
(
mpOtherBtn
->
IsChecked
())
{
nSaveButtonState
=
3
;
uOther
=
0
;
...
...
@@ -89,15 +89,15 @@ void SwConvertTableDlg::GetValues( sal_Unicode& rDelim,
sal_uInt16
nInsMode
=
0
;
if
(
aBorderCB
.
IsChecked
())
if
(
mpBorderCB
->
IsChecked
())
nInsMode
|=
tabopts
::
DEFAULT_BORDER
;
if
(
aHeaderCB
.
IsChecked
())
if
(
mpHeaderCB
->
IsChecked
())
nInsMode
|=
tabopts
::
HEADLINE
;
if
(
aRepeatHeaderCB
.
IsEnabled
()
&&
aRepeatHeaderCB
.
IsChecked
())
rInsTblOpts
.
mnRowsToRepeat
=
sal_uInt16
(
aRepeatHeaderNF
.
GetValue
()
);
if
(
mpRepeatHeaderCB
->
IsEnabled
()
&&
mpRepeatHeaderCB
->
IsChecked
())
rInsTblOpts
.
mnRowsToRepeat
=
sal_uInt16
(
mpRepeatHeaderNF
->
GetValue
()
);
else
rInsTblOpts
.
mnRowsToRepeat
=
0
;
if
(
!
aDontSplitCB
.
IsChecked
())
if
(
!
mpDontSplitCB
->
IsChecked
())
nInsMode
|=
tabopts
::
SPLIT_LAYOUT
;
if
(
pTAutoFmt
)
...
...
@@ -108,60 +108,43 @@ void SwConvertTableDlg::GetValues( sal_Unicode& rDelim,
SwConvertTableDlg
::
SwConvertTableDlg
(
SwView
&
rView
,
bool
bToTable
)
:
SfxModalDialog
(
&
rView
.
GetViewFrame
()
->
GetWindow
(),
SW_RES
(
DLG_CONV_TEXT_TABLE
)),
#ifdef MSC
#pragma warning (disable : 4355)
#endif
aTabBtn
(
this
,
SW_RES
(
CB_TAB
)),
aSemiBtn
(
this
,
SW_RES
(
CB_SEMI
)),
aParaBtn
(
this
,
SW_RES
(
CB_PARA
)),
aOtherBtn
(
this
,
SW_RES
(
RB_OTHER
)),
aOtherEd
(
this
,
SW_RES
(
ED_OTHER
)),
aKeepColumn
(
this
,
SW_RES
(
CB_KEEPCOLUMN
)),
aDelimFL
(
this
,
SW_RES
(
FL_DELIM
)),
aHeaderCB
(
this
,
SW_RES
(
CB_HEADER
)),
aRepeatHeaderCB
(
this
,
SW_RES
(
CB_REPEAT_HEADER
)),
aRepeatHeaderFT
(
this
,
SW_RES
(
FT_REPEAT_HEADER
)),
aRepeatHeaderBeforeFT
(
this
),
aRepeatHeaderNF
(
this
,
SW_RES
(
NF_REPEAT_HEADER
)),
aRepeatHeaderAfterFT
(
this
),
aRepeatHeaderCombo
(
this
,
SW_RES
(
WIN_REPEAT_HEADER
),
aRepeatHeaderNF
,
aRepeatHeaderBeforeFT
,
aRepeatHeaderAfterFT
),
aOptionsFL
(
this
,
SW_RES
(
FL_OPTIONS
)),
aDontSplitCB
(
this
,
SW_RES
(
CB_DONT_SPLIT
)),
aBorderCB
(
this
,
SW_RES
(
CB_BORDER
)),
aAutoFmtBtn
(
this
,
SW_RES
(
BT_AUTOFORMAT
)),
aOkBtn
(
this
,
SW_RES
(
BT_OK
)),
aCancelBtn
(
this
,
SW_RES
(
BT_CANCEL
)),
aHelpBtn
(
this
,
SW_RES
(
BT_HELP
)),
#ifdef MSC
#pragma warning (default : 4355)
#endif
sConvertTextTable
(
SW_RES
(
STR_CONVERT_TEXT_TABLE
)),
pTAutoFmt
(
0
),
pShell
(
&
rView
.
GetWrtShell
()
)
:
SfxModalDialog
(
&
rView
.
GetViewFrame
()
->
GetWindow
(),
"ConvertTextTableDialog"
,
"modules/swriter/ui/converttexttable.ui"
)
,
sConvertTextTable
(
SW_RES
(
STR_CONVERT_TEXT_TABLE
))
,
pTAutoFmt
(
0
)
,
pShell
(
&
rView
.
GetWrtShell
())
{
aOtherEd
.
SetAccessibleName
(
String
(
SW_RES
(
STR_SYMBOL
)));
aOtherEd
.
SetAccessibleRelationLabeledBy
(
&
aOtherBtn
);
FreeResource
();
get
(
mpTabBtn
,
"tabs"
);
get
(
mpSemiBtn
,
"semicolons"
);
get
(
mpParaBtn
,
"paragraph"
);
get
(
mpOtherBtn
,
"other"
);
get
(
mpOtherEd
,
"othered"
);
get
(
mpKeepColumn
,
"keepcolumn"
);
get
(
mpOptions
,
"options"
);
get
(
mpHeaderCB
,
"headingcb"
);
get
(
mpRepeatHeaderCB
,
"repeatheading"
);
get
(
mpRepeatRows
,
"repeatrows"
);
get
(
mpRepeatHeaderNF
,
"repeatheadersb"
);
get
(
mpDontSplitCB
,
"dontsplitcb"
);
get
(
mpBorderCB
,
"bordercb"
);
get
(
mpAutoFmtBtn
,
"autofmt"
);
mpOtherEd
->
SetAccessibleName
(
String
(
SW_RES
(
STR_SYMBOL
)));
mpOtherEd
->
SetAccessibleRelationLabeledBy
(
mpOtherBtn
);
if
(
nSaveButtonState
>
-
1
)
{
switch
(
nSaveButtonState
)
{
case
0
:
aTabBtn
.
Check
();
aKeepColumn
.
Check
(
bIsKeepColumn
);
mpTabBtn
->
Check
();
mpKeepColumn
->
Check
(
bIsKeepColumn
);
break
;
case
1
:
aSemiBtn
.
Check
();
break
;
case
2
:
aParaBtn
.
Check
();
break
;
case
1
:
mpSemiBtn
->
Check
();
break
;
case
2
:
mpParaBtn
->
Check
();
break
;
case
3
:
aOtherBtn
.
Check
();
mpOtherBtn
->
Check
();
if
(
uOther
)
aOtherEd
.
SetText
(
rtl
::
OUString
(
uOther
));
mpOtherEd
->
SetText
(
rtl
::
OUString
(
uOther
));
break
;
}
...
...
@@ -169,35 +152,24 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable )
if
(
bToTable
)
{
SetText
(
sConvertTextTable
);
aAutoFmtBtn
.
SetClickHdl
(
LINK
(
this
,
SwConvertTableDlg
,
AutoFmtHdl
));
aAutoFmtBtn
.
Show
();
aKeepColumn
.
Show
();
aKeepColumn
.
Enable
(
aTabBtn
.
IsChecked
()
);
aRepeatHeaderCombo
.
Arrange
(
aRepeatHeaderFT
);
mpAutoFmtBtn
->
SetClickHdl
(
LINK
(
this
,
SwConvertTableDlg
,
AutoFmtHdl
));
mpAutoFmtBtn
->
Show
();
mpKeepColumn
->
Show
();
mpKeepColumn
->
Enable
(
mpTabBtn
->
IsChecked
()
);
}
else
{
//Einfuege-Optionen verstecken
aHeaderCB
.
Show
(
sal_False
);
aRepeatHeaderCB
.
Show
(
sal_False
);
aDontSplitCB
.
Show
(
sal_False
);
aBorderCB
.
Show
(
sal_False
);
aOptionsFL
.
Show
(
sal_False
);
aRepeatHeaderCombo
.
Show
(
sal_False
);
//Groesse anpassen
Size
aSize
(
GetSizePixel
());
aSize
.
Height
()
=
8
+
aHelpBtn
.
GetSizePixel
().
Height
()
+
aHelpBtn
.
GetPosPixel
().
Y
();
SetOutputSizePixel
(
aSize
);
mpOptions
->
Hide
();
}
aKeepColumn
.
SaveValue
();
mpKeepColumn
->
SaveValue
();
Link
aLk
(
LINK
(
this
,
SwConvertTableDlg
,
BtnHdl
)
);
aTabBtn
.
SetClickHdl
(
aLk
);
aSemiBtn
.
SetClickHdl
(
aLk
);
aParaBtn
.
SetClickHdl
(
aLk
);
aOtherBtn
.
SetClickHdl
(
aLk
);
aOtherEd
.
Enable
(
aOtherBtn
.
IsChecked
()
);
mpTabBtn
->
SetClickHdl
(
aLk
);
mpSemiBtn
->
SetClickHdl
(
aLk
);
mpParaBtn
->
SetClickHdl
(
aLk
);
mpOtherBtn
->
SetClickHdl
(
aLk
);
mpOtherEd
->
Enable
(
mpOtherBtn
->
IsChecked
()
);
const
SwModuleOptions
*
pModOpt
=
SW_MOD
()
->
GetModuleConfig
();
...
...
@@ -206,13 +178,13 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable )
SwInsertTableOptions
aInsOpts
=
pModOpt
->
GetInsTblFlags
(
bHTMLMode
);
sal_uInt16
nInsTblFlags
=
aInsOpts
.
mnInsMode
;
aHeaderCB
.
Check
(
0
!=
(
nInsTblFlags
&
tabopts
::
HEADLINE
)
);
aRepeatHeaderCB
.
Check
(
aInsOpts
.
mnRowsToRepeat
>
0
);
aDontSplitCB
.
Check
(
0
==
(
nInsTblFlags
&
tabopts
::
SPLIT_LAYOUT
));
aBorderCB
.
Check
(
0
!=
(
nInsTblFlags
&
tabopts
::
DEFAULT_BORDER
)
);
mpHeaderCB
->
Check
(
0
!=
(
nInsTblFlags
&
tabopts
::
HEADLINE
)
);
mpRepeatHeaderCB
->
Check
(
aInsOpts
.
mnRowsToRepeat
>
0
);
mpDontSplitCB
->
Check
(
0
==
(
nInsTblFlags
&
tabopts
::
SPLIT_LAYOUT
));
mpBorderCB
->
Check
(
0
!=
(
nInsTblFlags
&
tabopts
::
DEFAULT_BORDER
)
);
aHeaderCB
.
SetClickHdl
(
LINK
(
this
,
SwConvertTableDlg
,
CheckBoxHdl
));
aRepeatHeaderCB
.
SetClickHdl
(
LINK
(
this
,
SwConvertTableDlg
,
ReapeatHeaderCheckBoxHdl
));
mpHeaderCB
->
SetClickHdl
(
LINK
(
this
,
SwConvertTableDlg
,
CheckBoxHdl
));
mpRepeatHeaderCB
->
SetClickHdl
(
LINK
(
this
,
SwConvertTableDlg
,
ReapeatHeaderCheckBoxHdl
));
ReapeatHeaderCheckBoxHdl
();
CheckBoxHdl
();
}
...
...
@@ -237,22 +209,22 @@ IMPL_LINK( SwConvertTableDlg, AutoFmtHdl, PushButton*, pButton )
IMPL_LINK
(
SwConvertTableDlg
,
BtnHdl
,
Button
*
,
pButton
)
{
if
(
pButton
==
&
a
TabBtn
)
aKeepColumn
.
SetState
(
aKeepColumn
.
GetSavedValue
()
);
if
(
pButton
==
mp
TabBtn
)
mpKeepColumn
->
SetState
(
mpKeepColumn
->
GetSavedValue
()
);
else
{
if
(
aKeepColumn
.
IsEnabled
()
)
aKeepColumn
.
SaveValue
();
aKeepColumn
.
Check
(
sal_True
);
if
(
mpKeepColumn
->
IsEnabled
()
)
mpKeepColumn
->
SaveValue
();
mpKeepColumn
->
Check
(
sal_True
);
}
aKeepColumn
.
Enable
(
aTabBtn
.
IsChecked
()
);
aOtherEd
.
Enable
(
aOtherBtn
.
IsChecked
()
);
mpKeepColumn
->
Enable
(
mpTabBtn
->
IsChecked
()
);
mpOtherEd
->
Enable
(
mpOtherBtn
->
IsChecked
()
);
return
0
;
}
IMPL_LINK_NOARG
(
SwConvertTableDlg
,
CheckBoxHdl
)
{
aRepeatHeaderCB
.
Enable
(
aHeaderCB
.
IsChecked
());
mpRepeatHeaderCB
->
Enable
(
mpHeaderCB
->
IsChecked
());
ReapeatHeaderCheckBoxHdl
();
return
0
;
...
...
@@ -260,11 +232,8 @@ IMPL_LINK_NOARG(SwConvertTableDlg, CheckBoxHdl)
IMPL_LINK_NOARG
(
SwConvertTableDlg
,
ReapeatHeaderCheckBoxHdl
)
{
sal_Bool
bEnable
=
aHeaderCB
.
IsChecked
()
&&
aRepeatHeaderCB
.
IsChecked
();
aRepeatHeaderBeforeFT
.
Enable
(
bEnable
);
aRepeatHeaderAfterFT
.
Enable
(
bEnable
);
aRepeatHeaderNF
.
Enable
(
bEnable
);
bool
bEnable
=
mpHeaderCB
->
IsChecked
()
&&
mpRepeatHeaderCB
->
IsChecked
();
mpRepeatRows
->
Enable
(
bEnable
);
return
0
;
}
...
...
sw/source/ui/table/convert.hrc
deleted
100644 → 0
Dosyayı görüntüle @
ae6e2448
/*
* 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 CB_TAB 1
#define CB_SEMI 3
#define CB_PARA 4
#define FL_DELIM 5
#define RB_OTHER 6
#define ED_OTHER 7
#define CB_KEEPCOLUMN 8
#define STR_CONVERT_TEXT_TABLE 9
#define CB_HEADER 13
#define CB_REPEAT_HEADER 14
#define CB_DONT_SPLIT 15
#define CB_BORDER 16
#define FL_OPTIONS 17
#define FT_REPEAT_HEADER 18
#define NF_REPEAT_HEADER 19
#define BT_OK 100
#define BT_CANCEL 101
#define BT_AUTOFORMAT 102
#define BT_HELP 103
#define WIN_REPEAT_HEADER 104
#define STR_SYMBOL 105
sw/source/ui/table/convert.src
deleted
100644 → 0
Dosyayı görüntüle @
ae6e2448
/*
* 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 .
*/
#include "table.hrc"
#include "convert.hrc"
#include "cmdid.h"
#include "helpid.h"
ModalDialog DLG_CONV_TEXT_TABLE
{
HelpID = CMD_FN_CONVERT_TEXT_TABLE ;
OUTPUTSIZE = TRUE ;
Size = MAP_APPFONT ( 203 , 169 ) ;
Text [ en-US ] = "Convert Table to Text" ;
MOVEABLE = TRUE ;
SVLOOK = TRUE ;
RadioButton CB_TAB
{
HelpID = "sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_TAB";
Pos = MAP_APPFONT ( 12 , 17 ) ;
Size = MAP_APPFONT ( 60 , 10 ) ;
Text [ en-US ] = "~Tabs" ;
TABSTOP = TRUE ;
Group = TRUE ;
Check = TRUE ;
};
RadioButton CB_SEMI
{
HelpID = "sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_SEMI";
Pos = MAP_APPFONT ( 75 , 17 ) ;
Size = MAP_APPFONT ( 60 , 10 ) ;
Text [ en-US ] = "~Semicolons" ;
TABSTOP = TRUE ;
};
RadioButton CB_PARA
{
HelpID = "sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_PARA";
Pos = MAP_APPFONT ( 12 , 33 ) ;
Size = MAP_APPFONT ( 60 , 10 ) ;
Text [ en-US ] = "~Paragraph" ;
TABSTOP = TRUE ;
};
RadioButton RB_OTHER
{
HelpID = "sw:RadioButton:DLG_CONV_TEXT_TABLE:RB_OTHER";
Pos = MAP_APPFONT ( 75 , 33 ) ;
Size = MAP_APPFONT ( 45 , 10 ) ;
Text [ en-US ] = "~Other: " ;
};
Edit ED_OTHER
{
HelpID = "sw:Edit:DLG_CONV_TEXT_TABLE:ED_OTHER";
Border = TRUE ;
Left = TRUE ;
Pos = MAP_APPFONT ( 123 , 32 ) ;
Size = MAP_APPFONT ( 9 , 12 ) ;
Text = "," ;
MaxTextLength = 1 ;
};
CheckBox CB_KEEPCOLUMN
{
HelpID = "sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_KEEPCOLUMN";
Pos = MAP_APPFONT ( 12 , 49 ) ;
Size = MAP_APPFONT ( 128 , 10 ) ;
Check = TRUE;
Hide = TRUE ;
Text [ en-US ] = "Equal width for all columns" ;
};
FixedLine FL_DELIM
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 135 , 8 ) ;
Text [ en-US ] = "Separate text at" ;
Group = TRUE ;
};
CheckBox CB_HEADER
{
HelpID = "sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_HEADER";
Pos = MAP_APPFONT ( 12 , 84 ) ;
Size = MAP_APPFONT ( 123 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Heading";
};
CheckBox CB_REPEAT_HEADER
{
HelpID = "sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_REPEAT_HEADER";
Pos = MAP_APPFONT ( 22 , 97 ) ;
Size = MAP_APPFONT ( 113 , 10 ) ;
Text [ en-US ] = "Repeat heading";
TabStop = TRUE ;
};
FixedText FT_REPEAT_HEADER
{
Pos = MAP_APPFONT ( 125 , 113 ) ;
Size = MAP_APPFONT ( 66 , 10 ) ;
Text [ en-US ] = "The first %POSITION_OF_CONTROL rows" ;
};
NumericField NF_REPEAT_HEADER
{
HelpID = "sw:NumericField:DLG_CONV_TEXT_TABLE:NF_REPEAT_HEADER";
Border = TRUE ;
Pos = MAP_APPFONT ( 191 , 112 ) ;
Size = MAP_APPFONT ( 28 , 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Minimum = 1 ;
Maximum = 1000 ;
First = 1 ;
};
Window WIN_REPEAT_HEADER
{
Pos = MAP_APPFONT ( 30 , 110 ) ;
Size = MAP_APPFONT ( 2 , 1 ) ;
};
CheckBox CB_DONT_SPLIT
{
HelpID = "sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_DONT_SPLIT";
Pos = MAP_APPFONT ( 12 , 126 ) ;
Size = MAP_APPFONT ( 123 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Don't split table";
};
CheckBox CB_BORDER
{
HelpID = "sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_BORDER";
Pos = MAP_APPFONT ( 12 , 139 ) ;
Size = MAP_APPFONT ( 123 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Border";
};
FixedLine FL_OPTIONS
{
Pos = MAP_APPFONT ( 6 , 71 ) ;
Size = MAP_APPFONT ( 135 , 8 ) ;
Text [ en-US ] = "Options";
};
String STR_CONVERT_TEXT_TABLE
{
Text [ en-US ] = "Convert Text to Table" ;
};
OkButton BT_OK
{
Pos = MAP_APPFONT ( 147 , 6 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TABSTOP = TRUE ;
DefButton = TRUE ;
};
CancelButton BT_CANCEL
{
Pos = MAP_APPFONT ( 147 , 23 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TABSTOP = TRUE ;
};
HelpButton BT_HELP
{
Pos = MAP_APPFONT ( 147 , 43 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TABSTOP = TRUE ;
};
PushButton BT_AUTOFORMAT
{
HelpID = "sw:PushButton:DLG_CONV_TEXT_TABLE:BT_AUTOFORMAT";
Pos = MAP_APPFONT ( 12 , 152 ) ;
Size = MAP_APPFONT ( 86 , 14 ) ;
TabStop = TRUE ;
Hide = TRUE ;
Text [ en-US ] = "Auto~Format..." ;
};
String STR_SYMBOL
{
Text [ en-US ] = "Symbol" ;
};
};
sw/uiconfig/swriter/ui/converttexttable.ui
Dosyayı görüntüle @
11de6f79
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object
class=
"GtkAdjustment"
id=
"adjustment1"
>
<property
name=
"lower"
>
1
</property>
<property
name=
"upper"
>
1000
</property>
<property
name=
"value"
>
1
</property>
<property
name=
"step_increment"
>
1
</property>
<property
name=
"page_increment"
>
10
</property>
</object>
<object
class=
"GtkDialog"
id=
"ConvertTextTableDialog"
>
<property
name=
"can_focus"
>
False
</property>
<property
name=
"border_width"
>
5
</property>
...
...
@@ -99,31 +106,24 @@
<property
name=
"row_spacing"
>
18
</property>
<property
name=
"column_spacing"
>
10
</property>
<child>
<object
class=
"GtkRadioButton"
id=
"tabs"
>
<property
name=
"label"
translatable=
"yes"
>
Tabs
</property>
<property
name=
"use_action_appearance"
>
False
</property>
<object
class=
"GtkEntry"
id=
"othered"
>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
True
</property>
<property
name=
"receives_default"
>
False
</property>
<property
name=
"halign"
>
start
</property>
<property
name=
"valign"
>
end
</property>
<property
name=
"use_action_appearance"
>
False
</property>
<property
name=
"relief"
>
half
</property>
<property
name=
"xalign"
>
0
</property>
<property
name=
"active"
>
True
</property>
<property
name=
"draw_indicator"
>
True
</property>
<property
name=
"group"
>
semicolons
</property>
<property
name=
"invisible_char"
>
●
</property>
<property
name=
"width_chars"
>
1
</property>
<property
name=
"text"
translatable=
"yes"
>
,
</property>
<property
name=
"invisible_char_set"
>
True
</property>
</object>
<packing>
<property
name=
"left_attach"
>
0
</property>
<property
name=
"top_attach"
>
0
</property>
<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=
"GtkRadioButton"
id=
"
semicolons
"
>
<property
name=
"label"
translatable=
"yes"
>
Paragraph
</property>
<object
class=
"GtkRadioButton"
id=
"
other
"
>
<property
name=
"label"
translatable=
"yes"
>
Other:
</property>
<property
name=
"use_action_appearance"
>
False
</property>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
True
</property>
...
...
@@ -132,17 +132,17 @@
<property
name=
"use_action_appearance"
>
False
</property>
<property
name=
"xalign"
>
0
</property>
<property
name=
"draw_indicator"
>
True
</property>
<property
name=
"group"
>
paragraph
</property>
<property
name=
"group"
>
tabs
</property>
</object>
<packing>
<property
name=
"left_attach"
>
0
</property>
<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=
"GtkRadioButton"
id=
"
paragraph
"
>
<object
class=
"GtkRadioButton"
id=
"
semicolons
"
>
<property
name=
"label"
translatable=
"yes"
>
Semicolons
</property>
<property
name=
"use_action_appearance"
>
False
</property>
<property
name=
"visible"
>
True
</property>
...
...
@@ -162,8 +162,8 @@
</packing>
</child>
<child>
<object
class=
"GtkRadioButton"
id=
"
other
"
>
<property
name=
"label"
translatable=
"yes"
>
Other:
</property>
<object
class=
"GtkRadioButton"
id=
"
paragraph
"
>
<property
name=
"label"
translatable=
"yes"
>
Paragraph
</property>
<property
name=
"use_action_appearance"
>
False
</property>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
True
</property>
...
...
@@ -172,26 +172,34 @@
<property
name=
"use_action_appearance"
>
False
</property>
<property
name=
"xalign"
>
0
</property>
<property
name=
"draw_indicator"
>
True
</property>
<property
name=
"group"
>
tab
s
</property>
<property
name=
"group"
>
semicolon
s
</property>
</object>
<packing>
<property
name=
"left_attach"
>
1
</property>
<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=
"GtkEntry"
id=
"othered"
>
<object
class=
"GtkRadioButton"
id=
"tabs"
>
<property
name=
"label"
translatable=
"yes"
>
Tabs
</property>
<property
name=
"use_action_appearance"
>
False
</property>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
True
</property>
<property
name=
"invisible_char"
>
●
</property>
<property
name=
"width_chars"
>
1
</property>
<property
name=
"invisible_char_set"
>
True
</property>
<property
name=
"receives_default"
>
False
</property>
<property
name=
"halign"
>
start
</property>
<property
name=
"valign"
>
end
</property>
<property
name=
"use_action_appearance"
>
False
</property>
<property
name=
"relief"
>
half
</property>
<property
name=
"xalign"
>
0
</property>
<property
name=
"active"
>
True
</property>
<property
name=
"draw_indicator"
>
True
</property>
<property
name=
"group"
>
paragraph
</property>
</object>
<packing>
<property
name=
"left_attach"
>
2
</property>
<property
name=
"top_attach"
>
1
</property>
<property
name=
"left_attach"
>
0
</property>
<property
name=
"top_attach"
>
0
</property>
<property
name=
"width"
>
1
</property>
<property
name=
"height"
>
1
</property>
</packing>
...
...
@@ -219,7 +227,7 @@
</object>
</child>
<child
type=
"label"
>
<object
class=
"GtkLabel"
id=
"1"
>
<object
class=
"GtkLabel"
id=
"
label
1"
>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
False
</property>
<property
name=
"label"
translatable=
"yes"
>
Separate text at
</property>
...
...
@@ -365,6 +373,7 @@
<property
name=
"shadow_type"
>
out
</property>
<property
name=
"invisible_char_set"
>
True
</property>
<property
name=
"progress_pulse_step"
>
1
</property>
<property
name=
"adjustment"
>
adjustment1
</property>
<property
name=
"update_policy"
>
if-valid
</property>
</object>
<packing>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment