diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2012-05-25 10:02:26 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2012-05-25 10:07:34 +0200 |
| commit | f76fde91c4103812d924b973cec83a7b316a1f05 (patch) | |
| tree | 38a6115c690f3a65f174330aa69bd913160c810f /svx/inc | |
| parent | f4e9f095fc7306651246f648b9caf706652ca8a8 (diff) | |
status bar: Get rid of STD/BLK/..., and introduce a menu for that instead.
Nobody know what these acronyms stay for; so instead use an icon, and a menu
that contains the full descrption. Tooltip now says what is active.
Change-Id: I21a67c5456c96081797c1cb88d2a980d161a1c0c
Diffstat (limited to 'svx/inc')
| -rw-r--r-- | svx/inc/svx/dialogs.hrc | 6 | ||||
| -rw-r--r-- | svx/inc/svx/selctrl.hxx | 26 |
2 files changed, 12 insertions, 20 deletions
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc index 1790e8156f28..0c56983f74b6 100644 --- a/svx/inc/svx/dialogs.hrc +++ b/svx/inc/svx/dialogs.hrc @@ -411,9 +411,8 @@ #define RID_SVXSTR_OVERWRITE_TEXT (RID_SVX_START + 212) // Strings for the selection mode -#define RID_SVXSTR_SELMODE_STD (RID_SVX_START + 213) -#define RID_SVXSTR_SELMODE_ER (RID_SVX_START + 214) -#define RID_SVXSTR_SELMODE_ERG (RID_SVX_START + 215) +#define RID_SVXMENU_SELECTION (RID_SVX_START + 213) +#define RID_SVXBMP_SELECTION (RID_SVX_START + 215) #define RID_SVXSTR_XMLSEC_SIG_OK (RID_SVX_START + 222) #define RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY (RID_SVX_START + 223) @@ -1050,7 +1049,6 @@ #define RID_SVXSTR_UNDO_APPLY_EXTRUSION_SURFACE (RID_SVX_START + 1133) #define RID_SVXSTR_UNDO_APPLY_EXTRUSION_COLOR (RID_SVX_START + 1134) -#define RID_SVXSTR_SELMODE_BLK (RID_SVX_START + 1167) #define RID_SVXSTR_STYLEFAMILY_TABLEDESIGN (RID_SVX_START + 1168) // if you add here, remember to adjust RID_SVXSTR_NEXTFREE diff --git a/svx/inc/svx/selctrl.hxx b/svx/inc/svx/selctrl.hxx index 42b30db720fb..4a26bd99b335 100644 --- a/svx/inc/svx/selctrl.hxx +++ b/svx/inc/svx/selctrl.hxx @@ -28,34 +28,28 @@ #ifndef _SVX_SELCTRL_HXX #define _SVX_SELCTRL_HXX -// include --------------------------------------------------------------- - +#include <vcl/image.hxx> #include <sfx2/stbitem.hxx> -#include "svx/svxdllapi.h" - -// class SvxSelModeControl ----------------------------------------------- +#include <svx/svxdllapi.h> +/// Status bar control that indicates or changes the selection mode (standard / block / etc.) class SVX_DLLPUBLIC SvxSelectionModeControl : public SfxStatusBarControl { public: - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); - virtual void Click(); - virtual void Paint( const UserDrawEvent& rEvt ); - SFX_DECL_STATUSBAR_CONTROL(); SvxSelectionModeControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); -private: - sal_uInt16 nState; + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, + const SfxPoolItem* pState ); + virtual sal_Bool MouseButtonDown( const MouseEvent& rEvt ); + virtual void Paint( const UserDrawEvent& rEvt ); -#ifdef _SVX_SELCTRL_CXX - SVX_DLLPRIVATE void DrawItemText_Impl(); -#endif +private: + sal_uInt16 mnState; + Image maImage; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |