Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
171477fb
Kaydet (Commit)
171477fb
authored
Nis 13, 2017
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
convert master page menus to .ui
Change-Id: I7ab0ad0f3216b69966f5ff345b052762993eb666
üst
26dcda4c
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
191 additions
and
209 deletions
+191
-209
AllLangResTarget_sd.mk
sd/AllLangResTarget_sd.mk
+0
-1
UIConfig_simpress.mk
sd/UIConfig_simpress.mk
+2
-0
sdcommands.h
sd/inc/sdcommands.h
+0
-7
popup.src
sd/source/ui/app/popup.src
+0
-111
res_bmp.hrc
sd/source/ui/inc/res_bmp.hrc
+0
-5
CurrentMasterPagesSelector.cxx
sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+12
-10
CurrentMasterPagesSelector.hxx
sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
+2
-2
MasterPagesSelector.cxx
sd/source/ui/sidebar/MasterPagesSelector.cxx
+53
-66
MasterPagesSelector.hxx
sd/source/ui/sidebar/MasterPagesSelector.hxx
+4
-4
RecentMasterPagesSelector.cxx
sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
+3
-2
currentmastermenu.ui
sd/uiconfig/simpress/ui/currentmastermenu.ui
+67
-0
layoutmenu.ui
sd/uiconfig/simpress/ui/layoutmenu.ui
+1
-1
mastermenu.ui
sd/uiconfig/simpress/ui/mastermenu.ui
+47
-0
No files found.
sd/AllLangResTarget_sd.mk
Dosyayı görüntüle @
171477fb
...
@@ -29,7 +29,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
...
@@ -29,7 +29,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
sd/source/ui/accessibility/accessibility.src \
sd/source/ui/accessibility/accessibility.src \
sd/source/ui/animations/CustomAnimation.src \
sd/source/ui/animations/CustomAnimation.src \
sd/source/ui/annotations/annotations.src \
sd/source/ui/annotations/annotations.src \
sd/source/ui/app/popup.src \
sd/source/ui/app/res_bmp.src \
sd/source/ui/app/res_bmp.src \
sd/source/ui/app/sdstring.src \
sd/source/ui/app/sdstring.src \
sd/source/ui/app/strings.src \
sd/source/ui/app/strings.src \
...
...
sd/UIConfig_simpress.mk
Dosyayı görüntüle @
171477fb
...
@@ -106,6 +106,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/simpress,\
...
@@ -106,6 +106,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/simpress,\
))
))
$(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
$(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/currentmastermenu \
sd/uiconfig/simpress/ui/customanimationspanel \
sd/uiconfig/simpress/ui/customanimationspanel \
sd/uiconfig/simpress/ui/customanimationspanelhorizontal \
sd/uiconfig/simpress/ui/customanimationspanelhorizontal \
sd/uiconfig/simpress/ui/customanimationproperties \
sd/uiconfig/simpress/ui/customanimationproperties \
...
@@ -123,6 +124,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
...
@@ -123,6 +124,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/interactionpage \
sd/uiconfig/simpress/ui/interactionpage \
sd/uiconfig/simpress/ui/layoutmenu \
sd/uiconfig/simpress/ui/layoutmenu \
sd/uiconfig/simpress/ui/masterlayoutdlg \
sd/uiconfig/simpress/ui/masterlayoutdlg \
sd/uiconfig/simpress/ui/mastermenu \
sd/uiconfig/simpress/ui/navigatorpanel \
sd/uiconfig/simpress/ui/navigatorpanel \
sd/uiconfig/simpress/ui/notebookbar \
sd/uiconfig/simpress/ui/notebookbar \
sd/uiconfig/simpress/ui/notebookbar_groups \
sd/uiconfig/simpress/ui/notebookbar_groups \
...
...
sd/inc/sdcommands.h
Dosyayı görüntüle @
171477fb
...
@@ -21,13 +21,6 @@
...
@@ -21,13 +21,6 @@
#define CMD_SID_HANDOUT_MASTER_MODE ".uno:HandoutMode"
#define CMD_SID_HANDOUT_MASTER_MODE ".uno:HandoutMode"
#define CMD_SID_NOTES_MODE ".uno:NotesMode"
#define CMD_SID_NOTES_MODE ".uno:NotesMode"
#define CMD_SID_DELETE_MASTER_PAGE ".uno:DeleteMasterPage"
#define CMD_SID_TP_APPLY_TO_ALL_SLIDES ".uno:TaskPaneApplyToAllSlides"
#define CMD_SID_TP_APPLY_TO_SELECTED_SLIDES ".uno:TaskPaneApplyToSelectedSlides"
#define CMD_SID_TP_SHOW_SMALL_PREVIEW ".uno:TaskPaneShowSmallPreview"
#define CMD_SID_TP_SHOW_LARGE_PREVIEW ".uno:TaskPaneShowLargePreview"
#define CMD_SID_TP_EDIT_MASTER ".uno:TaskPaneEditMaster"
#define CMD_SID_INSERTPAGE_LAYOUT_MENU ".uno:TaskPaneInsertPage"
#endif
#endif
...
...
sd/source/ui/app/popup.src
deleted
100644 → 0
Dosyayı görüntüle @
26dcda4c
/* -*- 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 "app.hrc"
#include "res_bmp.hrc"
#include "helpids.h"
#define SEPARATOR MenuItem { Separator = TRUE; };
Menu RID_TASKPANE_MASTERPAGESSELECTOR_POPUP
{
ItemList =
{
MenuItem
{
Identifier = SID_TP_APPLY_TO_ALL_SLIDES;
HelpId = CMD_SID_TP_APPLY_TO_ALL_SLIDES;
Text [ en-US ] = "~Apply to All Slides";
};
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_TP_SHOW_LARGE_PREVIEW;
HelpId = CMD_SID_TP_SHOW_LARGE_PREVIEW;
Text[ en-US ] = "Show ~Large Preview";
};
MenuItem
{
Identifier = SID_TP_SHOW_SMALL_PREVIEW;
HelpId = CMD_SID_TP_SHOW_SMALL_PREVIEW;
Text[ en-US ] = "Show S~mall Preview";
};
};
};
Menu RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP
{
ItemList =
{
MenuItem
{
Identifier = SID_TP_APPLY_TO_ALL_SLIDES;
HelpId = CMD_SID_TP_APPLY_TO_ALL_SLIDES;
Text [ en-US ] = "~Apply to All Slides";
};
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_TP_EDIT_MASTER;
HelpId = CMD_SID_TP_EDIT_MASTER;
Text[ en-US ] = "~Edit Master...";
};
MenuItem
{
Identifier = SID_DELETE_MASTER_PAGE;
HelpId = CMD_SID_DELETE_MASTER_PAGE;
Text [ en-US ] = "D~elete Master";
};
SEPARATOR
MenuItem
{
Identifier = SID_TP_SHOW_LARGE_PREVIEW;
HelpId = CMD_SID_TP_SHOW_LARGE_PREVIEW;
Text[ en-US ] = "Show ~Large Preview";
};
MenuItem
{
Identifier = SID_TP_SHOW_SMALL_PREVIEW;
HelpId = CMD_SID_TP_SHOW_SMALL_PREVIEW;
Text[ en-US ] = "Show S~mall Preview";
};
};
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sd/source/ui/inc/res_bmp.hrc
Dosyayı görüntüle @
171477fb
...
@@ -196,11 +196,6 @@
...
@@ -196,11 +196,6 @@
#define BMP_PRESENTERSCREEN_BUTTON_RESTART_TIMER_MOUSE_OVER (RID_SD_START+594)
#define BMP_PRESENTERSCREEN_BUTTON_RESTART_TIMER_MOUSE_OVER (RID_SD_START+594)
#define BMP_PRESENTERSCREEN_BUTTON_RESTART_TIMER_NORMAL (RID_SD_START+595)
#define BMP_PRESENTERSCREEN_BUTTON_RESTART_TIMER_NORMAL (RID_SD_START+595)
// ResourceIDs for Popup-Menus do not need a dummy string!!!
#define RID_TASKPANE_MASTERPAGESSELECTOR_POPUP RID_APP_START+67
#define RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP RID_APP_START+93
#define RID_GRAPHICSTYLEFAMILY RID_APP_START+395
#define RID_GRAPHICSTYLEFAMILY RID_APP_START+395
#define RID_PRESENTATIONSTYLEFAMILY RID_APP_START+396
#define RID_PRESENTATIONSTYLEFAMILY RID_APP_START+396
#define BMP_STYLES_FAMILY_GRAPHICS RID_APP_START+397
#define BMP_STYLES_FAMILY_GRAPHICS RID_APP_START+397
...
...
sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
Dosyayı görüntüle @
171477fb
...
@@ -152,9 +152,9 @@ void CurrentMasterPagesSelector::Fill (ItemList& rItemList)
...
@@ -152,9 +152,9 @@ void CurrentMasterPagesSelector::Fill (ItemList& rItemList)
}
}
}
}
ResId
CurrentMasterPagesSelector
::
GetContextMenuResId
()
const
OUString
CurrentMasterPagesSelector
::
GetContextMenuUIFile
()
const
{
{
return
SdResId
(
RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP
)
;
return
"modules/simpress/ui/currentmastermenu.ui"
;
}
}
void
CurrentMasterPagesSelector
::
UpdateSelection
()
void
CurrentMasterPagesSelector
::
UpdateSelection
()
...
@@ -202,9 +202,9 @@ void CurrentMasterPagesSelector::UpdateSelection()
...
@@ -202,9 +202,9 @@ void CurrentMasterPagesSelector::UpdateSelection()
}
}
}
}
void
CurrentMasterPagesSelector
::
ExecuteCommand
(
const
sal_Int32
nCommandId
)
void
CurrentMasterPagesSelector
::
ExecuteCommand
(
const
OString
&
rIdent
)
{
{
if
(
nCommandId
==
SID_DELETE_MASTER_PAGE
)
if
(
rIdent
==
"delete"
)
{
{
// Check once again that the master page can safely be deleted,
// Check once again that the master page can safely be deleted,
// i.e. is not used.
// i.e. is not used.
...
@@ -219,16 +219,17 @@ void CurrentMasterPagesSelector::ExecuteCommand (const sal_Int32 nCommandId)
...
@@ -219,16 +219,17 @@ void CurrentMasterPagesSelector::ExecuteCommand (const sal_Int32 nCommandId)
}
}
}
}
else
else
MasterPagesSelector
::
ExecuteCommand
(
nCommandId
);
MasterPagesSelector
::
ExecuteCommand
(
rIdent
);
}
}
void
CurrentMasterPagesSelector
::
ProcessPopupMenu
(
Menu
&
rMenu
)
void
CurrentMasterPagesSelector
::
ProcessPopupMenu
(
Menu
&
rMenu
)
{
{
// Disable the
SID_DELTE_MASTER slot
when there is only one master page.
// Disable the
delete entry
when there is only one master page.
if
(
mrDocument
.
GetMasterPageUserCount
(
GetSelectedMasterPage
())
>
0
)
if
(
mrDocument
.
GetMasterPageUserCount
(
GetSelectedMasterPage
())
>
0
)
{
{
if
(
rMenu
.
GetItemPos
(
SID_DELETE_MASTER_PAGE
)
!=
MENU_ITEM_NOTFOUND
)
sal_uInt16
nItemid
=
rMenu
.
GetItemId
(
"delete"
);
rMenu
.
EnableItem
(
SID_DELETE_MASTER_PAGE
,
false
);
if
(
rMenu
.
GetItemPos
(
nItemid
)
!=
MENU_ITEM_NOTFOUND
)
rMenu
.
EnableItem
(
nItemid
,
false
);
}
}
std
::
shared_ptr
<
DrawViewShell
>
pDrawViewShell
(
std
::
shared_ptr
<
DrawViewShell
>
pDrawViewShell
(
...
@@ -236,8 +237,9 @@ void CurrentMasterPagesSelector::ProcessPopupMenu (Menu& rMenu)
...
@@ -236,8 +237,9 @@ void CurrentMasterPagesSelector::ProcessPopupMenu (Menu& rMenu)
if
(
pDrawViewShell
if
(
pDrawViewShell
&&
pDrawViewShell
->
GetEditMode
()
==
EditMode
::
MasterPage
)
&&
pDrawViewShell
->
GetEditMode
()
==
EditMode
::
MasterPage
)
{
{
if
(
rMenu
.
GetItemPos
(
SID_TP_EDIT_MASTER
)
!=
MENU_ITEM_NOTFOUND
)
sal_uInt16
nItemid
=
rMenu
.
GetItemId
(
"edit"
);
rMenu
.
EnableItem
(
SID_TP_EDIT_MASTER
,
false
);
if
(
rMenu
.
GetItemPos
(
nItemid
)
!=
MENU_ITEM_NOTFOUND
)
rMenu
.
EnableItem
(
nItemid
,
false
);
}
}
MasterPagesSelector
::
ProcessPopupMenu
(
rMenu
);
MasterPagesSelector
::
ProcessPopupMenu
(
rMenu
);
...
...
sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
Dosyayı görüntüle @
171477fb
...
@@ -54,10 +54,10 @@ public:
...
@@ -54,10 +54,10 @@ public:
using
MasterPagesSelector
::
Fill
;
using
MasterPagesSelector
::
Fill
;
protected
:
protected
:
virtual
ResId
GetContextMenuResId
()
const
override
;
virtual
OUString
GetContextMenuUIFile
()
const
override
;
virtual
void
ProcessPopupMenu
(
Menu
&
rMenu
)
override
;
virtual
void
ProcessPopupMenu
(
Menu
&
rMenu
)
override
;
virtual
void
ExecuteCommand
(
const
sal_Int32
nCommandId
)
override
;
virtual
void
ExecuteCommand
(
const
OString
&
rIdent
)
override
;
private
:
private
:
CurrentMasterPagesSelector
(
CurrentMasterPagesSelector
(
...
...
sd/source/ui/sidebar/MasterPagesSelector.cxx
Dosyayı görüntüle @
171477fb
...
@@ -75,7 +75,7 @@ MasterPagesSelector::MasterPagesSelector (
...
@@ -75,7 +75,7 @@ MasterPagesSelector::MasterPagesSelector (
mpContainer
(
rpContainer
),
mpContainer
(
rpContainer
),
mrDocument
(
rDocument
),
mrDocument
(
rDocument
),
mrBase
(
rBase
),
mrBase
(
rBase
),
m
nDefaultClickAction
(
SID_TP_APPLY_TO_SELECTED_SLIDES
),
m
sDefaultClickAction
(
"applyselect"
),
maCurrentItemList
(),
maCurrentItemList
(),
maTokenToValueSetIndex
(),
maTokenToValueSetIndex
(),
maLockedMasterPages
(),
maLockedMasterPages
(),
...
@@ -164,9 +164,9 @@ void MasterPagesSelector::Fill()
...
@@ -164,9 +164,9 @@ void MasterPagesSelector::Fill()
UpdateItemList
(
std
::
move
(
pItemList
));
UpdateItemList
(
std
::
move
(
pItemList
));
}
}
ResId
MasterPagesSelector
::
GetContextMenuResId
()
const
OUString
MasterPagesSelector
::
GetContextMenuUIFile
()
const
{
{
return
SdResId
(
RID_TASKPANE_MASTERPAGESSELECTOR_POPUP
)
;
return
"modules/simpress/ui/mastermenu.ui"
;
}
}
IMPL_LINK_NOARG
(
MasterPagesSelector
,
ClickHandler
,
ValueSet
*
,
void
)
IMPL_LINK_NOARG
(
MasterPagesSelector
,
ClickHandler
,
ValueSet
*
,
void
)
...
@@ -174,7 +174,7 @@ IMPL_LINK_NOARG(MasterPagesSelector, ClickHandler, ValueSet*, void)
...
@@ -174,7 +174,7 @@ IMPL_LINK_NOARG(MasterPagesSelector, ClickHandler, ValueSet*, void)
// We use the framework to assign the clicked-on master page because we
// We use the framework to assign the clicked-on master page because we
// so use the same mechanism as the context menu does (where we do not
// so use the same mechanism as the context menu does (where we do not
// have the option to call the assignment method directly.)
// have the option to call the assignment method directly.)
ExecuteCommand
(
m
n
DefaultClickAction
);
ExecuteCommand
(
m
s
DefaultClickAction
);
}
}
IMPL_LINK
(
MasterPagesSelector
,
RightClickHandler
,
const
MouseEvent
&
,
rEvent
,
void
)
IMPL_LINK
(
MasterPagesSelector
,
RightClickHandler
,
const
MouseEvent
&
,
rEvent
,
void
)
...
@@ -221,7 +221,8 @@ void MasterPagesSelector::Command (const CommandEvent& rEvent)
...
@@ -221,7 +221,8 @@ void MasterPagesSelector::Command (const CommandEvent& rEvent)
}
}
// Setup the menu.
// Setup the menu.
ScopedVclPtrInstance
<
PopupMenu
>
pMenu
(
GetContextMenuResId
());
VclBuilder
aBuilder
(
nullptr
,
VclBuilderContainer
::
getUIRootDir
(),
GetContextMenuUIFile
(),
""
);
VclPtr
<
PopupMenu
>
pMenu
(
aBuilder
.
get_menu
(
"menu"
));
FloatingWindow
*
pMenuWindow
=
dynamic_cast
<
FloatingWindow
*>
(
pMenu
->
GetWindow
());
FloatingWindow
*
pMenuWindow
=
dynamic_cast
<
FloatingWindow
*>
(
pMenu
->
GetWindow
());
if
(
pMenuWindow
!=
nullptr
)
if
(
pMenuWindow
!=
nullptr
)
pMenuWindow
->
SetPopupModeFlags
(
pMenuWindow
->
SetPopupModeFlags
(
...
@@ -243,9 +244,9 @@ void MasterPagesSelector::ProcessPopupMenu (Menu& rMenu)
...
@@ -243,9 +244,9 @@ void MasterPagesSelector::ProcessPopupMenu (Menu& rMenu)
{
{
// Disable some entries.
// Disable some entries.
if
(
mpContainer
->
GetPreviewSize
()
==
MasterPageContainer
::
SMALL
)
if
(
mpContainer
->
GetPreviewSize
()
==
MasterPageContainer
::
SMALL
)
rMenu
.
EnableItem
(
SID_TP_SHOW_SMALL_PREVIEW
,
false
);
rMenu
.
EnableItem
(
rMenu
.
GetItemId
(
"small"
)
,
false
);
else
else
rMenu
.
EnableItem
(
SID_TP_SHOW_LARGE_PREVIEW
,
false
);
rMenu
.
EnableItem
(
rMenu
.
GetItemId
(
"large"
)
,
false
);
}
}
IMPL_LINK
(
MasterPagesSelector
,
OnMenuItemSelected
,
Menu
*
,
pMenu
,
bool
)
IMPL_LINK
(
MasterPagesSelector
,
OnMenuItemSelected
,
Menu
*
,
pMenu
,
bool
)
...
@@ -257,74 +258,60 @@ IMPL_LINK(MasterPagesSelector, OnMenuItemSelected, Menu*, pMenu, bool)
...
@@ -257,74 +258,60 @@ IMPL_LINK(MasterPagesSelector, OnMenuItemSelected, Menu*, pMenu, bool)
}
}
pMenu
->
Deactivate
();
pMenu
->
Deactivate
();
ExecuteCommand
(
pMenu
->
GetCurItemId
());
ExecuteCommand
(
pMenu
->
GetCurItemId
ent
());
return
false
;
return
false
;
}
}
void
MasterPagesSelector
::
ExecuteCommand
(
const
sal_Int32
nCommandId
)
void
MasterPagesSelector
::
ExecuteCommand
(
const
OString
&
rIdent
)
{
{
switch
(
nCommandId
)
if
(
rIdent
==
"applyall"
)
{
{
case
SID_TP_APPLY_TO_ALL_SLIDES
:
mrBase
.
SetBusyState
(
true
);
mrBase
.
SetBusyState
(
true
);
AssignMasterPageToAllSlides
(
GetSelectedMasterPage
());
AssignMasterPageToAllSlides
(
GetSelectedMasterPage
());
mrBase
.
SetBusyState
(
false
);
mrBase
.
SetBusyState
(
false
);
}
break
;
else
if
(
rIdent
==
"applyselect"
)
{
case
SID_TP_APPLY_TO_SELECTED_SLIDES
:
mrBase
.
SetBusyState
(
true
);
mrBase
.
SetBusyState
(
true
);
AssignMasterPageToSelectedSlides
(
GetSelectedMasterPage
());
AssignMasterPageToSelectedSlides
(
GetSelectedMasterPage
());
mrBase
.
SetBusyState
(
false
);
mrBase
.
SetBusyState
(
false
);
}
break
;
else
if
(
rIdent
==
"large"
)
{
case
SID_TP_USE_FOR_NEW_PRESENTATIONS
:
mrBase
.
SetBusyState
(
true
);
SAL_WARN
(
"sd"
,
mpContainer
->
SetPreviewSize
(
MasterPageContainer
::
LARGE
);
"Using slides as default for new presentations"
mrBase
.
SetBusyState
(
false
);
" is not yet implemented"
);
if
(
mxSidebar
.
is
())
break
;
mxSidebar
->
requestLayout
();
}
case
SID_TP_SHOW_SMALL_PREVIEW
:
else
if
(
rIdent
==
"small"
)
case
SID_TP_SHOW_LARGE_PREVIEW
:
{
{
mrBase
.
SetBusyState
(
true
);
mrBase
.
SetBusyState
(
true
);
mpContainer
->
SetPreviewSize
(
MasterPageContainer
::
SMALL
);
mpContainer
->
SetPreviewSize
(
mrBase
.
SetBusyState
(
false
);
nCommandId
==
SID_TP_SHOW_SMALL_PREVIEW
if
(
mxSidebar
.
is
())
?
MasterPageContainer
::
SMALL
mxSidebar
->
requestLayout
();
:
MasterPageContainer
::
LARGE
);
}
mrBase
.
SetBusyState
(
false
);
else
if
(
rIdent
==
"edit"
)
if
(
mxSidebar
.
is
())
{
mxSidebar
->
requestLayout
();
using
namespace
::
com
::
sun
::
star
;
break
;
uno
::
Reference
<
drawing
::
XDrawPage
>
xSelectedMaster
;
}
SdPage
*
pMasterPage
=
GetSelectedMasterPage
();
assert
(
pMasterPage
);
//rhbz#902884
case
SID_TP_EDIT_MASTER
:
if
(
pMasterPage
)
xSelectedMaster
.
set
(
pMasterPage
->
getUnoPage
(),
uno
::
UNO_QUERY
);
SfxViewFrame
*
pViewFrame
=
mrBase
.
GetViewFrame
();
if
(
pViewFrame
!=
nullptr
&&
xSelectedMaster
.
is
())
{
{
using
namespace
::
com
::
sun
::
star
;
SfxDispatcher
*
pDispatcher
=
pViewFrame
->
GetDispatcher
();
uno
::
Reference
<
drawing
::
XDrawPage
>
xSelectedMaster
;
if
(
pDispatcher
!=
nullptr
)
SdPage
*
pMasterPage
=
GetSelectedMasterPage
();
assert
(
pMasterPage
);
//rhbz#902884
if
(
pMasterPage
)
xSelectedMaster
.
set
(
pMasterPage
->
getUnoPage
(),
uno
::
UNO_QUERY
);
SfxViewFrame
*
pViewFrame
=
mrBase
.
GetViewFrame
();
if
(
pViewFrame
!=
nullptr
&&
xSelectedMaster
.
is
())
{
{
SfxDispatcher
*
pDispatcher
=
pViewFrame
->
GetDispatcher
();
sal_uInt16
nIndex
=
PreviewValueSet
::
GetSelectItemId
();
if
(
pDispatcher
!=
nullptr
)
pDispatcher
->
Execute
(
SID_MASTERPAGE
,
SfxCallMode
::
SYNCHRON
);
{
PreviewValueSet
::
SelectItem
(
nIndex
);
sal_uInt16
nIndex
=
PreviewValueSet
::
GetSelectItemId
();
mrBase
.
GetDrawController
().
setCurrentPage
(
xSelectedMaster
);
pDispatcher
->
Execute
(
SID_MASTERPAGE
,
SfxCallMode
::
SYNCHRON
);
PreviewValueSet
::
SelectItem
(
nIndex
);
mrBase
.
GetDrawController
().
setCurrentPage
(
xSelectedMaster
);
}
}
}
break
;
}
}
case
SID_CUT
:
case
SID_COPY
:
case
SID_PASTE
:
// Cut, copy, and paste are not supported and thus are ignored.
break
;
}
}
}
}
...
...
sd/source/ui/sidebar/MasterPagesSelector.hxx
Dosyayı görüntüle @
171477fb
...
@@ -112,10 +112,10 @@ protected:
...
@@ -112,10 +112,10 @@ protected:
SdDrawDocument
&
mrDocument
;
SdDrawDocument
&
mrDocument
;
ViewShellBase
&
mrBase
;
ViewShellBase
&
mrBase
;
/**
Slot
that is executed as default action when the left mouse button is
/**
menu entry
that is executed as default action when the left mouse button is
clicked over a master page.
clicked over a master page.
*/
*/
sal_uInt16
mn
DefaultClickAction
;
OString
ms
DefaultClickAction
;
SdPage
*
GetSelectedMasterPage
();
SdPage
*
GetSelectedMasterPage
();
...
@@ -170,12 +170,12 @@ protected:
...
@@ -170,12 +170,12 @@ protected:
menu. If they do then they probably have to provide their own
menu. If they do then they probably have to provide their own
Execute() and GetState() methods as well.
Execute() and GetState() methods as well.
*/
*/
virtual
ResId
GetContextMenuResId
()
const
;
virtual
OUString
GetContextMenuUIFile
()
const
;
virtual
void
Command
(
const
CommandEvent
&
rEvent
)
override
;
virtual
void
Command
(
const
CommandEvent
&
rEvent
)
override
;
virtual
void
ProcessPopupMenu
(
Menu
&
rMenu
);
virtual
void
ProcessPopupMenu
(
Menu
&
rMenu
);
virtual
void
ExecuteCommand
(
const
sal_Int32
nCommandId
);
virtual
void
ExecuteCommand
(
const
OString
&
rIdent
);
private
:
private
:
css
::
uno
::
Reference
<
css
::
ui
::
XSidebar
>
mxSidebar
;
css
::
uno
::
Reference
<
css
::
ui
::
XSidebar
>
mxSidebar
;
...
...
sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
Dosyayı görüntüle @
171477fb
...
@@ -145,8 +145,9 @@ void RecentMasterPagesSelector::AssignMasterPageToPageList (
...
@@ -145,8 +145,9 @@ void RecentMasterPagesSelector::AssignMasterPageToPageList (
void
RecentMasterPagesSelector
::
ProcessPopupMenu
(
Menu
&
rMenu
)
void
RecentMasterPagesSelector
::
ProcessPopupMenu
(
Menu
&
rMenu
)
{
{
if
(
rMenu
.
GetItemPos
(
SID_TP_EDIT_MASTER
)
!=
MENU_ITEM_NOTFOUND
)
sal_uInt16
nItemid
=
rMenu
.
GetItemId
(
"edit"
);
rMenu
.
EnableItem
(
SID_TP_EDIT_MASTER
,
false
);
if
(
rMenu
.
GetItemPos
(
nItemid
)
!=
MENU_ITEM_NOTFOUND
)
rMenu
.
EnableItem
(
nItemid
,
false
);
}
}
}
}
// end of namespace sd::sidebar
}
}
// end of namespace sd::sidebar
...
...
sd/uiconfig/simpress/ui/currentmastermenu.ui
0 → 100644
Dosyayı görüntüle @
171477fb
<?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=
"applyall"
>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
False
</property>
<property
name=
"label"
translatable=
"yes"
>
_Apply to All Slides
</property>
<property
name=
"use_underline"
>
True
</property>
</object>
</child>
<child>
<object
class=
"GtkMenuItem"
id=
"applyselect"
>
<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=
"edit"
>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
False
</property>
<property
name=
"label"
translatable=
"yes"
>
_Edit Master...
</property>
<property
name=
"use_underline"
>
True
</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"
>
D_elete Master
</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>
</object>
</child>
<child>
<object
class=
"GtkMenuItem"
id=
"large"
>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
False
</property>
<property
name=
"label"
translatable=
"yes"
>
Show _Large Preview
</property>
</object>
</child>
<child>
<object
class=
"GtkMenuItem"
id=
"small"
>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
False
</property>
<property
name=
"label"
translatable=
"yes"
>
Show S_mall Preview
</property>
</object>
</child>
</object>
</interface>
sd/uiconfig/simpress/ui/layoutmenu.ui
Dosyayı görüntüle @
171477fb
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
<object
class=
"GtkMenuItem"
id=
"apply"
>
<object
class=
"GtkMenuItem"
id=
"apply"
>
<property
name=
"visible"
>
True
</property>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
False
</property>
<property
name=
"can_focus"
>
False
</property>
<property
name=
"label"
translatable=
"yes"
>
Apply to
~
Selected Slides
</property>
<property
name=
"label"
translatable=
"yes"
>
Apply to
_
Selected Slides
</property>
<property
name=
"use_underline"
>
True
</property>
<property
name=
"use_underline"
>
True
</property>
</object>
</object>
</child>
</child>
...
...
sd/uiconfig/simpress/ui/mastermenu.ui
0 → 100644
Dosyayı görüntüle @
171477fb
<?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=
"applyall"
>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
False
</property>
<property
name=
"label"
translatable=
"yes"
>
_Apply to All Slides
</property>
<property
name=
"use_underline"
>
True
</property>
</object>
</child>
<child>
<object
class=
"GtkMenuItem"
id=
"applyselect"
>
<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=
"large"
>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
False
</property>
<property
name=
"label"
translatable=
"yes"
>
Show _Large Preview
</property>
<property
name=
"use_underline"
>
True
</property>
</object>
</child>
<child>
<object
class=
"GtkMenuItem"
id=
"small"
>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
False
</property>
<property
name=
"label"
translatable=
"yes"
>
Show S_mall Preview
</property>
<property
name=
"use_underline"
>
True
</property>
</object>
</child>
</object>
</interface>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment