[Libreoffice-commits] core.git: 2 commits - sd/source sd/uiconfig sd/UIConfig_simpress.mk sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
Caolán McNamara
caolanm at redhat.com
Thu Apr 13 10:12:33 UTC 2017
sd/UIConfig_simpress.mk | 1
sd/source/ui/app/popup.src | 22 -----
sd/source/ui/inc/res_bmp.hrc | 1
sd/source/ui/sidebar/LayoutMenu.cxx | 9 +-
sd/uiconfig/simpress/ui/layoutmenu.ui | 31 ++++++++
sw/AllLangResTarget_sw.mk | 1
sw/UIConfig_swriter.mk | 1
sw/inc/AnnotationWin.hxx | 2
sw/inc/swcommands.h | 12 ---
sw/source/ui/app/mn.src | 92 ------------------------
sw/source/uibase/docvw/AnnotationMenuButton.cxx | 30 +++++--
sw/source/uibase/docvw/AnnotationWin.cxx | 12 +--
sw/source/uibase/docvw/AnnotationWin2.cxx | 1
sw/source/uibase/docvw/HeaderFooterWin.cxx | 1
sw/source/uibase/docvw/PageBreakWin.cxx | 1
sw/source/uibase/inc/popup.hrc | 34 --------
sw/source/uibase/shells/annotsh.cxx | 1
sw/source/uibase/shells/beziersh.cxx | 1
sw/source/uibase/shells/drawsh.cxx | 1
sw/source/uibase/shells/drformsh.cxx | 1
sw/source/uibase/shells/drwtxtsh.cxx | 1
sw/source/uibase/shells/frmsh.cxx | 1
sw/source/uibase/shells/grfsh.cxx | 1
sw/source/uibase/shells/mediash.cxx | 1
sw/source/uibase/shells/navsh.cxx | 1
sw/source/uibase/shells/olesh.cxx | 1
sw/source/uibase/shells/tabsh.cxx | 1
sw/source/uibase/shells/textsh.cxx | 1
sw/source/uibase/uiview/pview.cxx | 1
sw/source/uibase/uiview/srcview.cxx | 1
sw/source/uibase/uiview/view.src | 1
sw/source/uibase/web/wformsh.cxx | 1
sw/source/uibase/web/wfrmsh.cxx | 1
sw/source/uibase/web/wgrfsh.cxx | 1
sw/source/uibase/web/wolesh.cxx | 1
sw/source/uibase/web/wtabsh.cxx | 1
sw/source/uibase/web/wtextsh.cxx | 1
sw/uiconfig/swriter/ui/annotationmenu.ui | 55 ++++++++++++++
38 files changed, 122 insertions(+), 205 deletions(-)
New commits:
commit a8b366af313a4ffd0ae5766cf4fc281c7efc83f3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 13 11:10:01 2017 +0100
convert taskpane layout menu to .ui
Change-Id: Id5ecde3bc38a6d4c3dd15354c64d7b5e52712093
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index 6bf23ea2f9ae..f98901bd695a 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -121,6 +121,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/insertslides \
sd/uiconfig/simpress/ui/interactiondialog \
sd/uiconfig/simpress/ui/interactionpage \
+ sd/uiconfig/simpress/ui/layoutmenu \
sd/uiconfig/simpress/ui/masterlayoutdlg \
sd/uiconfig/simpress/ui/navigatorpanel \
sd/uiconfig/simpress/ui/notebookbar \
diff --git a/sd/source/ui/app/popup.src b/sd/source/ui/app/popup.src
index 9668057eab3c..aad53501ce1c 100644
--- a/sd/source/ui/app/popup.src
+++ b/sd/source/ui/app/popup.src
@@ -108,26 +108,4 @@ Menu RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP
};
};
-Menu RID_TASKPANE_LAYOUTMENU_POPUP
-{
- ItemList =
- {
- MenuItem
- {
- Identifier = SID_TP_APPLY_TO_SELECTED_SLIDES;
- HelpId = CMD_SID_TP_APPLY_TO_SELECTED_SLIDES;
- Text [ en-US ] = "Apply to ~Selected Slides";
- };
-
- SEPARATOR
-
- MenuItem
- {
- Identifier = SID_INSERTPAGE_LAYOUT_MENU;
- HelpId = CMD_SID_INSERTPAGE_LAYOUT_MENU;
- Text [ en-US ] = "~Insert Slide";
- };
- };
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc
index 79e05cbd5b09..a6c240efa51a 100644
--- a/sd/source/ui/inc/res_bmp.hrc
+++ b/sd/source/ui/inc/res_bmp.hrc
@@ -199,7 +199,6 @@
// ResourceIDs for Popup-Menus do not need a dummy string!!!
#define RID_TASKPANE_MASTERPAGESSELECTOR_POPUP RID_APP_START+67
-#define RID_TASKPANE_LAYOUTMENU_POPUP RID_APP_START+68
#define RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP RID_APP_START+93
#define RID_GRAPHICSTYLEFAMILY RID_APP_START+395
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index ab862728f282..2a621b0fa554 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -600,7 +600,8 @@ void LayoutMenu::Command (const CommandEvent& rEvent)
}
// Setup the menu.
- ScopedVclPtrInstance<PopupMenu> pMenu(SdResId(RID_TASKPANE_LAYOUTMENU_POPUP));
+ VclBuilder aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "modules/simpress/ui/layoutmenu.ui", "");
+ VclPtr<PopupMenu> pMenu(aBuilder.get_menu("menu"));
FloatingWindow* pMenuWindow = dynamic_cast<FloatingWindow*>(pMenu->GetWindow());
if (pMenuWindow != nullptr)
pMenuWindow->SetPopupModeFlags(
@@ -640,13 +641,13 @@ IMPL_LINK(LayoutMenu, OnMenuItemSelected, Menu*, pMenu, bool)
}
pMenu->Deactivate();
- const sal_Int32 nIndex (pMenu->GetCurItemId());
+ OString sIdent = pMenu->GetCurItemIdent();
- if (nIndex == SID_TP_APPLY_TO_SELECTED_SLIDES)
+ if (sIdent == "apply")
{
AssignLayoutToSelectedSlides(GetSelectedAutoLayout());
}
- else if (nIndex == SID_INSERTPAGE_LAYOUT_MENU)
+ else if (sIdent == "insert")
{
// Add arguments to this slot and forward it to the main view
// shell.
diff --git a/sd/uiconfig/simpress/ui/layoutmenu.ui b/sd/uiconfig/simpress/ui/layoutmenu.ui
new file mode 100644
index 000000000000..ae59cf23241d
--- /dev/null
+++ b/sd/uiconfig/simpress/ui/layoutmenu.ui
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface>
+ <requires lib="gtk+" version="3.10"/>
+ <object class="GtkMenu" id="menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="apply">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Apply to ~Selected Slides</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="menuitem1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="insert">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Insert Slide</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ </object>
+</interface>
commit a10b4fd2bc08651d47bdb19bb8ab9c1f8f3d4851
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 12 14:51:13 2017 +0100
convert annotation menu to .ui
Change-Id: Id15e1c2040d3d202e90984888598da4426b5fec4
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 925c5abc2d0e..8cd89f3acfde 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -78,7 +78,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/uibase/dbui/mailmergechildwindow.src \
sw/source/ui/app/app.src \
sw/source/ui/app/error.src \
- sw/source/ui/app/mn.src \
sw/source/ui/chrdlg/chrdlg.src \
sw/source/ui/config/optdlg.src \
sw/source/ui/config/optload.src \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 66e19966b996..10143d23d735 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -88,6 +88,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/addentrydialog \
sw/uiconfig/swriter/ui/addressblockdialog \
sw/uiconfig/swriter/ui/alreadyexistsdialog \
+ sw/uiconfig/swriter/ui/annotationmenu \
sw/uiconfig/swriter/ui/asciifilterdialog \
sw/uiconfig/swriter/ui/asksearchdialog \
sw/uiconfig/swriter/ui/assignfieldsdialog \
diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx
index 6f660a27ccca..29080823050a 100644
--- a/sw/inc/AnnotationWin.hxx
+++ b/sw/inc/AnnotationWin.hxx
@@ -24,6 +24,7 @@
#include <basegfx/range/b2drange.hxx>
#include <editeng/editstat.hxx>
#include <tools/date.hxx>
+#include <vcl/builder.hxx>
#include <vcl/lineinfo.hxx>
#include <vcl/window.hxx>
@@ -208,6 +209,7 @@ class SwAnnotationWin : public vcl::Window
SwAnnotationWin* GetTopReplyNote();
SvxLanguageItem GetLanguage();
+ VclBuilder maBuilder;
SwPostItMgr& mrMgr;
SwView& mrView;
diff --git a/sw/inc/swcommands.h b/sw/inc/swcommands.h
index e726c818344e..ac50f3e381b8 100644
--- a/sw/inc/swcommands.h
+++ b/sw/inc/swcommands.h
@@ -20,18 +20,6 @@
#define INCLUDED_SW_INC_SWCOMMANDS_H
#define CMD_FN_READONLY_SELECTION_MODE ".uno:SelectTextMode"
-#define CMD_FN_REPLY ".uno:ReplyNote"
-#define CMD_FN_DELETE_COMMENT ".uno:DeleteComment"
-#define CMD_FN_DELETE_NOTE_AUTHOR ".uno:DeleteAuthor"
-#define CMD_FN_DELETE_ALL_NOTES ".uno:DeleteAllNotes"
-#define CMD_FN_FORMAT_ALL_NOTES ".uno:FormatAllNotes"
-#define CMD_FN_HIDE_NOTE ".uno:HideNote"
-#define CMD_FN_HIDE_NOTE_AUTHOR ".uno:HideAuthor"
-#define CMD_FN_HIDE_ALL_NOTES ".uno:HideAllNotes"
-#define CMD_FN_REDLINE_ACCEPT_DIRECT ".uno:AcceptTrackedChange"
-#define CMD_FN_REDLINE_REJECT_DIRECT ".uno:RejectTrackedChange"
-#define CMD_FN_REDLINE_NEXT_CHANGE ".uno:NextTrackedChange"
-#define CMD_FN_REDLINE_PREV_CHANGE ".uno:PreviousTrackedChange"
#endif
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
deleted file mode 100644
index 984e7ebf55b7..000000000000
--- a/sw/source/ui/app/mn.src
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <svx/dialogs.hrc>
-#include "cmdid.h"
-#include "app.hrc"
-#include "globals.hrc"
-#include "helpid.h"
-#include "popup.hrc"
-
-#define SEPARATOR MenuItem { Separator = TRUE; }
-/*------------------------------------------------------------------------
- Description: Menu Window
-------------------------------------------------------------------------*/
-
-/*--Popups---------------------------------------------------------------*/
-
-Menu MN_ANNOTATION_BUTTON
-{
- ItemList =
- {
- MenuItem
- {
- Identifier = FN_REPLY ;
- HelpID = CMD_FN_REPLY ;
- Text [ en-US ] = "Reply" ;
- };
- SEPARATOR ;
- MenuItem
- {
- Identifier = FN_DELETE_COMMENT ;
- HelpID = CMD_FN_DELETE_COMMENT ;
- Text [ en-US ] = "Delete ~Comment" ;
- };
- MenuItem
- {
- Identifier = FN_DELETE_NOTE_AUTHOR ;
- HelpId = CMD_FN_DELETE_NOTE_AUTHOR ;
- Text [ en-US ] = "Delete ~All Comments by $1" ;
- };
- MenuItem
- {
- Identifier = FN_DELETE_ALL_NOTES ;
- HelpId = CMD_FN_DELETE_ALL_NOTES ;
- Text [ en-US ] = "~Delete All Comments" ;
- };
- MenuItem
- {
- Identifier = FN_FORMAT_ALL_NOTES ;
- HelpId = CMD_FN_FORMAT_ALL_NOTES ;
- Text [ en-US ] = "~Format All Comments..." ;
- };
- /*
- MenuItem
- {
- Identifier = FN_HIDE_NOTE ;
- HelpId = CMD_FN_HIDE_NOTE ;
- Text [ en-US ] = "~Hide comment" ;
- };
- MenuItem
- {
- Identifier = FN_HIDE_NOTE_AUTHOR ;
- HelpId = CMD_FN_HIDE_NOTE_AUTHOR ;
- Text [ en-US ] = "Hide ~author" ;
- };
- MenuItem
- {
- Identifier = FN_HIDE_ALL_NOTES ;
- HelpId = CMD_FN_HIDE_ALL_NOTES ;
- Text [ en-US ] = "Hide all ~comments" ;
- };
- */
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
index a7f56ffe650c..f0cf0645608c 100644
--- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx
+++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
@@ -67,7 +67,17 @@ void AnnotationMenuButton::dispose()
void AnnotationMenuButton::Select()
{
- mrSidebarWin.ExecuteCommand( GetCurItemId() );
+ OString sIdent = GetCurItemIdent();
+ if (sIdent == "reply")
+ mrSidebarWin.ExecuteCommand(FN_REPLY);
+ else if (sIdent == "delete")
+ mrSidebarWin.ExecuteCommand(FN_DELETE_COMMENT);
+ else if (sIdent == "deleteby")
+ mrSidebarWin.ExecuteCommand(FN_DELETE_NOTE_AUTHOR);
+ else if (sIdent == "deleteall")
+ mrSidebarWin.ExecuteCommand(FN_DELETE_ALL_NOTES);
+ else if (sIdent == "formatall")
+ mrSidebarWin.ExecuteCommand(FN_FORMAT_ALL_NOTES);
}
void AnnotationMenuButton::MouseButtonDown( const MouseEvent& rMEvt )
@@ -75,18 +85,18 @@ void AnnotationMenuButton::MouseButtonDown( const MouseEvent& rMEvt )
PopupMenu* pButtonPopup(GetPopupMenu());
if (mrSidebarWin.IsReadOnly())
{
- pButtonPopup->EnableItem(FN_REPLY, false );
- pButtonPopup->EnableItem(FN_DELETE_COMMENT, false );
- pButtonPopup->EnableItem(FN_DELETE_NOTE_AUTHOR, false );
- pButtonPopup->EnableItem(FN_DELETE_ALL_NOTES, false );
- pButtonPopup->EnableItem(FN_FORMAT_ALL_NOTES, false );
+ pButtonPopup->EnableItem(pButtonPopup->GetItemId("reply"), false);
+ pButtonPopup->EnableItem(pButtonPopup->GetItemId("delete"), false );
+ pButtonPopup->EnableItem(pButtonPopup->GetItemId("deleteby"), false );
+ pButtonPopup->EnableItem(pButtonPopup->GetItemId("deleteall"), false );
+ pButtonPopup->EnableItem(pButtonPopup->GetItemId("formatall"), false );
}
else
{
- pButtonPopup->EnableItem(FN_DELETE_COMMENT, !mrSidebarWin.IsProtected() );
- pButtonPopup->EnableItem(FN_DELETE_NOTE_AUTHOR);
- pButtonPopup->EnableItem(FN_DELETE_ALL_NOTES);
- pButtonPopup->EnableItem(FN_FORMAT_ALL_NOTES);
+ pButtonPopup->EnableItem(pButtonPopup->GetItemId("delete"), !mrSidebarWin.IsProtected());
+ pButtonPopup->EnableItem(pButtonPopup->GetItemId("deleteby"));
+ pButtonPopup->EnableItem(pButtonPopup->GetItemId("deleteall"));
+ pButtonPopup->EnableItem(pButtonPopup->GetItemId("formatall"));
}
if (mrSidebarWin.IsProtected())
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx
index 241de71f81cc..8bbb502c5ce6 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -23,7 +23,6 @@
#include <PostItMgr.hxx>
#include <annotation.hrc>
-#include <popup.hrc>
#include <cmdid.h>
#include <vcl/menu.hxx>
@@ -67,6 +66,7 @@ SwAnnotationWin::SwAnnotationWin( SwEditWin& rEditWin,
SwSidebarItem& rSidebarItem,
SwFormatField* aField )
: Window(&rEditWin, nBits)
+ , maBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "modules/swriter/ui/annotationmenu.ui", "")
, mrMgr(aMgr)
, mrView(rEditWin.GetView())
, mnEventId(nullptr)
@@ -122,7 +122,8 @@ SwAnnotationWin::~SwAnnotationWin()
void SwAnnotationWin::dispose()
{
- mpButtonPopup.disposeAndClear();
+ mpButtonPopup.clear();
+ maBuilder.disposeBuilder();
if (IsDisposed())
return;
@@ -342,12 +343,13 @@ sal_uInt32 SwAnnotationWin::CountFollowing()
VclPtr<MenuButton> SwAnnotationWin::CreateMenuButton()
{
- mpButtonPopup = VclPtr<PopupMenu>::Create(SW_RES(MN_ANNOTATION_BUTTON));
- OUString aText = mpButtonPopup->GetItemText( FN_DELETE_NOTE_AUTHOR );
+ mpButtonPopup = maBuilder.get_menu("menu");
+ sal_uInt16 nByAuthorId = mpButtonPopup->GetItemId("deleteby");
+ OUString aText = mpButtonPopup->GetItemText(nByAuthorId);
SwRewriter aRewriter;
aRewriter.AddRule(UndoArg1,GetAuthor());
aText = aRewriter.Apply(aText);
- mpButtonPopup->SetItemText(FN_DELETE_NOTE_AUTHOR,aText);
+ mpButtonPopup->SetItemText(nByAuthorId, aText);
VclPtrInstance<AnnotationMenuButton> pMenuButton( *this );
pMenuButton->SetPopupMenu( mpButtonPopup );
pMenuButton->Show();
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx
index 84abbb3026fb..c61b7a82f45d 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -34,7 +34,6 @@
#include <OverlayRanges.hxx>
#include <annotation.hrc>
-#include <popup.hrc>
#include <docvw.hrc>
#include <app.hrc>
#include <access.hrc>
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx
index 85e2836ab08e..635bf6fa0996 100644
--- a/sw/source/uibase/docvw/HeaderFooterWin.cxx
+++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx
@@ -10,7 +10,6 @@
#include <app.hrc>
#include <docvw.hrc>
#include <globals.hrc>
-#include <popup.hrc>
#include <svtools/svtools.hrc>
#include <cmdid.h>
diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx
index 10b91718b756..7aea3c768ac3 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -8,7 +8,6 @@
*/
#include <globals.hrc>
-#include <popup.hrc>
#include <utlui.hrc>
#include <cmdid.h>
diff --git a/sw/source/uibase/inc/popup.hrc b/sw/source/uibase/inc/popup.hrc
deleted file mode 100644
index 0bc6595a6eb3..000000000000
--- a/sw/source/uibase/inc/popup.hrc
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_POPUP_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_INC_POPUP_HRC
-
-#include "rcid.hrc"
-
-#define MN_ANNOTATION_BUTTON (RC_POPUPS_BEGIN + 0)
-
-#if MN_ANNOTATION_BUTTON > RC_POPUPS_END
-
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index b58ef60fea11..c51072f5695c 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -75,7 +75,6 @@
#include <viewopt.hxx>
#include <wrtsh.hxx>
#include <uitool.hxx>
-#include <popup.hrc>
#include <chrdlgmodes.hxx>
#include <pardlg.hxx>
#include <swdtflvr.hxx>
diff --git a/sw/source/uibase/shells/beziersh.cxx b/sw/source/uibase/shells/beziersh.cxx
index c60d2417c27e..383acf740564 100644
--- a/sw/source/uibase/shells/beziersh.cxx
+++ b/sw/source/uibase/shells/beziersh.cxx
@@ -35,7 +35,6 @@
#include "globals.hrc"
#include "drawbase.hxx"
#include "beziersh.hxx"
-#include "popup.hrc"
#include "shells.hrc"
#define SwBezierShell
#include <sfx2/msg.hxx>
diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx
index 1f978e99f7ca..fc0580ea85bd 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -55,7 +55,6 @@
#include "cmdid.h"
#include "globals.hrc"
#include "helpid.h"
-#include "popup.hrc"
#include "shells.hrc"
#include "drwbassh.hxx"
#include "drawsh.hxx"
diff --git a/sw/source/uibase/shells/drformsh.cxx b/sw/source/uibase/shells/drformsh.cxx
index 8cd842334412..cde7c347c86a 100644
--- a/sw/source/uibase/shells/drformsh.cxx
+++ b/sw/source/uibase/shells/drformsh.cxx
@@ -40,7 +40,6 @@
#include "cmdid.h"
#include "globals.hrc"
#include "helpid.h"
-#include "popup.hrc"
#include "shells.hrc"
#include "drwbassh.hxx"
#include "drformsh.hxx"
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index 56d203bd19ba..af9becb17a1b 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -61,7 +61,6 @@
#define SwDrawTextShell
#include <sfx2/msg.hxx>
#include <swslots.hxx>
-#include <popup.hrc>
#include <uitool.hxx>
#include <wview.hxx>
#include <swmodule.hxx>
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index 72811476b4b9..31778367ac9e 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -73,7 +73,6 @@
#include <cmdid.h>
#include <cfgitems.hxx>
#include <globals.hrc>
-#include <popup.hrc>
#include <shells.hrc>
#include "swabstdlg.hxx"
#include "misc.hrc"
diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx
index 777be9f04156..a334edc3edf7 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -64,7 +64,6 @@
#include <edtwin.hxx>
#include <swwait.hxx>
#include <shells.hrc>
-#include <popup.hrc>
#include <svx/extedit.hxx>
#include <svx/graphichelper.hxx>
#include <doc.hxx>
diff --git a/sw/source/uibase/shells/mediash.cxx b/sw/source/uibase/shells/mediash.cxx
index 04fa43365382..8440025570db 100644
--- a/sw/source/uibase/shells/mediash.cxx
+++ b/sw/source/uibase/shells/mediash.cxx
@@ -55,7 +55,6 @@
#include <edtwin.hxx>
#include <swwait.hxx>
#include <shells.hrc>
-#include <popup.hrc>
#include <sfx2/objface.hxx>
#include <vcl/EnumContext.hxx>
diff --git a/sw/source/uibase/shells/navsh.cxx b/sw/source/uibase/shells/navsh.cxx
index edd99373c84f..073f22a7820c 100644
--- a/sw/source/uibase/shells/navsh.cxx
+++ b/sw/source/uibase/shells/navsh.cxx
@@ -22,7 +22,6 @@
#include "helpid.h"
#include "globals.hrc"
#include "navsh.hxx"
-#include "popup.hrc"
#include "shells.hrc"
#define SwNavigationShell
#include "swslots.hxx"
diff --git a/sw/source/uibase/shells/olesh.cxx b/sw/source/uibase/shells/olesh.cxx
index 5171612100c3..e9bd948d7d16 100644
--- a/sw/source/uibase/shells/olesh.cxx
+++ b/sw/source/uibase/shells/olesh.cxx
@@ -30,7 +30,6 @@
#include <olesh.hxx>
#include <cmdid.h>
-#include <popup.hrc>
#include <shells.hrc>
#define SwOleShell
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index f53c55927ffc..5106448688b4 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -73,7 +73,6 @@
#include <app.hrc>
#include <dialog.hrc>
-#include <popup.hrc>
#include <shells.hrc>
#include <cmdid.h>
#include <globals.hrc>
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index b512f5ed0e39..4ea1a236a19a 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -88,7 +88,6 @@
#include <column.hxx>
#include <edtwin.hxx>
#include <shells.hrc>
-#include <popup.hrc>
#include <swerror.h>
#include <unochart.hxx>
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index a5bb54adecdf..0d31ebe0ef8e 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -67,7 +67,6 @@
#include <helpid.h>
#include <cmdid.h>
#include <globals.hrc>
-#include <popup.hrc>
#include <view.hrc>
#define SwPagePreview
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index 31967bd56ed2..30f19297d1d1 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -73,7 +73,6 @@
#include <helpid.h>
#include <globals.hrc>
#include <shells.hrc>
-#include <popup.hrc>
#include <web.hrc>
#include <view.hrc>
#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
diff --git a/sw/source/uibase/uiview/view.src b/sw/source/uibase/uiview/view.src
index bcbe2b718d2f..8792b0158d93 100644
--- a/sw/source/uibase/uiview/view.src
+++ b/sw/source/uibase/uiview/view.src
@@ -21,7 +21,6 @@
#include "view.hrc"
#include "shells.hrc"
#include "globals.hrc"
-#include "popup.hrc"
#include "helpid.h"
#include "cmdid.h"
diff --git a/sw/source/uibase/web/wformsh.cxx b/sw/source/uibase/web/wformsh.cxx
index 7b11b3afe027..ec5c590b5b77 100644
--- a/sw/source/uibase/web/wformsh.cxx
+++ b/sw/source/uibase/web/wformsh.cxx
@@ -30,7 +30,6 @@
#include "wformsh.hxx"
#include "globals.hrc"
#include "web.hrc"
-#include "popup.hrc"
#include "shells.hrc"
#include <sfx2/request.hxx>
diff --git a/sw/source/uibase/web/wfrmsh.cxx b/sw/source/uibase/web/wfrmsh.cxx
index f70967ef844e..b0df1dd0ca11 100644
--- a/sw/source/uibase/web/wfrmsh.cxx
+++ b/sw/source/uibase/web/wfrmsh.cxx
@@ -26,7 +26,6 @@
#include "view.hxx"
#include "wfrmsh.hxx"
#include "globals.hrc"
-#include "popup.hrc"
#include "shells.hrc"
#include "web.hrc"
diff --git a/sw/source/uibase/web/wgrfsh.cxx b/sw/source/uibase/web/wgrfsh.cxx
index 745a2cf12261..9bd77670d3bb 100644
--- a/sw/source/uibase/web/wgrfsh.cxx
+++ b/sw/source/uibase/web/wgrfsh.cxx
@@ -30,7 +30,6 @@
#include "uitool.hxx"
#include "docsh.hxx"
#include "shells.hrc"
-#include "popup.hrc"
#include "globals.hrc"
#include "web.hrc"
#include "wgrfsh.hxx"
diff --git a/sw/source/uibase/web/wolesh.cxx b/sw/source/uibase/web/wolesh.cxx
index 0cdb514f8fe1..ef452e46d8a2 100644
--- a/sw/source/uibase/web/wolesh.cxx
+++ b/sw/source/uibase/web/wolesh.cxx
@@ -27,7 +27,6 @@
#include "helpid.h"
#include "globals.hrc"
#include "web.hrc"
-#include "popup.hrc"
#include "shells.hrc"
#include "wolesh.hxx"
#include "cmdid.h"
diff --git a/sw/source/uibase/web/wtabsh.cxx b/sw/source/uibase/web/wtabsh.cxx
index a6294f6e67e5..c660b6491a16 100644
--- a/sw/source/uibase/web/wtabsh.cxx
+++ b/sw/source/uibase/web/wtabsh.cxx
@@ -27,7 +27,6 @@
#include "globals.hrc"
#include "uitool.hxx"
#include "helpid.h"
-#include "popup.hrc"
#include "shells.hrc"
#include "table.hrc"
#include "wrtsh.hxx"
diff --git a/sw/source/uibase/web/wtextsh.cxx b/sw/source/uibase/web/wtextsh.cxx
index 837b7aea0f06..abdf4866ad85 100644
--- a/sw/source/uibase/web/wtextsh.cxx
+++ b/sw/source/uibase/web/wtextsh.cxx
@@ -30,7 +30,6 @@
#include "wtextsh.hxx"
#include "basesh.hxx"
#include "globals.hrc"
-#include "popup.hrc"
#include "shells.hrc"
#include "web.hrc"
diff --git a/sw/uiconfig/swriter/ui/annotationmenu.ui b/sw/uiconfig/swriter/ui/annotationmenu.ui
new file mode 100644
index 000000000000..0f8cc62e89fe
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/annotationmenu.ui
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface>
+ <requires lib="gtk+" version="3.10"/>
+ <object class="GtkMenu" id="menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="reply">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Reply</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="sep1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="delete">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Delete _Comment</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="deleteby">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Delete _All Comments by $1</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="deleteall">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Delete All Comments</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="formatall">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Format All Comments...</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list