[Libreoffice-commits] core.git: officecfg/registry sdext/source sd/source sd/uiconfig
officecfg/registry/schema/org/openoffice/Office/Impress.xcs |7 ++
sd/source/ui/app/optsitem.cxx | 19 -
sd/source/ui/dlg/tpoption.cxx | 24 ---
sd/source/ui/framework/factories/FullScreenPane.cxx | 23 ---
sd/source/ui/framework/factories/FullScreenPane.hxx |3
sd/source/ui/inc/optsitem.hxx | 39 ++--
sd/source/ui/inc/tpoption.hxx |1
sd/uiconfig/simpress/ui/optimpressgeneralpage.ui| 21 ++
sdext/source/presenter/PresenterScreen.cxx | 26 +++-
sdext/source/presenter/PresenterScreen.hxx |6 +
10 files changed, 124 insertions(+), 45 deletions(-)
New commits:
commit a15bcda0e21be04bec424172192f2416b7f52422
Author: Daniel Lohmann
AuthorDate: Mon Nov 14 19:17:14 2022 +0100
Commit: Samuel Mehrbrodt
CommitDate: Thu Nov 17 06:57:40 2022 +0100
tdf#33495: Allow presenter console in windowed mode
Added an option in the Impress settings window to set the presenter
console into fullscreen/windowed mode. This will then be used the
next time a presentation is started.
Two pictures of how the result looks are given in the bug tracker.
Change-Id: I231f9180301301a9eccf9984ea4dcd529bd7dfce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142359
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index acf2673f54a7..fefd4ba2f6bf 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -570,6 +570,13 @@
true
+
+
+ Indicates whether the Presenter Screen Console is shown in
FullScreen mode.
+ Presenter Screen FullScreen
+
+ true
+
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 5baff32e2df8..fb9aac86d491 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -409,7 +409,8 @@ SdOptionsMisc::SdOptionsMisc( bool bImpress, bool
bUseConfig ) :
bDoubleClickTextEdit( true ),
bClickChangeRotation( false ),
bEnableSdremote( false ),
-bEnablePresenterScreen( true),
+bEnablePresenterScreen( true ),
+bPresenterScreenFullScreen( true ),
bSolidDragging( true ),
bSummationOfParagraphs( false ),
bTabBarVisible( true ),
@@ -443,7 +444,8 @@ bool SdOptionsMisc::operator==( const SdOptionsMisc& rOpt )
const
IsDoubleClickTextEdit() == rOpt.IsDoubleClickTextEdit() &&
IsClickChangeRotation() == rOpt.IsClickChangeRotation() &&
IsEnableSdremote() == rOpt.IsEnableSdremote() &&
-IsEnablePresenterScreen() == rOpt.IsEnablePresenterScreen()&&
+IsEnablePresenterScreen() == rOpt.IsEnablePresenterScreen() &&
+IsPresenterScreenFullScreen() ==
rOpt.IsPresenterScreenFullScreen() &&
IsSummationOfParagraphs() == rOpt.IsSummationOfParagraphs() &&
IsTabBarVisible() == rOpt.IsTabBarVisible() &&
IsSolidDragging() == rOpt.IsSolidDragging() &&
@@ -500,6 +502,7 @@ void SdOptionsMisc::GetPropNameArray( const char**&
ppNames, sal_uLong& rCount )
"PenWidth",
"Start/EnableSdremote",
"Start/EnablePresenterScreen",
+"Start/PresenterScreenFullScreen",
"TabBarVisible"
};
@@ -562,8 +565,11 @@ bool SdOptionsMisc::ReadData( const Any* pValues )
if( pValues[25].hasValue() )
SetEnablePresenterScreen( *o3tl::doAccess(pValues[ 25 ]) );
-if( pValues[26].hasValue() ) {
-SetTabBarVisible( *o3tl::doAccess(pValues[ 26 ]) );
+if (pValues[26].hasValue() )
+SetPresenterScreenFullScreen( *o3tl::doAccess(pValues[ 26 ])
);
+
+if( pValues[27].hasValue() ) {
+SetTabBarVisible( *o3tl::doAccess(pValues[ 27 ]) );
}
}
@@ -606,7 +612,8 @@ bool SdOptionsMisc::WriteData( Any* pValues ) const
pValues[ 23 ] <<= GetPresentationPenWidth();
pValues[ 24 ] <<= IsEnableSdremote();
pValues[ 25 ] <<= IsEnablePresenterScreen();
-pValues[ 26 ] <<= IsTabBarVisible();
+pValues[ 26 ] <<= IsPresenterScreenFullScreen();
+pValues[ 27 ] <<= IsTabBarVisible();
}
return true;
@@ -633,6 +640,7 @@ SdOptionsMiscItem::SdOptionsMiscItem( SdOptions const *
pOpts, ::sd::FrameView c
maOptionsMisc.SetStartWithTemplate( pOpts->IsStartWithTemplate() );
maOptionsMisc.SetEnableSdremote( pOpts->IsEnableSdremote() );
maOptionsMisc.SetEnablePresenterScreen(
pOpts->IsEnablePresenterScreen() );
+maOptionsMisc.SetPresenterScreenFullScreen(
[Libreoffice-commits] core.git: officecfg/registry sdext/source sd/source
officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu |8
+++
sd/source/ui/slideshow/slideshowimpl.cxx |9
sdext/source/presenter/PresenterController.cxx| 11
++
3 files changed, 28 insertions(+)
New commits:
commit 76f7f0c167a5148c01cdb1e0d8ea56b905f5a875
Author: Gabor Kelemen
AuthorDate: Fri Jun 10 10:28:36 2022 +0200
Commit: Gabor Kelemen
CommitDate: Tue Jun 14 16:37:46 2022 +0200
tdf#149351 Add a 'Turn off mouse as pen' shortcut
for UX compatibility with PP: Ctrl-A turns off 'mouse as pen' mode
Change-Id: I0379580f4034f07f044dc1079c14898f3014face
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135579
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
Reviewed-by: Gabor Kelemen
diff --git a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
index 4f99dae763a8..b21e67fd9e47 100644
--- a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
@@ -1163,6 +1163,14 @@
Switches monitors
+
+
+Ctrl-'A'
+
+
+Turn off pointer as pen mode
+
+
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 3215a550b7c1..89a8ac95f033 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1816,6 +1816,15 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt)
setUsePen( !mbUsePen );
break;
+// tdf#149351 Ctrl+A disables pointer as pen mode
+case KEY_A:
+if(rKEvt.GetKeyCode().IsMod1())
+{
+setUsePen( false );
+break;
+}
+break;
+
case KEY_E:
setEraseAllInk( true );
updateSlideShow();
diff --git a/sdext/source/presenter/PresenterController.cxx
b/sdext/source/presenter/PresenterController.cxx
index 5b501dbfa7cd..1062d892d336 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -878,6 +878,17 @@ void SAL_CALL PresenterController::keyReleased (const
awt::KeyEvent& rEvent)
}
break;
+// tdf#149351 Ctrl+A disables pointer as pen mode
+case awt::Key::A:
+if (mxSlideShowController.is())
+{
+if (rEvent.Modifiers == awt::KeyModifier::MOD1)
+{
+mxSlideShowController->setUsePen( false );
+}
+}
+break;
+
case awt::Key::E:
if (mxSlideShowController.is())
{
[Libreoffice-commits] core.git: officecfg/registry sdext/source sd/source
officecfg/registry/schema/org/openoffice/Office/Impress.xcs |7 ++ sd/source/ui/app/optsitem.cxx | 13 +-- sd/source/ui/dlg/tpoption.cxx |9 +++ sd/source/ui/dlg/tpoption.src | 10 +++- sd/source/ui/inc/optsitem.hxx |3 ++ sd/source/ui/inc/tpoption.hrc |2 - sd/source/ui/inc/tpoption.hxx |1 sdext/source/presenter/PresenterScreen.cxx | 14 +++- sdext/source/presenter/PresenterScreen.hxx |2 + 9 files changed, 56 insertions(+), 5 deletions(-) New commits: commit 39da7ee77e5c5add8aaef12bf1e80c66132782fa Author: mmeof manik10...@iiitd.ac.in Date: Fri May 3 09:20:28 2013 -0700 fdo#56995 Created global option to disable presenter console in Impress Changes made are as Follows /officecfg/registry/schema/org/openoffice/Office/Impress.xcs To add the new global checkbox to Libreoffice ImpressGeneralStart A new xml block for EnablePresenterScreen was added prop oor:name=EnablePresenterScreen oor:type=xs:boolean /sd/source/ui/app/optsitem.cxx To add the setter/getter for the new checkbox button, namely: SetEnablePresenterScreen IsEnablePresenterScreen EnablePresenterScreen added to index number 26 of: GetPropNameArray() /sd/source/ui/dlg/tpoption.cxx SdTpOptionsMisc() editted to attach EnablePresenterScreen to CBX_ENABLE_PRESENTER_SCREEN aCbxEnablePresenterScreen ( this, SdResId( CBX_ENABLE_PRESENTER_SCREEN)) Also Added to FillItemSet() and Reset() functions /sd/source/ui/dlg/tpoption.src b/sd/source/ui/dlg/tpoption.src enableSdRemote size changed to Size = MAP_APPFONT ( 116 , 10 ) ; Pos = MAP_APPFONT ( 12 , 171 ) ; 158 was correct but 171 was added on request To allow enableSdRemote(CBX_ENABLE_SDREMOTE) and enablePresenterScreen( CBX_ENABLE_PRESENTER_SCREEN) to be drawn adjacent. enablePresenterScreen checkbox CBX_ENABLE_PRESENTER_SCREEN added /sd/source/ui/inc/optsitem.hxx Set default value for enablePresenterScreen as 1 or TRUE sal_BoolbEnablePresenterScreen : 1; Added getter/setter named same as above for interface definition sd/source/ui/inc/tpoption.hrc Defined CBX_ENABLE_PRESENTER_SCREEN as 42nd checkbox #define CBX_ENABLE_PRESENTER_SCREEN 42 /sd/source/ui/inc/tpoption.hxx Added interface declaration of aCbxEnablePresenterScreen which was attached to CBX_ENABLE_PRESENTER_SCREEN /sdext/source/presenter/PresenterScreen.hxx Added interface declaration of bool isPresenterScreenEnabled() to PresenterScreen class to allow presenterscreen to get if the option is checked /sdext/source/presenter/PresenterScreen.cxx Added definition of isPresenterScreenEnabled(const css::uno::Referencecss::uno::XComponentContext rxContext) Input : Current Process Context Output : The 0/1 value of EnablePresenterScreen from presenterconfig In PresenterScreenListener::notifyEvent( ) Added if(mpPresenterScreen-isPresenterScreenEnabled(mxComponentContext) mpPresenterScreen-InitializePresenterScreen() To initialize PresenterScreen only when enabled Change-Id: If8242e607323df57d8e78d08cf2129d03c0c9e4f Reviewed-on: https://gerrit.libreoffice.org/3762 Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Tested-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs index 1ec830b..8161806 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs @@ -601,6 +601,13 @@ /info valuetrue/value /prop +prop oor:name=EnablePresenterScreen oor:type=xs:boolean oor:nillable=false + info +descIndicates whether to show Presenter Screen Console which shows next slide, notes etc./desc +labelEnable Presenter Screen/label + /info + valuetrue/value +/prop /group group oor:name=Compatibility info diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index 9fe08cc..e960588 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -489,6 +489,7 @@
