diff options
| -rw-r--r-- | sd/source/ui/slideshow/slideshow.src | 55 | ||||
| -rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 18 |
2 files changed, 31 insertions, 42 deletions
diff --git a/sd/source/ui/slideshow/slideshow.src b/sd/source/ui/slideshow/slideshow.src index 7d5a05c463bd..07df291e428f 100644 --- a/sd/source/ui/slideshow/slideshow.src +++ b/sd/source/ui/slideshow/slideshow.src @@ -118,7 +118,7 @@ Menu RID_SLIDESHOW_CONTEXTMENU MenuItem { Identifier = CM_COLOR_PEN ; - Text [ en-US ] = "~Change Color" ; + Text [ en-US ] = "~Change Pen Color" ; }; MenuItem { @@ -126,28 +126,6 @@ Menu RID_SLIDESHOW_CONTEXTMENU }; MenuItem { - Identifier = CM_SCREEN; - Text [ en-US ] = "~Screen" ; - - SubMenu = Menu - { - ItemList = - { - MenuItem - { - Identifier = CM_SCREEN_BLACK; - Text [ en-US ] = "~Black"; - }; - MenuItem - { - Identifier = CM_SCREEN_WHITE; - Text [ en-US ] = "~White"; - }; - }; - }; - }; - MenuItem - { Separator = TRUE; }; MenuItem @@ -166,11 +144,6 @@ Menu RID_SLIDESHOW_CONTEXTMENU }; MenuItem { - Identifier = CM_ERASE_ALLINK ; - Text [ en-US ] = "~Erase All Ink" ; - }; - MenuItem - { Identifier = CM_ERASE_INK_PEN; Text [ en-US ] = "~Eraser Size" ; @@ -206,14 +179,36 @@ Menu RID_SLIDESHOW_CONTEXTMENU }; }; }; + MenuItem + { + Separator = TRUE; + }; MenuItem { - Separator = TRUE; + Identifier = CM_SCREEN; + Text [ en-US ] = "~Screen" ; + + SubMenu = Menu + { + ItemList = + { + MenuItem + { + Identifier = CM_SCREEN_BLACK; + Text [ en-US ] = "~Black"; + }; + MenuItem + { + Identifier = CM_SCREEN_WHITE; + Text [ en-US ] = "~White"; + }; + }; + }; }; MenuItem { Identifier = CM_ENDSHOW ; Text [ en-US ] = "~End Show" ; - }; + }; }; }; diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index e56c93f72b13..c7966d805c01 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -2354,8 +2354,10 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu ) } } break; + + if( maPresSettings.mbMouseAsPen ) + { case CM_COLOR_PEN: - if( maPresSettings.mbMouseAsPen ) { //Open a color picker based on SvColorDialog ::Color aColor( mnUserPaintColor ); @@ -2373,7 +2375,6 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu ) break; case CM_WIDTH_PEN_VERY_THIN: - if( maPresSettings.mbMouseAsPen ) { setPenWidth(4.0); mbWasPaused = false; @@ -2381,7 +2382,6 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu ) break; case CM_WIDTH_PEN_THIN: - if( maPresSettings.mbMouseAsPen ) { setPenWidth(100.0); mbWasPaused = false; @@ -2389,7 +2389,6 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu ) break; case CM_WIDTH_PEN_NORMAL: - if( maPresSettings.mbMouseAsPen ) { setPenWidth(150.0); mbWasPaused = false; @@ -2397,7 +2396,6 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu ) break; case CM_WIDTH_PEN_THICK: - if( maPresSettings.mbMouseAsPen ) { setPenWidth(200.0); mbWasPaused = false; @@ -2405,21 +2403,19 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu ) break; case CM_WIDTH_PEN_VERY_THICK: - if( maPresSettings.mbMouseAsPen ) { setPenWidth(400.0); mbWasPaused = false; } break; +#ifdef ENABLE_PRESENTER_EXTRA_UI case CM_ERASE_ALLINK: - if( maPresSettings.mbMouseAsPen ) { setEraseAllInk(true); mbWasPaused = false; } break; case CM_ERASE_INK_PEN_VERY_THIN: - if( maPresSettings.mbMouseAsPen ) { setEraseInk(100.0); mbWasPaused = false; @@ -2427,7 +2423,6 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu ) break; case CM_ERASE_INK_PEN_THIN: - if( maPresSettings.mbMouseAsPen ) { setEraseInk(200.0); mbWasPaused = false; @@ -2435,7 +2430,6 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu ) break; case CM_ERASE_INK_PEN_NORMAL: - if( maPresSettings.mbMouseAsPen ) { setEraseInk(300.0); mbWasPaused = false; @@ -2443,19 +2437,19 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu ) break; case CM_ERASE_INK_PEN_THICK: - if( maPresSettings.mbMouseAsPen ) { setEraseInk(400.0); mbWasPaused = false; } break; case CM_ERASE_INK_PEN_VERY_THICK: - if( maPresSettings.mbMouseAsPen ) { setEraseInk(500.0); mbWasPaused = false; } break; +#endif + } case CM_ENDSHOW: // in case the user cancels the presentation, switch to current slide |