diff options
| author | Matthias Huetsch [mhu] <matthias.huetsch@oracle.com> | 2011-01-27 18:16:28 +0100 |
|---|---|---|
| committer | Matthias Huetsch [mhu] <matthias.huetsch@oracle.com> | 2011-01-27 18:16:28 +0100 |
| commit | cff21146b09d6bd46d83cf6a36bac14d340b6c9c (patch) | |
| tree | fd3c068484f281253ebe425550fe6b0798d1f79d /sd/source/ui/dlg | |
| parent | 563aab4eddce3503905a2b404f653531b3ba9439 (diff) | |
| parent | fa27b2da2f8e7bd9bafb4a057318ac22577727dd (diff) | |
Update from master repository (DEV300_m98).
Diffstat (limited to 'sd/source/ui/dlg')
37 files changed, 369 insertions, 801 deletions
diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx index 29425a3bda71..29425a3bda71 100644..100755 --- a/sd/source/ui/dlg/LayerTabBar.cxx +++ b/sd/source/ui/dlg/LayerTabBar.cxx diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx index 6a6d515822f8..f9f181b0e44d 100755 --- a/sd/source/ui/dlg/PaneChildWindows.cxx +++ b/sd/source/ui/dlg/PaneChildWindows.cxx @@ -37,6 +37,9 @@ #include "strings.hrc" #include "sdresid.hxx" +#include <com/sun/star/drawing/framework/XConfigurationController.hpp> +#include <com/sun/star/drawing/framework/ResourceActivationMode.hpp> + #include <sfx2/app.hxx> #include <sfx2/dockwin.hxx> #include <sfx2/bindings.hxx> @@ -45,6 +48,12 @@ namespace sd { +using ::com::sun::star::uno::Reference; +using ::com::sun::star::drawing::framework::XResourceId; +using ::com::sun::star::drawing::framework::XConfigurationController; +using ::com::sun::star::drawing::framework::ResourceActivationMode_ADD; +using ::com::sun::star::drawing::framework::ResourceActivationMode_REPLACE; + SFX_IMPL_DOCKINGWINDOW(LeftPaneImpressChildWindow, SID_LEFT_PANE_IMPRESS) SFX_IMPL_DOCKINGWINDOW(LeftPaneDrawChildWindow, SID_LEFT_PANE_DRAW) SFX_IMPL_DOCKINGWINDOW( ToolPanelChildWindow, SID_TASKPANE) @@ -148,9 +157,48 @@ ToolPanelChildWindow::ToolPanelChildWindow( ::Window* i_pParentWindow, USHORT i_ :PaneChildWindow( i_pParentWindow, i_nId, i_pBindings, i_pChildWindowInfo, FLT_TOOL_PANEL_DOCKING_WINDOW, STR_RIGHT_PANE_TITLE, SFX_ALIGN_RIGHT ) { + // just in case this window has been created by SFX, instead our resource framework: Ensure that the resource framework + // activates the task pane, so it is really filled with content (in opposite to the other SFX applications, the + // child window registered for SID_TASKPANE is not responsible for its content, but here in SD, it's the ToolPanelViewShell + // which has this responsibility. And this view shell is created implicitly via the resource framework.) + // #i113788# / 2010-09-03 / frank.schoenheit@oracle.com + SfxDockingWindow* pDockingWindow = dynamic_cast< SfxDockingWindow* >( GetWindow() ); + ViewShellBase* pViewShellBase = ViewShellBase::GetViewShellBase( pDockingWindow->GetBindings().GetDispatcher()->GetFrame() ); + ENSURE_OR_RETURN_VOID( pViewShellBase != NULL, "ToolPanelChildWindow::ToolPanelChildWindow: no view shell access!" ); + + const ::boost::shared_ptr< framework::FrameworkHelper > pFrameworkHelper( framework::FrameworkHelper::Instance( *pViewShellBase ) ); + ENSURE_OR_RETURN_VOID( pFrameworkHelper.get(), "ToolPanelChildWindow::ToolPanelChildWindow: no framework helper for the view shell!" ); + Reference<XConfigurationController> xConfigController( pFrameworkHelper->GetConfigurationController() ); + ENSURE_OR_RETURN_VOID( xConfigController.is(), "ToolPanelChildWindow::ToolPanelChildWindow: no config controller!" ); + xConfigController->requestResourceActivation( + framework::FrameworkHelper::CreateResourceId( framework::FrameworkHelper::msRightPaneURL ), + ResourceActivationMode_ADD ); + xConfigController->requestResourceActivation( + framework::FrameworkHelper::CreateResourceId( framework::FrameworkHelper::msTaskPaneURL, framework::FrameworkHelper::msRightPaneURL ), + ResourceActivationMode_REPLACE + ); } //---------------------------------------------------------------------------------------------------------------------- +struct DelayedToolPanelActivation +{ + DelayedToolPanelActivation( ToolPanelChildWindow& i_rToolPanelWindow, const ::rtl::OUString& i_rPanelURL ) + :m_rToolPanelWindow( i_rToolPanelWindow ) + ,m_sPanelURL( i_rPanelURL ) + { + } + + void operator() (bool) + { + m_rToolPanelWindow.ActivateToolPanel( m_sPanelURL ); + } + +private: + ToolPanelChildWindow& m_rToolPanelWindow; + const ::rtl::OUString m_sPanelURL; +}; + +//---------------------------------------------------------------------------------------------------------------------- void ToolPanelChildWindow::ActivateToolPanel( const ::rtl::OUString& i_rPanelURL ) { SfxDockingWindow* pDockingWindow = dynamic_cast< SfxDockingWindow* >( GetWindow() ); @@ -170,8 +218,16 @@ void ToolPanelChildWindow::ActivateToolPanel( const ::rtl::OUString& i_rPanelURL // extensions, too. As long as this is not the case, we need to take the direct way ... ::boost::shared_ptr< ViewShell > pViewShell = pFrameworkHelper->GetViewShell( framework::FrameworkHelper::msRightPaneURL ); toolpanel::ToolPanelViewShell* pToolPanelViewShell = dynamic_cast< toolpanel::ToolPanelViewShell* >( pViewShell.get() ); - ENSURE_OR_RETURN_VOID( pToolPanelViewShell != NULL, "ToolPanelChildWindow::ActivateToolPanel: no tool panel view shell access!" ); - pToolPanelViewShell->ActivatePanel( i_rPanelURL ); + if ( pToolPanelViewShell ) + { + pToolPanelViewShell->ActivatePanel( i_rPanelURL ); + } + else + { + Reference< XResourceId > xTaskPaneResource = pFrameworkHelper->RequestView( + framework::FrameworkHelper::msTaskPaneURL, framework::FrameworkHelper::msRightPaneURL ); + pFrameworkHelper->RunOnResourceActivation( xTaskPaneResource, DelayedToolPanelActivation( *this, i_rPanelURL ) ); + } } } diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index c1dedd5d8293..bcf58c38c0b1 100755..100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -31,12 +31,16 @@ #include "PaneDockingWindow.hxx" #include "Window.hxx" #include "ViewShellBase.hxx" +#include "framework/FrameworkHelper.hxx" #include "sdresid.hxx" #include "res_bmp.hrc" #include <sfx2/dispatch.hxx> #include <vcl/toolbox.hxx> #include <vcl/taskpanelist.hxx> -#include "framework/FrameworkHelper.hxx" +#include <vcl/splitwin.hxx> +#include <vcl/svapp.hxx> +#include <tools/wintypes.hxx> +#include <boost/bind.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -61,6 +65,11 @@ void PaneDockingWindow::StateChanged( StateChangedType nType ) { switch (nType) { + case STATE_CHANGE_INITSHOW: + Resize(); + GetContentWindow().SetStyle(GetContentWindow().GetStyle() | WB_DIALOGCONTROL); + break; + case STATE_CHANGE_VISIBLE: // The visibility of the docking window has changed. Tell the // ConfigurationController so that it can activate or deactivate @@ -78,4 +87,61 @@ void PaneDockingWindow::StateChanged( StateChangedType nType ) SfxDockingWindow::StateChanged (nType); } +void PaneDockingWindow::MouseButtonDown (const MouseEvent& rEvent) +{ + if (rEvent.GetButtons() == MOUSE_LEFT) + { + // For some strange reason we have to set the WB_DIALOGCONTROL at + // the content window in order to have it pass focus to its content + // window. Without setting this flag here that works only on views + // that have not been taken from the cash and relocated to this pane + // docking window. + GetContentWindow().SetStyle(GetContentWindow().GetStyle() | WB_DIALOGCONTROL); + GetContentWindow().GrabFocus(); + } + SfxDockingWindow::MouseButtonDown(rEvent); +} + + + + + + + + +void PaneDockingWindow::SetValidSizeRange (const Range aValidSizeRange) +{ + SplitWindow* pSplitWindow = dynamic_cast<SplitWindow*>(GetParent()); + if (pSplitWindow != NULL) + { + const USHORT nId (pSplitWindow->GetItemId(static_cast< ::Window*>(this))); + const USHORT nSetId (pSplitWindow->GetSet(nId)); + // Because the PaneDockingWindow paints its own decoration, we have + // to compensate the valid size range for that. + const SvBorder aBorder (GetDecorationBorder()); + sal_Int32 nCompensation (pSplitWindow->IsHorizontal() + ? mnTitleBarHeight + aBorder.Top() + aBorder.Bottom() + : aBorder.Left() + aBorder.Right()); + pSplitWindow->SetItemSizeRange( + nSetId, + Range( + aValidSizeRange.Min() + nCompensation, + aValidSizeRange.Max() + nCompensation)); + } +} + + + + +PaneDockingWindow::Orientation PaneDockingWindow::GetOrientation (void) const +{ + SplitWindow* pSplitWindow = dynamic_cast<SplitWindow*>(GetParent()); + if (pSplitWindow == NULL) + return UnknownOrientation; + else if (pSplitWindow->IsHorizontal()) + return HorizontalOrientation; + else + return VerticalOrientation; +} + } // end of namespace ::sd diff --git a/sd/source/ui/dlg/PaneDockingWindow.src b/sd/source/ui/dlg/PaneDockingWindow.src index 23b0d19ac79b..a0def1c18ec7 100755 --- a/sd/source/ui/dlg/PaneDockingWindow.src +++ b/sd/source/ui/dlg/PaneDockingWindow.src @@ -29,7 +29,7 @@ DockingWindow FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW { - // HelpID = SID_EFFECT_WIN ; + HelpID = "sd:DockingWindow:FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW"; Border = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -45,7 +45,7 @@ DockingWindow FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW DockingWindow FLT_LEFT_PANE_DRAW_DOCKING_WINDOW { - // HelpID = SID_EFFECT_WIN ; + HelpID = "sd:DockingWindow:FLT_LEFT_PANE_DRAW_DOCKING_WINDOW"; Border = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -61,7 +61,7 @@ DockingWindow FLT_LEFT_PANE_DRAW_DOCKING_WINDOW DockingWindow FLT_TOOL_PANEL_DOCKING_WINDOW { - // HelpID = SID_EFFECT_WIN ; + HelpID = "sd:DockingWindow:FLT_TOOL_PANEL_DOCKING_WINDOW"; Border = TRUE ; Hide = TRUE ; SVLook = TRUE ; diff --git a/sd/source/ui/dlg/animobjs.src b/sd/source/ui/dlg/animobjs.src index d631dcaba2b2..efbd75ac9003 100644..100755 --- a/sd/source/ui/dlg/animobjs.src +++ b/sd/source/ui/dlg/animobjs.src @@ -28,6 +28,8 @@ #include "res_bmp.hrc" #include "app.hrc" #include "animobjs.hrc" +#include "helpids.h" + #define BUTTON_WIDTH 16 #define BUTTON_HEIGHT 14 #define BUTTON_SIZE MAP_APPFONT( BUTTON_WIDTH, BUTTON_HEIGHT ); @@ -36,7 +38,7 @@ #define MIN_BUTTON_SIZE MAP_APPFONT( MIN_BUTTON_WIDTH, MIN_BUTTON_HEIGHT ); DockingWindow FLT_WIN_ANIMATION { - HelpID = SID_ANIMATION_OBJECTS ; + HelpID = CMD_SID_ANIMATION_OBJECTS ; Border = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -57,6 +59,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_FIRST { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_FIRST"; Pos = MAP_APPFONT ( 6 , 100 ) ; Size = MIN_BUTTON_SIZE Symbol = IMAGEBUTTON_WINDSTART ; @@ -64,6 +67,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_REVERSE { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_REVERSE"; Pos = MAP_APPFONT ( 6 + MIN_BUTTON_WIDTH , 100 ) ; Size = MIN_BUTTON_SIZE Symbol = IMAGEBUTTON_REVERSEPLAY ; @@ -72,6 +76,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_STOP { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_STOP"; Pos = MAP_APPFONT ( 6 + MIN_BUTTON_WIDTH * 2 , 100 ) ; Size = MIN_BUTTON_SIZE Symbol = IMAGEBUTTON_STOP ; @@ -80,6 +85,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_PLAY { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_PLAY"; Pos = MAP_APPFONT ( 6 + MIN_BUTTON_WIDTH * 3 , 100 ) ; Size = MIN_BUTTON_SIZE Symbol = IMAGEBUTTON_PLAY ; @@ -87,6 +93,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_LAST { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_LAST"; Pos = MAP_APPFONT ( 6 + MIN_BUTTON_WIDTH * 4 , 100 ) ; Size = MIN_BUTTON_SIZE Symbol = IMAGEBUTTON_WINDEND ; @@ -94,6 +101,7 @@ DockingWindow FLT_WIN_ANIMATION }; NumericField NUM_FLD_BITMAP { + HelpID = "sd:NumericField:FLT_WIN_ANIMATION:NUM_FLD_BITMAP"; Border = TRUE ; Pos = MAP_APPFONT ( 6 + 3 + MIN_BUTTON_WIDTH * 5 , 100 ) ; Size = MAP_APPFONT ( MIN_BUTTON_WIDTH * 2 , 12 ) ; @@ -110,6 +118,7 @@ DockingWindow FLT_WIN_ANIMATION }; TimeField TIME_FIELD { + HelpID = "sd:TimeField:FLT_WIN_ANIMATION:TIME_FIELD"; Border = TRUE ; Pos = MAP_APPFONT ( 6 + 6 + MIN_BUTTON_WIDTH * 7 , 100 ) ; Size = MAP_APPFONT ( MIN_BUTTON_WIDTH * 2 + 3 , 12 ) ; @@ -132,6 +141,7 @@ DockingWindow FLT_WIN_ANIMATION }; ListBox LB_LOOP_COUNT { + HelpID = "sd:ListBox:FLT_WIN_ANIMATION:LB_LOOP_COUNT"; Border = TRUE ; Pos = MAP_APPFONT ( 6 + 12 + MIN_BUTTON_WIDTH * 9 , 100 ) ; Size = MAP_APPFONT ( MIN_BUTTON_WIDTH * 2 + 3 , 100 ) ; @@ -164,6 +174,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_GET_ONE_OBJECT { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_GET_ONE_OBJECT"; Pos = MAP_APPFONT ( 12 , 132 ) ; Size = MAP_APPFONT ( 16 , 14 ) ; ButtonImage = Image @@ -180,6 +191,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_GET_ALL_OBJECTS { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_GET_ALL_OBJECTS"; Pos = MAP_APPFONT ( 31 , 132 ) ; Size = MAP_APPFONT ( 16 , 14 ) ; ButtonImage = Image @@ -196,6 +208,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_REMOVE_BITMAP { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_REMOVE_BITMAP"; Pos = MAP_APPFONT ( 60 , 132 ) ; Size = MAP_APPFONT ( 16 , 14 ) ; ButtonImage = Image @@ -212,6 +225,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_REMOVE_ALL { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_REMOVE_ALL"; Pos = MAP_APPFONT ( 79 , 132 ) ; Size = MAP_APPFONT ( 16 , 14 ) ; ButtonImage = Image @@ -248,12 +262,14 @@ DockingWindow FLT_WIN_ANIMATION }; RadioButton RBT_GROUP { + HelpID = "sd:RadioButton:FLT_WIN_ANIMATION:RBT_GROUP"; Pos = MAP_APPFONT ( 12 , 167 ) ; Size = MAP_APPFONT ( 140 , 12 ) ; Text [ en-US ] = "Group object" ; }; RadioButton RBT_BITMAP { + HelpID = "sd:RadioButton:FLT_WIN_ANIMATION:RBT_BITMAP"; Pos = MAP_APPFONT ( 12 , 181 ) ; Size = MAP_APPFONT ( 140 , 12 ) ; Text [ en-US ] = "Bitmap object" ; @@ -268,6 +284,7 @@ DockingWindow FLT_WIN_ANIMATION }; ListBox LB_ADJUSTMENT { + HelpID = "sd:ListBox:FLT_WIN_ANIMATION:LB_ADJUSTMENT"; Border = TRUE ; Pos = MAP_APPFONT ( 75 , 196 ) ; Size = MAP_APPFONT ( 72 , 100 ) ; @@ -290,6 +307,7 @@ DockingWindow FLT_WIN_ANIMATION }; PushButton BTN_CREATE_GROUP { + HelpID = "sd:PushButton:FLT_WIN_ANIMATION:BTN_CREATE_GROUP"; Pos = MAP_APPFONT ( 107 , 216 ) ; Size = MAP_APPFONT ( 41 , 14 ) ; TabStop = TRUE ; diff --git a/sd/source/ui/dlg/brkdlg.src b/sd/source/ui/dlg/brkdlg.src index bf9b2d29c651..a574ab9714ca 100644..100755 --- a/sd/source/ui/dlg/brkdlg.src +++ b/sd/source/ui/dlg/brkdlg.src @@ -28,6 +28,7 @@ #include "brkdlg.hrc" ModalDialog DLG_BREAK { + HelpID = "sd:ModalDialog:DLG_BREAK"; OutputSize = TRUE; SVLook = TRUE; Pos = MAP_APPFONT( 84, 34 ); diff --git a/sd/source/ui/dlg/copydlg.src b/sd/source/ui/dlg/copydlg.src index 920be5e8df70..2cb99b4dfd75 100644..100755 --- a/sd/source/ui/dlg/copydlg.src +++ b/sd/source/ui/dlg/copydlg.src @@ -28,9 +28,11 @@ #include "app.hrc" #include "res_bmp.hrc" #include "copydlg.hrc" +#include "helpids.h" + ModalDialog DLG_COPY { - HelpID = SID_COPYOBJECTS ; + HelpID = CMD_SID_COPYOBJECTS ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 204 , 177 ) ; @@ -63,6 +65,7 @@ ModalDialog DLG_COPY }; NumericField NUM_FLD_COPIES { + HelpID = "sd:NumericField:DLG_COPY:NUM_FLD_COPIES"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 7 ) ; Size = MAP_APPFONT ( 35 , 12 ) ; @@ -78,6 +81,7 @@ ModalDialog DLG_COPY }; ImageButton BTN_SET_VIEWDATA { + HelpID = "sd:ImageButton:DLG_COPY:BTN_SET_VIEWDATA"; Pos = MAP_APPFONT ( 122 , 6 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; ButtonImage = Image @@ -90,6 +94,7 @@ ModalDialog DLG_COPY }; PushButton BTN_SET_DEFAULT { + HelpID = "sd:PushButton:DLG_COPY:BTN_SET_DEFAULT"; Pos = MAP_APPFONT ( 148 , 63 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -97,6 +102,7 @@ ModalDialog DLG_COPY }; MetricField MTR_FLD_ANGLE { + HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_ANGLE"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 69 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -124,6 +130,7 @@ ModalDialog DLG_COPY }; MetricField MTR_FLD_MOVE_X { + HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_MOVE_X"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 37 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -141,6 +148,7 @@ ModalDialog DLG_COPY }; MetricField MTR_FLD_MOVE_Y { + HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_MOVE_Y"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 53 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -158,6 +166,7 @@ ModalDialog DLG_COPY }; MetricField MTR_FLD_WIDTH { + HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_WIDTH"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 98 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -175,6 +184,7 @@ ModalDialog DLG_COPY }; MetricField MTR_FLD_HEIGHT { + HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_HEIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 114 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -228,6 +238,7 @@ ModalDialog DLG_COPY }; ListBox LB_START_COLOR { + HelpID = "sd:ListBox:DLG_COPY:LB_START_COLOR"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 143 ) ; Size = MAP_APPFONT ( 60 , 90 ) ; @@ -243,6 +254,7 @@ ModalDialog DLG_COPY }; ListBox LB_END_COLOR { + HelpID = "sd:ListBox:DLG_COPY:LB_END_COLOR"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 159 ) ; Size = MAP_APPFONT ( 60 , 90 ) ; diff --git a/sd/source/ui/dlg/custsdlg.src b/sd/source/ui/dlg/custsdlg.src index c8c49e9c0d48..5d05b63f6287 100644..100755 --- a/sd/source/ui/dlg/custsdlg.src +++ b/sd/source/ui/dlg/custsdlg.src @@ -32,7 +32,7 @@ #define DIFF_Y 17 ModalDialog DLG_CUSTOMSHOW { - HelpID = SID_CUSTOMSHOW_DLG ; + HelpID = CMD_SID_CUSTOMSHOW_DLG ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 175 + DIFF , 114 + DIFF_Y ) ; @@ -40,6 +40,7 @@ ModalDialog DLG_CUSTOMSHOW Closeable = TRUE ; PushButton BTN_NEW { + HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_NEW"; Pos = MAP_APPFONT ( 120 + DIFF , 6 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -47,6 +48,7 @@ ModalDialog DLG_CUSTOMSHOW }; PushButton BTN_EDIT { + HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_EDIT"; Pos = MAP_APPFONT ( 120 + DIFF , 23 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -54,6 +56,7 @@ ModalDialog DLG_CUSTOMSHOW }; PushButton BTN_REMOVE { + HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_REMOVE"; Pos = MAP_APPFONT ( 120 + DIFF , 40 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -61,6 +64,7 @@ ModalDialog DLG_CUSTOMSHOW }; PushButton BTN_COPY { + HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_COPY"; Pos = MAP_APPFONT ( 120 + DIFF , 57 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -74,6 +78,7 @@ ModalDialog DLG_CUSTOMSHOW }; PushButton BTN_STARTSHOW { + HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_STARTSHOW"; Pos = MAP_APPFONT ( 120 + DIFF , 94 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -89,6 +94,7 @@ ModalDialog DLG_CUSTOMSHOW }; ListBox LB_CUSTOMSHOWS { + HelpID = "sd:ListBox:DLG_CUSTOMSHOW:LB_CUSTOMSHOWS"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 6 ) ; Size = MAP_APPFONT ( 102 + DIFF , 86 + DIFF_Y ) ; @@ -96,6 +102,7 @@ ModalDialog DLG_CUSTOMSHOW }; CheckBox CBX_USE_CUSTOMSHOW { + HelpID = "sd:CheckBox:DLG_CUSTOMSHOW:CBX_USE_CUSTOMSHOW"; Pos = MAP_APPFONT ( 6 , 96 + DIFF_Y ) ; Size = MAP_APPFONT ( 112 + DIFF , 12 ) ; TabStop = TRUE ; @@ -138,6 +145,7 @@ ModalDialog DLG_DEFINE_CUSTOMSHOW }; Edit EDT_NAME { + HelpID = "sd:Edit:DLG_DEFINE_CUSTOMSHOW:EDT_NAME"; Border = TRUE ; Pos = MAP_APPFONT ( 38 , 6 ) ; Size = MAP_APPFONT ( 141 , 12 ) ; @@ -145,6 +153,7 @@ ModalDialog DLG_DEFINE_CUSTOMSHOW }; MultiListBox LB_PAGES { + HelpID = "sd:MultiListBox:DLG_DEFINE_CUSTOMSHOW:LB_PAGES"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 35 ) ; Size = MAP_APPFONT ( 75 , 75 ) ; @@ -153,6 +162,7 @@ ModalDialog DLG_DEFINE_CUSTOMSHOW }; PushButton BTN_ADD { + HelpID = "sd:PushButton:DLG_DEFINE_CUSTOMSHOW:BTN_ADD"; Pos = MAP_APPFONT ( 84 , 67 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Text = "~>>" ; @@ -168,6 +178,7 @@ ModalDialog DLG_DEFINE_CUSTOMSHOW }; PushButton BTN_REMOVE { + HelpID = "sd:PushButton:DLG_DEFINE_CUSTOMSHOW:BTN_REMOVE"; Pos = MAP_APPFONT ( 84 , 95 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Text = "~<<" ; diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 1eb3a3d0cedc..82ca4d05b996 100755 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -49,7 +49,7 @@ #include <svl/undo.hxx> #include "DrawDocShell.hxx" #include <vcl/gdimtf.hxx> -#include <vcl/wintypes.hxx> +#include <tools/wintypes.hxx> #include "docprev.hxx" #include <sfx2/app.hxx> #include <sfx2/docfile.hxx> @@ -102,7 +102,7 @@ void InterpolateFixedBitmap( FixedBitmap * pBitmap ) // ==================================================================== // ==================================================================== -UINT32 PageHelpIds[] = +const char* PageHelpIds[] = { HID_SD_AUTOPILOT_PAGE1, HID_SD_AUTOPILOT_PAGE2, @@ -1119,7 +1119,9 @@ void AssistentDlgImpl::ChangePage() USHORT nPage = (USHORT)maAssistentFunc.GetCurrentPage(); if( mpWindow ) + { mpWindow->SetHelpId( PageHelpIds[nPage-1]); + } UpdatePage(); diff --git a/sd/source/ui/dlg/dlgass.src b/sd/source/ui/dlg/dlgass.src index b4c146eb0df2..6427b9bff297 100644..100755 --- a/sd/source/ui/dlg/dlgass.src +++ b/sd/source/ui/dlg/dlgass.src @@ -48,6 +48,7 @@ ModalDialog DLG_ASS CheckBox CB_PREVIEW { + HelpID = "sd:CheckBox:DLG_ASS:CB_PREVIEW"; Pos = MAP_APPFONT ( 144 , 140 ); Size = MAP_APPFONT ( 122 , 10 ); TabStop = TRUE; @@ -56,6 +57,7 @@ ModalDialog DLG_ASS CheckBox CB_STARTWITH { + HelpID = "sd:CheckBox:DLG_ASS:CB_STARTWITH"; Pos = MAP_APPFONT ( 144 , 154 ); Size = MAP_APPFONT ( 122 , 10 ); TabStop = TRUE; @@ -84,6 +86,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE1_EMPTY { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE1_EMPTY"; Pos = MAP_APPFONT ( 12 , 48 ); Size = MAP_APPFONT ( 130 , 10 ); TabStop = TRUE; @@ -92,6 +95,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE1_TEMPLATE { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE1_TEMPLATE"; Pos = MAP_APPFONT ( 12 , 62 ); Size = MAP_APPFONT ( 130 , 10 ); Text [ en-US ] = "~From template"; @@ -99,6 +103,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE1_OPEN { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE1_OPEN"; Pos = MAP_APPFONT ( 12 , 76 ); Size = MAP_APPFONT ( 130 , 10 ); Text [ en-US ] = "O~pen existing presentation"; @@ -106,6 +111,7 @@ ModalDialog DLG_ASS PushButton PB_PAGE1_OPEN { + HelpID = "sd:PushButton:DLG_ASS:PB_PAGE1_OPEN"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 18 , 89 ) ; Size = MAP_APPFONT ( 50 , 18 ) ; @@ -171,6 +177,7 @@ ModalDialog DLG_ASS ListBox LB_PAGE2_LAYOUT { + HelpID = "sd:ListBox:DLG_ASS:LB_PAGE2_LAYOUT"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 64 ) ; Size = MAP_APPFONT ( 120 , 40 ) ; @@ -186,6 +193,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE2_MEDIUM5 { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM5"; OutputSize = TRUE; Pos = MAP_APPFONT ( 12 , 121 ); Size = MAP_APPFONT ( 59 , 10 ); @@ -194,6 +202,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE2_MEDIUM1 { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM1"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 75 , 121 ) ; Size = MAP_APPFONT ( 59 , 10 ) ; @@ -202,6 +211,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE2_MEDIUM2 { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM2"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 75 , 135 ) ; Size = MAP_APPFONT ( 59 , 10 ) ; @@ -211,6 +221,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE2_MEDIUM3 { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM3"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 12 , 135 ) ; Size = MAP_APPFONT ( 59 , 10 ) ; @@ -220,6 +231,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE2_MEDIUM4 { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM4"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 12 , 149 ) ; Size = MAP_APPFONT ( 59 , 10 ) ; @@ -256,6 +268,7 @@ ModalDialog DLG_ASS ListBox LB_PAGE3_EFFECT { + HelpID = "sd:ListBox:DLG_ASS:LB_PAGE3_EFFECT"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 72 , 48 ); Size = MAP_APPFONT ( 60 , 12 ); @@ -274,6 +287,7 @@ ModalDialog DLG_ASS ListBox LB_PAGE3_SPEED { + HelpID = "sd:ListBox:DLG_ASS:LB_PAGE3_SPEED"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 72 , 64 ); Size = MAP_APPFONT ( 60 , 12 ); @@ -292,6 +306,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE3_LIVE { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE3_LIVE"; OutputSize = TRUE; Pos = MAP_APPFONT ( 12 , 94 ); Size = MAP_APPFONT ( 120 , 10 ); @@ -300,6 +315,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE3_KIOSK { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE3_KIOSK"; OutputSize = TRUE; Pos = MAP_APPFONT ( 12 , 108 ); Size = MAP_APPFONT ( 120 , 10 ); @@ -316,6 +332,7 @@ ModalDialog DLG_ASS TimeField TMF_PAGE3_TIME { + HelpID = "sd:TimeField:DLG_ASS:TMF_PAGE3_TIME"; OutputSize = TRUE; Pos = MAP_APPFONT ( 77 , 122 ) ; Size = MAP_APPFONT ( 55 , 12 ) ; @@ -349,6 +366,7 @@ ModalDialog DLG_ASS TimeField TMF_PAGE3_BREAK { + HelpID = "sd:TimeField:DLG_ASS:TMF_PAGE3_BREAK"; OutputSize = TRUE; Pos = MAP_APPFONT ( 77 , 138 ) ; Size = MAP_APPFONT ( 55 , 12 ) ; @@ -374,6 +392,7 @@ ModalDialog DLG_ASS CheckBox CB_PAGE3_LOGO { + HelpID = "sd:CheckBox:DLG_ASS:CB_PAGE3_LOGO"; OutputSize = TRUE; Pos = MAP_APPFONT ( 21 , 154 ); Size = MAP_APPFONT ( 111 , 10 ); @@ -410,6 +429,7 @@ ModalDialog DLG_ASS }; Edit EDT_PAGE4_ASKNAME { + HelpID = "sd:Edit:DLG_ASS:EDT_PAGE4_ASKNAME"; OutputSize = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 59 ) ; @@ -425,6 +445,7 @@ ModalDialog DLG_ASS }; Edit EDT_PAGE4_ASKTOPIC { + HelpID = "sd:Edit:DLG_ASS:EDT_PAGE4_ASKTOPIC"; OutputSize = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 88 ) ; @@ -440,6 +461,7 @@ ModalDialog DLG_ASS }; MultiLineEdit EDT_PAGE4_ASKINFORMATION { + HelpID = "sd:MultiLineEdit:DLG_ASS:EDT_PAGE4_ASKINFORMATION"; OutputSize = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 117 ) ; @@ -479,6 +501,7 @@ ModalDialog DLG_ASS CheckBox CB_PAGE5_SUMMARY { + HelpID = "sd:CheckBox:DLG_ASS:CB_PAGE5_SUMMARY"; OutputSize = TRUE; Pos = MAP_APPFONT ( 6 , 154 ); Size = MAP_APPFONT ( 132 , 10 ); @@ -505,6 +528,7 @@ ModalDialog DLG_ASS PushButton BUT_LAST { + HelpID = "sd:PushButton:DLG_ASS:BUT_LAST"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 112 , 170 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; @@ -514,6 +538,7 @@ ModalDialog DLG_ASS PushButton BUT_NEXT { + HelpID = "sd:PushButton:DLG_ASS:BUT_NEXT"; DefButton = TRUE ; OutputSize = TRUE ; Pos = MAP_APPFONT ( 165 , 170 ) ; diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx index f9dcf5046189..aa2e234b0868 100755 --- a/sd/source/ui/dlg/dlgassim.cxx +++ b/sd/source/ui/dlg/dlgassim.cxx @@ -49,10 +49,10 @@ SdPageListControl::SdPageListControl( : SvTreeListBox(pParent, rResId) { // Tree-ListBox mit Linien versehen - SetWindowBits( WinBits( WB_TABSTOP | WB_BORDER | WB_HASLINES | + SetStyle( GetStyle() | WB_TABSTOP | WB_BORDER | WB_HASLINES | WB_HASBUTTONS | WB_HASLINESATROOT | WB_HSCROLL | // #31562# - WB_HASBUTTONSATROOT ) ); + WB_HASBUTTONSATROOT ); SetNodeDefaultImages (); m_pCheckButton = new SvLBoxButtonData(this); diff --git a/sd/source/ui/dlg/dlgfield.src b/sd/source/ui/dlg/dlgfield.src index 5abcd9e8b9b7..cbd1ba56f7cd 100644..100755 --- a/sd/source/ui/dlg/dlgfield.src +++ b/sd/source/ui/dlg/dlgfield.src @@ -28,6 +28,7 @@ #include "dlgfield.hrc" ModalDialog DLG_FIELD_MODIFY { + HelpID = "sd:ModalDialog:DLG_FIELD_MODIFY"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 138 , 154 ) ; @@ -41,6 +42,7 @@ ModalDialog DLG_FIELD_MODIFY }; RadioButton RBT_FIX { + HelpID = "sd:RadioButton:DLG_FIELD_MODIFY:RBT_FIX"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 64 , 10 ) ; TabStop = TRUE ; @@ -48,6 +50,7 @@ ModalDialog DLG_FIELD_MODIFY }; RadioButton RBT_VAR { + HelpID = "sd:RadioButton:DLG_FIELD_MODIFY:RBT_VAR"; Pos = MAP_APPFONT ( 12 , 25 ) ; Size = MAP_APPFONT ( 64 , 10 ) ; TabStop = TRUE ; @@ -62,6 +65,7 @@ ModalDialog DLG_FIELD_MODIFY ListBox LB_LANGUAGE { + HelpID = "sd:ListBox:DLG_FIELD_MODIFY:LB_LANGUAGE"; Border = TRUE ; Pos = MAP_APPFONT ( 52 , 65 ) ; Size = MAP_APPFONT ( 80 , 70 ) ; @@ -71,6 +75,7 @@ ModalDialog DLG_FIELD_MODIFY ListBox LB_FORMAT { + HelpID = "sd:ListBox:DLG_FIELD_MODIFY:LB_FORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 94 ) ; Size = MAP_APPFONT ( 126 , 54 ) ; diff --git a/sd/source/ui/dlg/dlgsnap.src b/sd/source/ui/dlg/dlgsnap.src index 631034dd5879..5d6a5c757be5 100644..100755 --- a/sd/source/ui/dlg/dlgsnap.src +++ b/sd/source/ui/dlg/dlgsnap.src @@ -28,9 +28,11 @@ #include "app.hrc" #include "res_bmp.hrc" #include "dlgsnap.hrc" +#include "helpids.h" + ModalDialog DLG_SNAPLINE { - HelpID = SID_CAPTUREPOINT ; + HelpID = CMD_SID_CAPTUREPOINT ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 140 , 125 ) ; @@ -57,6 +59,7 @@ ModalDialog DLG_SNAPLINE }; PushButton BTN_DELETE { + HelpID = "sd:PushButton:DLG_SNAPLINE:BTN_DELETE"; Pos = MAP_APPFONT ( 88 , 63 ) ; Size = MAP_APPFONT ( 46 , 14 ) ; /* ### ACHTUNG: Neuer Text in Resource? ~Lschen : ~Lschen */ @@ -77,6 +80,7 @@ ModalDialog DLG_SNAPLINE }; MetricField MTR_FLD_X { + HelpID = "sd:MetricField:DLG_SNAPLINE:MTR_FLD_X"; Border = TRUE ; Pos = MAP_APPFONT ( 22 , 14 ) ; Size = MAP_APPFONT ( 54 , 12 ) ; @@ -100,6 +104,7 @@ ModalDialog DLG_SNAPLINE }; MetricField MTR_FLD_Y { + HelpID = "sd:MetricField:DLG_SNAPLINE:MTR_FLD_Y"; Border = TRUE ; Pos = MAP_APPFONT ( 22 , 30 ) ; Size = MAP_APPFONT ( 54 , 12 ) ; @@ -123,6 +128,7 @@ ModalDialog DLG_SNAPLINE }; ImageRadioButton RB_POINT { + HelpID = "sd:ImageRadioButton:DLG_SNAPLINE:RB_POINT"; Pos = MAP_APPFONT ( 12 , 61 ) ; Size = MAP_APPFONT ( 64 , 16 ) ; Text [ en-US ] = "~Point" ; @@ -135,6 +141,7 @@ ModalDialog DLG_SNAPLINE }; ImageRadioButton RB_VERTICAL { + HelpID = "sd:ImageRadioButton:DLG_SNAPLINE:RB_VERTICAL"; Pos = MAP_APPFONT ( 12 , 81 ) ; Size = MAP_APPFONT ( 64 , 16 ) ; Text [ en-US ] = "~Vertical" ; @@ -147,6 +154,7 @@ ModalDialog DLG_SNAPLINE }; ImageRadioButton RB_HORIZONTAL { + HelpID = "sd:ImageRadioButton:DLG_SNAPLINE:RB_HORIZONTAL"; Pos = MAP_APPFONT ( 12 , 101 ) ; Size = MAP_APPFONT ( 65 , 16 ) ; Text [ en-US ] = "Hori~zontal" ; diff --git a/sd/source/ui/dlg/headerfooterdlg.src b/sd/source/ui/dlg/headerfooterdlg.src index df42ff9b7551..6dccc1cf2b6a 100644..100755 --- a/sd/source/ui/dlg/headerfooterdlg.src +++ b/sd/source/ui/dlg/headerfooterdlg.src @@ -103,6 +103,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER CheckBox CB_HEADER { + HelpID = "sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_HEADER"; Pos = MAP_APPFONT ( C1, Y1 ); Size = MAP_APPFONT ( W1 - C1, RSC_CD_CHECKBOX_HEIGHT ); TabStop = TRUE ; @@ -119,6 +120,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER Edit TB_HEADER_FIXED { + HelpID = "sd:Edit:RID_SD_TABPAGE_HEADERFOOTER:TB_HEADER_FIXED"; Pos = MAP_APPFONT ( C4, Y1 + SPACE_Y + RSC_CD_CHECKBOX_HEIGHT ); Size = MAP_APPFONT ( W3, RSC_CD_TEXTBOX_HEIGHT ); TabStop = TRUE ; @@ -135,6 +137,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER CheckBox CB_DATETIME { + HelpID = "sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_DATETIME"; Pos = MAP_APPFONT ( C1, Y2 + SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT ); Size = MAP_APPFONT ( W1 - C1, RSC_CD_CHECKBOX_HEIGHT ); TabStop = TRUE ; @@ -143,6 +146,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER RadioButton RB_DATETIME_FIXED { + HelpID = "sd:RadioButton:RID_SD_TABPAGE_HEADERFOOTER:RB_DATETIME_FIXED"; Pos = MAP_APPFONT ( C2, Y2 + 2 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + 1 ); Size = MAP_APPFONT ( W2, RSC_CD_RADIOBUTTON_HEIGHT ); TabStop = TRUE ; @@ -151,6 +155,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER Edit TB_DATETIME_FIXED { + HelpID = "sd:Edit:RID_SD_TABPAGE_HEADERFOOTER:TB_DATETIME_FIXED"; Pos = MAP_APPFONT ( C4, Y2 + 2 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT ); Size = MAP_APPFONT ( W3, RSC_CD_TEXTBOX_HEIGHT ); TabStop = TRUE ; @@ -159,6 +164,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER RadioButton RB_DATETIME_AUTOMATIC { + HelpID = "sd:RadioButton:RID_SD_TABPAGE_HEADERFOOTER:RB_DATETIME_AUTOMATIC"; Pos = MAP_APPFONT ( C2, Y2 + 3 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT ); Size = MAP_APPFONT ( 80, RSC_CD_RADIOBUTTON_HEIGHT ); TabStop = TRUE ; @@ -167,6 +173,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER ListBox CB_DATETIME_FORMAT { + HelpID = "sd:ListBox:RID_SD_TABPAGE_HEADERFOOTER:CB_DATETIME_FORMAT"; Pos = MAP_APPFONT ( C3, Y2 + 4 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT + RSC_CD_RADIOBUTTON_HEIGHT ); Size = MAP_APPFONT ( W4, 80 ); TabStop = TRUE ; @@ -183,6 +190,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER ListBox CB_DATETIME_LANGUAGE { + HelpID = "sd:ListBox:RID_SD_TABPAGE_HEADERFOOTER:CB_DATETIME_LANGUAGE"; Pos = MAP_APPFONT ( C3 + W4 + SPACE_X, Y2 + 4 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT + RSC_CD_RADIOBUTTON_HEIGHT ); Size = MAP_APPFONT ( W4, 80 ); TabStop = TRUE ; @@ -199,6 +207,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER CheckBox CB_FOOTER { + HelpID = "sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_FOOTER"; Pos = MAP_APPFONT ( C1, Y3 + SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT ); Size = MAP_APPFONT ( W1 - C1, RSC_CD_CHECKBOX_HEIGHT ); TabStop = TRUE ; @@ -215,6 +224,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER Edit TB_FOOTER_FIXED { + HelpID = "sd:Edit:RID_SD_TABPAGE_HEADERFOOTER:TB_FOOTER_FIXED"; Pos = MAP_APPFONT ( C4, Y3 + 2 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT ); Size = MAP_APPFONT ( W3, RSC_CD_TEXTBOX_HEIGHT ); TabStop = TRUE ; @@ -231,6 +241,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER CheckBox CB_SLIDENUMBER { + HelpID = "sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_SLIDENUMBER"; Pos = MAP_APPFONT ( C1, Y4 + SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT ); Size = MAP_APPFONT ( W1 - C1, RSC_CD_CHECKBOX_HEIGHT ); TabStop = TRUE ; @@ -247,6 +258,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER CheckBox CB_NOTONTITLE { + HelpID = "sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_NOTONTITLE"; Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT, Y5 + SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT ); Size = MAP_APPFONT ( W1 - RSC_SP_TBPG_INNERBORDER_LEFT, RSC_CD_CHECKBOX_HEIGHT ); TabStop = TRUE ; @@ -255,6 +267,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER PushButton BT_APPLYTOALL { + HelpID = "sd:PushButton:RID_SD_TABPAGE_HEADERFOOTER:BT_APPLYTOALL"; Pos = MAP_APPFONT ( TAB_WIDTH - 7 * SPACE_X - PUSHBUTTON_WIDTH, RSC_SP_TBPG_INNERBORDER_TOP ); Size = MAP_APPFONT ( PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); TabStop = TRUE ; @@ -263,6 +276,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER PushButton BT_APPLY { + HelpID = "sd:PushButton:RID_SD_TABPAGE_HEADERFOOTER:BT_APPLY"; Pos = MAP_APPFONT ( TAB_WIDTH - 7 * SPACE_X - PUSHBUTTON_WIDTH, RSC_SP_TBPG_INNERBORDER_TOP + RSC_CD_PUSHBUTTON_HEIGHT + SPACE_Y ); Size = MAP_APPFONT ( PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); TabStop = TRUE ; diff --git a/sd/source/ui/dlg/ins_paste.src b/sd/source/ui/dlg/ins_paste.src index 0b066f096f87..0668e26f1993 100644..100755 --- a/sd/source/ui/dlg/ins_paste.src +++ b/sd/source/ui/dlg/ins_paste.src @@ -29,6 +29,7 @@ ModalDialog DLG_INSERT_PASTE { + HelpID = "sd:ModalDialog:DLG_INSERT_PASTE"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 148 , 90 ) ; @@ -61,6 +62,7 @@ ModalDialog DLG_INSERT_PASTE }; RadioButton RB_BEFORE { + HelpID = "sd:RadioButton:DLG_INSERT_PASTE:RB_BEFORE"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 80, 10 ) ; Text [ en-US ] = "~Before" ; @@ -68,6 +70,7 @@ ModalDialog DLG_INSERT_PASTE }; RadioButton RB_AFTER { + HelpID = "sd:RadioButton:DLG_INSERT_PASTE:RB_AFTER"; Pos = MAP_APPFONT ( 12, 27 ) ; Size = MAP_APPFONT ( 80, 10 ) ; Text [ en-US ] = "A~fter" ; diff --git a/sd/source/ui/dlg/inspagob.src b/sd/source/ui/dlg/inspagob.src index 4eae011a9ba2..70bd99bd2641 100644..100755 --- a/sd/source/ui/dlg/inspagob.src +++ b/sd/source/ui/dlg/inspagob.src @@ -30,7 +30,7 @@ ModalDialog DLG_INSERT_PAGES_OBJS { - HelpID = DLG_INSERT_PAGES_OBJS ; + HelpID = HID_DLG_INSERT_PAGES_OBJS ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 200 , 128 ) ; @@ -66,6 +66,7 @@ ModalDialog DLG_INSERT_PAGES_OBJS }; CheckBox CBX_LINK { + HelpID = "sd:CheckBox:DLG_INSERT_PAGES_OBJS:CBX_LINK"; Pos = MAP_APPFONT ( 6 , 100 ) ; Size = MAP_APPFONT ( 140 , 12 ) ; TabStop = TRUE ; @@ -73,6 +74,7 @@ ModalDialog DLG_INSERT_PAGES_OBJS }; CheckBox CBX_CHECK_MASTERS { + HelpID = "sd:CheckBox:DLG_INSERT_PAGES_OBJS:CBX_CHECK_MASTERS"; Pos = MAP_APPFONT ( 6 , 114 ) ; Size = MAP_APPFONT ( 140 , 12 ) ; TabStop = TRUE ; diff --git a/sd/source/ui/dlg/layeroptionsdlg.src b/sd/source/ui/dlg/layeroptionsdlg.src index cd50a810d3fd..ee6a4c6c19d1 100644..100755 --- a/sd/source/ui/dlg/layeroptionsdlg.src +++ b/sd/source/ui/dlg/layeroptionsdlg.src @@ -27,10 +27,11 @@ #include "app.hrc" #include "layeroptionsdlg.hrc" +#include "helpids.h" ModalDialog DLG_INSERT_LAYER { - HelpID = SID_INSERTLAYER ; + HelpID = CMD_SID_INSERTLAYER ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 200 , 172 ) ; @@ -46,6 +47,7 @@ ModalDialog DLG_INSERT_LAYER Edit EDT_NAME { + HelpID = "sd:Edit:DLG_INSERT_LAYER:EDT_NAME"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 17 ) ; Size = MAP_APPFONT ( 188 , 12 ) ; @@ -61,6 +63,7 @@ ModalDialog DLG_INSERT_LAYER Edit EDT_TITLE { + HelpID = "sd:Edit:DLG_INSERT_LAYER:EDT_TITLE"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 43 ) ; Size = MAP_APPFONT ( 188 , 12 ) ; @@ -76,6 +79,7 @@ ModalDialog DLG_INSERT_LAYER MultiLineEdit EDT_DESCRIPTION { + HelpID = "sd:MultiLineEdit:DLG_INSERT_LAYER:EDT_DESCRIPTION"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 69 ) ; Size = MAP_APPFONT ( 188 , 34 ) ; @@ -86,6 +90,7 @@ ModalDialog DLG_INSERT_LAYER CheckBox CBX_VISIBLE { + HelpID = "sd:CheckBox:DLG_INSERT_LAYER:CBX_VISIBLE"; Pos = MAP_APPFONT ( 6 , 106 ) ; Size = MAP_APPFONT ( 188 , 10 ) ; Text [ en-US ] = "~Visible" ; @@ -94,6 +99,7 @@ ModalDialog DLG_INSERT_LAYER CheckBox CBX_PRINTABLE { + HelpID = "sd:CheckBox:DLG_INSERT_LAYER:CBX_PRINTABLE"; Pos = MAP_APPFONT ( 6 , 119 ) ; Size = MAP_APPFONT ( 188 , 10 ) ; Text [ en-US ] = "~Printable" ; @@ -102,6 +108,7 @@ ModalDialog DLG_INSERT_LAYER CheckBox CBX_LOCKED { + HelpID = "sd:CheckBox:DLG_INSERT_LAYER:CBX_LOCKED"; Pos = MAP_APPFONT ( 6 , 132 ) ; Size = MAP_APPFONT ( 188 , 10 ) ; Text [ en-US ] = "~Locked" ; diff --git a/sd/source/ui/dlg/makefile.mk b/sd/source/ui/dlg/makefile.mk index de3cff7b903d..ef763dc87f5f 100755 --- a/sd/source/ui/dlg/makefile.mk +++ b/sd/source/ui/dlg/makefile.mk @@ -63,7 +63,6 @@ SRC1FILES =\ navigatr.src\ sdpreslt.src\ morphdlg.src\ - printdlg.src\ dlgfield.src\ custsdlg.src\ brkdlg.src\ @@ -71,8 +70,7 @@ SRC1FILES =\ dlgolbul.src \ LayerDialog.src \ PaneDockingWindow.src \ - layeroptionsdlg.src \ - printdialog.src + layeroptionsdlg.src SLOFILES = \ $(SLO)$/inspagob.obj \ @@ -102,7 +100,6 @@ SLOFILES = \ $(SLO)$/navigatr.obj \ $(SLO)$/sdpreslt.obj \ $(SLO)$/morphdlg.obj \ - $(SLO)$/printdlg.obj \ $(SLO)$/dlgfield.obj \ $(SLO)$/custsdlg.obj \ $(SLO)$/brkdlg.obj \ @@ -120,8 +117,7 @@ SLOFILES = \ $(SLO)$/sdabstdlg.obj \ $(SLO)$/PaneChildWindows.obj \ $(SLO)$/PaneDockingWindow.obj \ - $(SLO)$/PaneShells.obj \ - $(SLO)$/printdialog.obj + $(SLO)$/PaneShells.obj LIB1TARGET= $(SLB)$/$(TARGET).lib @@ -147,8 +143,7 @@ LIB1OBJFILES= \ $(SLO)$/sdabstdlg.obj \ $(SLO)$/PaneChildWindows.obj \ $(SLO)$/PaneDockingWindow.obj \ - $(SLO)$/PaneShells.obj \ - $(SLO)$/printdialog.obj + $(SLO)$/PaneShells.obj LIB2TARGET= $(SLB)$/sdui.lib @@ -173,7 +168,6 @@ LIB2OBJFILES= \ $(SLO)$/dlgolbul.obj \ $(SLO)$/paragr.obj \ $(SLO)$/present.obj \ - $(SLO)$/printdlg.obj \ $(SLO)$/prltempl.obj \ $(SLO)$/sdpreslt.obj \ $(SLO)$/tabtempl.obj \ diff --git a/sd/source/ui/dlg/masterlayoutdlg.src b/sd/source/ui/dlg/masterlayoutdlg.src index 1e862b63cec6..71cf192b5fd4 100644..100755 --- a/sd/source/ui/dlg/masterlayoutdlg.src +++ b/sd/source/ui/dlg/masterlayoutdlg.src @@ -31,6 +31,7 @@ ModalDialog RID_SD_DLG_MASTER_LAYOUT { + HelpID = "sd:ModalDialog:RID_SD_DLG_MASTER_LAYOUT"; Size = MAP_APPFONT( 89 , 92 ); OutputSize = TRUE; SVLook = TRUE; @@ -46,6 +47,7 @@ ModalDialog RID_SD_DLG_MASTER_LAYOUT CheckBox CB_HEADER { + HelpID = "sd:CheckBox:RID_SD_DLG_MASTER_LAYOUT:CB_HEADER"; Pos = MAP_APPFONT( 6, 16 ); Size = MAP_APPFONT( 134 , 10 ); TabStop = TRUE; @@ -55,6 +57,7 @@ ModalDialog RID_SD_DLG_MASTER_LAYOUT CheckBox CB_DATE { + HelpID = "sd:CheckBox:RID_SD_DLG_MASTER_LAYOUT:CB_DATE"; Pos = MAP_APPFONT( 6, 29 ); Size = MAP_APPFONT( 134 , 10 ); TabStop = TRUE; @@ -64,6 +67,7 @@ ModalDialog RID_SD_DLG_MASTER_LAYOUT CheckBox CB_FOOTER { + HelpID = "sd:CheckBox:RID_SD_DLG_MASTER_LAYOUT:CB_FOOTER"; Pos = MAP_APPFONT( 6, 42 ); Size = MAP_APPFONT( 134 , 10 ); TabStop = TRUE; @@ -73,6 +77,7 @@ ModalDialog RID_SD_DLG_MASTER_LAYOUT CheckBox CB_PAGE_NUMBER { + HelpID = "sd:CheckBox:RID_SD_DLG_MASTER_LAYOUT:CB_PAGE_NUMBER"; Pos = MAP_APPFONT( 6, 55 ); Size = MAP_APPFONT( 134 , 10 ); TabStop = TRUE; diff --git a/sd/source/ui/dlg/morphdlg.src b/sd/source/ui/dlg/morphdlg.src index 64e63a33cd59..026a4fd29609 100644..100755 --- a/sd/source/ui/dlg/morphdlg.src +++ b/sd/source/ui/dlg/morphdlg.src @@ -27,6 +27,8 @@ #include "app.hrc" #include "morphdlg.hrc" +#include "helpids.h" + /****************************************************************************** |* |* @@ -34,7 +36,8 @@ \******************************************************************************/ ModalDialog DLG_MORPH { - HelpID = SID_POLYGON_MORPHING ; + HelpID = CMD_SID_POLYGON_MORPHING ; + HelpID = ".uno:Morphing" ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 196 , 68 ) ; @@ -74,6 +77,7 @@ ModalDialog DLG_MORPH }; MetricField MTF_STEPS { + HelpID = "sd:MetricField:DLG_MORPH:MTF_STEPS"; Border = TRUE ; Pos = MAP_APPFONT ( 56 , 14 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; @@ -87,6 +91,7 @@ ModalDialog DLG_MORPH }; CheckBox CBX_ATTRIBUTES { + HelpID = "sd:CheckBox:DLG_MORPH:CBX_ATTRIBUTES"; Pos = MAP_APPFONT ( 12 , 29 ) ; Size = MAP_APPFONT ( 121 , 12 ) ; /* ### ACHTUNG: Neuer Text in Resource? Attributierung berblenden : Attributierung berblenden */ @@ -95,6 +100,7 @@ ModalDialog DLG_MORPH }; CheckBox CBX_ORIENTATION { + HelpID = "sd:CheckBox:DLG_MORPH:CBX_ORIENTATION"; Pos = MAP_APPFONT ( 12 , 44 ) ; Size = MAP_APPFONT ( 121 , 12 ) ; TabStop = TRUE ; diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 294aa6feb65a..488737fa6b56 100644..100755 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -44,10 +44,10 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/dockwin.hxx> +#include <sfx2/sfxresid.hxx> #include "pres.hxx" #include "navigatr.hxx" -//#include "navichld.hxx" #include "navigatr.hrc" #include "pgjump.hxx" #include "app.hrc" @@ -309,6 +309,14 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox ) // gespeichert ist oder nicht PopupMenu *pMenu = new PopupMenu; + static const char* aHIDs[] = + { + HID_SD_NAVIGATOR_MENU1, + HID_SD_NAVIGATOR_MENU2, + HID_SD_NAVIGATOR_MENU3, + 0 + }; + for( USHORT nID = NAVIGATOR_DRAGTYPE_URL; nID < NAVIGATOR_DRAGTYPE_COUNT; nID++ ) @@ -316,9 +324,9 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox ) USHORT nRId = GetDragTypeSdResId( (NavigatorDragType)nID ); if( nRId > 0 ) { + DBG_ASSERT(aHIDs[nID-NAVIGATOR_DRAGTYPE_URL],"HelpId not added!"); pMenu->InsertItem( nID, String( SdResId( nRId ) ) ); - pMenu->SetHelpId( nID, HID_SD_NAVIGATOR_MENU1 + - nID - NAVIGATOR_DRAGTYPE_URL ); + pMenu->SetHelpId( nID, aHIDs[nID - NAVIGATOR_DRAGTYPE_URL] ); } } @@ -337,7 +345,6 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox ) pMenu->Execute( this, maToolbox.GetItemRect( nId ), POPUPMENU_EXECUTE_DOWN ); pBox->EndSelection(); delete pMenu; - //pBox->Invalidate(); } break; diff --git a/sd/source/ui/dlg/paragr.src b/sd/source/ui/dlg/paragr.src index 041a4524a705..99a9d4f4c17f 100644..100755 --- a/sd/source/ui/dlg/paragr.src +++ b/sd/source/ui/dlg/paragr.src @@ -27,6 +27,7 @@ #include <svx/dialogs.hrc> #include "glob.hrc" +#include "helpids.h" #include "paragr.hrc" TabDialog TAB_PARAGRAPH @@ -105,13 +106,14 @@ TabDialog TAB_PARAGRAPH TabPage RID_TABPAGE_PARA_NUMBERING { - HelpId = RID_TABPAGE_PARA_NUMBERING ; + HelpId = HID_TABPAGE_PARA_NUMBERING ; Hide = TRUE ; Text = "Numbering" ; Size = MAP_APPFONT ( 260 , 185 ) ; TriStateBox CB_NEW_START { + HelpID = "sd:TriStateBox:RID_TABPAGE_PARA_NUMBERING:CB_NEW_START"; Pos = MAP_APPFONT ( 6 , 6 ) ; Size = MAP_APPFONT ( 160 , 10 ) ; TabStop = TRUE ; @@ -119,6 +121,7 @@ TabPage RID_TABPAGE_PARA_NUMBERING }; TriStateBox CB_NUMBER_NEW_START { + HelpID = "sd:TriStateBox:RID_TABPAGE_PARA_NUMBERING:CB_NUMBER_NEW_START"; Pos = MAP_APPFONT ( 15 , 21 ) ; Size = MAP_APPFONT ( 103 , 10 ) ; Disable = TRUE ; @@ -126,6 +129,7 @@ TabPage RID_TABPAGE_PARA_NUMBERING }; NumericField NF_NEW_START { + HelpID = "sd:NumericField:RID_TABPAGE_PARA_NUMBERING:NF_NEW_START"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 20 ) ; Size = MAP_APPFONT ( 26 , 12 ) ; diff --git a/sd/source/ui/dlg/present.src b/sd/source/ui/dlg/present.src index 830e320ca4ba..73c16148a184 100644..100755 --- a/sd/source/ui/dlg/present.src +++ b/sd/source/ui/dlg/present.src @@ -33,7 +33,7 @@ ModalDialog DLG_START_PRESENTATION { - HelpID = SID_PRESENTATION ; + HelpID = CMD_SID_PRESENTATION ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 256, 205 ) ; @@ -69,6 +69,7 @@ ModalDialog DLG_START_PRESENTATION }; 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" ; @@ -76,6 +77,7 @@ ModalDialog DLG_START_PRESENTATION }; 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:" ; @@ -83,6 +85,7 @@ ModalDialog DLG_START_PRESENTATION }; ListBox LB_DIAS { + HelpID = "sd:ListBox:DLG_START_PRESENTATION:LB_DIAS"; Border = TRUE ; Pos = MAP_APPFONT ( 82, 24 ) ; Size = MAP_APPFONT ( 111, 80 ) ; @@ -92,6 +95,7 @@ ModalDialog DLG_START_PRESENTATION }; RadioButton RBT_CUSTOMSHOW { + HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_CUSTOMSHOW"; Pos = MAP_APPFONT ( 12 , 38 ) ; Size = MAP_APPFONT ( 130 , 12 ) ; TabStop = TRUE ; @@ -99,6 +103,7 @@ ModalDialog DLG_START_PRESENTATION }; ListBox LB_CUSTOMSHOW { + HelpID = "sd:ListBox:DLG_START_PRESENTATION:LB_CUSTOMSHOW"; Border = TRUE ; Pos = MAP_APPFONT ( 32, 53 ) ; Size = MAP_APPFONT ( 161, 80 ) ; @@ -114,6 +119,7 @@ ModalDialog DLG_START_PRESENTATION }; 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" ; @@ -121,6 +127,7 @@ ModalDialog DLG_START_PRESENTATION }; 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" ; @@ -128,6 +135,7 @@ ModalDialog DLG_START_PRESENTATION }; 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" ; @@ -143,6 +151,7 @@ ModalDialog DLG_START_PRESENTATION */ TimeField TMF_PAUSE { + HelpID = "sd:TimeField:DLG_START_PRESENTATION:TMF_PAUSE"; Pos = MAP_APPFONT ( 32, 120 ) ; Size = MAP_APPFONT ( 50, 12 ) ; Border = TRUE ; @@ -167,6 +176,7 @@ ModalDialog DLG_START_PRESENTATION }; CheckBox CBX_AUTOLOGO { + HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_AUTOLOGO"; Pos = MAP_APPFONT ( 32 , 138 ) ; Size = MAP_APPFONT ( 61 , 12 ) ; TabStop = TRUE ; @@ -181,6 +191,7 @@ ModalDialog DLG_START_PRESENTATION }; CheckBox CBX_MANUEL { + HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_MANUEL"; Pos = MAP_APPFONT ( 108 , 84 ) ; Size = MAP_APPFONT ( 139 , 12 ) ; TabStop = TRUE ; @@ -188,6 +199,7 @@ ModalDialog DLG_START_PRESENTATION }; 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" ; @@ -195,6 +207,7 @@ ModalDialog DLG_START_PRESENTATION }; 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" ; @@ -202,6 +215,7 @@ ModalDialog DLG_START_PRESENTATION }; CheckBox CBX_NAVIGATOR { + HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_NAVIGATOR"; Pos = MAP_APPFONT ( 108, 120 ) ; Size = MAP_APPFONT ( 139, 12 ) ; TabStop = TRUE ; @@ -209,6 +223,7 @@ ModalDialog DLG_START_PRESENTATION }; 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 ; @@ -216,6 +231,7 @@ ModalDialog DLG_START_PRESENTATION }; 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 ; @@ -223,6 +239,7 @@ ModalDialog DLG_START_PRESENTATION }; 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 ) ; /* ### ACHTUNG: Neuer Text in Resource? Prsentation immer im ~Vordergrund : Prsentation immer im ~Vordergrund */ diff --git a/sd/source/ui/dlg/printdialog.cxx b/sd/source/ui/dlg/printdialog.cxx deleted file mode 100644 index 3e02a18c2af7..000000000000 --- a/sd/source/ui/dlg/printdialog.cxx +++ /dev/null @@ -1,342 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sd.hxx" - -#include <boost/scoped_ptr.hpp> - -#include "sdresid.hxx" -#include "printdialog.hxx" -#include "printdialog.hrc" -#include "optsitem.hxx" -#include "res_bmp.hrc" - -class SdPrintDialogImpl : public ModalDialog -{ -public: - SdPrintDialogImpl() - : ModalDialog( 0, SdResId( DLG_PRINTDIALOG ) ) - { - } - - virtual ~SdPrintDialogImpl() - { - FreeResource(); - } -}; - -/** - aOptions.GetOptionsPrint().SetDraw( aCbxDraw.IsChecked() ); - aOptions.GetOptionsPrint().SetNotes( aCbxNotes.IsChecked() ); - aOptions.GetOptionsPrint().SetHandout( aCbxHandout.IsChecked() ); - aOptions.GetOptionsPrint().SetOutline( aCbxOutline.IsChecked() ); - - aCbxDraw.Check( pPrintOpts->GetOptionsPrint().IsDraw() ); - aCbxNotes.Check( pPrintOpts->GetOptionsPrint().IsNotes() ); - aCbxHandout.Check( pPrintOpts->GetOptionsPrint().IsHandout() ); - aCbxOutline.Check( pPrintOpts->GetOptionsPrint().IsOutline() ); - - only for impress!! -*/ - -SdPrintDialog* SdPrintDialog::Create( Window* pWindow, bool bImpress ) -{ - return new SdPrintDialog( pWindow, bImpress ); -} - -SdPrintDialog::SdPrintDialog( Window* pWindow, bool bImpress ) -: PrintDialog( pWindow, false ) -, mbImpress( bImpress ) -{ - if( bImpress ) - { - mpControls.resize( PRINTDLG_CONTROLCOUNT ); - - boost::scoped_ptr< SdPrintDialogImpl > aImplDlg( new SdPrintDialogImpl() ); - - USHORT nChildCount = GetChildCount(); - - mpControls[FL_PRINTCONTENT-1].reset( new FixedLine( this, SdResId( FL_PRINTCONTENT ) ) ); - mpControls[FT_CONTENT-1].reset( new FixedText( this, SdResId( FT_CONTENT ) ) ); - mpControls[CB_CONTENT-1].reset( new ListBox( this, SdResId( CB_CONTENT ) ) ); - mpControls[FT_SLIDESPERPAGE-1].reset( new FixedText( this, SdResId( FT_SLIDESPERPAGE ) ) ); - mpControls[CB_SLIDESPERPAGE-1].reset( new ListBox( this, SdResId( CB_SLIDESPERPAGE ) ) ); - mpControls[FT_ORDER-1].reset( new FixedText( this, SdResId( FT_ORDER ) ) ); - mpControls[RBT_HORIZONTAL-1].reset( new RadioButton( this, SdResId( RBT_HORIZONTAL ) ) ); - mpControls[RBT_VERTICAL-1].reset( new RadioButton( this, SdResId( RBT_VERTICAL ) ) ); - mpControls[IMG_PREVIEW-1].reset( new FixedImage( this, SdResId( IMG_PREVIEW ) ) ); - - sal_Int32 nHeight = LogicToPixel( Size( 0, 71 ), MAP_APPFONT ).Height(); - - sal_Int32 nInsertY = nHeight; - - Window* pNextControl = 0; - - // find second fixed line - USHORT nChild = 0; - USHORT nFixedLine = 2; - while( nChildCount-- ) - { - pNextControl = GetChild( nChild++ ); - if( dynamic_cast< FixedLine* >( pNextControl ) ) - { - if( --nFixedLine == 0 ) - { - nInsertY = pNextControl->GetPosPixel().Y(); - nChild--; - nChildCount++; - break; - } - } - } - - // move lower controls down - std::vector< Window* > aLowerControls; - while( nChildCount-- ) - { - Window* pControl = GetChild( nChild++ ); - if( pControl ) - { - Point aPos( pControl->GetPosPixel() ); - aPos.Y() += nHeight; - pControl->SetPosPixel(aPos); - aLowerControls.push_back(pControl); - } - } - - // positionate new controls - for( int i = 0; i < PRINTDLG_CONTROLCOUNT; i++ ) - { - Control* pControl = mpControls[i].get(); - if( pControl ) - { - Point aPos( pControl->GetPosPixel() ); - aPos.Y() += nInsertY; - pControl->SetPosPixel(aPos); - pControl->SetZOrder( pNextControl, WINDOW_ZORDER_BEFOR ); - } - } - - Size aDialogSize( GetSizePixel() ); - aDialogSize.Height() += nHeight; - SetSizePixel( aDialogSize ); - } -} - -SdPrintDialog::~SdPrintDialog() -{ -} - -void SdPrintDialog::Init( const SdOptionsPrintItem* pPrintOpts ) -{ - if( mbImpress ) - { - bool bDraw = true, bHandout = false, bNotes = false, bOutline = false; - sal_uInt16 nPagesPerHandout = 6; - bool bHandoutHorizontal = true; - - if( pPrintOpts ) - { - const SdOptionsPrint& rOpts = pPrintOpts->GetOptionsPrint(); - bDraw = rOpts.IsDraw(); - bHandout = rOpts.IsHandout(); - bNotes = rOpts.IsNotes(); - bOutline = rOpts.IsOutline(); - nPagesPerHandout = rOpts.GetHandoutPages(); - bHandoutHorizontal = rOpts.IsHandoutHorizontal(); - } - - sal_uInt16 nPos = 0; - if( !bDraw ) - { - if( bHandout ) - nPos = 1; - else if( bNotes ) - nPos = 2; - else if( bOutline ) - nPos = 3; - } - static_cast<ListBox*>( mpControls[CB_CONTENT-1].get() )->SelectEntryPos( nPos ); - - switch( nPagesPerHandout ) - { - case 1: nPos = 0; break; - case 2: nPos = 1; break; - case 3: nPos = 2; break; - case 4: nPos = 3; break; - case 5: - case 6: nPos = 4; break; - default:nPos = 5; break; - } - static_cast<ListBox*>( mpControls[CB_SLIDESPERPAGE-1].get() )->SelectEntryPos( nPos ); - - - static_cast<RadioButton*>( mpControls[RBT_HORIZONTAL-1].get() )->Check( bHandoutHorizontal == true ) ; - static_cast<RadioButton*>( mpControls[RBT_VERTICAL-1].get() )->Check( bHandoutHorizontal == false ) ; - - LoadPreviewImages(); - - Image* pImage = mpPreviews[0].get(); - if( pImage ) - { - FixedImage* pPreviewImage = static_cast<FixedImage*>( mpControls[IMG_PREVIEW-1].get() ); - - Point aPos( pPreviewImage->GetPosPixel() ); - pPreviewImage->SetSizePixel( pImage->GetSizePixel() ); - aPos.X() -= pImage->GetSizePixel().Width(); - - pPreviewImage->SetPosPixel( aPos ); - } - - UpdateStates(); - - Link aLink( LINK(this,SdPrintDialog,UpdateStatesHdl) ); - static_cast<ListBox*>( mpControls[CB_CONTENT-1].get() )->SetSelectHdl( aLink ); - static_cast<ListBox*>( mpControls[CB_SLIDESPERPAGE-1].get() )->SetSelectHdl( aLink ); - } -} - -bool SdPrintDialog::Fill( SdOptionsPrintItem* pPrintOpts ) -{ - bool bChanges = false; - if( mbImpress && pPrintOpts ) - { - SdOptionsPrint& rOpts = pPrintOpts->GetOptionsPrint(); - - BOOL bDraw = FALSE, bHandout = FALSE, bNotes = FALSE, bOutline = FALSE; - switch( static_cast<ListBox*>( mpControls[CB_CONTENT-1].get() )->GetSelectEntryPos() ) - { - case 1: bHandout = TRUE; break; - case 2: bNotes = TRUE; break; - case 3: bOutline = TRUE; break; - default: bDraw = TRUE; break; - } - if( rOpts.IsDraw() != bDraw ) - { - bChanges = true; - rOpts.SetDraw( bDraw ); - } - - if( rOpts.IsNotes() != bNotes ) - { - bChanges = true; - rOpts.SetNotes( bNotes ); - } - - if( rOpts.IsHandout() != bHandout ) - { - bChanges = true; - rOpts.SetHandout( bHandout ); - } - - if( rOpts.IsOutline() != bOutline ) - { - bChanges = true; - rOpts.SetOutline( bOutline ); - } - - sal_uInt16 nSlidePerHandout = 6; - switch( static_cast<ListBox*>( mpControls[CB_SLIDESPERPAGE-1].get() )->GetSelectEntryPos() ) - { - case 0: nSlidePerHandout = 1; break; - case 1: nSlidePerHandout = 2; break; - case 2: nSlidePerHandout = 3; break; - case 3: nSlidePerHandout = 4; break; - case 5: nSlidePerHandout = 9; break; - } - - if( rOpts.GetHandoutPages() != nSlidePerHandout ) - { - bChanges = true; - rOpts.SetHandoutPages( nSlidePerHandout ); - } - - const BOOL bHorizontal = static_cast<RadioButton*>( mpControls[RBT_HORIZONTAL-1].get() )->IsChecked(); - if( rOpts.IsHandoutHorizontal() != bHorizontal ) - { - bChanges = true; - rOpts.SetHandoutHorizontal( bHorizontal ); - } - } - return bChanges; -} - -static const sal_uInt16 PREVIEW_COUNT = 6; - -void SdPrintDialog::UpdateStates() -{ - const sal_uInt16 nSlidesPerPagePos = static_cast<ListBox*>( mpControls[CB_SLIDESPERPAGE-1].get() )->GetSelectEntryPos(); - bool bHandout = static_cast<ListBox*>( mpControls[CB_CONTENT-1].get() )->GetSelectEntryPos() == 1; - bool bOrder = bHandout && ( nSlidesPerPagePos >= 3); - - static_cast<Control*>( mpControls[FT_SLIDESPERPAGE-1].get() )->Enable( bHandout ); - static_cast<Control*>( mpControls[CB_SLIDESPERPAGE-1].get() )->Enable( bHandout ); - static_cast<Control*>( mpControls[FT_ORDER-1].get() )->Enable( bHandout && bOrder ); - static_cast<Control*>( mpControls[RBT_HORIZONTAL-1].get() )->Enable( bHandout && bOrder ); - static_cast<Control*>( mpControls[RBT_VERTICAL-1].get() )->Enable( bHandout && bOrder ); - - FixedImage* pPreviewImage = static_cast<FixedImage*>( mpControls[IMG_PREVIEW-1].get() ); - - if( pPreviewImage ) - { - pPreviewImage->Show( bHandout ); - if( bHandout ) - { - if( nSlidesPerPagePos < PREVIEW_COUNT) - { - if( mpPreviews[nSlidesPerPagePos].get() ) - pPreviewImage->SetModeImage( *mpPreviews[nSlidesPerPagePos].get(), BMP_COLOR_NORMAL ); - - if( mpPreviewsHC[nSlidesPerPagePos].get() ) - pPreviewImage->SetModeImage( *mpPreviewsHC[nSlidesPerPagePos].get(), BMP_COLOR_HIGHCONTRAST ); - } - } - } -} - -IMPL_LINK( SdPrintDialog, UpdateStatesHdl, void*, EMPTYARG ) -{ - UpdateStates(); - return 0; -} - -void SdPrintDialog::LoadPreviewImages() -{ - static const sal_uInt16 aResId[2*PREVIEW_COUNT] = { BMP_FOILH_01, BMP_FOILH_01_H, BMP_FOILH_02, BMP_FOILH_02_H, BMP_FOILH_03, BMP_FOILH_03_H, BMP_FOILH_04, BMP_FOILH_04_H, BMP_FOILH_06, BMP_FOILH_06_H, BMP_FOILH_09, BMP_FOILH_09_H }; - - mpPreviews.resize( PREVIEW_COUNT ); - mpPreviewsHC.resize( PREVIEW_COUNT ); - - const sal_uInt16* pResId( aResId ); - for( sal_uInt16 i = 0; i < PREVIEW_COUNT; i++ ) - { - mpPreviews[i].reset( new Image( Bitmap( SdResId( *pResId++ ) ) ) ); - mpPreviewsHC[i].reset( new Image( Bitmap( SdResId( *pResId++ ) ) ) ); - } -} - diff --git a/sd/source/ui/dlg/printdialog.hrc b/sd/source/ui/dlg/printdialog.hrc deleted file mode 100644 index 702dc3898b18..000000000000 --- a/sd/source/ui/dlg/printdialog.hrc +++ /dev/null @@ -1,38 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#define DLG_PRINTDIALOG 1847 -#define FL_PRINTCONTENT 1 -#define FT_CONTENT 2 -#define CB_CONTENT 3 -#define FT_SLIDESPERPAGE 4 -#define CB_SLIDESPERPAGE 5 -#define FT_ORDER 6 -#define RBT_HORIZONTAL 7 -#define RBT_VERTICAL 8 -#define IMG_PREVIEW 9 -#define PRINTDLG_CONTROLCOUNT 9 diff --git a/sd/source/ui/dlg/printdialog.src b/sd/source/ui/dlg/printdialog.src deleted file mode 100644 index be014c588b55..000000000000 --- a/sd/source/ui/dlg/printdialog.src +++ /dev/null @@ -1,130 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "app.hrc" -#include "printdialog.hrc" - -ModalDialog DLG_PRINTDIALOG -{ - Size = MAP_APPFONT ( 260, 77 ) ; - - FixedLine FL_PRINTCONTENT - { - Pos = MAP_APPFONT ( 6 , 0 ) ; - Size = MAP_APPFONT ( 248 , 8 ) ; - Text [ en-US ] = "Print content" ; - }; - FixedText FT_CONTENT - { - Pos = MAP_APPFONT ( 12 , 12 ) ; - Size = MAP_APPFONT ( 45 , 10 ) ; - Text [ en-US ] = "Content" ; - }; - ListBox CB_CONTENT - { - Border = TRUE ; - Pos = MAP_APPFONT ( 60 , 10 ) ; - Size = MAP_APPFONT ( 108 , 80 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - StringList [ en-US ] = - { - < "Slides" ; > ; - < "Handouts" ; > ; - < "Notes" ; > ; - < "Outline" ; > ; - }; - }; - FixedText FT_SLIDESPERPAGE - { - Pos = MAP_APPFONT ( 12 , 30 ) ; - Size = MAP_APPFONT ( 45 , 8 ) ; - Text [ en-US ] = "Slides per page" ; - }; - ListBox CB_SLIDESPERPAGE - { - Border = TRUE ; - Pos = MAP_APPFONT ( 60 , 28 ) ; - Size = MAP_APPFONT ( 24 , 80 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - StringList [ en-US ] = - { - < "1" ; > ; - < "2" ; > ; - < "3" ; > ; - < "4" ; > ; - < "6" ; > ; - < "9" ; > ; - }; - }; - FixedText FT_ORDER - { - Pos = MAP_APPFONT ( 12 , 47 ) ; - Size = MAP_APPFONT ( 45 , 8 ) ; - Text [ en-US ] = "Order" ; - }; - RadioButton RBT_HORIZONTAL - { - Pos = MAP_APPFONT ( 60 , 45 ) ; - Size = MAP_APPFONT ( 60 , 10 ) ; - TabStop = TRUE ; - Text [ en-US ] = "Horizontal" ; - }; - RadioButton RBT_VERTICAL - { - Pos = MAP_APPFONT ( 60 , 58 ) ; - Size = MAP_APPFONT ( 60 , 10 ) ; - TabStop = TRUE ; - Text [ en-US ] = "Vertical" ; - }; - FixedImage IMG_PREVIEW - { - Pos = MAP_APPFONT ( 168 , 28 ) ; - }; -}; - - - - - - - - - - - - - - - - - - - - - diff --git a/sd/source/ui/dlg/printdlg.cxx b/sd/source/ui/dlg/printdlg.cxx deleted file mode 100644 index cc20e0f67a84..000000000000 --- a/sd/source/ui/dlg/printdlg.cxx +++ /dev/null @@ -1,88 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sd.hxx" - -#ifdef SD_DLLIMPLEMENTATION -#undef SD_DLLIMPLEMENTATION -#endif - - -#include "sdresid.hxx" -#include "printdlg.hxx" -#include "printdlg.hrc" - -/************************************************************************* -|* -|* SdPrintDlg::SdPrintDlg() -|* -|* Beschreibung Dialog zum Einstellen von Printoptionen -|* -*************************************************************************/ - -SdPrintDlg::SdPrintDlg( Window* pWindow ) : - ModalDialog ( pWindow, SdResId( DLG_PRINT_WARNINGS ) ), - aFtInfo ( this, SdResId( FI_INFO ) ), - aRbtScale ( this, SdResId( RBT_SCALE ) ), - aRbtPoster ( this, SdResId( RBT_POSTER ) ), - aRbtCut ( this, SdResId( RBT_CUT ) ), - aGrpOptions ( this, SdResId( GRP_OPTIONS ) ), - aBtnOK ( this, SdResId( BTN_OK ) ), - aBtnCancel ( this, SdResId( BTN_CANCEL ) ), - aBtnHelp ( this, SdResId( BTN_HELP ) ) -{ - FreeResource(); - - aRbtScale.Check(); -} - -/************************************************************************* -|* -|* SdPrintDlg::GetAttr() -|* -|* Beschreibung Liefert eingestellte Option zurueck -|* -*************************************************************************/ - -USHORT SdPrintDlg::GetAttr() -{ - USHORT nOption = 0; - - if( aRbtScale.IsChecked() ) - nOption = 1; - else if( aRbtPoster.IsChecked() ) - nOption = 2; - else if( aRbtCut.IsChecked() ) - nOption = 3; - - return( nOption ); -} - - - - diff --git a/sd/source/ui/dlg/printdlg.src b/sd/source/ui/dlg/printdlg.src deleted file mode 100644 index 45121e72f3ff..000000000000 --- a/sd/source/ui/dlg/printdlg.src +++ /dev/null @@ -1,130 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "printdlg.hrc" -ModalDialog DLG_PRINT_WARNINGS -{ - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 212 , 87 ) ; - Moveable = TRUE ; - OKButton BTN_OK - { - Pos = MAP_APPFONT ( 156 , 6 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - }; - CancelButton BTN_CANCEL - { - Pos = MAP_APPFONT ( 156 , 23 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - HelpButton BTN_HELP - { - Pos = MAP_APPFONT ( 156 , 43 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - FixedLine GRP_OPTIONS - { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 144 , 8 ) ; - Text [ en-US ] = "Print options" ; - }; - RadioButton RBT_SCALE - { - Pos = MAP_APPFONT ( 12 , 42 ) ; - Size = MAP_APPFONT ( 129 , 12 ) ; - TabStop = TRUE ; - Text [ en-US ] = "~Fit page to print range" ; - }; - RadioButton RBT_POSTER - { - Pos = MAP_APPFONT ( 12 , 54 ) ; - Size = MAP_APPFONT ( 130 , 12 ) ; - TabStop = TRUE ; - Text [ en-US ] = "~Print on multiple pages" ; - }; - RadioButton RBT_CUT - { - Pos = MAP_APPFONT ( 12 , 66 ) ; - Size = MAP_APPFONT ( 127 , 12 ) ; - TabStop = TRUE ; - Text [ en-US ] = "~Trim" ; - }; - FixedText FI_INFO - { - Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 134 , 25 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Die Seiteneinstellungen stimmen nicht mit dem Druckbereich berein.\nSie knnen folgende Optionen whlen : Die Seiteneinstellungen stimmen nicht mit dem Druckbereich berein.\nSie knnen folgende Optionen whlen */ - Text [ en-US ] = "The page settings do not match the print range.\nChoose one of the following options" ; - WordBreak = TRUE ; - }; - Text [ en-US ] = "Warning Print Options" ; -}; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sd/source/ui/dlg/prntopts.src b/sd/source/ui/dlg/prntopts.src index dd2ed2e3f63b..7a4f88068e87 100644..100755 --- a/sd/source/ui/dlg/prntopts.src +++ b/sd/source/ui/dlg/prntopts.src @@ -42,6 +42,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_DRAW { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_DRAW"; TabStop = TRUE ; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; @@ -49,6 +50,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_NOTES { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_NOTES"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; TabStop = TRUE ; @@ -56,6 +58,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_HANDOUTS { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_HANDOUTS"; Pos = MAP_APPFONT ( 12 , 42 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; TabStop = TRUE ; @@ -63,6 +66,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_OUTLINE { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_OUTLINE"; Pos = MAP_APPFONT ( 12 , 56 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; TabStop = TRUE ; @@ -82,6 +86,7 @@ TabPage TP_PRINT_OPTIONS }; RadioButton RBT_COLOR { + HelpID = "sd:RadioButton:TP_PRINT_OPTIONS:RBT_COLOR"; Pos = MAP_APPFONT ( 136 , 14 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text [ en-US ] = "Default" ; @@ -89,6 +94,7 @@ TabPage TP_PRINT_OPTIONS }; RadioButton RBT_GRAYSCALE { + HelpID = "sd:RadioButton:TP_PRINT_OPTIONS:RBT_GRAYSCALE"; Pos = MAP_APPFONT ( 136 , 28 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text [ en-US ] = "Gra~yscale" ; @@ -96,6 +102,7 @@ TabPage TP_PRINT_OPTIONS }; RadioButton RBT_BLACKWHITE { + HelpID = "sd:RadioButton:TP_PRINT_OPTIONS:RBT_BLACKWHITE"; Pos = MAP_APPFONT ( 136 , 42 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text [ en-US ] = "Black & ~white" ; @@ -109,6 +116,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_PAGENAME { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_PAGENAME"; Pos = MAP_APPFONT ( 12 , 83 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Text [ en-US ] = "~Page name" ; @@ -116,6 +124,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_DATE { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_DATE"; Pos = MAP_APPFONT ( 12 , 97 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Text [ en-US ] = "D~ate" ; @@ -123,6 +132,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_TIME { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_TIME"; Pos = MAP_APPFONT ( 12 , 111 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Text [ en-US ] = "Ti~me" ; @@ -130,6 +140,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_HIDDEN_PAGES { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_HIDDEN_PAGES"; Pos = MAP_APPFONT ( 12 , 125 ) ; // 120 , 14 Size = MAP_APPFONT ( 90 , 10 ) ; @@ -150,6 +161,7 @@ TabPage TP_PRINT_OPTIONS }; RadioButton RBT_DEFAULT { + HelpID = "sd:RadioButton:TP_PRINT_OPTIONS:RBT_DEFAULT"; Pos = MAP_APPFONT ( 136 , 83 ) ; Size = MAP_APPFONT ( 110 , 10 ) ; TabStop = TRUE ; @@ -157,6 +169,7 @@ TabPage TP_PRINT_OPTIONS }; RadioButton RBT_PAGESIZE { + HelpID = "sd:RadioButton:TP_PRINT_OPTIONS:RBT_PAGESIZE"; Pos = MAP_APPFONT ( 136 , 97 ) ; Size = MAP_APPFONT ( 110 , 10 ) ; Text [ en-US ] = "~Fit to page" ; @@ -164,6 +177,7 @@ TabPage TP_PRINT_OPTIONS }; RadioButton RBT_PAGETILE { + HelpID = "sd:RadioButton:TP_PRINT_OPTIONS:RBT_PAGETILE"; Pos = MAP_APPFONT ( 136 , 111 ) ; Size = MAP_APPFONT ( 110 , 10 ) ; TabStop = TRUE ; @@ -171,6 +185,7 @@ TabPage TP_PRINT_OPTIONS }; RadioButton RBT_BOOKLET { + HelpID = "sd:RadioButton:TP_PRINT_OPTIONS:RBT_BOOKLET"; Pos = MAP_APPFONT ( 136, 125 ) ; Size = MAP_APPFONT ( 110 , 10 ) ; TabStop = TRUE ; @@ -178,6 +193,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_FRONT { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_FRONT"; Pos = MAP_APPFONT ( 145 , 139 ) ; Size = MAP_APPFONT ( 53 , 10 ) ; TabStop = TRUE ; @@ -185,6 +201,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_BACK { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_BACK"; Pos = MAP_APPFONT ( 202 , 139 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; TabStop = TRUE ; @@ -192,6 +209,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_PAPERBIN { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_PAPERBIN"; Pos = MAP_APPFONT ( 136 , 153 ) ; Size = MAP_APPFONT ( 118 , 30 ) ; Text [ en-US ] = "Paper tray from printer s~ettings" ; diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index 468b55f56c8a..9feb7507bd3f 100644..100755 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -51,7 +51,6 @@ #include "OutlineBulletDlg.hxx" #include "paragr.hxx" #include "present.hxx" -#include "printdlg.hxx" #include "prltempl.hxx" #include "sdpreslt.hxx" #include "tabtempl.hxx" @@ -76,7 +75,6 @@ IMPL_ABSTDLG_BASE(AbstractSdInsertPasteDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSdInsertPagesObjsDlg_Impl); IMPL_ABSTDLG_BASE(AbstractMorphDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSdStartPresDlg_Impl); -IMPL_ABSTDLG_BASE(AbstractSdPrintDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSdPresLayoutDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSfxDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSdVectorizeDlg_Impl); @@ -268,9 +266,9 @@ void AbstractSdInsertLayerDlg_Impl::GetAttr( SfxItemSet& rOutAttrs ) { pDlg->GetAttr( rOutAttrs ); } -void AbstractSdInsertLayerDlg_Impl::SetHelpId( ULONG nHelpId ) +void AbstractSdInsertLayerDlg_Impl::SetHelpId( const rtl::OString& rHelpId ) { - pDlg->SetHelpId( nHelpId ); + pDlg->SetHelpId( rHelpId ); } // AbstractSdInsertLayerDlg_Impl end @@ -326,13 +324,6 @@ void AbstractSdStartPresDlg_Impl::GetAttr( SfxItemSet& rOutAttrs ) } // AbstractSdStartPresDlg_Impl end -//AbstractSdPrintDlg_Impl begin -USHORT AbstractSdPrintDlg_Impl::GetAttr() -{ - return pDlg->GetAttr(); -} -// AbstractSdPrintDlg_Impl end - //AbstractSdPresLayoutDlg_Impl begin void AbstractSdPresLayoutDlg_Impl::GetAttr( SfxItemSet& rOutAttrs ) { @@ -498,13 +489,6 @@ AbstractSdStartPresDlg * SdAbstractDialogFactory_Impl::CreateSdStartPresentatio } // add for SdStartPresentationDlg end -// add for SdPrintDlg begin -AbstractSdPrintDlg * SdAbstractDialogFactory_Impl::CreateSdPrintDlg( ::Window* pWindow ) -{ - return new AbstractSdPrintDlg_Impl( new SdPrintDlg( pWindow ) ); -} -// add for SdPrintDlg end - // add for SdPresLayoutTemplateDlg begin SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) { diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index 44f5b0813a04..a8c1de96de62 100644..100755 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -169,7 +169,7 @@ class AbstractSdInsertLayerDlg_Impl : public AbstractSdInsertLayerDlg DECL_ABSTDLG_BASE(AbstractSdInsertLayerDlg_Impl,SdInsertLayerDlg) virtual void GetAttr( SfxItemSet& rOutAttrs ) ; //from class Window - virtual void SetHelpId( ULONG nHelpId ) ; + virtual void SetHelpId( const rtl::OString& rHelpId ) ; }; // add for SdInsertPasteDlg @@ -209,14 +209,6 @@ class AbstractSdStartPresDlg_Impl : public AbstractSdStartPresDlg virtual void GetAttr( SfxItemSet& rOutAttrs ); }; -// add for SdPrintDlg -class SdPrintDlg; -class AbstractSdPrintDlg_Impl : public AbstractSdPrintDlg -{ - DECL_ABSTDLG_BASE(AbstractSdPrintDlg_Impl,SdPrintDlg) - virtual USHORT GetAttr(); -}; - // add for SdPresLayoutDlg class SdPresLayoutDlg; class AbstractSdPresLayoutDlg_Impl : public AbstractSdPresLayoutDlg @@ -281,7 +273,6 @@ public: virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg ( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = NULL ); virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg ( ::Window* pParent, const SfxItemSet* pAttr ); virtual AbstractSdStartPresDlg* CreateSdStartPresentationDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, List& rPageNames, List* pCSList ); - virtual AbstractSdPrintDlg* CreateSdPrintDlg( ::Window* pWindow ); //add for SdPrintDlg virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ); virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::sd::ViewShell* pViewShell, ::Window* pWindow, const SfxItemSet& rInAttrs); virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ); diff --git a/sd/source/ui/dlg/sdpreslt.src b/sd/source/ui/dlg/sdpreslt.src index 3aad51674a46..f77132642b8a 100644..100755 --- a/sd/source/ui/dlg/sdpreslt.src +++ b/sd/source/ui/dlg/sdpreslt.src @@ -27,9 +27,11 @@ #include "app.hrc" #include "sdpreslt.hrc" +#include "sdcommands.h" + ModalDialog DLG_PRESLT { - HelpID = SID_PRESENTATION_LAYOUT ; + HelpID = CMD_SID_PRESENTATION_LAYOUT ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 212 , 185 ) ; @@ -64,6 +66,7 @@ ModalDialog DLG_PRESLT }; CheckBox CBX_MASTER_PAGE { + HelpID = "sd:CheckBox:DLG_PRESLT:CBX_MASTER_PAGE"; Pos = MAP_APPFONT ( 6 , 158 ) ; Size = MAP_APPFONT ( 120 , 12 ) ; TabStop = TRUE ; @@ -71,6 +74,7 @@ ModalDialog DLG_PRESLT }; CheckBox CBX_CHECK_MASTERS { + HelpID = "sd:CheckBox:DLG_PRESLT:CBX_CHECK_MASTERS"; Pos = MAP_APPFONT ( 6 , 170 ) ; Size = MAP_APPFONT ( 140 , 12 ) ; TabStop = TRUE ; @@ -78,6 +82,7 @@ ModalDialog DLG_PRESLT }; PushButton BTN_LOAD { + HelpID = "sd:PushButton:DLG_PRESLT:BTN_LOAD"; Pos = MAP_APPFONT ( 156 , 155 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 275d39af4ea5..c0a72d539add 100755 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -258,10 +258,11 @@ SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId ) { // Tree-ListBox mit Linien versehen - SetWindowBits( WinBits( WB_TABSTOP | WB_BORDER | WB_HASLINES | - WB_HASBUTTONS | // WB_HASLINESATROOT | - WB_HSCROLL | // #31562# - WB_HASBUTTONSATROOT ) ); + SetStyle( GetStyle() | WB_TABSTOP | WB_BORDER | WB_HASLINES | + WB_HASBUTTONS | // WB_HASLINESATROOT | + WB_HSCROLL | // #31562# + WB_HASBUTTONSATROOT | + WB_QUICK_SEARCH /* i31275 */ ); SetNodeBitmaps( Bitmap( SdResId( BMP_EXPAND ) ), Bitmap( SdResId( BMP_COLLAPSE ) ) ); diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index af2668fc9dad..c7404b820ed7 100755 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -46,7 +46,7 @@ #include <com/sun/star/embed/VerbAttributes.hpp> #include "sdattr.hxx" - +#include <sfx2/sfxresid.hxx> #include <vcl/waitobj.hxx> #include <osl/file.hxx> @@ -489,7 +489,7 @@ void SdTPAction::OpenFileDialog() // filter makes the (Windows system) open file dialog follow // links on the desktop to directories. aFileDialog.AddFilter ( - String (SdResId (STR_SFX_FILTERNAME_ALL)), + String (SfxResId (STR_SFX_FILTERNAME_ALL)), String (RTL_CONSTASCII_USTRINGPARAM("*.*"))); diff --git a/sd/source/ui/dlg/tpaction.src b/sd/source/ui/dlg/tpaction.src index fa951644c580..a567afebdf5c 100644..100755 --- a/sd/source/ui/dlg/tpaction.src +++ b/sd/source/ui/dlg/tpaction.src @@ -32,7 +32,7 @@ TabPage TP_ANIMATION { - HelpID = SID_ANIMATION_EFFECTS ; + HelpID = CMD_SID_ANIMATION_EFFECTS ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( 260 , 164 ) ; Hide = TRUE; @@ -48,6 +48,7 @@ TabPage TP_ANIMATION }; ListBox LB_ACTION { + HelpID = "sd:ListBox:TP_ANIMATION:LB_ACTION"; Border = TRUE ; Pos = MAP_APPFONT ( MA_ACTIONLB_LEFT , MA_ACTIONLB_TOP ) ; Size = MAP_APPFONT ( 150 - RSC_SP_GRP_INNERBORDER_RIGHT , 79 ) ; @@ -66,6 +67,7 @@ TabPage TP_ANIMATION Edit EDT_SOUND { + HelpID = "sd:Edit:TP_ANIMATION:EDT_SOUND"; Border = TRUE ; Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + RSC_SP_CHK_TEXTINDENT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + RSC_SP_CHK_TEXTINDENT) , 12 ) ; @@ -77,6 +79,7 @@ TabPage TP_ANIMATION // schiedlich heissen, da sie eben auch eine unterschiedliche Bedeutung haben PushButton BTN_SEARCH { + HelpID = "sd:PushButton:TP_ANIMATION:BTN_SEARCH"; Pos = MAP_APPFONT ( 247 - 65, MA_Y4 + RSC_CD_CHECKBOX_HEIGHT ) ; Size = MAP_APPFONT ( 65 , 14 ) ; TabStop = TRUE ; @@ -112,6 +115,7 @@ TabPage TP_ANIMATION }; ListBox LB_OLE_ACTION { + HelpID = "sd:ListBox:TP_ANIMATION:LB_OLE_ACTION"; Border = TRUE ; Pos = MAP_APPFONT ( MA_ACTIONLB_LEFT, MA_Y0 + 3 ) ; Size = MAP_APPFONT ( 150 - RSC_SP_GRP_INNERBORDER_RIGHT , 77 ) ; @@ -126,6 +130,7 @@ TabPage TP_ANIMATION }; Edit EDT_BOOKMARK { + HelpID = "sd:Edit:TP_ANIMATION:EDT_BOOKMARK"; Border = TRUE ; Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) , 12 ) ; @@ -134,6 +139,7 @@ TabPage TP_ANIMATION }; Edit EDT_DOCUMENT { + HelpID = "sd:Edit:TP_ANIMATION:EDT_DOCUMENT"; Border = TRUE ; Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) , 12 ) ; @@ -142,6 +148,7 @@ TabPage TP_ANIMATION }; Edit EDT_PROGRAM { + HelpID = "sd:Edit:TP_ANIMATION:EDT_PROGRAM"; Border = TRUE ; Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) , 12 ) ; @@ -150,6 +157,7 @@ TabPage TP_ANIMATION }; Edit EDT_MACRO { + HelpID = "sd:Edit:TP_ANIMATION:EDT_MACRO"; Border = TRUE ; Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) , 12 ) ; @@ -158,6 +166,7 @@ TabPage TP_ANIMATION }; PushButton BTN_SEEK { + HelpID = "sd:PushButton:TP_ANIMATION:BTN_SEEK"; Pos = MAP_APPFONT ( 247 - 65, MA_Y4 + RSC_CD_CHECKBOX_HEIGHT ) ; Size = MAP_APPFONT ( 65 , 14 ) ; TabStop = TRUE ; diff --git a/sd/source/ui/dlg/tpoption.src b/sd/source/ui/dlg/tpoption.src index 96149d4e6a1f..14db5a6a7635 100644..100755 --- a/sd/source/ui/dlg/tpoption.src +++ b/sd/source/ui/dlg/tpoption.src @@ -45,29 +45,33 @@ TabPage TP_OPTIONS_CONTENTS }; CheckBox CBX_RULER { + HelpID = "sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_RULER"; Pos = MAP_APPFONT ( 12 , 83 - 69 ) ; - Size = MAP_APPFONT ( 134 , 10 ) ; + Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; Text [ en-US ] = "~Rulers visible" ; }; CheckBox CBX_HELPLINES { + HelpID = "sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_HELPLINES"; Pos = MAP_APPFONT ( 12 , 97 - 69 ) ; - Size = MAP_APPFONT ( 134 , 10 ) ; + Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; Text [ en-US ] = "~Guides when moving" ; }; CheckBox CBX_HANDLES_BEZIER { + HelpID = "sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_HANDLES_BEZIER"; Pos = MAP_APPFONT ( 12 , 111 - 69 ) ; - Size = MAP_APPFONT ( 134 , 10 ) ; + Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; Text [ en-US ] = "~All control points in Bézier editor" ; }; CheckBox CBX_MOVE_OUTLINE { + HelpID = "sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_MOVE_OUTLINE"; Pos = MAP_APPFONT ( 12 , 125 - 69 ) ; - Size = MAP_APPFONT ( 134 , 10 ) ; + Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; Text [ en-US ] = "~Contour of each individual object" ; }; @@ -87,6 +91,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_QUICKEDIT { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_QUICKEDIT"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 116 , 10 ) ; TabStop = TRUE ; @@ -94,6 +99,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_PICKTHROUGH { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_PICKTHROUGH"; Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 116 , 10 ) ; TabStop = TRUE ; @@ -107,6 +113,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_START_WITH_TEMPLATE { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_START_WITH_TEMPLATE"; Pos = MAP_APPFONT ( 12 , 53 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -120,6 +127,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_MASTERPAGE_CACHE { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_MASTERPAGE_CACHE"; Pos = MAP_APPFONT ( 12 , 80 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -127,6 +135,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_COPY { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_COPY"; Pos = MAP_APPFONT ( 12 , 93 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -134,6 +143,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_MARKED_HIT_MOVES_ALWAYS { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_MARKED_HIT_MOVES_ALWAYS"; Pos = MAP_APPFONT ( 12 , 106 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -141,6 +151,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_CROOK_NO_CONTORTION { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_CROOK_NO_CONTORTION"; Pos = MAP_APPFONT ( 12 , 119 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -155,6 +166,7 @@ TabPage TP_OPTIONS_MISC }; ListBox LB_METRIC { + HelpID = "sd:ListBox:TP_OPTIONS_MISC:LB_METRIC"; Border = TRUE ; Pos = MAP_APPFONT ( 75 , 117 ) ; Size = MAP_APPFONT ( 50 , 50 ) ; @@ -169,6 +181,7 @@ TabPage TP_OPTIONS_MISC }; MetricField MTR_FLD_TABSTOP { + HelpID = "sd:MetricField:TP_OPTIONS_MISC:MTR_FLD_TABSTOP"; Border = TRUE ; Pos = MAP_APPFONT ( 206 , 117 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -192,6 +205,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_START_WITH_ACTUAL_PAGE { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_START_WITH_ACTUAL_PAGE"; Pos = MAP_APPFONT ( 12 , 145 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -205,6 +219,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CB_USE_PRINTER_METRICS { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CB_USE_PRINTER_METRICS"; // This checkbox and the following one will change places when this // one is wired in into the dialog. At the moment exists only for // translation to work on. @@ -214,6 +229,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CB_MERGE_PARA_DIST { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CB_MERGE_PARA_DIST"; Pos = MAP_APPFONT ( 12 , 171 ) ; Size = MAP_APPFONT ( 242, 10 ) ; Text [ en-US ] = "Add ~spacing between paragraphs and tables (in current document)"; @@ -248,6 +264,7 @@ TabPage TP_OPTIONS_MISC }; ComboBox CB_SCALE { + HelpID = "sd:ComboBox:TP_OPTIONS_MISC:CB_SCALE"; Hide = TRUE; Pos = MAP_APPFONT ( 72 , 147 ) ; Size = MAP_APPFONT ( 30 , 70 ) ; @@ -269,6 +286,7 @@ TabPage TP_OPTIONS_MISC }; MetricField MTR_FLD_ORIGINAL_WIDTH { + HelpID = "sd:MetricField:TP_OPTIONS_MISC:MTR_FLD_ORIGINAL_WIDTH"; Hide = TRUE; Border = TRUE ; Pos = MAP_APPFONT ( 206 , 147 ) ; @@ -300,6 +318,7 @@ TabPage TP_OPTIONS_MISC }; MetricField MTR_FLD_ORIGINAL_HEIGHT { + HelpID = "sd:MetricField:TP_OPTIONS_MISC:MTR_FLD_ORIGINAL_HEIGHT"; Hide = TRUE; Border = TRUE ; Pos = MAP_APPFONT ( 206 , 163 ) ; diff --git a/sd/source/ui/dlg/vectdlg.src b/sd/source/ui/dlg/vectdlg.src index 53b77ad49eab..f66ba0a9454c 100644..100755 --- a/sd/source/ui/dlg/vectdlg.src +++ b/sd/source/ui/dlg/vectdlg.src @@ -28,6 +28,7 @@ #include "app.hrc" #include "vectdlg.hrc" +#include "helpids.h" /****************************************************************************** |* @@ -37,7 +38,7 @@ ModalDialog DLG_VECTORIZE { - HelpID = SID_VECTORIZE; + HelpID = HID_VECTORIZE_DLG; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 200, 237 ) ; @@ -70,6 +71,7 @@ ModalDialog DLG_VECTORIZE PushButton BTN_PREVIEW { + HelpID = "sd:PushButton:DLG_VECTORIZE:BTN_PREVIEW"; Pos = MAP_APPFONT ( 144 , 63 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -92,6 +94,7 @@ ModalDialog DLG_VECTORIZE NumericField NM_LAYERS { + HelpID = "sd:NumericField:DLG_VECTORIZE:NM_LAYERS"; Border = TRUE ; Pos = MAP_APPFONT ( 92 , 14 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -115,6 +118,7 @@ ModalDialog DLG_VECTORIZE MetricField MT_REDUCE { + HelpID = "sd:MetricField:DLG_VECTORIZE:MT_REDUCE"; Border = TRUE ; Pos = MAP_APPFONT ( 92 , 29 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -133,6 +137,7 @@ ModalDialog DLG_VECTORIZE CheckBox CB_FILLHOLES { + HelpID = "sd:CheckBox:DLG_VECTORIZE:CB_FILLHOLES"; Pos = MAP_APPFONT ( 12 , 44 ) ; Size = MAP_APPFONT ( 79 , 12 ) ; TabStop = TRUE ; @@ -148,6 +153,7 @@ ModalDialog DLG_VECTORIZE MetricField MT_FILLHOLES { + HelpID = "sd:MetricField:DLG_VECTORIZE:MT_FILLHOLES"; Border = TRUE ; Pos = MAP_APPFONT ( 92 , 59 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; |