From 67c834aad2299ece8365bad2f30922e83dea78a1 Mon Sep 17 00:00:00 2001 From: Krisztian Pinter Date: Tue, 12 Mar 2013 12:53:11 +0100 Subject: converted sd/source/ui/dlg/present.src to .ui MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I92ab3ab57146524c1c70e6503261989df86dc22d Reviewed-on: https://gerrit.libreoffice.org/2732 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sd/AllLangResTarget_sd.mk | 1 - sd/UI_simpress.mk | 1 + sd/source/ui/dlg/present.cxx | 222 ++++----- sd/source/ui/dlg/present.src | 277 ----------- sd/source/ui/inc/present.hrc | 57 --- sd/source/ui/inc/present.hxx | 58 +-- sd/uiconfig/simpress/ui/presentationdialog.ui | 663 ++++++++++++++++++++++++++ 7 files changed, 795 insertions(+), 484 deletions(-) delete mode 100644 sd/source/ui/dlg/present.src delete mode 100644 sd/source/ui/inc/present.hrc create mode 100644 sd/uiconfig/simpress/ui/presentationdialog.ui diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk index 4068afc218e9..86834facbd24 100644 --- a/sd/AllLangResTarget_sd.mk +++ b/sd/AllLangResTarget_sd.mk @@ -88,7 +88,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\ sd/source/ui/dlg/navigatr.src \ sd/source/ui/dlg/PaneDockingWindow.src \ sd/source/ui/dlg/paragr.src \ - sd/source/ui/dlg/present.src \ sd/source/ui/dlg/prltempl.src \ sd/source/ui/dlg/prntopts.src \ sd/source/ui/dlg/RemoteDialog.src \ diff --git a/sd/UI_simpress.mk b/sd/UI_simpress.mk index 3ddeac9192df..2caf77c3e237 100644 --- a/sd/UI_simpress.mk +++ b/sd/UI_simpress.mk @@ -10,6 +10,7 @@ $(eval $(call gb_UI_UI,modules/simpress)) $(eval $(call gb_UI_add_uifiles,modules/simpress,\ + sd/uiconfig/simpress/ui/presentationdialog \ sd/uiconfig/simpress/ui/printeroptions \ )) diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index 0d7d02eeb4f1..bf3890792b9a 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -30,7 +30,6 @@ #include "sdattr.hxx" #include "present.hxx" -#include "present.hrc" #include "sdresid.hxx" #include "cusshow.hxx" #include "customshowlist.hxx" @@ -45,71 +44,61 @@ using namespace ::com::sun::star::beans; SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow, const SfxItemSet& rInAttrs, const std::vector &rPageNames, SdCustomShowList* pCSList ) : - ModalDialog ( pWindow, SdResId( DLG_START_PRESENTATION ) ), - aGrpRange ( this, SdResId( GRP_RANGE ) ), - aRbtAll ( this, SdResId( RBT_ALL ) ), - aRbtAtDia ( this, SdResId( RBT_AT_DIA ) ), - aRbtCustomshow ( this, SdResId( RBT_CUSTOMSHOW ) ), - aLbDias ( this, SdResId( LB_DIAS ) ), - aLbCustomshow ( this, SdResId( LB_CUSTOMSHOW ) ), - - aGrpKind ( this, SdResId( GRP_KIND ) ), - aRbtStandard ( this, SdResId( RBT_STANDARD ) ), - aRbtWindow ( this, SdResId( RBT_WINDOW ) ), - aRbtAuto ( this, SdResId( RBT_AUTO ) ), - aTmfPause ( this, SdResId( TMF_PAUSE ) ), - aCbxAutoLogo ( this, SdResId( CBX_AUTOLOGO ) ), - - aGrpOptions ( this, SdResId( GRP_OPTIONS ) ), - aCbxManuel ( this, SdResId( CBX_MANUEL ) ), - aCbxMousepointer ( this, SdResId( CBX_MOUSEPOINTER ) ), - aCbxPen ( this, SdResId( CBX_PEN ) ), - aCbxNavigator ( this, SdResId( CBX_NAVIGATOR ) ), - aCbxAnimationAllowed ( this, SdResId( CBX_ANIMATION_ALLOWED ) ), - aCbxChangePage ( this, SdResId( CBX_CHANGE_PAGE ) ), - aCbxAlwaysOnTop ( this, SdResId( CBX_ALWAYS_ON_TOP ) ), - - maGrpMonitor ( this, SdResId( GRP_MONITOR ) ), - maFtMonitor ( this, SdResId( FT_MONITOR ) ), - maLBMonitor ( this, SdResId( LB_MONITOR ) ), - - aBtnOK ( this, SdResId( BTN_OK ) ), - aBtnCancel ( this, SdResId( BTN_CANCEL ) ), - aBtnHelp ( this, SdResId( BTN_HELP ) ), - + ModalDialog ( pWindow, "PresentationDialog", "modules/simpress/ui/presentationdialog.ui" ), pCustomShowList ( pCSList ), rOutAttrs ( rInAttrs ), - mnMonitors ( 0 ), - - msExternalMonitor( SdResId(STR_EXTERNAL_MONITOR ) ), - msMonitor( SdResId( STR_MONITOR ) ), - msAllMonitors( SdResId( STR_ALL_MONITORS ) ) + mnMonitors ( 0 ) { - FreeResource(); + get( aRbtAll, "allslides" ); + get( aRbtAtDia, "from" ); + get( aRbtCustomshow, "customslideshow" ); + get( aLbDias, "from_cb" ); + get( aLbCustomshow, "customslideshow_cb" ); + + get( aRbtStandard, "default" ); + get( aRbtWindow, "window" ); + get( aRbtAuto, "auto" ); + get( aTmfPause, "pauseduration" ); + get( aCbxAutoLogo, "showlogo" ); + + get( aCbxManuel, "manualslides" ); + get( aCbxMousepointer, "pointervisible" ); + get( aCbxPen, "pointeraspen" ); + get( aCbxNavigator, "navigatorvisible" ); + get( aCbxAnimationAllowed, "animationsallowed" ); + get( aCbxChangePage, "changeslidesbyclick" ); + get( aCbxAlwaysOnTop, "alwaysontop" ); + + get( maFtMonitor, "presdisplay_label" ); + get( maLBMonitor, "presdisplay_cb" ); + + get( msExternalMonitor, "externalmonitor_str" ); + get( msMonitor, "monitor_str" ); + get( msAllMonitors, "allmonitors_str" ); Link aLink( LINK( this, SdStartPresentationDlg, ChangeRangeHdl ) ); - aRbtAll.SetClickHdl( aLink ); - aRbtAtDia.SetClickHdl( aLink ); - aRbtCustomshow.SetClickHdl( aLink ); + aRbtAll->SetClickHdl( aLink ); + aRbtAtDia->SetClickHdl( aLink ); + aRbtCustomshow->SetClickHdl( aLink ); aLink = LINK( this, SdStartPresentationDlg, ClickWindowPresentationHdl ); - aRbtStandard.SetClickHdl( aLink ); - aRbtWindow.SetClickHdl( aLink ); - aRbtAuto.SetClickHdl( aLink ); + aRbtStandard->SetClickHdl( aLink ); + aRbtWindow->SetClickHdl( aLink ); + aRbtAuto->SetClickHdl( aLink ); - aTmfPause.SetModifyHdl( LINK( this, SdStartPresentationDlg, ChangePauseHdl ) ); - aTmfPause.SetFormat( TIMEF_SEC ); + aTmfPause->SetModifyHdl( LINK( this, SdStartPresentationDlg, ChangePauseHdl ) ); + aTmfPause->SetFormat( TIMEF_SEC ); - aLbDias.SetAccessibleRelationLabeledBy( &aRbtAtDia ); - aLbDias.SetAccessibleName(aRbtAtDia.GetText()); - aLbCustomshow.SetAccessibleRelationLabeledBy( &aRbtCustomshow ); - aTmfPause.SetAccessibleRelationLabeledBy( &aRbtAuto ); - aTmfPause.SetAccessibleName(aRbtAuto.GetText()); + aLbDias->SetAccessibleRelationLabeledBy( aRbtAtDia ); + aLbDias->SetAccessibleName(aRbtAtDia->GetText()); + aLbCustomshow->SetAccessibleRelationLabeledBy( aRbtCustomshow ); + aTmfPause->SetAccessibleRelationLabeledBy( aRbtAuto ); + aTmfPause->SetAccessibleName(aRbtAuto->GetText()); // fill Listbox with page names for (std::vector::const_iterator pIter = rPageNames.begin(); pIter != rPageNames.end(); ++pIter) - aLbDias.InsertEntry(*pIter); + aLbDias->InsertEntry(*pIter); if( pCustomShowList ) { @@ -120,48 +109,48 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow, pCustomShow != NULL; pCustomShow = (SdCustomShow*) pCustomShowList->Next() ) { - aLbCustomshow.InsertEntry( pCustomShow->GetName() ); + aLbCustomshow->InsertEntry( pCustomShow->GetName() ); } - aLbCustomshow.SelectEntryPos( nPosToSelect ); + aLbCustomshow->SelectEntryPos( nPosToSelect ); pCustomShowList->Seek( nPosToSelect ); } else - aRbtCustomshow.Disable(); + aRbtCustomshow->Disable(); if( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_CUSTOMSHOW ) ).GetValue() && pCSList ) - aRbtCustomshow.Check(); + aRbtCustomshow->Check(); else if( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_ALL ) ).GetValue() ) - aRbtAll.Check(); + aRbtAll->Check(); else - aRbtAtDia.Check(); + aRbtAtDia->Check(); - aLbDias.SelectEntry( ( ( const SfxStringItem& ) rOutAttrs.Get( ATTR_PRESENT_DIANAME ) ).GetValue() ); - aCbxManuel.Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_MANUEL ) ).GetValue() ); - aCbxMousepointer.Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_MOUSE ) ).GetValue() ); - aCbxPen.Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_PEN ) ).GetValue() ); - aCbxNavigator.Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_NAVIGATOR ) ).GetValue() ); - aCbxAnimationAllowed.Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_ANIMATION_ALLOWED ) ).GetValue() ); - aCbxChangePage.Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_CHANGE_PAGE ) ).GetValue() ); - aCbxAlwaysOnTop.Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_ALWAYS_ON_TOP ) ).GetValue() ); + aLbDias->SelectEntry( ( ( const SfxStringItem& ) rOutAttrs.Get( ATTR_PRESENT_DIANAME ) ).GetValue() ); + aCbxManuel->Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_MANUEL ) ).GetValue() ); + aCbxMousepointer->Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_MOUSE ) ).GetValue() ); + aCbxPen->Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_PEN ) ).GetValue() ); + aCbxNavigator->Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_NAVIGATOR ) ).GetValue() ); + aCbxAnimationAllowed->Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_ANIMATION_ALLOWED ) ).GetValue() ); + aCbxChangePage->Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_CHANGE_PAGE ) ).GetValue() ); + aCbxAlwaysOnTop->Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_ALWAYS_ON_TOP ) ).GetValue() ); const sal_Bool bEndless = ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_ENDLESS ) ).GetValue(); const sal_Bool bWindow = !( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_FULLSCREEN ) ).GetValue(); const long nPause = ( ( const SfxUInt32Item& ) rOutAttrs.Get( ATTR_PRESENT_PAUSE_TIMEOUT ) ).GetValue(); - aTmfPause.SetTime( Time( 0, 0, nPause ) ); + aTmfPause->SetTime( Time( 0, 0, nPause ) ); // set cursor in timefield - Edit *pEdit = aTmfPause.GetField(); + Edit *pEdit = aTmfPause->GetField(); Selection aSel( pEdit->GetMaxTextLen(), pEdit->GetMaxTextLen() ); pEdit->SetSelection( aSel ); - aCbxAutoLogo.Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_SHOW_PAUSELOGO ) ).GetValue() ); + aCbxAutoLogo->Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_SHOW_PAUSELOGO ) ).GetValue() ); if( bWindow ) - aRbtWindow.Check( sal_True ); + aRbtWindow->Check( sal_True ); else if( bEndless ) - aRbtAuto.Check( sal_True ); + aRbtAuto->Check( sal_True ); else - aRbtStandard.Check( sal_True ); + aRbtStandard->Check( sal_True ); InitMonitorSettings(); @@ -175,16 +164,15 @@ void SdStartPresentationDlg::InitMonitorSettings() { try { - maGrpMonitor.Show( true ); - maFtMonitor.Show( true ); - maLBMonitor.Show( true ); + maFtMonitor->Show( true ); + maLBMonitor->Show( true ); mnMonitors = Application::GetScreenCount(); if( mnMonitors <= 1 ) { - maFtMonitor.Enable( false ); - maLBMonitor.Enable( false ); + maFtMonitor->Enable( false ); + maLBMonitor->Enable( false ); } else { @@ -198,14 +186,16 @@ void SdStartPresentationDlg::InitMonitorSettings() const String sPlaceHolder( RTL_CONSTASCII_USTRINGPARAM( "%1" ) ); for( sal_Int32 nDisplay = 0; nDisplay < mnMonitors; nDisplay++ ) { - String aName( nDisplay == nExternalIndex ? msExternalMonitor : msMonitor ); + String aName( nDisplay == nExternalIndex ? + msExternalMonitor->GetText() : + msMonitor->GetText() ); const String aNumber( OUString::number( nDisplay + 1 ) ); aName.SearchAndReplace( sPlaceHolder, aNumber ); - maLBMonitor.InsertEntry( aName ); + maLBMonitor->InsertEntry( aName ); // Store display index together with name. - const sal_uInt32 nEntryIndex (maLBMonitor.GetEntryCount()-1); - maLBMonitor.SetEntryData(nEntryIndex, (void*)(sal_IntPtr)nDisplay); + const sal_uInt32 nEntryIndex (maLBMonitor->GetEntryCount()-1); + maLBMonitor->SetEntryData(nEntryIndex, (void*)(sal_IntPtr)nDisplay); // Remember the index of the default selection. if (nDefaultSelectedDisplay == nDisplay) @@ -218,9 +208,9 @@ void SdStartPresentationDlg::InitMonitorSettings() if( bUnifiedDisplay ) { - maLBMonitor.InsertEntry( msAllMonitors ); - const sal_uInt32 nEntryIndex (maLBMonitor.GetEntryCount()-1); - maLBMonitor.SetEntryData(nEntryIndex, (void*)-1); + maLBMonitor->InsertEntry( msAllMonitors->GetText() ); + const sal_uInt32 nEntryIndex (maLBMonitor->GetEntryCount()-1); + maLBMonitor->SetEntryData(nEntryIndex, (void*)-1); if (nDefaultSelectedDisplay == -1) nSelectedIndex = nEntryIndex; } @@ -233,7 +223,7 @@ void SdStartPresentationDlg::InitMonitorSettings() nSelectedIndex = nDefaultExternalIndex; } - maLBMonitor.SelectEntryPos((sal_uInt16)nSelectedIndex); + maLBMonitor->SelectEntryPos((sal_uInt16)nSelectedIndex); } } catch( Exception& ) @@ -246,26 +236,26 @@ void SdStartPresentationDlg::InitMonitorSettings() */ void SdStartPresentationDlg::GetAttr( SfxItemSet& rAttr ) { - rAttr.Put( SfxBoolItem ( ATTR_PRESENT_ALL, aRbtAll.IsChecked() ) ); - rAttr.Put( SfxBoolItem ( ATTR_PRESENT_CUSTOMSHOW, aRbtCustomshow.IsChecked() ) ); - rAttr.Put( SfxStringItem ( ATTR_PRESENT_DIANAME, aLbDias.GetSelectEntry() ) ); - rAttr.Put( SfxBoolItem ( ATTR_PRESENT_MANUEL, aCbxManuel.IsChecked() ) ); - rAttr.Put( SfxBoolItem ( ATTR_PRESENT_MOUSE, aCbxMousepointer.IsChecked() ) ); - rAttr.Put( SfxBoolItem ( ATTR_PRESENT_PEN, aCbxPen.IsChecked() ) ); - rAttr.Put( SfxBoolItem ( ATTR_PRESENT_NAVIGATOR, aCbxNavigator.IsChecked() ) ); - rAttr.Put( SfxBoolItem ( ATTR_PRESENT_ANIMATION_ALLOWED, aCbxAnimationAllowed.IsChecked() ) ); - rAttr.Put( SfxBoolItem ( ATTR_PRESENT_CHANGE_PAGE, aCbxChangePage.IsChecked() ) ); - rAttr.Put( SfxBoolItem ( ATTR_PRESENT_ALWAYS_ON_TOP, aCbxAlwaysOnTop.IsChecked() ) ); - rAttr.Put( SfxBoolItem ( ATTR_PRESENT_FULLSCREEN, !aRbtWindow.IsChecked() ) ); - rAttr.Put( SfxBoolItem ( ATTR_PRESENT_ENDLESS, aRbtAuto.IsChecked() ) ); - rAttr.Put( SfxUInt32Item ( ATTR_PRESENT_PAUSE_TIMEOUT, aTmfPause.GetTime().GetMSFromTime() / 1000 ) ); - rAttr.Put( SfxBoolItem ( ATTR_PRESENT_SHOW_PAUSELOGO, aCbxAutoLogo.IsChecked() ) ); - - sal_uInt16 nPos = maLBMonitor.GetSelectEntryPos(); + rAttr.Put( SfxBoolItem ( ATTR_PRESENT_ALL, aRbtAll->IsChecked() ) ); + rAttr.Put( SfxBoolItem ( ATTR_PRESENT_CUSTOMSHOW, aRbtCustomshow->IsChecked() ) ); + rAttr.Put( SfxStringItem ( ATTR_PRESENT_DIANAME, aLbDias->GetSelectEntry() ) ); + rAttr.Put( SfxBoolItem ( ATTR_PRESENT_MANUEL, aCbxManuel->IsChecked() ) ); + rAttr.Put( SfxBoolItem ( ATTR_PRESENT_MOUSE, aCbxMousepointer->IsChecked() ) ); + rAttr.Put( SfxBoolItem ( ATTR_PRESENT_PEN, aCbxPen->IsChecked() ) ); + rAttr.Put( SfxBoolItem ( ATTR_PRESENT_NAVIGATOR, aCbxNavigator->IsChecked() ) ); + rAttr.Put( SfxBoolItem ( ATTR_PRESENT_ANIMATION_ALLOWED, aCbxAnimationAllowed->IsChecked() ) ); + rAttr.Put( SfxBoolItem ( ATTR_PRESENT_CHANGE_PAGE, aCbxChangePage->IsChecked() ) ); + rAttr.Put( SfxBoolItem ( ATTR_PRESENT_ALWAYS_ON_TOP, aCbxAlwaysOnTop->IsChecked() ) ); + rAttr.Put( SfxBoolItem ( ATTR_PRESENT_FULLSCREEN, !aRbtWindow->IsChecked() ) ); + rAttr.Put( SfxBoolItem ( ATTR_PRESENT_ENDLESS, aRbtAuto->IsChecked() ) ); + rAttr.Put( SfxUInt32Item ( ATTR_PRESENT_PAUSE_TIMEOUT, aTmfPause->GetTime().GetMSFromTime() / 1000 ) ); + rAttr.Put( SfxBoolItem ( ATTR_PRESENT_SHOW_PAUSELOGO, aCbxAutoLogo->IsChecked() ) ); + + sal_uInt16 nPos = maLBMonitor->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) - rAttr.Put( SfxInt32Item ( ATTR_PRESENT_DISPLAY, (sal_Int32)(sal_IntPtr)maLBMonitor.GetEntryData(nPos)) ); + rAttr.Put( SfxInt32Item ( ATTR_PRESENT_DISPLAY, (sal_Int32)(sal_IntPtr)maLBMonitor->GetEntryData(nPos)) ); - nPos = aLbCustomshow.GetSelectEntryPos(); + nPos = aLbCustomshow->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) pCustomShowList->Seek( nPos ); } @@ -275,8 +265,8 @@ void SdStartPresentationDlg::GetAttr( SfxItemSet& rAttr ) */ IMPL_LINK_NOARG(SdStartPresentationDlg, ChangeRangeHdl) { - aLbDias.Enable( aRbtAtDia.IsChecked() ); - aLbCustomshow.Enable( aRbtCustomshow.IsChecked() ); + aLbDias->Enable( aRbtAtDia->IsChecked() ); + aLbCustomshow->Enable( aRbtCustomshow->IsChecked() ); return( 0L ); } @@ -286,24 +276,24 @@ IMPL_LINK_NOARG(SdStartPresentationDlg, ChangeRangeHdl) */ IMPL_LINK_NOARG(SdStartPresentationDlg, ClickWindowPresentationHdl) { - const bool bAuto = aRbtAuto.IsChecked(); - const bool bWindow = aRbtWindow.IsChecked(); + const bool bAuto = aRbtAuto->IsChecked(); + const bool bWindow = aRbtWindow->IsChecked(); // aFtPause.Enable( bAuto ); - aTmfPause.Enable( bAuto ); - aCbxAutoLogo.Enable( bAuto && ( aTmfPause.GetTime().GetMSFromTime() > 0 ) ); + aTmfPause->Enable( bAuto ); + aCbxAutoLogo->Enable( bAuto && ( aTmfPause->GetTime().GetMSFromTime() > 0 ) ); const bool bDisplay = !bWindow && ( mnMonitors > 1 ); - maFtMonitor.Enable( bDisplay ); - maLBMonitor.Enable( bDisplay ); + maFtMonitor->Enable( bDisplay ); + maLBMonitor->Enable( bDisplay ); if( bWindow ) { - aCbxAlwaysOnTop.Enable( sal_False ); - aCbxAlwaysOnTop.Check( sal_False ); + aCbxAlwaysOnTop->Enable( sal_False ); + aCbxAlwaysOnTop->Check( sal_False ); } else - aCbxAlwaysOnTop.Enable(); + aCbxAlwaysOnTop->Enable(); return( 0L ); } @@ -313,7 +303,7 @@ IMPL_LINK_NOARG(SdStartPresentationDlg, ClickWindowPresentationHdl) */ IMPL_LINK_NOARG(SdStartPresentationDlg, ChangePauseHdl) { - aCbxAutoLogo.Enable( aRbtAuto.IsChecked() && ( aTmfPause.GetTime().GetMSFromTime() > 0 ) ); + aCbxAutoLogo->Enable( aRbtAuto->IsChecked() && ( aTmfPause->GetTime().GetMSFromTime() > 0 ) ); return( 0L ); } diff --git a/sd/source/ui/dlg/present.src b/sd/source/ui/dlg/present.src deleted file mode 100644 index e0894c66ad67..000000000000 --- a/sd/source/ui/dlg/present.src +++ /dev/null @@ -1,277 +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 "helpids.h" -#include -#include "present.hrc" - -#define DISTANCE 23 - -ModalDialog DLG_START_PRESENTATION -{ - HelpID = CMD_SID_PRESENTATION ; - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 256, 205 ) ; - Text [ en-US ] = "Slide Show" ; - Moveable = TRUE ; - - OKButton BTN_OK - { - Pos = MAP_APPFONT ( 200, 6 ) ; - Size = MAP_APPFONT ( 50, 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - }; - CancelButton BTN_CANCEL - { - Pos = MAP_APPFONT ( 200, 23 ) ; - Size = MAP_APPFONT ( 50, 14 ) ; - TabStop = TRUE ; - }; - HelpButton BTN_HELP - { - Pos = MAP_APPFONT ( 200, 43 ) ; - Size = MAP_APPFONT ( 50, 14 ) ; - TabStop = TRUE ; - }; - - FixedLine GRP_RANGE - { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 187, 8 ) ; - Text [ en-US ] = "Range" ; - }; - RadioButton RBT_ALL - { - HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_ALL"; - Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 80 , 12 ) ; - Text [ en-US ] = "All ~slides" ; - TabStop = TRUE ; - }; - RadioButton RBT_AT_DIA - { - HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_AT_DIA"; - Pos = MAP_APPFONT ( 12 , 26 ) ; - Size = MAP_APPFONT ( 60 , 12 ) ; - Text [ en-US ] = "~From:" ; - TabStop = TRUE ; - }; - ListBox LB_DIAS - { - HelpID = "sd:ListBox:DLG_START_PRESENTATION:LB_DIAS"; - Border = TRUE ; - Pos = MAP_APPFONT ( 96, 24 ) ; - Size = MAP_APPFONT ( 97, 80 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - //DDExtraWidth = TRUE; - }; - RadioButton RBT_CUSTOMSHOW - { - HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_CUSTOMSHOW"; - Pos = MAP_APPFONT ( 12 , 38 ) ; - Size = MAP_APPFONT ( 130 , 12 ) ; - TabStop = TRUE ; - Text [ en-US ] = "~Custom Slide Show" ; - }; - ListBox LB_CUSTOMSHOW - { - HelpID = "sd:ListBox:DLG_START_PRESENTATION:LB_CUSTOMSHOW"; - Border = TRUE ; - Pos = MAP_APPFONT ( 32, 53 ) ; - Size = MAP_APPFONT ( 161, 80 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - }; - - FixedLine GRP_KIND - { - Pos = MAP_APPFONT ( 6, 73 ) ; - Size = MAP_APPFONT ( 90, 8 ); - Text [ en-US ] = "Type" ; - }; - RadioButton RBT_STANDARD - { - HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_STANDARD"; - Pos = MAP_APPFONT ( 12, 84 ) ; - Size = MAP_APPFONT ( 81, 12 ) ; - Text [ en-US ] = "~Default" ; - TabStop = TRUE ; - }; - RadioButton RBT_WINDOW - { - HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_WINDOW"; - Pos = MAP_APPFONT ( 12 , 96 ) ; - Size = MAP_APPFONT ( 81 , 12 ) ; - Text [ en-US ] = "~Window" ; - TabStop = TRUE ; - }; - RadioButton RBT_AUTO - { - HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_AUTO"; - Pos = MAP_APPFONT ( 12 , 108 ) ; - Size = MAP_APPFONT ( 81 , 12 ) ; - Text [ en-US ] = "A~uto" ; - TabStop = TRUE ; - }; - TimeField TMF_PAUSE - { - HelpID = "sd:TimeField:DLG_START_PRESENTATION:TMF_PAUSE"; - Pos = MAP_APPFONT ( 32, 120 ) ; - Size = MAP_APPFONT ( 50, 12 ) ; - Border = TRUE ; - TabStop = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - Duration = TRUE ; - StrictFormat = TRUE ; - Maximum = Time - { - Hour = 23 ; - Minute = 59 ; - Second = 59 ; - }; - Last = Time - { - Hour = 23 ; - Minute = 59 ; - Second = 59 ; - }; - QuickHelpText [ en-US ] = "Duration of pause" ; - }; - CheckBox CBX_AUTOLOGO - { - HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_AUTOLOGO"; - Pos = MAP_APPFONT ( 32 , 138 ) ; - Size = MAP_APPFONT ( 61 , 12 ) ; - TabStop = TRUE ; - Text [ en-US ] = "Show ~logo" ; - }; - - FixedLine GRP_OPTIONS - { - Pos = MAP_APPFONT ( 102 , 73 ) ; - Size = MAP_APPFONT ( 148, 8 ); - Text [ en-US ] = "Options" ; - }; - CheckBox CBX_MANUEL - { - HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_MANUEL"; - Pos = MAP_APPFONT ( 108 , 84 ) ; - Size = MAP_APPFONT ( 139 , 12 ) ; - TabStop = TRUE ; - Text [ en-US ] = "Change slides ~manually" ; - }; - CheckBox CBX_MOUSEPOINTER - { - HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_MOUSEPOINTER"; - Pos = MAP_APPFONT ( 108, 96 ) ; - Size = MAP_APPFONT ( 139, 12 ) ; - Text [ en-US ] = "Mouse pointer ~visible" ; - TabStop = TRUE ; - }; - CheckBox CBX_PEN - { - HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_PEN"; - Pos = MAP_APPFONT ( 108, 108 ) ; - Size = MAP_APPFONT ( 139, 12 ) ; - Text [ en-US ] = "Mouse pointer as ~pen" ; - TabStop = TRUE ; - }; - CheckBox CBX_NAVIGATOR - { - HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_NAVIGATOR"; - Pos = MAP_APPFONT ( 108, 120 ) ; - Size = MAP_APPFONT ( 139, 12 ) ; - TabStop = TRUE ; - Text [ en-US ] = "~Navigator visible" ; - }; - CheckBox CBX_ANIMATION_ALLOWED - { - HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_ANIMATION_ALLOWED"; - Pos = MAP_APPFONT ( 108, 132 ) ; - Size = MAP_APPFONT ( 139, 12 ) ; - TabStop = TRUE ; - Text [ en-US ] = "~Animations allowed" ; - }; - CheckBox CBX_CHANGE_PAGE - { - HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_CHANGE_PAGE"; - Pos = MAP_APPFONT ( 108, 144 ) ; - Size = MAP_APPFONT ( 139, 12 ) ; - TabStop = TRUE ; - Text [ en-US ] = "Change slides by clic~king on background" ; - }; - CheckBox CBX_ALWAYS_ON_TOP - { - HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_ALWAYS_ON_TOP"; - Pos = MAP_APPFONT ( 108, 156 ) ; - Size = MAP_APPFONT ( 145, 12 ) ; - TabStop = TRUE ; - Text [ en-US ] = "Presentation always ~on top" ; - }; - - FixedLine GRP_MONITOR - { - Pos = MAP_APPFONT ( 6, 174 ) ; - Size = MAP_APPFONT ( 244, 8 ); - Hide = TRUE; - Text [ en-US ] = "Multiple displays" ; - }; - - FixedText FT_MONITOR - { - OutputSize = TRUE; - Pos = MAP_APPFONT ( 12 , 185 + 2 ) ; - Size = MAP_APPFONT( 70, 8 ); - Hide = TRUE; - Text [ en-US ] = "P~resentation display" ; - }; - - ListBox LB_MONITOR - { - Pos = MAP_APPFONT ( 82 , 185 ) ; - Size = MAP_APPFONT ( 111, 100 ); - HelpId = HID_SD_SLIDESHOW_DISPLAY; - Hide = TRUE; - TabStop = TRUE ; - Border = TRUE ; - DropDown = TRUE ; - ClipChildren = TRUE; - }; - - String STR_EXTERNAL_MONITOR - { - Text [ en-US ] = "Display %1 (external)"; - }; - - String STR_MONITOR - { - Text [ en-US ] = "Display %1"; - }; - - String STR_ALL_MONITORS - { - Text [ en-US ] = "All displays"; - }; - -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/present.hrc b/sd/source/ui/inc/present.hrc deleted file mode 100644 index a662e1a47a56..000000000000 --- a/sd/source/ui/inc/present.hrc +++ /dev/null @@ -1,57 +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 - -#define DLG_START_PRESENTATION RID_APP_START+3 -#define BTN_OK 1 -#define BTN_CANCEL 1 -#define BTN_HELP 1 - -#define GRP_RANGE 1 -#define RBT_ALL 1 -#define RBT_AT_DIA 2 -#define RBT_CUSTOMSHOW 3 -#define LB_DIAS 1 -#define LB_CUSTOMSHOW 2 - -#define GRP_KIND 2 -#define RBT_STANDARD 4 -#define RBT_WINDOW 5 -#define RBT_AUTO 6 -#define TMF_PAUSE 1 -#define CBX_AUTOLOGO 1 - -#define GRP_OPTIONS 3 -#define CBX_MANUEL 2 -#define CBX_MOUSEPOINTER 3 -#define CBX_PEN 4 -#define CBX_NAVIGATOR 5 -#define CBX_ANIMATION_ALLOWED 6 -#define CBX_CHANGE_PAGE 7 -#define CBX_ALWAYS_ON_TOP 8 - -#define GRP_MONITOR 9 -#define FT_MONITOR 10 -#define LB_MONITOR 11 - -#define STR_EXTERNAL_MONITOR 1 -#define STR_MONITOR 2 -#define STR_ALL_MONITORS 3 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/present.hxx b/sd/source/ui/inc/present.hxx index 8b9ff526f60e..393e03a4759f 100644 --- a/sd/source/ui/inc/present.hxx +++ b/sd/source/ui/inc/present.hxx @@ -38,44 +38,36 @@ class SdStartPresentationDlg : public ModalDialog { private: - FixedLine aGrpRange; - RadioButton aRbtAll; - RadioButton aRbtAtDia; - RadioButton aRbtCustomshow; - ListBox aLbDias; - ListBox aLbCustomshow; - - FixedLine aGrpKind; - RadioButton aRbtStandard; - RadioButton aRbtWindow; - RadioButton aRbtAuto; - TimeField aTmfPause; - CheckBox aCbxAutoLogo; - - FixedLine aGrpOptions; - CheckBox aCbxManuel; - CheckBox aCbxMousepointer; - CheckBox aCbxPen; - CheckBox aCbxNavigator; - CheckBox aCbxAnimationAllowed; - CheckBox aCbxChangePage; - CheckBox aCbxAlwaysOnTop; - - FixedLine maGrpMonitor; - FixedText maFtMonitor; - ListBox maLBMonitor; - - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + RadioButton* aRbtAll; + RadioButton* aRbtAtDia; + RadioButton* aRbtCustomshow; + ListBox* aLbDias; + ListBox* aLbCustomshow; + + RadioButton* aRbtStandard; + RadioButton* aRbtWindow; + RadioButton* aRbtAuto; + TimeField* aTmfPause; + CheckBox* aCbxAutoLogo; + + CheckBox* aCbxManuel; + CheckBox* aCbxMousepointer; + CheckBox* aCbxPen; + CheckBox* aCbxNavigator; + CheckBox* aCbxAnimationAllowed; + CheckBox* aCbxChangePage; + CheckBox* aCbxAlwaysOnTop; + + FixedText* maFtMonitor; + ListBox* maLBMonitor; SdCustomShowList* pCustomShowList; const SfxItemSet& rOutAttrs; sal_Int32 mnMonitors; - String msExternalMonitor; - String msMonitor; - String msAllMonitors; + FixedText* msExternalMonitor; + FixedText* msMonitor; + FixedText* msAllMonitors; DECL_LINK( ChangeRangeHdl, void * ); DECL_LINK( ClickWindowPresentationHdl, void * ); diff --git a/sd/uiconfig/simpress/ui/presentationdialog.ui b/sd/uiconfig/simpress/ui/presentationdialog.ui new file mode 100644 index 000000000000..c04fdc631ab0 --- /dev/null +++ b/sd/uiconfig/simpress/ui/presentationdialog.ui @@ -0,0 +1,663 @@ + + + + + False + 5 + Slide Show + dialog + + + True + False + vertical + + + True + False + True + True + 12 + + + True + False + True + True + 0 + none + + + True + False + 12 + + + True + False + 2 + + + True + False + 6 + + + _From: + True + True + False + True + 0 + True + allslides + + + 0 + 0 + 1 + 1 + + + + + True + False + 6 + True + + + 1 + 0 + 1 + 1 + + + + + 0 + 1 + 1 + 1 + + + + + All _slides + True + True + False + True + 0 + True + True + from + + + 0 + 0 + 1 + 1 + + + + + _Custom Slide Show: + True + True + False + True + 0 + True + from + + + 0 + 2 + 1 + 1 + + + + + True + False + 24 + True + + + 0 + 3 + 1 + 1 + + + + + + + + + True + False + Range + + + + + + + + 0 + 0 + 1 + 1 + + + + + True + False + True + True + 0 + none + + + True + False + 12 + + + True + False + True + True + + + True + False + True + True + + + True + False + 6 + True + + + 1 + 0 + 1 + 1 + + + + + True + False + P_resentation display: + True + presdisplay_cb + + + 0 + 0 + 1 + 1 + + + + + 0 + 0 + 1 + 1 + + + + + False + + + False + Display %1 (external) + + + 0 + 0 + 1 + 1 + + + + + False + Display %1label + + + 0 + 1 + 1 + 1 + + + + + False + All displays + + + 0 + 2 + 1 + 1 + + + + + 0 + 1 + 1 + 1 + + + + + + + + + True + False + Multiple displays + + + + + + + + 0 + 2 + 1 + 1 + + + + + True + False + 12 + + + True + False + True + True + 0 + none + + + True + False + 12 + + + True + False + True + True + 2 + + + _Default + True + True + False + True + 0 + True + True + auto + + + 0 + 0 + 1 + 1 + + + + + _Window + True + True + False + True + 0 + True + auto + + + 0 + 1 + 1 + 1 + + + + + A_uto + True + True + False + True + 0 + True + window + + + 0 + 2 + 1 + 1 + + + + + + 0 + 4 + 1 + 1 + + + + + True + False + True + 24 + + + 0 + 3 + 1 + 1 + + + + + + + + + True + False + Type + + + + + + + + 0 + 0 + 1 + 1 + + + + + True + False + True + True + 0 + none + + + True + False + 12 + + + True + False + True + True + 2 + + + Change slides _manually + True + True + False + True + 0 + True + + + 0 + 0 + 1 + 1 + + + + + Mouse pointer _visible + True + True + False + True + 0 + True + + + 0 + 1 + 1 + 1 + + + + + Mouse pointer as _pen + True + True + False + True + 0 + True + + + 0 + 2 + 1 + 1 + + + + + _Navigator visible + True + True + False + True + 0 + True + + + 0 + 3 + 1 + 1 + + + + + _Animations allowed + True + True + False + True + 0 + True + + + 0 + 4 + 1 + 1 + + + + + Change slides by clic_king on background + True + True + False + True + 0 + True + + + 0 + 5 + 1 + 1 + + + + + Presentation always _on top + True + True + False + True + 0 + True + + + 0 + 6 + 1 + 1 + + + + + + + + + True + False + Options + + + + + + + + 1 + 0 + 1 + 1 + + + + + 0 + 1 + 1 + 1 + + + + + False + True + 0 + + + + + True + False + end + + + gtk-ok + True + True + True + True + True + True + + + False + True + 0 + + + + + gtk-cancel + True + True + True + True + + + False + True + 1 + + + + + gtk-help + True + False + False + True + + + False + True + 2 + + + + + False + True + end + 1 + + + + + + ok + cancel + help + + + -- cgit v1.2.3