ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#124686 HideWhiteSpace should be positive Show Whitespace

Browse Source 
"Hide Whitespace" under View menu changes to "Show Whitespace". Functions and associated strings are renamed accordingly.

Change-Id: Id0c91ecf5c59a8c0cd5d00574f3ce0f38d6dd6d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90324
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
This commit is contained in:
shameempk
2020-03-30 09:36:37 +02:00
committed by Miklos Vajna
parent 8bbd58eca1
commit 96def0ee39
8 changed files with 50 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+8
View File
@@ -2766,6 +2766,14 @@
<value>1</value>
</prop>
</node>
<node oor:name=".uno:ShowWhitespace" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Show Whitespac~e</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
</node>
<node oor:name=".uno:SortDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">So~rt...</value>
sw/inc/cmdid.h
+2
View File
@@ -184,6 +184,8 @@
#define FN_VIEW_HIDE_WHITESPACE (FN_VIEW + 59) /* Hide header, footer, and pagebreak */
#define FN_SHOW_INLINETOOLTIPS (FN_VIEW + 60) /* Show tooltips for tracked changes */
#define FN_USE_HEADERFOOTERMENU (FN_VIEW + 61) /* Show advanced header/footer menu */
#define FN_VIEW_SHOW_WHITESPACE (FN_VIEW + 62) /* Show header, footer, and pagebreak */
// Region: Insert
#define FN_INSERT_BOOKMARK (FN_INSERT + 2 ) /* Bookmark */
sw/sdi/_viewsh.sdi
+7
View File
@@ -811,6 +811,13 @@ interface BaseTextEditView
Export = FALSE;
]
FN_VIEW_SHOW_WHITESPACE
[
ExecMethod = ExecViewOptions ;
StateMethod = StateViewOptions ;
Export = FALSE;
]
SID_TOGGLE_NOTES
[
ExecMethod = ExecViewOptions ;
sw/sdi/swriter.sdi
+18
View File
@@ -5476,6 +5476,24 @@ SfxBoolItem HideWhitespace FN_VIEW_HIDE_WHITESPACE
GroupId = SfxGroupId::View;
]
SfxBoolItem ShowWhitespace FN_VIEW_SHOW_WHITESPACE
[
AutoUpdate = TRUE,
FastCall = FALSE,
ReadOnlyDoc = TRUE,
Toggle = TRUE,
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
GroupId = SfxGroupId::View;
]
SfxBoolItem ShowTrackedChanges FN_REDLINE_SHOW
[
sw/source/uibase/uiview/view0.cxx
+12
View File
@@ -292,6 +292,11 @@ void SwView::StateViewOptions(SfxItemSet &rSet)
aBool.SetValue(pOpt->IsHideWhitespaceMode());
break;
}
case FN_VIEW_SHOW_WHITESPACE:
{
aBool.SetValue(!pOpt->IsHideWhitespaceMode());
break;
}
case SID_GRID_VISIBLE:
aBool.SetValue( pOpt->IsGridVisible() ); break;
case SID_GRID_USE:
@@ -452,6 +457,13 @@ void SwView::ExecViewOptions(SfxRequest &rReq)
pOpt->SetHideWhitespaceMode(bFlag);
break;
case FN_VIEW_SHOW_WHITESPACE:
if ( STATE_TOGGLE == eState )
bFlag = pOpt->IsHideWhitespaceMode();
pOpt->SetHideWhitespaceMode(!bFlag);
break;
case FN_VIEW_SMOOTH_SCROLL:
if ( STATE_TOGGLE == eState )
sw/uiconfig/sglobal/menubar/menubar.xml
+1 -1
View File
@@ -200,7 +200,7 @@
<menu:menuitem menu:id=".uno:ViewBounds" menu:style="text"/>
<menu:menuitem menu:id=".uno:TableBoundaries" menu:style="text"/>
<menu:menuitem menu:id=".uno:ShowGraphics" menu:style="text"/>
<menu:menuitem menu:id=".uno:HideWhitespace" menu:style="text"/>
<menu:menuitem menu:id=".uno:ShowWhitespace" menu:style="text"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ViewTrackChanges"/>
<menu:menuitem menu:id=".uno:ShowAnnotations" menu:style="text"/>
sw/uiconfig/swriter/menubar/menubar.xml
+1 -1
View File
@@ -206,7 +206,7 @@
<menu:menuitem menu:id=".uno:ViewBounds" menu:style="text"/>
<menu:menuitem menu:id=".uno:TableBoundaries" menu:style="text"/>
<menu:menuitem menu:id=".uno:ShowGraphics"/>
<menu:menuitem menu:id=".uno:HideWhitespace" menu:style="text"/>
<menu:menuitem menu:id=".uno:ShowWhitespace" menu:style="text"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ViewTrackChanges"/>
<menu:menuitem menu:id=".uno:ShowAnnotations" menu:style="text"/>
sw/uiconfig/swxform/menubar/menubar.xml
+1 -1
View File
@@ -199,7 +199,7 @@
<menu:menuitem menu:id=".uno:ViewBounds" menu:style="text"/>
<menu:menuitem menu:id=".uno:TableBoundaries" menu:style="text"/>
<menu:menuitem menu:id=".uno:ShowGraphics" menu:style="text"/>
<menu:menuitem menu:id=".uno:HideWhitespace" menu:style="text"/>
<menu:menuitem menu:id=".uno:ShowWhitespace" menu:style="text"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ViewTrackChanges"/>
<menu:menuitem menu:id=".uno:ShowAnnotations" menu:style="text"/>