diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-11-01 12:45:29 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-11-01 12:45:58 +0000 |
| commit | dfbbda5623c0ec92febcd6e2e714fc682e496512 (patch) | |
| tree | e27bdae5a5acf5900840c65f56e32b24048282f5 /starmath/inc | |
| parent | c399eea88b3f55ab5334552cba89c6e817490a0d (diff) | |
convert math font dialog to .ui
Change-Id: Ib7bf087664b6c8491872dfa37c750485fedabbe2
Diffstat (limited to 'starmath/inc')
| -rw-r--r-- | starmath/inc/dialog.hxx | 27 | ||||
| -rw-r--r-- | starmath/inc/starmath.hrc | 1 |
2 files changed, 11 insertions, 17 deletions
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 423ffed0df89..8b3aae2b5663 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -74,44 +74,39 @@ public: /**************************************************************************/ -class SmShowFont : public Control +class SmShowFont : public Window { - virtual void Paint(const Rectangle&); + virtual void Paint(const Rectangle&); public: - SmShowFont(Window *pParent, const ResId& rResId) : - Control(pParent, rResId) + SmShowFont(Window *pParent, WinBits nStyle) + : Window(pParent, nStyle) { } - + virtual Size GetOptimalSize() const; void SetFont(const Font& rFont); }; class SmFontDialog : public ModalDialog { - FixedText aFixedText1; - ComboBox aFontBox; - CheckBox aBoldCheckBox; - CheckBox aItalicCheckBox; - OKButton aOKButton1; - HelpButton aHelpButton1; - CancelButton aCancelButton1; - SmShowFont aShowFont; - FixedText aFixedText2; + ComboBox* m_pFontBox; + VclContainer* m_pAttrFrame; + CheckBox* m_pBoldCheckBox; + CheckBox* m_pItalicCheckBox; + SmShowFont* m_pShowFont; Font Face; DECL_LINK(FontSelectHdl, ComboBox *); DECL_LINK(FontModifyHdl, ComboBox *); DECL_LINK(AttrChangeHdl, CheckBox *); - DECL_LINK(HelpButtonClickHdl, Button *); void InitColor_Impl(); virtual void DataChanged( const DataChangedEvent& rDCEvt ); public: - SmFontDialog(Window * pParent, OutputDevice *pFntListDevice, bool bHideCheckboxes, bool bFreeRes = true); + SmFontDialog(Window * pParent, OutputDevice *pFntListDevice, bool bHideCheckboxes); const Font& GetFont() const { return Face; } void SetFont(const Font &rFont); diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc index 206e358132cb..e05382990aba 100644 --- a/starmath/inc/starmath.hrc +++ b/starmath/inc/starmath.hrc @@ -76,7 +76,6 @@ #define SID_ELEMENTSDOCKINGWINDOW (SID_SMA_START + 126) -#define RID_FONTDIALOG (RID_APP_START + 2) #define RID_SYMDEFINEDIALOG (RID_APP_START + 9) #define RID_PRINTUIOPTIONS (RID_APP_START + 11) |