Skip to content

C
core
Kaydet (Commit) f3988518 authored tarafından Csikós Tamás's avatar Csikós Tamás Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

modern .ui widgetlayout for optpage 

Change-Id: I257f4c5878caabd5394bb2641ebf6d82a833e5f1
Reviewed-on: https://gerrit.libreoffice.org/4756Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 48d696e2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 310 deletions
sw/UIConfig_swriter.mk
Dosyayı görüntüle @ f3988518
...@@ -103,6 +103,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ ...@@ -103,6 +103,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/optcomparison \ sw/uiconfig/swriter/ui/optcomparison \
sw/uiconfig/swriter/ui/optformataidspage \ sw/uiconfig/swriter/ui/optformataidspage \
sw/uiconfig/swriter/ui/optgeneralpage \ sw/uiconfig/swriter/ui/optgeneralpage \
sw/uiconfig/swriter/ui/opttablepage \
sw/uiconfig/swriter/ui/opttestpage \ sw/uiconfig/swriter/ui/opttestpage \
sw/uiconfig/swriter/ui/outlinenumbering \ sw/uiconfig/swriter/ui/outlinenumbering \
sw/uiconfig/swriter/ui/outlinenumberingpage \ sw/uiconfig/swriter/ui/outlinenumberingpage \
......
sw/inc/globals.hrc
Dosyayı görüntüle @ f3988518
...@@ -168,7 +168,6 @@ ...@@ -168,7 +168,6 @@
#define TP_FRM_ADD (RC_GLOBALS_BEGIN + 51) #define TP_FRM_ADD (RC_GLOBALS_BEGIN + 51)
#define TP_PARA_ALIGN (RC_GLOBALS_BEGIN + 55) #define TP_PARA_ALIGN (RC_GLOBALS_BEGIN + 55)
#define TP_OPTTABLE_PAGE (RC_GLOBALS_BEGIN + 56)
#define TP_NUMBER (RC_GLOBALS_BEGIN + 57) #define TP_NUMBER (RC_GLOBALS_BEGIN + 57)
......
sw/source/ui/config/optdlg.hrc
Dosyayı görüntüle @ f3988518
...@@ -73,37 +73,4 @@ ...@@ -73,37 +73,4 @@
#define LB_LABEL_SIZE 111 #define LB_LABEL_SIZE 111
#define LB_INDEX_SIZE 112 #define LB_INDEX_SIZE 112
//Tabpage Table
#define CB_HEADER 101
#define CB_REPEAT_HEADER 102
#define CB_DONT_SPLIT 103
#define CB_BORDER 104
#define CB_NUMFORMATTING 105
#define CB_NUMALIGNMENT 106
#define FL_TABLE 107
#define FL_TABLE_INSERT 108
#define CB_NUMFMT_FORMATTING 109
#define FL_MOVE 110
#define FT_ROWMOVE 111
#define MF_ROWMOVE 112
#define FT_COLMOVE 113
#define MF_COLMOVE 114
#define FT_INSERT 115
#define FT_ROWINSERT 116
#define MF_ROWINSERT 117
#define FT_COLINSERT 118
#define MF_COLINSERT 119
#define FT_HANDLING 120
#define RB_FIX 121
#define RB_FIXPROP 122
#define RB_VAR 123
#define FT_FIX 124
#define FT_FIXPROP 125
#define FT_VAR 126
#define FT_MOVE 128
#define FT_COMMENT 133
#define FL_TABLE_SEPARATOR 139
#define CB_PROSPECT_RTL 140
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/source/ui/config/optdlg.src
Dosyayı görüntüle @ f3988518
...@@ -195,245 +195,6 @@ TabPage TP_STD_FONT ...@@ -195,245 +195,6 @@ TabPage TP_STD_FONT
}; };
}; };
TabPage TP_OPTTABLE_PAGE
{
HelpID = HID_OPTTABLE_PAGE ;
Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_TABLE
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 113 , 8 ) ;
Text [ en-US ] = "Default";
};
CheckBox CB_HEADER
{
HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_HEADER";
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 107 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "H~eading";
};
CheckBox CB_REPEAT_HEADER
{
HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_REPEAT_HEADER";
Pos = MAP_APPFONT ( 21 , 27 ) ;
Size = MAP_APPFONT ( 99 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Re~peat on each page";
};
CheckBox CB_DONT_SPLIT
{
HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_DONT_SPLIT";
Pos = MAP_APPFONT ( 12 , 40 ) ;
Size = MAP_APPFONT ( 107 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Do not split";
};
CheckBox CB_BORDER
{
HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_BORDER";
Pos = MAP_APPFONT ( 12 , 53 ) ;
Size = MAP_APPFONT ( 107 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "B~order";
};
FixedLine FL_TABLE_SEPARATOR
{
Pos = MAP_APPFONT ( 120 , 14 ) ;
Size = MAP_APPFONT ( 4 , 52 ) ;
Vert = TRUE;
};
FixedLine FL_TABLE_INSERT
{
Pos = MAP_APPFONT ( 125 , 3 ) ;
Size = MAP_APPFONT ( 129 , 8 ) ;
Text [ en-US ] = "Input in tables";
};
CheckBox CB_NUMFORMATTING
{
HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMFORMATTING";
Pos = MAP_APPFONT ( 131 , 14 ) ;
Size = MAP_APPFONT ( 118 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Number recognition";
};
CheckBox CB_NUMFMT_FORMATTING
{
HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMFMT_FORMATTING";
Pos = MAP_APPFONT ( 140 , 27 ) ;
Size = MAP_APPFONT ( 114 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Number format recognition";
};
CheckBox CB_NUMALIGNMENT
{
HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMALIGNMENT";
Pos = MAP_APPFONT ( 140 , 40 ) ;
Size = MAP_APPFONT ( 114 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Alignment";
};
FixedLine FL_MOVE
{
Pos = MAP_APPFONT ( 6 , 69 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text [ en-US ] = "Keyboard handling";
};
FixedText FT_MOVE
{
Pos = MAP_APPFONT ( 12 , 80) ;
Size = MAP_APPFONT ( 100 , 8 ) ;
Text [ en-US ] = "Move cells";
};
FixedText FT_ROWMOVE
{
Pos = MAP_APPFONT ( 21 , 93 ) ;
Size = MAP_APPFONT ( 51 , 8 ) ;
Text [ en-US ] = "~Row" ;
};
MetricField MF_ROWMOVE
{
HelpID = "sw:MetricField:TP_OPTTABLE_PAGE:MF_ROWMOVE";
Border = TRUE ;
Pos = MAP_APPFONT ( 83 , 91 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
Left = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_CM ;
SpinSize = 10 ;
Minimum = 25 ;
Maximum = 999 ;
First = 25 ;
Last = 2000 ;
};
FixedText FT_COLMOVE
{
Pos = MAP_APPFONT ( 21 , 108 ) ;
Size = MAP_APPFONT ( 51 , 8 ) ;
Text [ en-US ] = "~Column" ;
};
MetricField MF_COLMOVE
{
HelpID = "sw:MetricField:TP_OPTTABLE_PAGE:MF_COLMOVE";
Border = TRUE ;
Pos = MAP_APPFONT ( 83 , 106 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
Left = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_CM ;
SpinSize = 10 ;
Minimum = 25 ;
Maximum = 999 ;
First = 25 ;
Last = 2000 ;
};
FixedText FT_INSERT
{
Pos = MAP_APPFONT ( 136 , 80 ) ;
Size = MAP_APPFONT ( 110 , 8 ) ;
Text [ en-US ] = "Insert cell";
};
FixedText FT_ROWINSERT
{
Pos = MAP_APPFONT ( 145 , 93 ) ;
Size = MAP_APPFONT ( 51 , 8 ) ;
Text [ en-US ] = "Ro~w" ;
};
MetricField MF_ROWINSERT
{
HelpID = "sw:MetricField:TP_OPTTABLE_PAGE:MF_ROWINSERT";
Border = TRUE ;
Pos = MAP_APPFONT ( 211 , 91 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
Left = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_CM ;
SpinSize = 10 ;
Minimum = 25 ;
Maximum = 999 ;
First = 25 ;
Last = 2000 ;
};
FixedText FT_COLINSERT
{
Pos = MAP_APPFONT ( 145 , 108 ) ;
Size = MAP_APPFONT ( 51 , 10 ) ;
Text [ en-US ] = "Colu~mn" ;
};
MetricField MF_COLINSERT
{
HelpID = "sw:MetricField:TP_OPTTABLE_PAGE:MF_COLINSERT";
Border = TRUE ;
Pos = MAP_APPFONT ( 211 , 106 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
Left = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_CM ;
SpinSize = 10 ;
Minimum = 25 ;
Maximum = 999 ;
First = 25 ;
Last = 2000 ;
};
FixedText FT_HANDLING
{
Pos = MAP_APPFONT ( 12 , 122 ) ;
Size = MAP_APPFONT ( 230 , 8 ) ;
Text [ en-US ] = "Behavior of rows/columns";
};
RadioButton RB_FIX
{
HelpID = "sw:RadioButton:TP_OPTTABLE_PAGE:RB_FIX";
Pos = MAP_APPFONT ( 21 , 133 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
Text [ en-US ] = "~Fixed" ;
};
FixedText FT_FIX
{
Pos = MAP_APPFONT ( 93 , 133 ) ;
Size = MAP_APPFONT ( 155 , 16 ) ;
WordBreak = TRUE ;
Text [ en-US ] = "Changes affect the adjacent area only";
};
RadioButton RB_FIXPROP
{
HelpID = "sw:RadioButton:TP_OPTTABLE_PAGE:RB_FIXPROP";
Pos = MAP_APPFONT ( 21 , 151 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
Text [ en-US ] = "Fi~xed, proportional" ;
};
FixedText FT_FIXPROP
{
Pos = MAP_APPFONT ( 93 , 151 ) ;
Size = MAP_APPFONT ( 155 , 16 ) ;
WordBreak = TRUE ;
Text [ en-US ] = "Changes affect the entire table";
};
RadioButton RB_VAR
{
HelpID = "sw:RadioButton:TP_OPTTABLE_PAGE:RB_VAR";
Pos = MAP_APPFONT ( 21 , 169 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
Text [ en-US ] = "~Variable" ;
};
FixedText FT_VAR
{
Pos = MAP_APPFONT ( 93 , 169 ) ;
Size = MAP_APPFONT ( 155 , 16 ) ;
WordBreak = TRUE ;
Text [ en-US ] = "Changes affect the table size";
};
};
StringArray STR_PRINTOPTUI StringArray STR_PRINTOPTUI
{ {
ItemList [en-US] = ItemList [en-US] =
......
sw/source/ui/config/optpage.cxx
Dosyayı görüntüle @ f3988518
This diff is collapsed.
sw/source/ui/dialog/swdlgfact.cxx
Dosyayı görüntüle @ f3988518
...@@ -1321,7 +1321,6 @@ CreateTabPage SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nI ...@@ -1321,7 +1321,6 @@ CreateTabPage SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nI
case RID_SW_TP_STD_FONT_CTL: case RID_SW_TP_STD_FONT_CTL:
pRet = SwStdFontTabPage::Create; pRet = SwStdFontTabPage::Create;
break; break;
case TP_OPTTABLE_PAGE :
case RID_SW_TP_HTML_OPTTABLE_PAGE: case RID_SW_TP_HTML_OPTTABLE_PAGE:
case RID_SW_TP_OPTTABLE_PAGE: case RID_SW_TP_OPTTABLE_PAGE:
pRet = SwTableOptionsTabPage::Create; pRet = SwTableOptionsTabPage::Create;
......
sw/source/ui/inc/optpage.hxx
Dosyayı görüntüle @ f3988518
...@@ -221,39 +221,24 @@ public: ...@@ -221,39 +221,24 @@ public:
class SwTableOptionsTabPage : public SfxTabPage class SwTableOptionsTabPage : public SfxTabPage
{ {
FixedLine aTableFL; CheckBox* pHeaderCB;
CheckBox aHeaderCB; CheckBox* pRepeatHeaderCB;
CheckBox aRepeatHeaderCB; CheckBox* pDontSplitCB;
CheckBox aDontSplitCB; CheckBox* pBorderCB;
CheckBox aBorderCB;
CheckBox* pNumFormattingCB;
FixedLine aSeparatorFL; CheckBox* pNumFmtFormattingCB;
CheckBox* pNumAlignmentCB;
FixedLine aTableInsertFL;
CheckBox aNumFormattingCB; MetricField* pRowMoveMF;
CheckBox aNumFmtFormattingCB; MetricField* pColMoveMF;
CheckBox aNumAlignmentCB;
MetricField* pRowInsertMF;
FixedLine aMoveFL; MetricField* pColInsertMF;
FixedText aMoveFT;
FixedText aRowMoveFT; RadioButton* pFixRB;
MetricField aRowMoveMF; RadioButton* pFixPropRB;
FixedText aColMoveFT; RadioButton* pVarRB;
MetricField aColMoveMF;
FixedText aInsertFT;
FixedText aRowInsertFT;
MetricField aRowInsertMF;
FixedText aColInsertFT;
MetricField aColInsertMF;
FixedText aHandlingFT;
RadioButton aFixRB;
RadioButton aFixPropRB;
RadioButton aVarRB;
FixedText aFixFT;
FixedText aFixPropFT;
FixedText aVarFT;
SwWrtShell* pWrtShell; SwWrtShell* pWrtShell;
sal_Bool bHTMLMode; sal_Bool bHTMLMode;
...@@ -473,10 +458,10 @@ class SwCompareOptionsTabPage : public SfxTabPage ...@@ -473,10 +458,10 @@ class SwCompareOptionsTabPage : public SfxTabPage
public: public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet );
}; };
#endif #endif
......
sw/uiconfig/swriter/ui/opttablepage.ui 0 → 100644
Dosyayı görüntüle @ f3988518
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment