.gitreview | 2 sd/source/ui/app/optsitem.cxx | 25 - sd/source/ui/dlg/present.cxx | 39 ++ sd/source/ui/dlg/tpoption.cxx | 12 sd/source/ui/inc/optsitem.hxx | 3 sd/source/ui/inc/present.hxx | 3 sd/source/ui/inc/tpoption.hxx | 2 sd/uiconfig/simpress/ui/optimpressgeneralpage.ui | 40 -- sd/uiconfig/simpress/ui/presentationdialog.ui | 431 ++++++++++++----------- 9 files changed, 277 insertions(+), 280 deletions(-)
New commits: commit 95d93d241258c725fdb37cce8458478d93123ece Author: Samuel Mehrbrodt <[email protected]> AuthorDate: Thu Nov 2 12:35:16 2023 +0100 Commit: Samuel Mehrbrodt <[email protected]> CommitDate: Mon Nov 6 10:47:07 2023 +0100 tdf#135089 Move Presenter console settings to Slide Show settings Change-Id: I0aeb180ee132bff359d46d963985196f5a24610f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158798 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <[email protected]> (cherry picked from commit 496f324b8f038d81fe7a14eb424680e9acab1a3c) diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index fe8bf5ea3b9f..9a94fadba3da 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -409,8 +409,6 @@ SdOptionsMisc::SdOptionsMisc( bool bImpress, bool bUseConfig ) : bDoubleClickTextEdit( true ), bClickChangeRotation( false ), bEnableSdremote( false ), - bEnablePresenterScreen( true ), - bPresenterScreenFullScreen( true ), bSolidDragging( true ), bSummationOfParagraphs( false ), bTabBarVisible( true ), @@ -445,8 +443,6 @@ bool SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const IsDoubleClickTextEdit() == rOpt.IsDoubleClickTextEdit() && IsClickChangeRotation() == rOpt.IsClickChangeRotation() && IsEnableSdremote() == rOpt.IsEnableSdremote() && - IsEnablePresenterScreen() == rOpt.IsEnablePresenterScreen() && - IsPresenterScreenFullScreen() == rOpt.IsPresenterScreenFullScreen() && IsSummationOfParagraphs() == rOpt.IsSummationOfParagraphs() && IsTabBarVisible() == rOpt.IsTabBarVisible() && IsSolidDragging() == rOpt.IsSolidDragging() && @@ -504,8 +500,6 @@ void SdOptionsMisc::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) "PenColor", "PenWidth", "Start/EnableSdremote", - "Start/EnablePresenterScreen", - "Start/PresenterScreenFullScreen", "TabBarVisible" }; @@ -567,14 +561,8 @@ bool SdOptionsMisc::ReadData( const Any* pValues ) if( pValues[25].hasValue() ) SetEnableSdremote( *o3tl::doAccess<bool>(pValues[ 25 ]) ); - if( pValues[26].hasValue() ) - SetEnablePresenterScreen( *o3tl::doAccess<bool>(pValues[ 26 ]) ); - - if (pValues[27].hasValue() ) - SetPresenterScreenFullScreen( *o3tl::doAccess<bool>(pValues[ 27 ]) ); - - if( pValues[28].hasValue() ) { - SetTabBarVisible( *o3tl::doAccess<bool>(pValues[ 28 ]) ); + if( pValues[26].hasValue() ) { + SetTabBarVisible( *o3tl::doAccess<bool>(pValues[ 26 ]) ); } } @@ -617,10 +605,7 @@ bool SdOptionsMisc::WriteData( Any* pValues ) const pValues[ 23 ] <<= GetPresentationPenColor(); pValues[ 24 ] <<= GetPresentationPenWidth(); pValues[ 25 ] <<= IsEnableSdremote(); - pValues[ 26 ] <<= IsEnablePresenterScreen(); - pValues[ 27 ] <<= IsPresenterScreenFullScreen(); - pValues[ 28 ] <<= IsTabBarVisible(); - + pValues[ 26 ] <<= IsTabBarVisible(); } return true; @@ -646,8 +631,6 @@ SdOptionsMiscItem::SdOptionsMiscItem( SdOptions const * pOpts, ::sd::FrameView c { maOptionsMisc.SetStartWithTemplate( pOpts->IsStartWithTemplate() ); maOptionsMisc.SetEnableSdremote( pOpts->IsEnableSdremote() ); - maOptionsMisc.SetEnablePresenterScreen( pOpts->IsEnablePresenterScreen() ); - maOptionsMisc.SetPresenterScreenFullScreen( pOpts->IsPresenterScreenFullScreen() ); maOptionsMisc.SetSummationOfParagraphs( pOpts->IsSummationOfParagraphs() ); maOptionsMisc.SetTabBarVisible( pOpts->IsTabBarVisible() ); maOptionsMisc.SetShowUndoDeleteWarning( pOpts->IsShowUndoDeleteWarning() ); @@ -726,8 +709,6 @@ void SdOptionsMiscItem::SetOptions( SdOptions* pOpts ) const pOpts->SetDoubleClickTextEdit( maOptionsMisc.IsDoubleClickTextEdit() ); pOpts->SetClickChangeRotation( maOptionsMisc.IsClickChangeRotation() ); pOpts->SetEnableSdremote( maOptionsMisc.IsEnableSdremote() ); - pOpts->SetEnablePresenterScreen( maOptionsMisc.IsEnablePresenterScreen() ); - pOpts->SetPresenterScreenFullScreen( maOptionsMisc.IsPresenterScreenFullScreen() ); pOpts->SetSummationOfParagraphs( maOptionsMisc.IsSummationOfParagraphs() ); pOpts->SetTabBarVisible( maOptionsMisc.IsTabBarVisible() ); diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index a2c39f4e4fed..3584a46fb4cc 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <officecfg/Office/Impress.hxx> #include <svl/itemset.hxx> #include <svl/intitem.hxx> #include <svl/eitem.hxx> @@ -31,6 +32,16 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; +namespace +{ +enum PresenterConsoleMode +{ + FullScreen = 0, + Windowed = 1, + Disabled = 2 +}; +} + SdStartPresentationDlg::SdStartPresentationDlg(weld::Window* pWindow, const SfxItemSet& rInAttrs, const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList) : GenericDialogController(pWindow, "modules/simpress/ui/presentationdialog.ui", "PresentationDialog") @@ -55,6 +66,7 @@ SdStartPresentationDlg::SdStartPresentationDlg(weld::Window* pWindow, const SfxI , m_xCbxChangePage(m_xBuilder->weld_check_button("changeslidesbyclick")) , m_xCbxAlwaysOnTop(m_xBuilder->weld_check_button("alwaysontop")) , m_xCbxShowNavigationButton(m_xBuilder->weld_check_button("shownavigationbutton")) + , m_xLbConsole(m_xBuilder->weld_combo_box("console_cb")) , m_xFtMonitor(m_xBuilder->weld_label("presdisplay_label")) , m_xLBMonitor(m_xBuilder->weld_combo_box("presdisplay_cb")) , m_xMonitor(m_xBuilder->weld_label("monitor_str")) @@ -132,6 +144,13 @@ SdStartPresentationDlg::SdStartPresentationDlg(weld::Window* pWindow, const SfxI else m_xRbtStandard->set_active(true); + if (!officecfg::Office::Impress::Misc::Start::EnablePresenterScreen::get()) + m_xLbConsole->set_active(PresenterConsoleMode::Disabled); + else if (officecfg::Office::Impress::Misc::Start::PresenterScreenFullScreen::get()) + m_xLbConsole->set_active(PresenterConsoleMode::FullScreen); + else + m_xLbConsole->set_active(PresenterConsoleMode::Windowed); + InitMonitorSettings(); ChangeRangeHdl(*m_xRbtCustomshow); @@ -144,6 +163,26 @@ SdStartPresentationDlg::~SdStartPresentationDlg() { } +short SdStartPresentationDlg::run() +{ + short nRet = GenericDialogController::run(); + if (nRet == RET_OK) + { + std::shared_ptr<comphelper::ConfigurationChanges> batch( + comphelper::ConfigurationChanges::create()); + auto nActive = m_xLbConsole->get_active(); + bool bEnabled = nActive != PresenterConsoleMode::Disabled; + officecfg::Office::Impress::Misc::Start::EnablePresenterScreen::set(bEnabled, batch); + if (bEnabled) + { + officecfg::Office::Impress::Misc::Start::PresenterScreenFullScreen::set( + nActive == PresenterConsoleMode::FullScreen, batch); + } + batch->commit(); + } + return nRet; +} + OUString SdStartPresentationDlg::GetDisplayName( sal_Int32 nDisplay, DisplayType eType ) { diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 694590712c72..ac0d28fa013e 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -185,8 +185,6 @@ SdTpOptionsMisc::SdTpOptionsMisc(weld::Container* pPage, weld::DialogController* , m_xLbMetric(m_xBuilder->weld_combo_box("units")) , m_xMtrFldTabstop(m_xBuilder->weld_metric_spin_button("metricFields", FieldUnit::MM)) , m_xCbxEnableSdremote(m_xBuilder->weld_check_button("enremotcont")) - , m_xCbxEnablePresenterScreen(m_xBuilder->weld_check_button("enprsntcons")) - , m_xCbxPresenterScreenFullScreen(m_xBuilder->weld_check_button("enprsntconsfullscreen")) , m_xCbxCompatibility(m_xBuilder->weld_check_button("cbCompatibility")) , m_xScaleFrame(m_xBuilder->weld_frame("scaleframe")) , m_xCbScale(m_xBuilder->weld_combo_box("scaleBox")) @@ -337,8 +335,6 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet* rAttrs ) m_xCbxMasterPageCache->get_state_changed_from_saved() || m_xCbxCopy->get_state_changed_from_saved() || m_xCbxEnableSdremote->get_state_changed_from_saved() || - m_xCbxEnablePresenterScreen->get_state_changed_from_saved() || - m_xCbxPresenterScreenFullScreen->get_state_changed_from_saved() || m_xCbxCompatibility->get_state_changed_from_saved() || m_xCbxDistort->get_state_changed_from_saved()) { @@ -351,8 +347,6 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet* rAttrs ) aOptsItem.GetOptionsMisc().SetMasterPagePaintCaching( m_xCbxMasterPageCache->get_active() ); aOptsItem.GetOptionsMisc().SetDragWithCopy( m_xCbxCopy->get_active() ); aOptsItem.GetOptionsMisc().SetEnableSdremote( m_xCbxEnableSdremote->get_active() ); - aOptsItem.GetOptionsMisc().SetEnablePresenterScreen( m_xCbxEnablePresenterScreen->get_active() ); - aOptsItem.GetOptionsMisc().SetPresenterScreenFullScreen( m_xCbxPresenterScreenFullScreen->get_active() ); aOptsItem.GetOptionsMisc().SetSummationOfParagraphs( m_xCbxCompatibility->get_active() ); aOptsItem.GetOptionsMisc().SetCrookNoContortion( m_xCbxDistort->get_active() ); rAttrs->Put( aOptsItem ); @@ -401,8 +395,6 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs ) m_xCbxMasterPageCache->set_active( aOptsItem.GetOptionsMisc().IsMasterPagePaintCaching() ); m_xCbxCopy->set_active( aOptsItem.GetOptionsMisc().IsDragWithCopy() ); m_xCbxEnableSdremote->set_active( aOptsItem.GetOptionsMisc().IsEnableSdremote() ); - m_xCbxEnablePresenterScreen->set_active( aOptsItem.GetOptionsMisc().IsEnablePresenterScreen() ); - m_xCbxPresenterScreenFullScreen->set_active( aOptsItem.GetOptionsMisc().IsPresenterScreenFullScreen() ); m_xCbxCompatibility->set_active( aOptsItem.GetOptionsMisc().IsSummationOfParagraphs() ); m_xCbxDistort->set_active( aOptsItem.GetOptionsMisc().IsCrookNoContortion() ); m_xCbxStartWithTemplate->save_state(); @@ -413,8 +405,6 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs ) m_xCbxMasterPageCache->save_state(); m_xCbxCopy->save_state(); m_xCbxEnableSdremote->save_state(); - m_xCbxEnablePresenterScreen->save_state(); - m_xCbxPresenterScreenFullScreen->save_state(); m_xCbxCompatibility->save_state(); m_xCbxDistort->save_state(); @@ -498,8 +488,6 @@ void SdTpOptionsMisc::SetDrawMode() m_xScaleFrame->show(); m_xNewDocumentFrame->hide(); m_xCbxEnableSdremote->hide(); - m_xCbxEnablePresenterScreen->hide(); - m_xCbxPresenterScreenFullScreen->hide(); m_xCbxCompatibility->hide(); m_xNewDocLb->hide(); m_xCbScale->show(); diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index ffa8de612c61..67262a76d005 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -196,7 +196,6 @@ private: bool bDoubleClickTextEdit : 1; // Misc/DclickTextedit bool bClickChangeRotation : 1; // Misc/RotateClick bool bEnableSdremote : 1; // Misc/Start/EnableSdremote - bool bEnablePresenterScreen : 1; // Misc/Start/EnablePresenterScreen bool bPresenterScreenFullScreen : 1; // Misc/Start/PresenterScreenFullScreen bool bSolidDragging : 1; // Misc/ModifyWithAttributes bool bSummationOfParagraphs : 1; // misc/SummationOfParagraphs @@ -250,7 +249,6 @@ public: bool IsDoubleClickTextEdit() const { Init(); return bDoubleClickTextEdit; } bool IsClickChangeRotation() const { Init(); return bClickChangeRotation; } bool IsEnableSdremote() const { Init(); return bEnableSdremote; } - bool IsEnablePresenterScreen() const { Init(); return bEnablePresenterScreen; } bool IsPresenterScreenFullScreen() const { Init(); return bPresenterScreenFullScreen; } bool IsSolidDragging() const { Init(); return bSolidDragging; } bool IsSummationOfParagraphs() const { Init(); return bSummationOfParagraphs; }; @@ -294,7 +292,6 @@ public: void SetDoubleClickTextEdit( bool bOn ) { if( bDoubleClickTextEdit != bOn ) { OptionsChanged(); bDoubleClickTextEdit = bOn; } } void SetClickChangeRotation( bool bOn ) { if( bClickChangeRotation != bOn ) { OptionsChanged(); bClickChangeRotation = bOn; } } void SetEnableSdremote( bool bOn ) { if( bEnableSdremote != bOn ) { OptionsChanged(); bEnableSdremote = bOn; } } - void SetEnablePresenterScreen( bool bOn ) { if( bEnablePresenterScreen != bOn ) { OptionsChanged(); bEnablePresenterScreen = bOn; } } void SetPresenterScreenFullScreen( bool bOn ) { if ( bPresenterScreenFullScreen != bOn) { OptionsChanged(); bPresenterScreenFullScreen = bOn; } } void SetSummationOfParagraphs( bool bOn ){ if ( bOn != bSummationOfParagraphs ) { OptionsChanged(); bSummationOfParagraphs = bOn; } } void SetTabBarVisible( bool bOn ){ if ( bOn != bTabBarVisible ) { OptionsChanged(); bTabBarVisible = bOn; } } diff --git a/sd/source/ui/inc/present.hxx b/sd/source/ui/inc/present.hxx index aba8839bdfd2..de6761314b00 100644 --- a/sd/source/ui/inc/present.hxx +++ b/sd/source/ui/inc/present.hxx @@ -56,6 +56,8 @@ private: std::unique_ptr<weld::CheckButton> m_xCbxAlwaysOnTop; std::unique_ptr<weld::CheckButton> m_xCbxShowNavigationButton; + std::unique_ptr<weld::ComboBox> m_xLbConsole; + std::unique_ptr<weld::Label> m_xFtMonitor; std::unique_ptr<weld::ComboBox> m_xLBMonitor; @@ -85,6 +87,7 @@ public: const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList); virtual ~SdStartPresentationDlg() override; + virtual short run() override; void GetAttr( SfxItemSet& rOutAttrs ); }; diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index 995916331223..7d8040813e5f 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -87,8 +87,6 @@ private: std::unique_ptr<weld::MetricSpinButton> m_xMtrFldTabstop; std::unique_ptr<weld::CheckButton> m_xCbxEnableSdremote; - std::unique_ptr<weld::CheckButton> m_xCbxEnablePresenterScreen; - std::unique_ptr<weld::CheckButton> m_xCbxPresenterScreenFullScreen; std::unique_ptr<weld::CheckButton> m_xCbxCompatibility; //Scale diff --git a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui index d97502be275f..2e62be48a238 100644 --- a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui +++ b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui @@ -96,7 +96,7 @@ <property name="label-xalign">0</property> <property name="shadow-type">none</property> <child> - <!-- n-columns=1 n-rows=3 --> + <!-- n-columns=1 n-rows=2 --> <object class="GtkGrid" id="grid5"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -105,25 +105,6 @@ <property name="hexpand">True</property> <property name="row-spacing">6</property> <property name="column-spacing">12</property> - <child> - <object class="GtkCheckButton" id="enprsntcons"> - <property name="label" translatable="yes" context="optimpressgeneralpage|enprsntcons">Enable Presenter Console</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="use-underline">True</property> - <property name="draw-indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="enprsntcons-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|enprsntcons">Specifies that you want to enable the Presenter Console during slideshows.</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> <child> <object class="GtkCheckButton" id="enremotcont"> <property name="label" translatable="yes" context="optimpressgeneralpage|enremotcont">Enable remote control</property> @@ -144,25 +125,6 @@ <property name="top-attach">0</property> </packing> </child> - <child> - <object class="GtkCheckButton" id="enprsntconsfullscreen"> - <property name="label" translatable="yes" context="optimpressgeneralpage|enprsntconsfullscreen">Fullscreen presenter console</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="use-underline">True</property> - <property name="draw-indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="enprsntconsfullscreen-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|enprsntconsfullscreen">Specifies that you want to show the Presenter Console in fullscreen mode.</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </child> </object> </child> <child type="label"> diff --git a/sd/uiconfig/simpress/ui/presentationdialog.ui b/sd/uiconfig/simpress/ui/presentationdialog.ui index 6f149cdf558b..d81c243306c8 100644 --- a/sd/uiconfig/simpress/ui/presentationdialog.ui +++ b/sd/uiconfig/simpress/ui/presentationdialog.ui @@ -268,12 +268,13 @@ <property name="hexpand">True</property> <property name="vexpand">True</property> <child> - <!-- n-columns=2 n-rows=1 --> + <!-- n-columns=2 n-rows=2 --> <object class="GtkGrid" id="grid8"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="row-spacing">6</property> <property name="column-spacing">12</property> <child> <object class="GtkComboBoxText" id="presdisplay_cb"> @@ -305,6 +306,37 @@ <property name="top-attach">0</property> </packing> </child> + <child> + <object class="GtkComboBoxText" id="console_cb"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="hexpand">True</property> + <property name="active">0</property> + <items> + <item id="0" translatable="yes" context="presentationdialog|console_cb">Full screen</item> + <item id="1" translatable="yes" context="presentationdialog|console_cb">Windowed</item> + <item id="2" translatable="yes" context="presentationdialog|console_cb">Disabled</item> + </items> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="console_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="presentationdialog|console_label">Presenter console:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">console_cb</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">1</property> + </packing> + </child> </object> <packing> <property name="left-attach">0</property> commit 057094a9efdf3cafa08abc6f90fc44b72ed0a2a3 Author: Samuel Mehrbrodt <[email protected]> AuthorDate: Thu Nov 2 10:58:54 2023 +0100 Commit: Samuel Mehrbrodt <[email protected]> CommitDate: Mon Nov 6 10:47:07 2023 +0100 Save with latest glade Change-Id: Ibaa2851fede2ecd78b86388e151b4484e1ff60db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158796 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <[email protected]> (cherry picked from commit 15bac35f442312d7f6d12f84c7051b8678236ee2) diff --git a/sd/uiconfig/simpress/ui/presentationdialog.ui b/sd/uiconfig/simpress/ui/presentationdialog.ui index 2c2d191b8ddf..6f149cdf558b 100644 --- a/sd/uiconfig/simpress/ui/presentationdialog.ui +++ b/sd/uiconfig/simpress/ui/presentationdialog.ui @@ -1,39 +1,39 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.36.0 --> +<!-- Generated with glade 3.40.0 --> <interface domain="sd"> <requires lib="gtk+" version="3.20"/> <object class="GtkAdjustment" id="adjustment1"> <property name="upper">86400000</property> - <property name="step_increment">1000</property> - <property name="page_increment">60000</property> + <property name="step-increment">1000</property> + <property name="page-increment">60000</property> </object> <object class="GtkDialog" id="PresentationDialog"> - <property name="can_focus">False</property> - <property name="border_width">6</property> + <property name="can-focus">False</property> + <property name="border-width">6</property> <property name="title" translatable="yes" context="presentationdialog|PresentationDialog">Slide Show Settings</property> <property name="modal">True</property> - <property name="default_width">0</property> - <property name="default_height">0</property> - <property name="type_hint">dialog</property> + <property name="default-width">0</property> + <property name="default-height">0</property> + <property name="type-hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="layout_style">end</property> + <property name="can-focus">False</property> + <property name="layout-style">end</property> <child> <object class="GtkButton" id="ok"> <property name="label" translatable="yes" context="stock">_OK</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="has-default">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -46,8 +46,8 @@ <object class="GtkButton" id="cancel"> <property name="label" translatable="yes" context="stock">_Cancel</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -60,8 +60,8 @@ <object class="GtkButton" id="help"> <property name="label" translatable="yes" context="stock">_Help</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> <property name="use-underline">True</property> </object> <packing> @@ -75,48 +75,48 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> + <property name="pack-type">end</property> <property name="position">1</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=1 n-rows=3 --> <object class="GtkGrid" id="grid1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="row_spacing">12</property> + <property name="row-spacing">12</property> <child> <object class="GtkFrame" id="frame1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=1 n-rows=3 --> <object class="GtkGrid" id="grid5"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> + <property name="can-focus">False</property> <property name="margin-start">12</property> <property name="margin-top">6</property> + <property name="row-spacing">6</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=1 --> <object class="GtkGrid" id="grid6"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> + <property name="can-focus">False</property> + <property name="column-spacing">12</property> <child> <object class="GtkRadioButton" id="from"> <property name="label" translatable="yes" context="presentationdialog|from">_From:</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> <property name="group">allslides</property> <accessibility> <relation type="label-for" target="from_cb"/> @@ -128,14 +128,14 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkComboBoxText" id="from_cb"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <accessibility> <relation type="labelled-by" target="from"/> @@ -148,25 +148,25 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkRadioButton" id="allslides"> <property name="label" translatable="yes" context="presentationdialog|allslides">All _slides</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> <property name="active">True</property> - <property name="draw_indicator">True</property> + <property name="draw-indicator">True</property> <child internal-child="accessible"> <object class="AtkObject" id="allslides-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="presentationdialog|extended_tip|allslides">Includes all of the slides in your slide show.</property> @@ -174,24 +174,24 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=1 --> <object class="GtkGrid" id="grid"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> + <property name="can-focus">False</property> + <property name="column-spacing">12</property> <child> <object class="GtkRadioButton" id="customslideshow"> <property name="label" translatable="yes" context="presentationdialog|customslideshow">_Custom slide show:</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> <property name="group">allslides</property> <accessibility> <relation type="label-for" target="customslideshow_cb"/> @@ -203,14 +203,14 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkComboBoxText" id="customslideshow_cb"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <accessibility> <relation type="labelled-by" target="customslideshow"/> @@ -222,14 +222,14 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> </object> @@ -237,7 +237,7 @@ <child type="label"> <object class="GtkLabel" id="label1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="presentationdialog|label1">Range</property> <attributes> <attribute name="weight" value="bold"/> @@ -246,39 +246,39 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkFrame" id="frame3"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=1 n-rows=2 --> <object class="GtkGrid" id="grid7"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> + <property name="can-focus">False</property> <property name="margin-start">12</property> <property name="margin-top">6</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=1 --> <object class="GtkGrid" id="grid8"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="column_spacing">12</property> + <property name="column-spacing">12</property> <child> <object class="GtkComboBoxText" id="presdisplay_cb"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <child internal-child="accessible"> <object class="AtkObject" id="presdisplay_cb-atkobject"> @@ -287,78 +287,78 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="presdisplay_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="presentationdialog|presdisplay_label">P_resentation display:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">presdisplay_cb</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">presdisplay_cb</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=1 n-rows=4 --> <object class="GtkGrid" id="grid9"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkLabel" id="externalmonitor_str"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="presentationdialog|externalmonitor_str">Display %1 (external)</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="monitor_str"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="presentationdialog|monitor_str">Display %1</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkLabel" id="allmonitors_str"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="presentationdialog|allmonitors_str">All displays</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkLabel" id="external_str"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="presentationdialog|external_str">Auto External (Display %1)</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="left-attach">0</property> + <property name="top-attach">3</property> </packing> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> </object> @@ -366,7 +366,7 @@ <child type="label"> <object class="GtkLabel" id="label3"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="presentationdialog|label3">Multiple Displays</property> <attributes> <attribute name="weight" value="bold"/> @@ -375,43 +375,43 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=1 --> <object class="GtkGrid" id="grid2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> + <property name="can-focus">False</property> + <property name="column-spacing">12</property> <child> <object class="GtkFrame" id="frame2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=1 n-rows=5 --> <object class="GtkGrid" id="grid3"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="row_spacing">6</property> + <property name="can-focus">False</property> <property name="margin-start">12</property> <property name="margin-top">6</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row-spacing">6</property> <child> <object class="GtkRadioButton" id="default"> <property name="label" translatable="yes" context="presentationdialog|default">F_ull screen</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> <property name="active">True</property> - <property name="draw_indicator">True</property> + <property name="draw-indicator">True</property> <child internal-child="accessible"> <object class="AtkObject" id="default-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="presentationdialog|extended_tip|default">A full screen slide is shown.</property> @@ -419,18 +419,18 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkRadioButton" id="window"> <property name="label" translatable="yes" context="presentationdialog|window">In a _window</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> <property name="group">default</property> <child internal-child="accessible"> <object class="AtkObject" id="window-atkobject"> @@ -439,18 +439,18 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkRadioButton" id="auto"> <property name="label" translatable="yes" context="presentationdialog|auto">_Loop and repeat after:</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> <property name="group">default</property> <accessibility> <relation type="label-for" target="pauseduration"/> @@ -462,19 +462,19 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkCheckButton" id="showlogo"> <property name="label" translatable="yes" context="presentationdialog|showlogo">Show _logo</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> <property name="margin-start">12</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> <child internal-child="accessible"> <object class="AtkObject" id="showlogo-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="presentationdialog|extended_tip|showlogo">Displays the application logo on the pause slide.</property> @@ -482,23 +482,23 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="left-attach">0</property> + <property name="top-attach">4</property> </packing> </child> <child> <object class="GtkSpinButton" id="pauseduration"> <property name="visible">True</property> <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes" context="presentationdialog|pauseduration|tooltip_text">Duration of pause</property> + <property name="can-focus">True</property> + <property name="tooltip-text" translatable="yes" context="presentationdialog|pauseduration|tooltip_text">Duration of pause</property> <property name="margin-start">12</property> - <property name="activates_default">True</property> + <property name="activates-default">True</property> + <property name="truncate-multiline">True</property> <property name="adjustment">adjustment1</property> <accessibility> <relation type="labelled-by" target="auto"/> </accessibility> - <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="pauseduration-atkobject"> <property name="AtkObject::accessible-name" translatable="yes" context="presentationdialog|pauseduration-atkobject">Pause Duration</property> @@ -507,8 +507,8 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="left-attach">0</property> + <property name="top-attach">3</property> </packing> </child> </object> @@ -516,7 +516,7 @@ <child type="label"> <object class="GtkLabel" id="label2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="presentationdialog|label2">Presentation Mode</property> <attributes> <attribute name="weight" value="bold"/> @@ -525,36 +525,36 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkFrame" id="frame4"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=1 n-rows=7 --> <object class="GtkGrid" id="grid4"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="row_spacing">6</property> + <property name="can-focus">False</property> <property name="margin-start">12</property> <property name="margin-top">6</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row-spacing">6</property> <child> <object class="GtkCheckButton" id="manualslides"> <property name="label" translatable="yes" context="presentationdialog|manualslides">Change slides _manually</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> <child internal-child="accessible"> <object class="AtkObject" id="manualslides-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="presentationdialog|extended_tip|manualslides">Slides never change automatically when this box is selected.</property> @@ -562,18 +562,18 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkCheckButton" id="pointervisible"> <property name="label" translatable="yes" context="presentationdialog|pointervisible">Mouse pointer _visible</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> <child internal-child="accessible"> <object class="AtkObject" id="pointervisible-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="presentationdialog|extended_tip|pointervisible">Shows the mouse pointer during a slide show.</property> @@ -581,18 +581,18 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkCheckButton" id="pointeraspen"> <property name="label" translatable="yes" context="presentationdialog|pointeraspen">Mouse pointer as _pen</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> <child internal-child="accessible"> <object class="AtkObject" id="pointeraspen-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="presentationdialog|extended_tip|pointeraspen">Changes the mouse pointer to a pen which you can use to draw on slides during the presentation.</property> @@ -600,18 +600,18 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkCheckButton" id="animationsallowed"> <property name="label" translatable="yes" context="presentationdialog|animationsallowed">_Animations allowed</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> <child internal-child="accessible"> <object class="AtkObject" id="animationsallowed-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="presentationdialog|extended_tip|animationsallowed">Displays all frames of animated GIF files during the slide show.</property> @@ -619,18 +619,18 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="left-attach">0</property> + <property name="top-attach">4</property> </packing> </child> <child> <object class="GtkCheckButton" id="changeslidesbyclick"> <property name="label" translatable="yes" context="presentationdialog|changeslidesbyclick">Change slides by clic_king on background</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> <child internal-child="accessible"> <object class="AtkObject" id="changeslidesbyclick-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="presentationdialog|extended_tip|changeslidesbyclick">Advances to the next slide when you click on the background of a slide.</property> @@ -638,18 +638,18 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> + <property name="left-attach">0</property> + <property name="top-attach">5</property> </packing> </child> <child> <object class="GtkCheckButton" id="alwaysontop"> <property name="label" translatable="yes" context="presentationdialog|alwaysontop">Presentation always _on top</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> <child internal-child="accessible"> <object class="AtkObject" id="alwaysontop-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="presentationdialog|extended_tip|alwaysontop">The Impress window remains on top during the presentation. No other program will show its window in front of your presentation.</property> @@ -657,8 +657,8 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> + <property name="left-attach">0</property> + <property name="top-attach">6</property> </packing> </child> <child> @@ -688,7 +688,7 @@ <child type="label"> <object class="GtkLabel" id="label4"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="presentationdialog|label4">Options</property> <attributes> <attribute name="weight" value="bold"/> @@ -697,14 +697,14 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> </object> @@ -721,9 +721,6 @@ <action-widget response="-6">cancel</action-widget> <action-widget response="-11">help</action-widget> </action-widgets> - <child type="titlebar"> - <placeholder/> - </child> <child internal-child="accessible"> <object class="AtkObject" id="PresentationDialog-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="presentationdialog|extended_tip|PresentationDialog">Defines settings for your slide show, including which slide to start from, the way you advance the slides, the type of presentation, and pointer options.</property> commit ecc072282a9e0be2fd9855ed4dfdc0616d4259b7 Author: Samuel Mehrbrodt <[email protected]> AuthorDate: Mon Nov 6 10:46:05 2023 +0100 Commit: Samuel Mehrbrodt <[email protected]> CommitDate: Mon Nov 6 10:47:07 2023 +0100 Update .gitreview default branch Change-Id: I4c77a40fd2cd8089a06100129dd3d37aeab3a868 diff --git a/.gitreview b/.gitreview index 79f2270aa337..e092f9b0d452 100644 --- a/.gitreview +++ b/.gitreview @@ -3,5 +3,5 @@ host=gerrit.libreoffice.org port=29418 project=core defaultremote=logerrit -defaultbranch=libreoffice-7-6-3 +defaultbranch=feature/cib_contract49
