summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2012-05-23 10:53:13 +0200
committerJan Holesovsky <kendy@suse.cz>2012-05-23 11:04:10 +0200
commitb30e202861e9bdba4d86e76ba8a6f059da8efc31 (patch)
treecd1faea0a50acf637e88f069ed787a9282606013 /svx
parentb0932cb801db0dfdf6f1a0312683c7fc55eea443 (diff)
status bar: INSRT/OVER -> 'Overwrite' shown only when in overwrite mode.
Idea by Mirek M. - thank you! Additionally introduced a tooltip showing more verbose text when in overwrite mode. Change-Id: I1236253bc6c97809ebed872fe86233cc08f41345
Diffstat (limited to 'svx')
-rw-r--r--svx/inc/svx/dialogs.hrc13
-rw-r--r--svx/source/stbctrls/insctrl.cxx14
-rw-r--r--svx/source/stbctrls/stbctrls.src13
3 files changed, 25 insertions, 15 deletions
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index b915a1245697..1790e8156f28 100644
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -405,14 +405,15 @@
#define RID_SVXSTR_ACTION (RID_SVX_START + 202)
#define RID_SVXSTR_ACTIONS (RID_SVX_START + 203)
-// Strings for insert/overwrite
-#define RID_SVXSTR_INSERT_TEXT (RID_SVX_START + 210)
-#define RID_SVXSTR_OVERWRITE_TEXT (RID_SVX_START + 211)
+// Strings for insert/overwrite mode
+#define RID_SVXSTR_INSERT_HELPTEXT (RID_SVX_START + 210)
+#define RID_SVXSTR_OVERWRITE_HELPTEXT (RID_SVX_START + 211)
+#define RID_SVXSTR_OVERWRITE_TEXT (RID_SVX_START + 212)
// Strings for the selection mode
-#define RID_SVXSTR_SELMODE_STD (RID_SVX_START + 212)
-#define RID_SVXSTR_SELMODE_ER (RID_SVX_START + 213)
-#define RID_SVXSTR_SELMODE_ERG (RID_SVX_START + 214)
+#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_SVXSTR_XMLSEC_SIG_OK (RID_SVX_START + 222)
#define RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY (RID_SVX_START + 223)
diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx
index 437ca7e91686..96e3c7acbe7f 100644
--- a/svx/source/stbctrls/insctrl.cxx
+++ b/svx/source/stbctrls/insctrl.cxx
@@ -72,6 +72,12 @@ void SvxInsertStatusBarControl::StateChanged( sal_uInt16 , SfxItemState eState,
DBG_ASSERT( pState->ISA( SfxBoolItem ), "invalid item type" );
SfxBoolItem* pItem = (SfxBoolItem*)pState;
bInsert = pItem->GetValue();
+
+ if ( bInsert )
+ GetStatusBar().SetQuickHelpText( GetId(), SVX_RESSTR( RID_SVXSTR_INSERT_HELPTEXT ) );
+ else
+ GetStatusBar().SetQuickHelpText( GetId(), SVX_RESSTR( RID_SVXSTR_OVERWRITE_HELPTEXT ) );
+
DrawItemText_Impl();
}
}
@@ -105,11 +111,11 @@ void SvxInsertStatusBarControl::Paint( const UserDrawEvent& )
void SvxInsertStatusBarControl::DrawItemText_Impl()
{
- sal_uInt16 _nId = RID_SVXSTR_OVERWRITE_TEXT;
+ String aText;
+ if ( !bInsert )
+ aText = SVX_RESSTR( RID_SVXSTR_OVERWRITE_TEXT );
- if ( bInsert )
- _nId = RID_SVXSTR_INSERT_TEXT;
- GetStatusBar().SetItemText( GetId(), SVX_RESSTR( _nId ) );
+ GetStatusBar().SetItemText( GetId(), aText );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index 745a8dbcbfc0..0dc08437d143 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -30,15 +30,18 @@
#include "stbctrls.h"
// Strings ---------------------------------------------------------------
-String RID_SVXSTR_INSERT_TEXT
+String RID_SVXSTR_INSERT_HELPTEXT
{
- // 'Insert' shortened to a maximum of 5 characters
- Text [ en-US ] = "INSRT" ;
+ Text [ en-US ] = "Insert mode." ;
+};
+String RID_SVXSTR_OVERWRITE_HELPTEXT
+{
+ Text [ en-US ] = "Overwrite mode, text will be overwritten when typing." ;
};
String RID_SVXSTR_OVERWRITE_TEXT
{
- // 'Overwrite' shortened to a maximum of 5 characters
- Text [ en-US ] = "OVER" ;
+ Text [ x-comment ] = "To be shown in the status bar when in overwrite mode, please try to make it not longer than the word 'Overwrite'." ;
+ Text [ en-US ] = "Overwrite" ;
};
String RID_SVXSTR_SELMODE_STD
{