diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-09-05 20:55:29 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-06 07:02:42 +0100 |
| commit | 13bbb6f56d49bf891f6b6f075c1d75100fbc1a63 (patch) | |
| tree | 1b2c5e698c2646eb31479020f9bde907d3f3fa89 /starmath/inc | |
| parent | 3c24537465a90e59a714c88e3f672f0786ecd573 (diff) | |
convert floating RID_TOOLBOXWINDOW to .ui
well the dialog itself and the top toolbar, the
other toolbars remain as resources as now
Change-Id: If2bc5b2c108af0efb88fb018896806531cdafe60
Diffstat (limited to 'starmath/inc')
| -rw-r--r-- | starmath/inc/helpids.h | 11 | ||||
| -rw-r--r-- | starmath/inc/starmath.hrc | 10 | ||||
| -rw-r--r-- | starmath/inc/toolbox.hxx | 16 |
3 files changed, 23 insertions, 14 deletions
diff --git a/starmath/inc/helpids.h b/starmath/inc/helpids.h index 66d8189967c4..977b44e2d375 100644 --- a/starmath/inc/helpids.h +++ b/starmath/inc/helpids.h @@ -126,17 +126,6 @@ #define HID_SMA_NOTPRECEDES "STARMATH_HID_SMA_NOTPRECEDES" #define HID_SMA_NOTSUCCEEDS "STARMATH_HID_SMA_NOTSUCCEEDS" -#define HID_SMA_MISC_CAT "STARMATH_HID_SMA_MISC_CAT" -#define HID_SMA_UNBINOPS_CAT "STARMATH_HID_SMA_UNBINOPS_CAT" -#define HID_SMA_RELATIONS_CAT "STARMATH_HID_SMA_RELATIONS_CAT" -#define HID_SMA_SETOPERATIONS_CAT "STARMATH_HID_SMA_SETOPERATIONS_CAT" -#define HID_SMA_FUNCTIONS_CAT "STARMATH_HID_SMA_FUNCTIONS_CAT" -#define HID_SMA_OPERATORS_CAT "STARMATH_HID_SMA_OPERATORS_CAT" -#define HID_SMA_ATTRIBUTES_CAT "STARMATH_HID_SMA_ATTRIBUTES_CAT" -#define HID_SMA_BRACKETS_CAT "STARMATH_HID_SMA_BRACKETS_CAT" -#define HID_SMA_FORMAT_CAT "STARMATH_HID_SMA_FORMAT_CAT" - -#define HID_SMA_OPERATOR_WIN "STARMATH_HID_SMA_OPERATOR_WIN" #define HID_SMA_UNBINOPS_TBX "STARMATH_HID_SMA_UNBINOPS_TBX" #define HID_SMA_RELATIONS_TBX "STARMATH_HID_SMA_RELATIONS_TBX" #define HID_SMA_SETOPERATIONS_TBX "STARMATH_HID_SMA_SETOPERATIONS_TBX" diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc index 768c9bee68b1..ae9cafb4cf39 100644 --- a/starmath/inc/starmath.hrc +++ b/starmath/inc/starmath.hrc @@ -680,6 +680,16 @@ #define RID_ALIGNCX_HELP (RID_APP_START + 4276) #define RID_ALIGNRX_HELP (RID_APP_START + 4277) +#define TOOLBOX_CAT_A (RID_APP_START + 4278) +#define TOOLBOX_CAT_B (RID_APP_START + 4279) +#define TOOLBOX_CAT_C (RID_APP_START + 4280) +#define TOOLBOX_CAT_D (RID_APP_START + 4281) +#define TOOLBOX_CAT_E (RID_APP_START + 4282) +#define TOOLBOX_CAT_F (RID_APP_START + 4283) +#define TOOLBOX_CAT_G (RID_APP_START + 4284) +#define TOOLBOX_CAT_H (RID_APP_START + 4285) +#define TOOLBOX_CAT_I (RID_APP_START + 4286) + // 342 == SCH_IF_SMAVIEWSHELL, because SFX_INTERFACE_LIB is no // Define but latterly an Enum #define HID_SMA_VIEWSHELL_DOCUMENT (342) diff --git a/starmath/inc/toolbox.hxx b/starmath/inc/toolbox.hxx index 6e4f03753666..8f50a055bb1f 100644 --- a/starmath/inc/toolbox.hxx +++ b/starmath/inc/toolbox.hxx @@ -32,8 +32,16 @@ class SmToolBoxWindow : public SfxFloatingWindow { protected: - ToolBox aToolBoxCat; - FixedLine aToolBoxCat_Delim; // to visually separate the catalog part + ToolBox* m_pToolBoxCat; + sal_uInt16 m_nUnbinopsId; + sal_uInt16 m_nRelationsId; + sal_uInt16 m_nSetoperationsId; + sal_uInt16 m_nFunctionsId; + sal_uInt16 m_nOperatorsId; + sal_uInt16 m_nAttributesId; + sal_uInt16 m_nBracketsId; + sal_uInt16 m_nFormatId; + sal_uInt16 m_nMiscId; ToolBox *pToolBoxCmd; ToolBox *vToolBoxCategories[NUM_TBX_CATEGORIES]; ImageList *aImageLists [NUM_TBX_CATEGORIES + 1]; /* regular */ @@ -50,6 +58,8 @@ protected: SmViewShell * GetView(); const ImageList * GetImageList( sal_uInt16 nResId ); + sal_uInt16 MapToolbarIdToCategory(sal_uInt16 nId) const; + public: SmToolBoxWindow(SfxBindings *pBindings, SfxChildWindow *pChildWindow, @@ -60,7 +70,7 @@ public: virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent &rEvt ) SAL_OVERRIDE; - void AdjustPosSize( bool bSetPos ); + void AdjustPos(); void SetCategory(sal_uInt16 nCategory); }; |