You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by af...@apache.org on 2013/05/13 16:41:07 UTC
svn commit: r1481886 - in /openoffice/trunk/main/sfx2/source/sidebar:
DeckTitleBar.cxx PanelTitleBar.cxx Sidebar.hrc Sidebar.src
Author: af
Date: Mon May 13 14:41:07 2013
New Revision: 1481886
URL: http://svn.apache.org/r1481886
Log:
122298: Added quick help texts to title bar buttons of sidebar panels and deck.
Modified:
openoffice/trunk/main/sfx2/source/sidebar/DeckTitleBar.cxx
openoffice/trunk/main/sfx2/source/sidebar/PanelTitleBar.cxx
openoffice/trunk/main/sfx2/source/sidebar/Sidebar.hrc
openoffice/trunk/main/sfx2/source/sidebar/Sidebar.src
Modified: openoffice/trunk/main/sfx2/source/sidebar/DeckTitleBar.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/DeckTitleBar.cxx?rev=1481886&r1=1481885&r2=1481886&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/sidebar/DeckTitleBar.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/DeckTitleBar.cxx Mon May 13 14:41:07 2013
@@ -23,6 +23,8 @@
#include "DeckTitleBar.hxx"
#include "sfx2/sidebar/Theme.hxx"
+#include "sfx2/sfxresid.hxx"
+#include "Sidebar.hrc"
#include <vcl/image.hxx>
@@ -44,16 +46,12 @@ DeckTitleBar::DeckTitleBar (
: TitleBar(rsTitle, pParentWindow, GetBackgroundPaint()),
mnCloserItemIndex(1),
maCloserAction(rCloserAction),
- mbIsCloserVisible(rCloserAction)
+ mbIsCloserVisible(false)
{
OSL_ASSERT(pParentWindow != NULL);
if (maCloserAction)
- {
- maToolBox.InsertItem(
- mnCloserItemIndex,
- Theme::GetImage(Theme::Image_Closer));
- }
+ SetCloserVisible(true);
#ifdef DEBUG
SetText(A2S("DeckTitleBar"));
@@ -77,9 +75,14 @@ void DeckTitleBar::SetCloserVisible (con
mbIsCloserVisible = bIsCloserVisible;
if (mbIsCloserVisible)
+ {
maToolBox.InsertItem(
mnCloserItemIndex,
Theme::GetImage(Theme::Image_Closer));
+ maToolBox.SetQuickHelpText(
+ mnCloserItemIndex,
+ String(SfxResId(SFX_STR_SIDEBAR_CLOSE_DECK)));
+ }
else
maToolBox.RemoveItem(
maToolBox.GetItemPos(mnCloserItemIndex));
Modified: openoffice/trunk/main/sfx2/source/sidebar/PanelTitleBar.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/PanelTitleBar.cxx?rev=1481886&r1=1481885&r2=1481886&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/sidebar/PanelTitleBar.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/PanelTitleBar.cxx Mon May 13 14:41:07 2013
@@ -22,6 +22,8 @@
#include "precompiled_sfx2.hxx"
#include "PanelTitleBar.hxx"
+#include "sfx2/sfxresid.hxx"
+#include "Sidebar.hrc"
#include "Paint.hxx"
#include "Panel.hxx"
@@ -78,6 +80,9 @@ void PanelTitleBar::SetMenuAction ( cons
mnMenuItemIndex,
Theme::GetImage(Theme::Image_PanelMenu));
maToolBox.SetOutStyle(TOOLBOX_STYLE_FLAT);
+ maToolBox.SetQuickHelpText(
+ mnMenuItemIndex,
+ String(SfxResId(SFX_STR_SIDEBAR_MORE_OPTIONS)));
}
else if ( maMenuAction && !rMenuAction )
{
Modified: openoffice/trunk/main/sfx2/source/sidebar/Sidebar.hrc
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/Sidebar.hrc?rev=1481886&r1=1481885&r2=1481886&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/sidebar/Sidebar.hrc (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/Sidebar.hrc Mon May 13 14:41:07 2013
@@ -85,3 +85,6 @@
#define IMAGE_SIDEBAR_DECK_FUNCTIONS_SMALL_HC 133
#define STRING_CUSTOMIZATION 200
#define STRING_RESTORE 201
+
+#define SFX_STR_SIDEBAR_MORE_OPTIONS (RID_SFX_SIDEBAR_START + 1)
+#define SFX_STR_SIDEBAR_CLOSE_DECK (RID_SFX_SIDEBAR_START + 2)
Modified: openoffice/trunk/main/sfx2/source/sidebar/Sidebar.src
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/Sidebar.src?rev=1481886&r1=1481885&r2=1481886&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/sidebar/Sidebar.src (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/Sidebar.src Mon May 13 14:41:07 2013
@@ -292,4 +292,13 @@ Resource RID_SIDEBAR_RESOURCE
};
};
+String SFX_STR_SIDEBAR_MORE_OPTIONS
+{
+ Text [en-US] = "More Options";
+};
+
+String SFX_STR_SIDEBAR_CLOSE_DECK
+{
+ Text [en-US] = "Close Sidebar Deck";
+};