Skip to content

C
core
Kaydet (Commit) b1a5e34e authored tarafından Jan Holesovsky's avatar Jan Holesovsky
Dosyalara gözat
Seçenekler

Revert "Related fdo#81475 Improve toolbar tooltips in Writer standard toolbar" 

Unfortunately this breaks the Edit menu - it is now crowded with long texts;
so while it may improve the toolbar, it definitely breaks the menu.

This reverts commit b59c5ace.
üst cfbcce70
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 33 deletions
framework/source/uielement/toolbarmanager.cxx
Dosyayı görüntüle @ b1a5e34e
......@@ -1276,18 +1276,23 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
}
m_pToolBar->InsertItem( nId, aString, nItemBits );
m_pToolBar->SetItemCommand( nId, aCommandURL );
OUString sQuickHelp( aString );
// Use custom tooltip if available
if ( !aTooltip.isEmpty() )
sQuickHelp = aTooltip;
OUString sShortCut;
if( RetrieveShortcut( aCommandURL, sShortCut ) )
{
sQuickHelp += " (";
sQuickHelp += sShortCut;
sQuickHelp += ")";
m_pToolBar->SetQuickHelpText( nId, aTooltip );
}
else
{
OUString sQuickHelp( aString );
OUString sShortCut;
if( RetrieveShortcut( aCommandURL, sShortCut ) )
{
sQuickHelp += " (";
sQuickHelp += sShortCut;
sQuickHelp += ")";
}
m_pToolBar->SetQuickHelpText( nId, sQuickHelp );
}
m_pToolBar->SetQuickHelpText( nId, sQuickHelp );
if ( !aLabel.isEmpty() )
{
......
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
Dosyayı görüntüle @ b1a5e34e
......@@ -1264,7 +1264,7 @@
</node>
<node oor:name=".uno:UndoAction" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Undo Last Action</value>
<value xml:lang="en-US">Undo</value>
</prop>
</node>
<node oor:name=".uno:ToggleControlFocus" oor:op="replace">
......@@ -2019,7 +2019,7 @@
</node>
<node oor:name=".uno:PrintDefault" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Print Document Directly</value>
<value xml:lang="en-US">Print File Directly</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
......@@ -2246,7 +2246,7 @@
</node>
<node oor:name=".uno:InsertDoc" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Document...</value>
<value xml:lang="en-US">~File...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
......@@ -3077,7 +3077,7 @@
</node>
<node oor:name=".uno:SpellingDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Check ~Spelling and Grammar...</value>
<value xml:lang="en-US">~Spelling...</value>
</prop>
</node>
<node oor:name=".uno:RecheckDocument" oor:op="replace">
......@@ -3087,7 +3087,7 @@
</node>
<node oor:name=".uno:SpellingAndGrammarDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Check ~Spelling and Grammar...</value>
<value xml:lang="en-US">~Spelling and Grammar...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
......@@ -3103,7 +3103,7 @@
</node>
<node oor:name=".uno:SpellDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Check ~Spelling and Grammar...</value>
<value xml:lang="en-US">~Spelling...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
......@@ -3366,7 +3366,7 @@
</node>
<node oor:name=".uno:Redo" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Redo Last Action</value>
<value xml:lang="en-US">Redo</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
......@@ -3382,7 +3382,7 @@
</node>
<node oor:name=".uno:FormatPaintbrush" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Clone Formatting (double click for multi-selection)</value>
<value xml:lang="en-US">Format Paintbrush (double click for multi-selection)</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>9</value>
......@@ -3403,7 +3403,7 @@
</node>
<node oor:name=".uno:Cut" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Cu~t Selection</value>
<value xml:lang="en-US">Cu~t</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
......@@ -3411,7 +3411,7 @@
</node>
<node oor:name=".uno:Copy" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Copy Selection</value>
<value xml:lang="en-US">~Copy</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
......@@ -3419,7 +3419,7 @@
</node>
<node oor:name=".uno:Paste" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Paste from Clipboard</value>
<value xml:lang="en-US">~Paste</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
......@@ -5445,7 +5445,7 @@
</node>
<node oor:name=".uno:SpellingMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Toggle Auto ~Spellcheck</value>
<value xml:lang="en-US">~Spellcheck</value>
</prop>
</node>
<node oor:name=".uno:LanguageMenu" oor:op="replace">
......
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
Dosyayı görüntüle @ b1a5e34e
......@@ -88,7 +88,7 @@
</node>
<node oor:name=".uno:InsertEndnote" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Insert Endnote</value>
<value xml:lang="en-US">Insert Endnote Directly</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
......@@ -492,7 +492,7 @@
</node>
<node oor:name=".uno:InsertFieldCtrl" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Insert Field</value>
<value xml:lang="en-US">Insert Fields</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>9</value>
......@@ -561,7 +561,7 @@
</node>
<node oor:name=".uno:InsertFootnote" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Insert Footnote</value>
<value xml:lang="en-US">Insert Footnote Directly</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
......
sw/uiconfig/swriter/toolbar/standardbar.xml
Dosyayı görüntüle @ b1a5e34e
......@@ -19,10 +19,10 @@
-->
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="5537" toolbar:tooltip="Create New Document"/>
<toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="5537"/>
<toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false" toolbar:helpid="5500"/>
<toolbar:toolbaritem xlink:href=".uno:OpenFromWriter" toolbar:style="dropdown" toolbar:tooltip="Open Document"/>
<toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="5505" toolbar:tooltip="Save Document"/>
<toolbar:toolbaritem xlink:href=".uno:OpenFromWriter" toolbar:style="dropdown"/>
<toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="5505"/>
<toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false" toolbar:helpid="5502"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:visible="false" toolbar:helpid="5331"/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="6674"/>
......@@ -46,14 +46,14 @@
<toolbar:toolbaritem xlink:href=".uno:SearchDialog"/>
<toolbar:toolbaritem xlink:href=".uno:ControlCodes" toolbar:helpid="20224"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="20330" toolbar:tooltip="Insert Table"/>
<toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:tooltip="Insert Image"/>
<toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:tooltip="Insert Chart"/>
<toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="20330"/>
<toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>
<toolbar:toolbaritem xlink:href=".uno:InsertObjectChart"/>
<toolbar:toolbaritem xlink:href=".uno:InsertFootnote"/>
<toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog" toolbar:helpid="5678" toolbar:tooltip="Insert Hyperlink"/>
<toolbar:toolbaritem xlink:href=".uno:InsertSymbol" toolbar:tooltip="Insert Special Character"/>
<toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog" toolbar:helpid="5678"/>
<toolbar:toolbaritem xlink:href=".uno:InsertSymbol"/>
<toolbar:toolbaritem xlink:href=".uno:InsertFieldCtrl"/>
<toolbar:toolbaritem xlink:href=".uno:InsertAnnotation" toolbar:tooltip="Insert Comment"/>
<toolbar:toolbaritem xlink:href=".uno:InsertAnnotation"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:InsertDraw" toolbar:helpid="10244"/>
<toolbar:toolbaritem xlink:href=".uno:ViewDataSourceBrowser" toolbar:visible="false" toolbar:helpid="6660"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment