You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2020/03/16 20:58:07 UTC

[openoffice] branch AOO42X updated: Changed icon for Content View in Navigation (Calc), use correct icons in help

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/AOO42X by this push:
     new fde98ba  Changed icon for Content View in Navigation (Calc), use correct icons in help
fde98ba is described below

commit fde98ba70b77cc5ec55761d2bc203c006c40a4a1
Author: mseidel <ms...@apache.org>
AuthorDate: Mon Mar 16 21:55:16 2020 +0100

    Changed icon for Content View in Navigation (Calc), use correct icons in help
    
    (cherry picked from commit 2ff7150472da82bf528ceaad0679d96d1d9d188e)
---
 main/default_images/sc/res/imglst/navipi/na010.png | Bin 796 -> 609 bytes
 .../default_images/sc/res/imglst/navipi/nah010.png | Bin 139 -> 233 bytes
 .../helpcontent2/source/text/scalc/01/02110000.xhp |  16 ++++++++--------
 .../classic/classic_images.tar.gz                  | Bin 1855722 -> 1855846 bytes
 main/sc/source/ui/navipi/navipi.src                |   6 +++---
 main/sw/source/ui/utlui/utlui.src                  |   2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/main/default_images/sc/res/imglst/navipi/na010.png b/main/default_images/sc/res/imglst/navipi/na010.png
index dd64727..fbf01ab 100644
Binary files a/main/default_images/sc/res/imglst/navipi/na010.png and b/main/default_images/sc/res/imglst/navipi/na010.png differ
diff --git a/main/default_images/sc/res/imglst/navipi/nah010.png b/main/default_images/sc/res/imglst/navipi/nah010.png
index dcedb85..d1ce956 100644
Binary files a/main/default_images/sc/res/imglst/navipi/nah010.png and b/main/default_images/sc/res/imglst/navipi/nah010.png differ
diff --git a/main/helpcontent2/source/text/scalc/01/02110000.xhp b/main/helpcontent2/source/text/scalc/01/02110000.xhp
index bee2226..bbb16a3 100644
--- a/main/helpcontent2/source/text/scalc/01/02110000.xhp
+++ b/main/helpcontent2/source/text/scalc/01/02110000.xhp
@@ -61,7 +61,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3159264" xml-lang="en-US" l10n="E">
-<image id="img_id3147338" src="res/commandimagelist/sc_grid.png" width="0.2228in" height="0.2228in"><alt id="alt_id3147338" xml-lang="en-US">Icon</alt>
+<image id="img_id3147338" src="sc/res/imglst/navipi/na03.png" width="0.2228in" height="0.2228in"><alt id="alt_id3147338" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -77,7 +77,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3152994" xml-lang="en-US" l10n="E">
-<image id="img_id3150515" src="sw/imglst/sc20186.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150515" xml-lang="en-US">Icon</alt>
+<image id="img_id3150515" src="sc/res/imglst/navipi/na05.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150515" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -93,7 +93,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3159170" xml-lang="en-US" l10n="E">
-<image id="img_id3148871" src="sw/imglst/sc20175.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148871" xml-lang="en-US">Icon</alt>
+<image id="img_id3148871" src="sc/res/imglst/navipi/na06.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148871" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -103,17 +103,17 @@
 </table>
 
 <bookmark xml-lang="en-US" branch="hid/SC_HID_SC_NAVIPI_ROOT" id="bm_id3155269" localize="false"/>
-<paragraph role="heading" id="hd_id3150107" xml-lang="en-US" level="2" l10n="U" oldref="20">Toggle</paragraph>
-<paragraph role="paragraph" id="par_id3159098" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="HID_SC_NAVIPI_ROOT">Toggles the content view. Only the selected Navigator element and its subelements are displayed.</ahelp> Click the icon again to restore all elements for viewing.</paragraph>
+<paragraph role="heading" id="hd_id3150107" xml-lang="en-US" level="2" l10n="U" oldref="20">Content View</paragraph>
+<paragraph role="paragraph" id="par_id3159098" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="HID_SC_NAVIPI_ROOT">Switches to content view. Only the selected Navigator element and its subelements are displayed.</ahelp> Click the icon again to restore all elements for viewing.</paragraph>
 <table id="tbl_id3153973">
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3152869" xml-lang="en-US" l10n="E">
-<image id="img_id3149126" src="sw/imglst/sc20244.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149126" xml-lang="en-US">Icon</alt>
+<image id="img_id3149126" src="sc/res/imglst/navipi/na010.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149126" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
-<paragraph role="paragraph" id="par_id3159229" xml-lang="en-US" l10n="U" oldref="21">Toggle</paragraph>
+<paragraph role="paragraph" id="par_id3159229" xml-lang="en-US" l10n="U" oldref="21">Switch Content View</paragraph>
 </tablecell>
 </tablerow>
 </table>
@@ -125,7 +125,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3155597" xml-lang="en-US" l10n="E">
-<image id="img_id3154738" src="sw/imglst/sc20233.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154738" xml-lang="en-US">Icon</alt>
+<image id="img_id3154738" src="sc/res/imglst/navipi/na011.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154738" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/main/ooo_custom_images/classic/classic_images.tar.gz b/main/ooo_custom_images/classic/classic_images.tar.gz
index 6202617..8e26e39 100644
Binary files a/main/ooo_custom_images/classic/classic_images.tar.gz and b/main/ooo_custom_images/classic/classic_images.tar.gz differ
diff --git a/main/sc/source/ui/navipi/navipi.src b/main/sc/source/ui/navipi/navipi.src
index 743a80d..7780c27 100644
--- a/main/sc/source/ui/navipi/navipi.src
+++ b/main/sc/source/ui/navipi/navipi.src
@@ -186,7 +186,7 @@ Window RID_SCDLG_NAVIGATOR
 			{
 				Identifier = IID_CHANGEROOT ;
 				HelpId = HID_SC_NAVIPI_ROOT ;
-				Text [ en-US ] = "Toggle" ;
+				Text [ en-US ] = "Content View" ;
 			};
 			ToolBoxItem
 			{
@@ -301,7 +301,7 @@ String SCSTR_CONTENT_RANGENAME
 };
 String SCSTR_CONTENT_DBAREA
 {
-	Text [ en-US ] = "Database Ranges" ;
+	Text [ en-US ] = "Database ranges" ;
 };
 String SCSTR_CONTENT_GRAPHIC
 {
@@ -321,7 +321,7 @@ String SCSTR_CONTENT_AREALINK
 };
 String SCSTR_CONTENT_DRAWING
 {
-	Text [ en-US ] = "Drawing objects";
+	Text [ en-US ] = "Drawing objects" ;
 };
  // PopupMenu -------------------------------------------------------------
 Menu RID_POPUP_DROPMODE
diff --git a/main/sw/source/ui/utlui/utlui.src b/main/sw/source/ui/utlui/utlui.src
index acc242a..e81ec43 100644
--- a/main/sw/source/ui/utlui/utlui.src
+++ b/main/sw/source/ui/utlui/utlui.src
@@ -219,7 +219,7 @@ String STR_CONTENT_TYPE_INDEX
 };
 String STR_CONTENT_TYPE_DRAWOBJECT
 {
-	Text [ en-US ] = "Draw objects" ;
+	Text [ en-US ] = "Drawing objects" ;
 };
 String STR_CONTENT_TYPE_POSTIT
 {