Skip to content

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

convert tox entries page to .ui 

Change-Id: Iedc6ab145a39b3844a42b70bfa18f4af574d732d
üst 81e0c2c3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 103 deletions
extras/source/glade/libreoffice-catalog.xml.in
Dosyayı görüntüle @ 4a4631b8
......@@ -368,6 +368,9 @@
<glade-widget-class title="Tab List" name="svtlo-SvTabListBox"
generic-name="Tab List" parent="svtlo-SvTreeListBox"
icon-name="widget-gtk-treeview"/>
<glade-widget-class title="SwIdxTreeListBox" name="swuilo-SwIdxTreeListBox"
generic-name="SwIdxTreeListBox" parent="svtlo-SvTreeListBox"
icon-name="widget-gtk-treeview"/>
<glade-widget-class title="Tooltip Tree List" name="swuilo-SwFldRefTreeListBox"
generic-name="Tooltip Tree List" parent="svtlo-SvTreeListBox"
icon-name="widget-gtk-treeview"/>
......
sw/UIConfig_swriter.mk
Dosyayı görüntüle @ 4a4631b8
......@@ -170,6 +170,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/statisticsinfopage \
sw/uiconfig/swriter/ui/stringinput \
sw/uiconfig/swriter/ui/tocdialog \
sw/uiconfig/swriter/ui/tocentriespage \
sw/uiconfig/swriter/ui/tocstylespage \
sw/uiconfig/swriter/ui/tablecolumnpage \
sw/uiconfig/swriter/ui/tableproperties \
......
sw/inc/helpid.h
Dosyayı görüntüle @ 4a4631b8
......@@ -138,7 +138,6 @@
#define HID_REDLINE_CTRL "SW_HID_REDLINE_CTRL"
#define HID_OPTCAPTION_PAGE "SW_HID_OPTCAPTION_PAGE"
#define HID_TP_TOX_SELECT "SW_HID_TP_TOX_SELECT"
#define HID_TP_TOX_ENTRY "SW_HID_TP_TOX_ENTRY"
#define HID_DLG_ADD_IDX_STYLES "SW_HID_DLG_ADD_IDX_STYLES"
#define HID_ADD_STYLES_TLB "SW_HID_ADD_STYLES_TLB"
#define HID_OLE_CHECKLB "SW_HID_OLE_CHECKLB"
......@@ -350,7 +349,6 @@
#define HID_AUTH_FIELD_CUSTOM5 "SW_HID_AUTH_FIELD_CUSTOM5"
#define HID_AUTH_FIELD_ISBN "SW_HID_AUTH_FIELD_ISBN"
#define HID_INSERT_INDEX_ENTRY_LEVEL_LB "SW_HID_INSERT_INDEX_ENTRY_LEVEL_LB"
#define HID_BUSINESS_FMT_PAGE "SW_HID_BUSINESS_FMT_PAGE"
#define HID_BUSINESS_FMT_PAGE_CONT "SW_HID_BUSINESS_FMT_PAGE_CONT"
#define HID_BUSINESS_FMT_PAGE_SHEET "SW_HID_BUSINESS_FMT_PAGE_SHEET"
......
sw/inc/index.hrc
Dosyayı görüntüle @ 4a4631b8
......@@ -41,6 +41,9 @@
#define STR_FILE_NOT_FOUND (RC_INDEX_BEGIN + 18)
#define DLG_CHANGE_AUTH_ENTRY (RC_INDEX_BEGIN + 19)
#define STR_USER_DEFINED_INDEX (RC_INDEX_BEGIN + 20)
#define STR_NOSORTKEY (RC_INDEX_BEGIN + 21)
#define STR_NO_CHAR_STYLE (RC_INDEX_BEGIN + 22)
#define STR_DELIM (RC_INDEX_BEGIN + 23)
#endif // _INDEX_HRC
......
sw/source/ui/inc/swuicnttab.hxx
Dosyayı görüntüle @ 4a4631b8
......@@ -291,9 +291,11 @@ class SwTokenWindow : public Window
void MoveControls(long nOffset);
public:
SwTokenWindow(SwTOXEntryTabPage* pParent, const ResId& rResId);
SwTokenWindow(Window* pParent, const ResId& rResId);
~SwTokenWindow();
void SetTabPage(SwTOXEntryTabPage *pParent) { m_pParent = pParent; }
void SetForm(SwForm& rForm, sal_uInt16 nLevel);
sal_uInt16 GetLastLevel()const {return nLevel;};
......@@ -334,96 +336,83 @@ class SwIdxTreeListBox : public SvTreeListBox
virtual void RequestHelp( const HelpEvent& rHEvt );
public:
SwIdxTreeListBox(SwTOXEntryTabPage* pPar, const ResId& rResId);
SwIdxTreeListBox(Window* pPar, WinBits nStyle);
void SetTabPage(SwTOXEntryTabPage* pPar) { pParent = pPar; }
};
class SwTOXEntryTabPage : public SfxTabPage
{
FixedText aLevelFT;
SwIdxTreeListBox aLevelLB;
FixedLine aEntryFL;
FixedText aTokenFT;
SwTokenWindow aTokenWIN;
PushButton aAllLevelsPB;
PushButton aEntryNoPB;
PushButton aEntryPB;
PushButton aTabPB;
PushButton aChapterInfoPB;
PushButton aPageNoPB;
PushButton aHyperLinkPB;
ListBox aAuthFieldsLB;
PushButton aAuthInsertPB;
PushButton aAuthRemovePB;
FixedText aCharStyleFT;
ListBox aCharStyleLB; // character style of the current token
PushButton aEditStylePB;
FixedText aChapterEntryFT;
ListBox aChapterEntryLB; // type of chapter info
FixedText aNumberFormatFT;
ListBox aNumberFormatLB; //!< format for numbering (E#)
FixedText aEntryOutlineLevelFT; //!< Fixed text, for i53420
NumericField aEntryOutlineLevelNF; //!< level to evaluate outline level to, for i53420
FixedText aFillCharFT;
ComboBox aFillCharCB; // fill char for tab stop
FixedText aTabPosFT;
MetricField aTabPosMF; // tab stop position
CheckBox aAutoRightCB;
FixedLine aFormatFL;
CheckBox aRelToStyleCB; // position relative to the right margin of the para style
FixedText aMainEntryStyleFT;
ListBox aMainEntryStyleLB; // character style of main entries in indexes
CheckBox aAlphaDelimCB;
CheckBox aCommaSeparatedCB;
RadioButton aSortDocPosRB;
RadioButton aSortContentRB;
FixedLine aSortingFL;
FixedText aFirstKeyFT;
ListBox aFirstKeyLB;
ImageRadioButton aFirstSortUpRB;
ImageRadioButton aFirstSortDownRB;
FixedText aSecondKeyFT;
ListBox aSecondKeyLB;
ImageRadioButton aSecondSortUpRB;
ImageRadioButton aSecondSortDownRB;
FixedText aThirdKeyFT;
ListBox aThirdKeyLB;
ImageRadioButton aThirdSortUpRB;
ImageRadioButton aThirdSortDownRB;
FixedLine aSortKeyFL;
String sDelimStr;
String sLevelStr;
String sAuthTypeStr;
String sNoCharStyle;
String sNoCharSortKey;
Point aButtonPositions[5];
SwForm* m_pCurrentForm;
FixedText* m_pLevelFT;
SwIdxTreeListBox* m_pLevelLB;
Point aRelToStylePos;
Point aRelToStyleIdxPos;
Size aLevelFLSize;
SwTokenWindow* m_pTokenWIN;
CurTOXType aLastTOXType;
sal_Bool bInLevelHdl;
PushButton* m_pAllLevelsPB;
PushButton* m_pEntryNoPB;
PushButton* m_pEntryPB;
PushButton* m_pTabPB;
PushButton* m_pChapterInfoPB;
PushButton* m_pPageNoPB;
PushButton* m_pHyperLinkPB;
ListBox* m_pAuthFieldsLB;
PushButton* m_pAuthInsertPB;
PushButton* m_pAuthRemovePB;
ListBox* m_pCharStyleLB; // character style of the current token
PushButton* m_pEditStylePB;
FixedText* m_pChapterEntryFT;
ListBox* m_pChapterEntryLB; // type of chapter info
FixedText* m_pNumberFormatFT;
ListBox* m_pNumberFormatLB; //!< format for numbering (E#)
FixedText* m_pEntryOutlineLevelFT; //!< Fixed text, for i53420
NumericField* m_pEntryOutlineLevelNF; //!< level to evaluate outline level to, for i53420
FixedText* m_pFillCharFT;
ComboBox* m_pFillCharCB; // fill char for tab stop
Point aChapterEntryFTPosition; //!< holds position of ChapterEntryFT control,
//to be used in moving the element among different tokens
Point aEntryOutlineLevelFTPosition;//!< holds position ofrEntryOutlineLevelFT control
sal_Int32 nBiasToEntryPoint;
FixedText* m_pTabPosFT;
MetricField* m_pTabPosMF; // tab stop position
CheckBox* m_pAutoRightCB;
VclContainer* m_pFormatFrame;
FixedText* m_pMainEntryStyleFT;
ListBox* m_pMainEntryStyleLB; // character style of main entries in indexes
CheckBox* m_pAlphaDelimCB;
CheckBox* m_pCommaSeparatedCB;
CheckBox* m_pRelToStyleCB; // position relative to the right margin of the para style
VclContainer* m_pSortingFrame;
RadioButton* m_pSortDocPosRB;
RadioButton* m_pSortContentRB;
VclContainer* m_pSortKeyFrame;
ListBox* m_pFirstKeyLB;
RadioButton* m_pFirstSortUpRB;
RadioButton* m_pFirstSortDownRB;
ListBox* m_pSecondKeyLB;
RadioButton* m_pSecondSortUpRB;
RadioButton* m_pSecondSortDownRB;
ListBox* m_pThirdKeyLB;
RadioButton* m_pThirdSortUpRB;
RadioButton* m_pThirdSortDownRB;
OUString sDelimStr;
OUString sLevelStr;
OUString sAuthTypeStr;
OUString sNoCharStyle;
OUString sNoCharSortKey;
SwForm* m_pCurrentForm;
CurTOXType aLastTOXType;
bool bInLevelHdl;
DECL_LINK(StyleSelectHdl, ListBox*);
DECL_LINK(EditStyleHdl, PushButton*);
......
sw/source/ui/index/cnttab.cxx
Dosyayı görüntüle @ 4a4631b8
This diff is collapsed.
sw/source/ui/index/cnttab.hrc
Dosyayı görüntüle @ 4a4631b8
......@@ -89,7 +89,6 @@
#define CB_ALPHADELIM 58
#define CB_COMMASEPARATED 59
#define STR_NO_CHAR_STYLE 61
#define CLB_FROMOBJ 62
#define FL_FROMOBJ 63
#define RES_SRCTYPES 64
......@@ -160,14 +159,12 @@
#define LB_THIRDKEY 133
#define FL_SORTKEY 134
#define FL_SORTING 135
#define STR_NOSORTKEY 136
#define RB_SORTUP1 137
#define RB_SORTUP2 138
#define RB_SORTUP3 139
#define RB_SORTDOWN1 140
#define RB_SORTDOWN2 141
#define RB_SORTDOWN3 142
#define STR_DELIM 143
#define FL_SORTOPTIONS 144
#define FT_LANGUAGE 145
#define LB_LANGUAGE 146
......
sw/source/ui/index/cnttab.src
Dosyayı görüntüle @ 4a4631b8
......@@ -45,6 +45,21 @@ String STR_USER_DEFINED_INDEX
Text [ en-US ] = "User-Defined Index";
};
String STR_NOSORTKEY
{
Text [ en-US ] = "<None>";
};
String STR_NO_CHAR_STYLE
{
Text [ en-US ] = "<None>";
};
String STR_DELIM
{
Text [ en-US ] = "S";
};
//------------------------------------------------------------------
TabPage TP_TOX_SELECT
{
......@@ -481,7 +496,6 @@ TabPage TP_TOX_SELECT
TabPage TP_TOX_ENTRY
{
HelpID = HID_TP_TOX_ENTRY;
Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedText FT_LEVEL
......@@ -907,19 +921,6 @@ TabPage TP_TOX_ENTRY
Size = MAP_APPFONT ( 220, 8 ) ;
Text [ en-US ] = "Sort keys";
};
String STR_NOSORTKEY
{
Text [ en-US ] = "<None>";
};
String STR_NO_CHAR_STYLE
{
Text [ en-US ] = "<None>";
};
String STR_DELIM
{
Text [ en-US ] = "S";
};
};
Window WIN_TOKEN
......
sw/uiconfig/swriter/ui/labelformatpage.ui
Dosyayı görüntüle @ 4a4631b8
......@@ -380,6 +380,8 @@
<property name="xalign">0</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">top:0.00cm</property>
<property name="ellipsize">middle</property>
<property name="max_width_chars">32</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -395,6 +397,8 @@
<property name="xalign">0</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">top:0.00cm</property>
<property name="ellipsize">middle</property>
<property name="max_width_chars">32</property>
</object>
<packing>
<property name="left_attach">1</property>
......
sw/uiconfig/swriter/ui/tocentriespage.ui 0 → 100644
Dosyayı görüntüle @ 4a4631b8
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