Skip to content

C
core
Kaydet (Commit) 0cdf12e0 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

split out numbering options page to cui and adapt code 

Change-Id: Ib2fedda13ff0b0d94f818bf6d9daf40a02fa8302
üst 6773db03
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 118 deletions
cui/AllLangResTarget_cui.mk
Dosyayı görüntüle @ 0cdf12e0
......@@ -117,7 +117,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/tabpages/labdlg.src \
cui/source/tabpages/macroass.src \
cui/source/tabpages/measure.src \
cui/source/tabpages/numpages.src \
cui/source/tabpages/page.src \
cui/source/tabpages/paragrph.src \
cui/source/tabpages/strings.src \
......
cui/UI_cui.mk
Dosyayı görüntüle @ 0cdf12e0
......@@ -19,6 +19,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\
cui/uiconfig/ui/insertrowcolumn \
cui/uiconfig/ui/macroselectordialog \
cui/uiconfig/ui/numberingformatpage \
cui/uiconfig/ui/numberingoptionspage \
cui/uiconfig/ui/numberingpositionpage \
cui/uiconfig/ui/personalization_tab \
cui/uiconfig/ui/pickbulletpage \
......
cui/source/dialogs/cuires.src
Dosyayı görüntüle @ 0cdf12e0
......@@ -54,6 +54,11 @@ String RID_SVXSTR_AUTO_ENTRY
Text [ en-US ] = "Automatic";
};
String RID_SVXSTR_EDIT_GRAPHIC
{
Text [ en-US ] = "Link" ;
};
#define MASKCOLOR MaskColor = \
Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
......
cui/source/inc/cuires.hrc
Dosyayı görüntüle @ 0cdf12e0
......@@ -66,8 +66,8 @@
#define RID_SVXSTR_SHADOW_STYLE_TOPRIGHT (RID_SVX_START + 981)
#define RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT (RID_SVX_START + 982)
#define RID_SVXSTR_SHADOW_STYLE_TOPLEFT (RID_SVX_START + 983)
#define RID_SVXSTR_HOR_PRESET_ONLYHOR (RID_SVX_START + 1113)
#define RID_SVXSTR_VER_PRESET_ONLYVER (RID_SVX_START + 1114)
#define RID_SVXSTR_HOR_PRESET_ONLYHOR (RID_SVX_START + 1113)
#define RID_SVXSTR_VER_PRESET_ONLYVER (RID_SVX_START + 1114)
#define RID_SVXSTR_FRAMEDIR_LTR (RID_SVX_START + 960)
#define RID_SVXSTR_FRAMEDIR_RTL (RID_SVX_START + 961)
#define RID_SVXSTR_FRAMEDIR_SUPER (RID_SVX_START + 962)
......@@ -75,7 +75,7 @@
#define RID_SVXSTR_PAGEDIR_RTL_HORI (RID_SVX_START + 966)
#define RID_SVXSTR_PAGEDIR_RTL_VERT (RID_SVX_START + 967)
#define RID_SVXSTR_PAGEDIR_LTR_VERT (RID_SVX_START + 968)
#define RID_STR_EDIT_GRAPHIC (RID_SVX_START + 509)
#define RID_SVXSTR_EDIT_GRAPHIC (RID_SVX_START + 509)
#define RID_SVXSTR_DESC_GRADIENT (RID_SVX_START + 163)
#define RID_SVXSTR_ASK_DEL_GRADIENT (RID_SVX_START + 165)
......
cui/source/inc/helpid.hrc
Dosyayı görüntüle @ 0cdf12e0
......@@ -295,7 +295,6 @@
#define HID_FORMAT_PARAGRAPH_STD "CUI_HID_FORMAT_PARAGRAPH_STD"
#define HID_VALUESET_NUM "CUI_HID_VALUESET_NUM"
#define HID_VALUESET_NUMBMP "CUI_HID_VALUESET_NUMBMP"
#define HID_SVXPAGE_NUM_OPTIONS "CUI_HID_SVXPAGE_NUM_OPTIONS"
#define HID_MEASURE_CTL_PREVIEW "CUI_HID_MEASURE_CTL_PREVIEW"
#define HID_FORMAT_PARAGRAPH_EXT "CUI_HID_FORMAT_PARAGRAPH_EXT"
#define HID_FORMAT_PARAGRAPH_ALIGN "CUI_HID_FORMAT_PARAGRAPH_ALIGN"
......
cui/source/inc/numpages.hxx
Dosyayı görüntüle @ 0cdf12e0
......@@ -253,48 +253,49 @@ class SvxNumOptionsTabPage : public SfxTabPage
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
FixedLine aFormatFL;
FixedText aLevelFT;
MultiListBox aLevelLB;
FixedText aFmtFT;
ListBox aFmtLB;
FixedText aPrefixFT;
Edit aPrefixED;
FixedText aSuffixFT;
Edit aSuffixED;
FixedText aCharFmtFT;
ListBox aCharFmtLB;
FixedText aBulColorFT;
ColorListBox aBulColLB;
FixedText aBulRelSizeFT;
MetricField aBulRelSizeMF;
FixedText aAllLevelFT;
NumericField aAllLevelNF;
FixedText aStartFT;
NumericField aStartED;
PushButton aBulletPB;
FixedText aAlignFT;
ListBox aAlignLB;
FixedText aBitmapFT;
MenuButton aBitmapMB;
FixedText aSizeFT;
MetricField aWidthMF;
FixedText aMultFT;
MetricField aHeightMF;
CheckBox aRatioCB;
FixedText aOrientFT;
ListBox aOrientLB;
FixedLine aSameLevelFL;
CheckBox aSameLevelCB;
String sNumCharFmtName;
String sBulletCharFmtName;
ListBox* m_pLevelLB;
ListBox* m_pFmtLB;
FixedText* m_pSeperatorFT;
FixedText* m_pPrefixFT;
Edit* m_pPrefixED;
FixedText* m_pSuffixFT;
Edit* m_pSuffixED;
FixedText* m_pCharFmtFT;
ListBox* m_pCharFmtLB;
FixedText* m_pBulColorFT;
ColorListBox* m_pBulColLB;
FixedText* m_pBulRelSizeFT;
MetricField* m_pBulRelSizeMF;
FixedText* m_pAllLevelFT;
NumericField* m_pAllLevelNF;
FixedText* m_pStartFT;
NumericField* m_pStartED;
FixedText* m_pBulletFT;
PushButton* m_pBulletPB;
FixedText* m_pAlignFT;
ListBox* m_pAlignLB;
FixedText* m_pBitmapFT;
MenuButton* m_pBitmapMB;
sal_uInt16 m_nGalleryId;
FixedText* m_pWidthFT;
MetricField* m_pWidthMF;
FixedText* m_pHeightFT;
MetricField* m_pHeightMF;
CheckBox* m_pRatioCB;
FixedText* m_pOrientFT;
ListBox* m_pOrientLB;
VclContainer* m_pAllLevelsFrame;
CheckBox* m_pSameLevelCB;
Timer aInvalidateTimer;
SvxNumberingPreview* m_pPreviewWIN;
SvxNumberingPreview* pPreviewWIN;
OUString m_sNumCharFmtName;
OUString m_sBulletCharFmtName;
Timer aInvalidateTimer;
SvxNumRule* pActNum;
SvxNumRule* pSaveNum;
......@@ -310,8 +311,6 @@ class SvxNumOptionsTabPage : public SfxTabPage
std::vector<String> aGrfNames;
Font aActBulletFont;
String sBullet;
String sStartWith;
sal_uInt8 nBullet;
sal_uInt16 nActNumLvl;
......@@ -357,14 +356,14 @@ class SvxNumOptionsTabPage : public SfxTabPage
virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
void SetCharFmts(const String& rNumName, const String& rBulletName )
{
sNumCharFmtName = rNumName;
sBulletCharFmtName = rBulletName;
}
void SetCharFmts(const OUString& rNumName, const OUString& rBulletName)
{
m_sNumCharFmtName = rNumName;
m_sBulletCharFmtName = rBulletName;
}
void SetMetric(FieldUnit eSet);
ListBox& GetCharFmtListBox() {return aCharFmtLB;}
ListBox& GetCharFmtListBox() {return *m_pCharFmtLB;}
void SetModified(sal_Bool bRepaint = sal_True);
virtual void PageCreated(SfxAllItemSet aSet);
......
cui/source/tabpages/numpages.hrc
Dosyayı görüntüle @ 0cdf12e0
......@@ -16,68 +16,4 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#define FT_ALIGN 50
#define LB_ALIGN 51
#define FT_WIDTH 67
#define FT_HEIGHT 70
#define STR_BULLET 200
#define LB_FORM 210
#define ED_FORM 211
#define FT_LEVEL 151
#define LB_LEVEL 152
#define FL_FORMAT 153
#define FL_POSITION 154
#define FT_PREFIX 155
#define ED_PREFIX 156
#define FT_FMT 157
#define LB_FMT 158
#define FT_SUFFIX 159
#define ED_SUFFIX 160
#define FT_INDENT 165
#define MF_INDENT 166
#define FT_CHARFMT 167
#define LB_CHARFMT 168
#define NF_ALL_LEVEL 169
#define FT_START 170
#define ED_START 171
#define PB_BULLET 173
#define WIN_PREVIEW 174
#define FT_BITMAP 175
#define PB_SEARCH 176
#define CB_RATIO 177
#define FT_SIZE 178
#define MF_WIDTH 179
#define FT_MULT 180
#define MF_HEIGHT 181
#define FT_ORIENT 182
#define LB_ORIENT 183
#define MB_BITMAP 184
#define FT_ALL_LEVEL 186
#define CB_SAME_LEVEL 188
#define FL_SAME_LEVEL 189
#define FT_BUL_COLOR 190
#define LB_BUL_COLOR 191
#define FT_BUL_REL_SIZE 192
#define MF_BUL_REL_SIZE 193
// 194 removed
#define ST_POPUP_EMPTY_ENTRY 195
#define MN_GRAPHIC_DLG 1
#define MN_GALLERY 2
#define MN_GALLERY_ENTRY 100
#define FT_LABEL_FOLLOWED_BY 250
#define LB_LABEL_FOLLOWED_BY 251
#define FT_LISTTAB 252
#define MF_LISTTAB 253
#define FT_ALIGN_2 254
#define LB_ALIGN_2 255
#define FT_ALIGNED_AT 256
#define MF_ALIGNED_AT 257
#define FT_INDENT_AT 258
#define MF_INDENT_AT 259
cui/source/tabpages/numpages.src deleted 100644 → 0
Dosyayı görüntüle @ 6773db03
This diff is collapsed.
cui/source/tabpages/tpline.cxx
Dosyayı görüntüle @ 0cdf12e0
......@@ -456,7 +456,7 @@ void SvxLineTabPage::SymbolSelected(MenuButton* pButton)
break;
default:
{
SvxOpenGraphicDialog aGrfDlg(CUI_RES(RID_STR_EDIT_GRAPHIC));
SvxOpenGraphicDialog aGrfDlg(CUI_RES(RID_SVXSTR_EDIT_GRAPHIC));
aGrfDlg.EnableLink(false);
aGrfDlg.AsLink(false);
if( !aGrfDlg.Execute() )
......
cui/uiconfig/ui/numberingoptionspage.ui 0 → 100644
Dosyayı görüntüle @ 0cdf12e0
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