sd/inc/bitmaps.hlst | 5
sd/inc/strings.hrc | 7
sd/source/ui/slideshow/slideshowimpl.cxx | 202 ++++++++++++----------------
sd/source/ui/slideshow/slideshowimpl.hxx | 2
sd/uiconfig/simpress/ui/slidecontextmenu.ui | 120 ++++++----------
5 files changed, 146 insertions(+), 190 deletions(-)
New commits:
commit e872d77cc0e5dc1571df4559101d0b80e40097c2
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Feb 19 16:13:36 2021 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Feb 19 21:05:57 2021 +0100
weld slidecontextmenu
Change-Id: I7777a3fea3ddf920c45daa244826dffb7effa58c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111238
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sd/inc/bitmaps.hlst b/sd/inc/bitmaps.hlst
index 6186abcab3c1..6986085a8992 100644
--- a/sd/inc/bitmaps.hlst
+++ b/sd/inc/bitmaps.hlst
@@ -204,6 +204,11 @@
#define BMP_CUSTOMANIMATION_MEDIA_PAUSE
"sd/res/breakplayingblue_16.png"
#define BMP_CUSTOMANIMATION_MEDIA_STOP
"sd/res/stopplayingblue_16.png"
+#define BMP_MENU_NEXT
"cmd/sc_nextrecord.png"
+#define BMP_MENU_PREV
"cmd/sc_prevrecord.png"
+#define BMP_MENU_FIRST
"cmd/sc_firstrecord.png"
+#define BMP_MENU_LAST
"cmd/sc_lastrecord.png"
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index ec8222b8bd15..183324d2679a 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -478,7 +478,12 @@
#define STR_ANIMATION_DIALOG_TITLE
NC_("STR_ANIMATION_DIALOG_TITLE", "Animation")
-#define RID_SVXSTR_EDIT_GRAPHIC
NC_("RID_SVXSTR_EDIT_GRAPHIC", "Link")
+#define RID_SVXSTR_EDIT_GRAPHIC
NC_("RID_SVXSTR_EDIT_GRAPHIC", "Link")
+
+#define RID_SVXSTR_MENU_NEXT
NC_("RID_SVXSTR_MENU_NEXT", "~Next")
+#define RID_SVXSTR_MENU_PREV
NC_("RID_SVXSTR_MENU_NEXT", "~Previous")
+#define RID_SVXSTR_MENU_FIRST
NC_("RID_SVXSTR_MENU_FIRST", "~First Slide")
+#define RID_SVXSTR_MENU_LAST
NC_("RID_SVXSTR_MENU_LAST", "~Last Slide")
#endif
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 22893cf34a3a..b9639f184cb9 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -67,10 +67,12 @@
#include "PaneHider.hxx"
#include <bitmaps.hlst>
-#include <vcl/builder.hxx>
+#include <strings.hrc>
+#include <sdresid.hxx>
#include <vcl/canvastools.hxx>
#include <vcl/commandevent.hxx>
#include <vcl/commandinfoprovider.hxx>
+#include <vcl/weldutils.hxx>
#include <vcl/settings.hxx>
#include <vcl/scheduler.hxx>
@@ -1942,119 +1944,102 @@ IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl, void*,
void)
if( !mbWasPaused )
pause();
- VclBuilder aBuilder(nullptr, AllSettings::GetUIRootDir(),
"modules/simpress/ui/slidecontextmenu.ui", "");
- VclPtr<PopupMenu> pMenu(aBuilder.get_menu("menu"));
+ std::unique_ptr<weld::Builder>
xBuilder(Application::CreateBuilder(nullptr,
"modules/simpress/ui/slidecontextmenu.ui"));
+ std::unique_ptr<weld::Menu> xMenu(xBuilder->weld_menu("menu"));
+ OUString sNextImage(BMP_MENU_NEXT), sPrevImage(BMP_MENU_PREV);
+ xMenu->insert(0, "next", SdResId(RID_SVXSTR_MENU_NEXT), &sNextImage,
nullptr, nullptr, TRISTATE_INDET);
+ xMenu->insert(1, "prev", SdResId(RID_SVXSTR_MENU_PREV), &sPrevImage,
nullptr, nullptr, TRISTATE_INDET);
// Adding button to display if in Pen mode
- pMenu->CheckItem("pen", mbUsePen);
+ xMenu->set_active("pen", mbUsePen);
const ShowWindowMode eMode = mpShowWindow->GetShowWindowMode();
- pMenu->EnableItem(pMenu->GetItemId("next"),
mpSlideController->getNextSlideIndex() != -1);
- pMenu->EnableItem(pMenu->GetItemId("prev"),
(mpSlideController->getPreviousSlideIndex() != -1 ) || (eMode ==
SHOWWINDOWMODE_END) || (eMode == SHOWWINDOWMODE_PAUSE) || (eMode ==
SHOWWINDOWMODE_BLANK));
- pMenu->EnableItem(pMenu->GetItemId("edit"),
mpViewShell->GetDoc()->IsStartWithPresentation());
+ xMenu->set_visible("next", mpSlideController->getNextSlideIndex() != -1);
+ xMenu->set_visible("prev", (mpSlideController->getPreviousSlideIndex() !=
-1 ) || (eMode == SHOWWINDOWMODE_END) || (eMode == SHOWWINDOWMODE_PAUSE) ||
(eMode == SHOWWINDOWMODE_BLANK));
+ xMenu->set_visible("edit",
mpViewShell->GetDoc()->IsStartWithPresentation());
- PopupMenu* pPageMenu = pMenu->GetPopupMenu(pMenu->GetItemId("goto"));
+ std::unique_ptr<weld::Menu> xPageMenu(xBuilder->weld_menu("gotomenu"));
+ OUString sFirstImage(BMP_MENU_FIRST), sLastImage(BMP_MENU_LAST);
+ xPageMenu->insert(0, "first", SdResId(RID_SVXSTR_MENU_FIRST),
&sFirstImage, nullptr, nullptr, TRISTATE_INDET);
+ xPageMenu->insert(1, "last", SdResId(RID_SVXSTR_MENU_LAST), &sLastImage,
nullptr, nullptr, TRISTATE_INDET);
- SfxViewFrame* pViewFrame = getViewFrame();
- if( pViewFrame )
+ // populate slide goto list
+ const sal_Int32 nPageNumberCount =
mpSlideController->getSlideNumberCount();
+ if( nPageNumberCount <= 1 )
{
- Reference< css::frame::XFrame > xFrame(
pViewFrame->GetFrame().GetFrameInterface() );
- if( xFrame.is() )
- {
- pMenu->SetItemImage(pMenu->GetItemId("next"),
vcl::CommandInfoProvider::GetImageForCommand(".uno:NextRecord", xFrame));
- pMenu->SetItemImage(pMenu->GetItemId("prev"),
vcl::CommandInfoProvider::GetImageForCommand(".uno:PrevRecord", xFrame));
-
- if( pPageMenu )
- {
- pPageMenu->SetItemImage(pPageMenu->GetItemId("first"),
vcl::CommandInfoProvider::GetImageForCommand(".uno:FirstRecord", xFrame));
- pPageMenu->SetItemImage(pPageMenu->GetItemId("last"),
vcl::CommandInfoProvider::GetImageForCommand(".uno:LastRecord", xFrame));
- }
- }
+ xMenu->set_visible("goto", false);
}
-
- // populate slide goto list
- if( pPageMenu )
+ else
{
- const sal_Int32 nPageNumberCount =
mpSlideController->getSlideNumberCount();
- if( nPageNumberCount <= 1 )
- {
- pMenu->EnableItem(pMenu->GetItemId("goto"), false);
- }
- else
- {
- sal_Int32 nCurrentSlideNumber =
mpSlideController->getCurrentSlideNumber();
- if( (eMode == SHOWWINDOWMODE_END) || (eMode ==
SHOWWINDOWMODE_PAUSE) || (eMode == SHOWWINDOWMODE_BLANK) )
- nCurrentSlideNumber = -1;
+ sal_Int32 nCurrentSlideNumber =
mpSlideController->getCurrentSlideNumber();
+ if( (eMode == SHOWWINDOWMODE_END) || (eMode == SHOWWINDOWMODE_PAUSE)
|| (eMode == SHOWWINDOWMODE_BLANK) )
+ nCurrentSlideNumber = -1;
- pPageMenu->EnableItem(pPageMenu->GetItemId("first"),
mpSlideController->getSlideNumber(0) != nCurrentSlideNumber);
- pPageMenu->EnableItem(pPageMenu->GetItemId("last"),
mpSlideController->getSlideNumber(mpSlideController->getSlideIndexCount() - 1)
!= nCurrentSlideNumber);
+ xPageMenu->set_visible("first", mpSlideController->getSlideNumber(0)
!= nCurrentSlideNumber);
+ xPageMenu->set_visible("last",
mpSlideController->getSlideNumber(mpSlideController->getSlideIndexCount() - 1)
!= nCurrentSlideNumber);
- sal_Int32 nPageNumber;
+ sal_Int32 nPageNumber;
- for( nPageNumber = 0; nPageNumber < nPageNumberCount;
nPageNumber++ )
+ for( nPageNumber = 0; nPageNumber < nPageNumberCount; nPageNumber++ )
+ {
+ if( mpSlideController->isVisibleSlideNumber( nPageNumber ) )
{
- if( mpSlideController->isVisibleSlideNumber( nPageNumber ) )
+ SdPage* pPage =
mpDoc->GetSdPage(static_cast<sal_uInt16>(nPageNumber), PageKind::Standard);
+ if (pPage)
{
- SdPage* pPage =
mpDoc->GetSdPage(static_cast<sal_uInt16>(nPageNumber), PageKind::Standard);
- if (pPage)
- {
- pPageMenu->InsertItem(
static_cast<sal_uInt16>(CM_SLIDES + nPageNumber), pPage->GetName() );
- if( nPageNumber == nCurrentSlideNumber )
- pPageMenu->CheckItem(
static_cast<sal_uInt16>(CM_SLIDES + nPageNumber) );
- }
+ OUString sId(OUString::number(CM_SLIDES + nPageNumber));
+ xPageMenu->append_check(sId, pPage->GetName());
+ if (nPageNumber == nCurrentSlideNumber)
+ xPageMenu->set_active(sId.toUtf8(), true);
}
}
}
}
- if( mpShowWindow->GetShowWindowMode() == SHOWWINDOWMODE_BLANK )
+ std::unique_ptr<weld::Menu> xBlankMenu(xBuilder->weld_menu("screenmenu"));
+
+ if (mpShowWindow->GetShowWindowMode() == SHOWWINDOWMODE_BLANK)
{
- PopupMenu* pBlankMenu =
pMenu->GetPopupMenu(pMenu->GetItemId("screen"));
- if( pBlankMenu )
- {
- pBlankMenu->CheckItem((mpShowWindow->GetBlankColor() == COL_WHITE)
? "white" : "black");
- }
+ xBlankMenu->set_active((mpShowWindow->GetBlankColor() == COL_WHITE) ?
"white" : "black", true);
}
- PopupMenu* pWidthMenu = pMenu->GetPopupMenu(pMenu->GetItemId("width"));
+ std::unique_ptr<weld::Menu> xWidthMenu(xBuilder->weld_menu("widthmenu"));
// populate color width list
- if( pWidthMenu )
- {
- sal_Int32 nIterator;
- double nWidth;
+ sal_Int32 nIterator;
+ double nWidth;
- nWidth = 4.0;
- for( nIterator = 1; nIterator < 6; nIterator++)
+ nWidth = 4.0;
+ for( nIterator = 1; nIterator < 6; nIterator++)
+ {
+ switch(nIterator)
{
- switch(nIterator)
- {
- case 1:
- nWidth = 4.0;
- break;
- case 2:
- nWidth = 100.0;
- break;
- case 3:
- nWidth = 150.0;
- break;
- case 4:
- nWidth = 200.0;
- break;
- case 5:
- nWidth = 400.0;
- break;
- default:
- break;
- }
-
- if (nWidth == mdUserPaintStrokeWidth)
- pWidthMenu->CheckItem(OString::number(nWidth));
+ case 1:
+ nWidth = 4.0;
+ break;
+ case 2:
+ nWidth = 100.0;
+ break;
+ case 3:
+ nWidth = 150.0;
+ break;
+ case 4:
+ nWidth = 200.0;
+ break;
+ case 5:
+ nWidth = 400.0;
+ break;
+ default:
+ break;
}
+
+ if (nWidth == mdUserPaintStrokeWidth)
+ xWidthMenu->set_active(OString::number(nWidth), true);
}
- pMenu->SetSelectHdl( LINK( this, SlideshowImpl, ContextMenuSelectHdl ) );
- pMenu->Execute( mpShowWindow, maPopupMousePos );
+ ::tools::Rectangle aRect(maPopupMousePos, Size(1,1));
+ weld::Window* pParent = weld::GetPopupParent(*mpShowWindow, aRect);
+ ContextMenuSelectHdl(xMenu->popup_at_rect(pParent, aRect));
if( mxView.is() )
mxView->ignoreNextMouseReleased();
@@ -2063,36 +2048,31 @@ IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl, void*,
void)
resume();
}
-IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu, bool )
+void SlideshowImpl::ContextMenuSelectHdl(const OString& rMenuId)
{
- if (!pMenu)
- return false;
-
- OString sMenuId = pMenu->GetCurItemIdent();
-
- if (sMenuId == "prev")
+ if (rMenuId == "prev")
{
gotoPreviousSlide();
mbWasPaused = false;
}
- else if(sMenuId == "next")
+ else if(rMenuId == "next")
{
gotoNextSlide();
mbWasPaused = false;
}
- else if (sMenuId == "first")
+ else if (rMenuId == "first")
{
gotoFirstSlide();
mbWasPaused = false;
}
- else if (sMenuId == "last")
+ else if (rMenuId == "last")
{
gotoLastSlide();
mbWasPaused = false;
}
- else if (sMenuId == "black" || sMenuId == "white")
+ else if (rMenuId == "black" || rMenuId == "white")
{
- const Color aBlankColor(sMenuId == "white" ? COL_WHITE : COL_BLACK);
+ const Color aBlankColor(rMenuId == "white" ? COL_WHITE : COL_BLACK);
if( mbWasPaused )
{
if( mpShowWindow->GetShowWindowMode() == SHOWWINDOWMODE_BLANK )
@@ -2101,7 +2081,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *,
pMenu, bool )
{
mbWasPaused = false;
mpShowWindow->RestartShow();
- return false;
+ return;
}
}
mpShowWindow->RestartShow();
@@ -2112,7 +2092,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *,
pMenu, bool )
mbWasPaused = true;
}
}
- else if (sMenuId == "color")
+ else if (rMenuId == "color")
{
//Open a color picker based on SvColorDialog
::Color aColor( ColorTransparency, mnUserPaintColor );
@@ -2126,42 +2106,42 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *,
pMenu, bool )
}
mbWasPaused = false;
}
- else if (sMenuId == "4")
+ else if (rMenuId == "4")
{
setPenWidth(4.0);
mbWasPaused = false;
}
- else if (sMenuId == "100")
+ else if (rMenuId == "100")
{
setPenWidth(100.0);
mbWasPaused = false;
}
- else if (sMenuId == "150")
+ else if (rMenuId == "150")
{
setPenWidth(150.0);
mbWasPaused = false;
}
- else if (sMenuId == "200")
+ else if (rMenuId == "200")
{
setPenWidth(200.0);
mbWasPaused = false;
}
- else if (sMenuId == "400")
+ else if (rMenuId == "400")
{
setPenWidth(400.0);
mbWasPaused = false;
}
- else if (sMenuId == "erase")
+ else if (rMenuId == "erase")
{
setEraseAllInk(true);
mbWasPaused = false;
}
- else if (sMenuId == "pen")
+ else if (rMenuId == "pen")
{
setUsePen(!mbUsePen);
mbWasPaused = false;
}
- else if (sMenuId == "edit")
+ else if (rMenuId == "edit")
{
// When in autoplay mode (pps/ppsx), offer editing of the presentation
// Turn autostart off, else Impress will close when exiting the
Presentation
@@ -2175,7 +2155,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *,
pMenu, bool )
}
endPresentation();
}
- else if (sMenuId == "end")
+ else if (rMenuId == "end")
{
// in case the user cancels the presentation, switch to current slide
// in edit mode
@@ -2188,9 +2168,9 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *,
pMenu, bool )
}
endPresentation();
}
- else
+ else if (!rMenuId.isEmpty())
{
- sal_Int32 nPageNumber = pMenu->GetCurItemId() - CM_SLIDES;
+ sal_Int32 nPageNumber = rMenuId.toInt32() - CM_SLIDES;
const ShowWindowMode eMode = mpShowWindow->GetShowWindowMode();
if( (eMode == SHOWWINDOWMODE_END) || (eMode == SHOWWINDOWMODE_PAUSE)
|| (eMode == SHOWWINDOWMODE_BLANK) )
{
@@ -2202,8 +2182,6 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *,
pMenu, bool )
}
mbWasPaused = false;
}
-
- return false;
}
Reference< XSlideShow > SlideshowImpl::createSlideShow()
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx
b/sd/source/ui/slideshow/slideshowimpl.hxx
index 5fbd564fc00f..193681259aa8 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -244,7 +244,7 @@ private:
DECL_LINK( updateHdl, Timer *, void );
DECL_LINK( ReadyForNextInputHdl, Timer *, void );
DECL_LINK( endPresentationHdl, void*, void );
- DECL_LINK( ContextMenuSelectHdl, Menu *, bool );
+ void ContextMenuSelectHdl(const OString& rIdent);
DECL_LINK( ContextMenuHdl, void*, void );
DECL_LINK( deactivateHdl, Timer *, void );
DECL_LINK( EventListenerHdl, VclSimpleEvent&, void );
diff --git a/sd/uiconfig/simpress/ui/slidecontextmenu.ui
b/sd/uiconfig/simpress/ui/slidecontextmenu.ui
index 90b50f13d55a..91b5e1b59d0a 100644
--- a/sd/uiconfig/simpress/ui/slidecontextmenu.ui
+++ b/sd/uiconfig/simpress/ui/slidecontextmenu.ui
@@ -1,56 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.38.2 -->
<interface domain="sd">
<requires lib="gtk+" version="3.20"/>
<object class="GtkMenu" id="menu">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkMenuItem" id="next">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="slidecontextmenu|next">_Next</property>
- <property name="use_underline">True</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="prev">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="slidecontextmenu|prev">_Previous</property>
- <property name="use_underline">True</property>
- </object>
- </child>
+ <property name="can-focus">False</property>
<child>
<object class="GtkMenuItem" id="goto">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="slidecontextmenu|goto">_Go to Slide</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
<child type="submenu">
- <object class="GtkMenu">
+ <object class="GtkMenu" id="gotomenu">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkMenuItem" id="first">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="slidecontextmenu|first">_First Slide</property>
- <property name="use_underline">True</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="last">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="slidecontextmenu|last">_Last Slide</property>
- <property name="use_underline">True</property>
- </object>
- </child>
+ <property name="can-focus">False</property>
<child>
<object class="GtkSeparatorMenuItem" id="menuitem3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
</object>
</child>
</object>
@@ -60,65 +28,65 @@
<child>
<object class="GtkSeparatorMenuItem" id="menuitem1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="pen">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="slidecontextmenu|pen">Mouse Pointer as ~Pen</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="slidecontextmenu|pen">Mouse Pointer as _Pen</property>
+ <property name="use-underline">True</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="width">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="slidecontextmenu|width">_Pen Width</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
<child type="submenu">
- <object class="GtkMenu">
+ <object class="GtkMenu" id="widthmenu">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<child>
<object class="GtkRadioMenuItem" id="4">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="slidecontextmenu|4">_Very Thin</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
<child>
<object class="GtkRadioMenuItem" id="100">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="slidecontextmenu|100">_Thin</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
<child>
<object class="GtkRadioMenuItem" id="150">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="slidecontextmenu|150">_Normal</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
<child>
<object class="GtkRadioMenuItem" id="200">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="slidecontextmenu|200">_Thick</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
<child>
<object class="GtkRadioMenuItem" id="400">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="slidecontextmenu|400">_Very Thick</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
</object>
@@ -128,49 +96,49 @@
<child>
<object class="GtkMenuItem" id="color">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="slidecontextmenu|color">_Change Pen Color...</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="erase">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="slidecontextmenu|erase">_Erase All Ink on Slide</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="menuitem2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="screen">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="slidecontextmenu|screen">_Screen</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
<child type="submenu">
- <object class="GtkMenu">
+ <object class="GtkMenu" id="screenmenu">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<child>
- <object class="GtkMenuItem" id="black">
+ <object class="GtkCheckMenuItem" id="black">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="slidecontextmenu|black">_Black</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="white">
+ <object class="GtkCheckMenuItem" id="white">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="slidecontextmenu|white">_White</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
</object>
@@ -180,17 +148,17 @@
<child>
<object class="GtkMenuItem" id="edit">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="slidecontextmenu|edit">E_dit Presentation</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="end">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="slidecontextmenu|end">_End Show</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
</object>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
