Skip to content

C
core
Kaydet (Commit) e1535106 authored tarafından Rachit Gupta's avatar Rachit Gupta Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

Convert RID_SVX_MDLG_HANGULHANJA_EDIT to Widget Layout. 

Change-Id: I63d61a9caeb356e6b5bd340c1f9a5415869a91a1
Reviewed-on: https://gerrit.libreoffice.org/10518Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 84279dce
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 188 deletions
cui/UIConfig_cui.mk
Dosyayı görüntüle @ e1535106
...@@ -70,6 +70,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\ ...@@ -70,6 +70,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/gallerytitledialog \ cui/uiconfig/ui/gallerytitledialog \
cui/uiconfig/ui/galleryupdateprogress \ cui/uiconfig/ui/galleryupdateprogress \
cui/uiconfig/ui/hangulhanjaadddialog \ cui/uiconfig/ui/hangulhanjaadddialog \
cui/uiconfig/ui/hangulhanjaeditdictdialog \
cui/uiconfig/ui/hangulhanjaoptdialog \ cui/uiconfig/ui/hangulhanjaoptdialog \
cui/uiconfig/ui/hatchpage \ cui/uiconfig/ui/hatchpage \
cui/uiconfig/ui/hyperlinkdialog \ cui/uiconfig/ui/hyperlinkdialog \
......
cui/source/dialogs/cuires.src
Dosyayı görüntüle @ e1535106
...@@ -117,4 +117,9 @@ String RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN ...@@ -117,4 +117,9 @@ String RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN
Text [ en-US ] = "Couldn't open the document." ; Text [ en-US ] = "Couldn't open the document." ;
}; };
String RID_SVXSTR_EDITHINT
{
Text [ en-US ] = "[Enter text here]";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
cui/source/dialogs/hangulhanjadlg.hrc
Dosyayı görüntüle @ e1535106
...@@ -71,62 +71,10 @@ ...@@ -71,62 +71,10 @@
// metrics // metrics
#define HHO_DLGWIDTH 287 #define HHO_DLGWIDTH 287
#define HHx_DLGHIGHT 175
// Hangul Hanja Edit Custom Dictionary Dialog // Hangul Hanja Edit Custom Dictionary Dialog
#define MAXNUM_SUGGESTIONS 50 #define MAXNUM_SUGGESTIONS 50
#define STR_EDITHINT 1
#define FT_BOOK 1
#define FT_ORIGINAL 2
#define FT_SUGGESTIONS 3
#define LB_BOOK 1
#define LB_ORIGINAL 2
#define PB_HHE_NEW 1
#define PB_HHE_DELETE 2
#define PB_HHE_HELP 3
#define PB_HHE_CLOSE 4
#define SB_SCROLL 1
#define ED_1 1
#define ED_2 2
#define ED_3 3
#define ED_4 4
// metrics
#define RSC_CD_VSCRLWIDTH 8 // vertical scroll bar width
#define HHE_DLGWIDTH HHO_DLGWIDTH
#define HHE_COL_1 RSC_SP_DLG_INNERBORDER_LEFT
#define HHE_COL_6 (HHE_DLGWIDTH-RSC_SP_DLG_INNERBORDER_RIGHT)
#define HHE_COL_5 (HHE_COL_6-RSC_CD_PUSHBUTTON_WIDTH)
#define HHE_COL_4 (HHE_COL_5-6)
#define HHE_COL_3_2 (HHE_COL_4-RSC_CD_VSCRLWIDTH)
#define HHE_COL_3_1 (HHE_COL_3_2-RSC_SP_CTRL_GROUP_X)
#define HHE_COL_3_0 (HHE_COL_3_2-RSC_CD_PUSHBUTTON_WIDTH)
#define HHE_COL_2 (HHE_COL_1+50)
#define HHE_COL_3 (HHE_COL_2+1)
#define HHE_ROW_1 RSC_SP_DLG_INNERBORDER_TOP
#define HHE_ROW_2 (HHE_ROW_1+2)
#define HHE_ROW_3 (HHE_ROW_2+12)
#define HHE_ROW_4 (HHE_ROW_3+12)
#define HHE_ROW_5 (HHE_ROW_4+8+2)
#define HHE_ROW_6 (HHE_ROW_5+12)
#define HHE_ROW_7 (HHE_ROW_6+2)
#define HHE_ROW_8 (HHE_ROW_7+2)
#define HHE_ROW_10 (HHE_ROW_8+RSC_SP_CTRL_GROUP_Y)
#define HHE_ROW_11 (HHE_ROW_10+8+2)
#define HHE_ROW_12 (HHE_ROW_11+4*12)
#define HHE_ROW_14 (HHx_DLGHIGHT-RSC_SP_DLG_INNERBORDER_BOTTOM)
#define HHE_ROW_13 (HHE_ROW_14-RSC_CD_PUSHBUTTON_HEIGHT)
#define HHE_ROW_a1 (HHE_ROW_5)
#define HHE_ROW_a3 (HHE_ROW_a1+RSC_CD_PUSHBUTTON_HEIGHT+2)
#endif // SVX_HANGUL_HANJA_DLG_HRC #endif // SVX_HANGUL_HANJA_DLG_HRC
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
cui/source/dialogs/hangulhanjadlg.src
Dosyayı görüntüle @ e1535106
...@@ -179,120 +179,4 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA ...@@ -179,120 +179,4 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
}; };
}; };
ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT
{
OutputSize = TRUE ;
Hide = TRUE ;
SVLook = TRUE ;
HelpId = HID_HANGULHANJA_EDIT_DLG;
Pos = MAP_APPFONT ( 0 , 0 ) ;
Size = MAP_APPFONT ( HHE_DLGWIDTH , HHx_DLGHIGHT ) ;
Text [ en-US ] = "Edit Custom Dictionary" ;
Moveable = TRUE ;
Closeable = TRUE ;
String STR_EDITHINT
{
Text [ en-US ] = "[Enter text here]";
};
FixedText FT_BOOK
{
Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_2 ) ;
Size = MAP_APPFONT ( HHE_COL_2 - HHE_COL_1, 8 ) ;
Text [ en-US ] = "Book";
};
ListBox LB_BOOK
{
HelpID = "cui:ListBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_BOOK";
Pos = MAP_APPFONT ( HHE_COL_3 , HHE_ROW_1 ) ;
Size = MAP_APPFONT ( HHE_COL_4 - HHE_COL_3 , 60 ) ;
DropDown = TRUE;
Border = TRUE;
};
FixedText FT_ORIGINAL
{
Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_4 ) ;
Size = MAP_APPFONT ( HHE_COL_4 - HHE_COL_1, 8 ) ;
Text [ en-US ] = "Original";
};
ComboBox LB_ORIGINAL
{
HelpID = "cui:ComboBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_ORIGINAL";
Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_5 ) ;
Size = MAP_APPFONT ( HHE_COL_4 - HHE_COL_1 , 60 ) ;
DropDown = TRUE;
Border = TRUE;
};
FixedText FT_SUGGESTIONS
{
Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_10 ) ;
Size = MAP_APPFONT ( HHE_COL_4 - HHE_COL_1, 8 ) ;
Text [ en-US ] = "Suggestions (max. 8)";
};
Edit ED_1
{
HelpID = "cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_1";
Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_11 ) ;
Size = MAP_APPFONT ( HHE_COL_3_1 - HHE_COL_1 , 12 ) ;
Hide = False;
Border = TRUE;
};
Edit ED_2
{
HelpID = "cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_2";
Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_11 + 12 ) ;
Size = MAP_APPFONT ( HHE_COL_3_1 - HHE_COL_1 , 12 ) ;
Hide = False;
Border = TRUE;
};
Edit ED_3
{
HelpID = "cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_3";
Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_11 + 24 ) ;
Size = MAP_APPFONT ( HHE_COL_3_1 - HHE_COL_1 , 12 ) ;
Hide = False;
Border = TRUE;
};
Edit ED_4
{
HelpID = "cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_4";
Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_11 + 36 ) ;
Size = MAP_APPFONT ( HHE_COL_3_1 - HHE_COL_1 , 12 ) ;
Hide = False;
Border = TRUE;
};
ScrollBar SB_SCROLL
{
Pos = MAP_APPFONT ( HHE_COL_3_2 , HHE_ROW_11 ) ;
Size = MAP_APPFONT ( RSC_CD_VSCRLWIDTH , HHE_ROW_12 - HHE_ROW_11 ) ; // height = 48
VScroll = TRUE ;
Drag = TRUE ;
};
PushButton PB_HHE_NEW
{
HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_NEW";
Pos = MAP_APPFONT ( HHE_COL_5 , HHE_ROW_a1 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
Text [ en-US ] = "New";
};
PushButton PB_HHE_DELETE
{
HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_DELETE";
Pos = MAP_APPFONT ( HHE_COL_5 , HHE_ROW_a3 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
Text [ en-US ] = "Delete";
};
HelpButton PB_HHE_HELP
{
Pos = MAP_APPFONT ( HHE_COL_3_0 , HHE_ROW_13 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
};
CancelButton PB_HHE_CLOSE
{
Pos = MAP_APPFONT ( HHE_COL_5 , HHE_ROW_13 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
Text [ en-US ] = "Close";
};
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
cui/source/inc/cuires.hrc
Dosyayı görüntüle @ e1535106
...@@ -215,7 +215,6 @@ ...@@ -215,7 +215,6 @@
// hangulhanja // hangulhanja
#define RID_SVX_MDLG_HANGULHANJA (RID_SVX_START + 1 ) #define RID_SVX_MDLG_HANGULHANJA (RID_SVX_START + 1 )
#define RID_SVX_MDLG_HANGULHANJA_EDIT ( RID_SVX_START + 5 )
// icon choice // icon choice
#define RID_SVXSTR_ICONCHOICEDLG_RESETBUT (RID_SVX_START + 580) #define RID_SVXSTR_ICONCHOICEDLG_RESETBUT (RID_SVX_START + 580)
...@@ -442,6 +441,8 @@ ...@@ -442,6 +441,8 @@
#define RID_SVXSTR_FILTERNAME_CFG (RID_SVX_START + 1264) #define RID_SVXSTR_FILTERNAME_CFG (RID_SVX_START + 1264)
#define RID_SVXSTR_LOAD_ERROR (RID_SVX_START + 1265) #define RID_SVXSTR_LOAD_ERROR (RID_SVX_START + 1265)
#define RID_SVXSTR_EDITHINT (RID_SVX_START + 1266)
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
cui/source/inc/hangulhanjadlg.hxx
Dosyayı görüntüle @ e1535106
...@@ -255,16 +255,15 @@ namespace svx ...@@ -255,16 +255,15 @@ namespace svx
private: private:
SuggestionEdit* m_pPrev; SuggestionEdit* m_pPrev;
SuggestionEdit* m_pNext; SuggestionEdit* m_pNext;
ScrollBar& m_rScrollBar; ScrollBar* m_rScrollBar;
bool ShouldScroll( bool _bUp ) const; bool ShouldScroll( bool _bUp ) const;
void DoJump( bool _bUp ); void DoJump( bool _bUp );
public: public:
SuggestionEdit( Window* pParent, const ResId& rResId, SuggestionEdit( Window* pParent, WinBits nBits );
ScrollBar& _rScrollBar,
SuggestionEdit* _pPrev, SuggestionEdit* _pNext );
virtual ~SuggestionEdit(); virtual ~SuggestionEdit();
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
void init( ScrollBar* pScrollBar, SuggestionEdit* pPrev, SuggestionEdit* pNext);
}; };
...@@ -278,20 +277,15 @@ namespace svx ...@@ -278,20 +277,15 @@ namespace svx
OUString m_aOriginal; OUString m_aOriginal;
SuggestionList* m_pSuggestions; SuggestionList* m_pSuggestions;
FixedText m_aBookFT; ListBox* m_aBookLB;
ListBox m_aBookLB; ComboBox* m_aOriginalLB;
FixedText m_aOriginalFT; SuggestionEdit* m_aEdit1;
ComboBox m_aOriginalLB; SuggestionEdit* m_aEdit2;
FixedText m_aSuggestionsFT; SuggestionEdit* m_aEdit3;
SuggestionEdit m_aEdit1; SuggestionEdit* m_aEdit4;
SuggestionEdit m_aEdit2; ScrollBar* m_aScrollSB;
SuggestionEdit m_aEdit3; PushButton* m_aNewPB;
SuggestionEdit m_aEdit4; PushButton* m_aDeletePB;
ScrollBar m_aScrollSB;
PushButton m_aNewPB;
PushButton m_aDeletePB;
HelpButton m_aHelpPB;
CancelButton m_aClosePB;
sal_uInt16 m_nTopPos; sal_uInt16 m_nTopPos;
bool m_bModifiedSuggestions; bool m_bModifiedSuggestions;
......
cui/source/inc/helpid.hrc
Dosyayı görüntüle @ e1535106
...@@ -55,7 +55,6 @@ ...@@ -55,7 +55,6 @@
#define HID_SVX_DOWN_TOOLBAR_ITEM "CUI_HID_SVX_DOWN_TOOLBAR_ITEM" #define HID_SVX_DOWN_TOOLBAR_ITEM "CUI_HID_SVX_DOWN_TOOLBAR_ITEM"
#define HID_SVX_SAVE_IN "CUI_HID_SVX_SAVE_IN" #define HID_SVX_SAVE_IN "CUI_HID_SVX_SAVE_IN"
#define HID_DIALOG_HANGULHANJA "CUI_HID_DIALOG_HANGULHANJA" #define HID_DIALOG_HANGULHANJA "CUI_HID_DIALOG_HANGULHANJA"
#define HID_HANGULHANJA_EDIT_DLG "CUI_HID_HANGULHANJA_EDIT_DLG"
#define UID_SEARCH_RECORDSTATUS "CUI_UID_SEARCH_RECORDSTATUS" #define UID_SEARCH_RECORDSTATUS "CUI_UID_SEARCH_RECORDSTATUS"
#define HID_SPELLDLG_SETWORD "CUI_HID_SPELLDLG_SETWORD" #define HID_SPELLDLG_SETWORD "CUI_HID_SPELLDLG_SETWORD"
#define HID_HYPERLINK_INTERNET "CUI_HID_HYPERLINK_INTERNET" #define HID_HYPERLINK_INTERNET "CUI_HID_HYPERLINK_INTERNET"
......
cui/uiconfig/ui/hangulhanjaeditdictdialog.ui 0 → 100644
Dosyayı görüntüle @ e1535106
This diff is collapsed.
extras/source/glade/libreoffice-catalog.xml.in
Dosyayı görüntüle @ e1535106
...@@ -770,5 +770,9 @@ ...@@ -770,5 +770,9 @@
<glade-widget-class title="DataTreeListBox" name="svxlo-DataTreeListBox" <glade-widget-class title="DataTreeListBox" name="svxlo-DataTreeListBox"
generic-name="DataTreeListBox" parent="GtkTreeView" generic-name="DataTreeListBox" parent="GtkTreeView"
icon-name="widget-gtk-treeview"/> icon-name="widget-gtk-treeview"/>
<glade-widget-class title="Suggestion Edit" name="cuilo-SuggestionEdit"
generic-name="SuggestionEdit" parent="GtkEntry"
icon-name="widget-gtk-textentry"/>
</glade-widget-classes> </glade-widget-classes>
</glade-catalog> </glade-catalog>
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