mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better wording for Impress "Start from first/current Slide"

Browse Source 
The menu is now:
Slide Show
  Start from first Slide
  Start from current Slide
  ...
instead of:
Slide Show
  Slide Show
  Slide Show From This Slide
  ...

I also changed the recently introduced function name/uno command for "Start from current Slide".
This should make no trouble, since this function has not seen a release so far.

Change-Id: I248c9d63ec28071b2887f89912aa90fa1e4afcb5
Reviewed-on: https://gerrit.libreoffice.org/3604
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
This commit is contained in:
Samuel Mehrbrodt 2013-04-25 13:53:33 +02:00 committed by Fridrich Strba
parent a4660b78ef
commit c41dfa1265
10 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/svx/svxids.hrc
View File

@ -351,7 +351,7 @@
#define SID_OUTLINE_COLLAPSE_ALL ( SID_SVX_START + 155 )
#define SID_OUTLINE_BULLET ( SID_SVX_START + 156 )
#define SID_PRESENTATION ( SID_SVX_START + 157 )
#define SID_PRESENTATION_THIS_SLIDE ( SID_SVX_START + 158 )
#define SID_PRESENTATION_CURRENT_SLIDE ( SID_SVX_START + 158 )
#define SID_REHEARSE_TIMINGS ( SID_SVX_START + 159 )
#define SID_HIDE_SLIDE ( SID_SVX_START + 161 )
#define SID_CHOOSE_POLYGON ( SID_SVX_START + 162 )

2
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
View File

@ -2234,7 +2234,7 @@
</node>
<node oor:name="F5_SHIFT" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="en-US">.uno:PresentationThisSlide</value>
<value xml:lang="en-US">.uno:PresentationCurrentSlide</value>
</prop>
</node>
<node oor:name="F5_SHIFT_MOD2" oor:op="replace">

11
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
View File

@ -31,15 +31,15 @@
</node>
<node oor:name=".uno:Presentation" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Slide Show</value>
<value xml:lang="en-US">Start from ~first Slide</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
</node>
<node oor:name=".uno:PresentationThisSlide" oor:op="replace">
<node oor:name=".uno:PresentationCurrentSlide" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Sl~ide Show From This Slide</value>
<value xml:lang="en-US">Start from c~urrent Slide</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@ -1534,11 +1534,6 @@
<value xml:lang="en-US">~Slide Show</value>
</prop>
</node>
<!--node oor:name=".uno:ReviewMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Review</value>
</prop>
</node-->
<node oor:name=".uno:GroupMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Group</value>

2
sd/inc/sdcommands.h
View File

@ -94,7 +94,7 @@
#define CMD_SID_OUTLINE_TEXT_AUTOFIT ".uno.OutlineTextAutofit"
#define CMD_SID_PAGESETUP ".uno:PageSetup"
#define CMD_SID_PRESENTATION ".uno:Presentation"
#define CMD_SID_PRESENTATION_THIS_SLIDE ".uno:PresentationThisSlide"
#define CMD_SID_PRESENTATION_CURRENT_SLIDE ".uno:PresentationCurrentSlide"
#define CMD_SID_REMOTE_DLG ".uno:Remote"
#define CMD_SID_PRESENTATION_LAYOUT ".uno:PresentationLayout"
#define CMD_SID_RENAMELAYER ".uno:RenameLayer"

2
sd/sdi/SlideSorterController.sdi
View File

@ -136,7 +136,7 @@ interface SlideSorterView
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
SID_PRESENTATION_THIS_SLIDE // ole : no, status : ?
SID_PRESENTATION_CURRENT_SLIDE // ole : no, status : ?
[
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;

2
sd/sdi/sdraw.sdi
View File

@ -5196,7 +5196,7 @@ SfxVoidItem Presentation SID_PRESENTATION
]
//--------------------------------------------------------------------------
SfxVoidItem PresentationThisSlide SID_PRESENTATION_THIS_SLIDE
SfxVoidItem PresentationCurrentSlide SID_PRESENTATION_CURRENT_SLIDE
()
[
/* flags: */

2
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
View File

@ -141,7 +141,7 @@ void SlotManager::FuTemporary (SfxRequest& rRequest)
switch (rRequest.GetSlot())
{
case SID_PRESENTATION:
case SID_PRESENTATION_THIS_SLIDE:
case SID_PRESENTATION_CURRENT_SLIDE:
case SID_REHEARSE_TIMINGS:
ShowSlideShow (rRequest);
pShell->Cancel();

2
sd/source/ui/view/drviewse.cxx
View File

@ -684,7 +684,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
break;
case SID_PRESENTATION:
case SID_PRESENTATION_THIS_SLIDE:
case SID_PRESENTATION_CURRENT_SLIDE:
case SID_REHEARSE_TIMINGS:
{
ShowSlideShow(rReq);

2
sd/source/ui/view/outlnvs2.cxx
View File

@ -232,7 +232,7 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq)
break;
case SID_PRESENTATION:
case SID_PRESENTATION_THIS_SLIDE:
case SID_PRESENTATION_CURRENT_SLIDE:
case SID_REHEARSE_TIMINGS:
{
pOlView->PrepareClose();

3
sd/uiconfig/simpress/menubar/menubar.xml
View File

@ -300,13 +300,12 @@
<menu:menu menu:id=".uno:SlideShowMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:Presentation"/>
<menu:menuitem menu:id=".uno:PresentationThisSlide"/>
<menu:menuitem menu:id=".uno:PresentationCurrentSlide"/>
<menu:menuitem menu:id=".uno:PresentationDialog"/>
<menu:menuitem menu:id=".uno:RehearseTimings"/>
<menu:menuitem menu:id=".uno:Remote"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:AnimationEffects"/>
<!--menu:menuitem menu:id=".uno:CustomAnimationSchemes" / -->
<menu:menuitem menu:id=".uno:CustomAnimation"/>
<menu:menuitem menu:id=".uno:SlideChangeWindow"/>
<menu:menuseparator/>