Kaydet (Commit) 4e5fb3ae authored tarafından Christian M. Heller's avatar Christian M. Heller Kaydeden (comit) Caolán McNamara

fdo#39468 Translate German Comments - vcl/source/window/floatwin.cxx

Conflicts:
	vcl/source/window/floatwin.cxx

Change-Id: I5cf91515e088f7f7bb766089c0812b023ecb3bdd
Reviewed-on: https://gerrit.libreoffice.org/8172Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 99f92d7f
...@@ -34,8 +34,6 @@ ...@@ -34,8 +34,6 @@
#include <tools/debug.hxx> #include <tools/debug.hxx>
// =======================================================================
class FloatingWindow::ImplData class FloatingWindow::ImplData
{ {
public: public:
...@@ -60,7 +58,6 @@ Rectangle& FloatingWindow::ImplGetItemEdgeClipRect() ...@@ -60,7 +58,6 @@ Rectangle& FloatingWindow::ImplGetItemEdgeClipRect()
return mpImplData->maItemEdgeClipRect; return mpImplData->maItemEdgeClipRect;
} }
// =======================================================================
void FloatingWindow::ImplInit( Window* pParent, WinBits nStyle ) void FloatingWindow::ImplInit( Window* pParent, WinBits nStyle )
{ {
...@@ -138,8 +135,6 @@ void FloatingWindow::ImplInit( Window* pParent, WinBits nStyle ) ...@@ -138,8 +135,6 @@ void FloatingWindow::ImplInit( Window* pParent, WinBits nStyle )
ImplInitSettings(); ImplInitSettings();
} }
void FloatingWindow::ImplInitSettings() void FloatingWindow::ImplInitSettings()
{ {
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
...@@ -154,7 +149,6 @@ void FloatingWindow::ImplInitSettings() ...@@ -154,7 +149,6 @@ void FloatingWindow::ImplInitSettings()
SetBackground( aColor ); SetBackground( aColor );
} }
// =======================================================================
FloatingWindow::FloatingWindow( Window* pParent, WinBits nStyle ) : FloatingWindow::FloatingWindow( Window* pParent, WinBits nStyle ) :
SystemWindow( WINDOW_FLOATINGWINDOW ) SystemWindow( WINDOW_FLOATINGWINDOW )
...@@ -162,8 +156,6 @@ FloatingWindow::FloatingWindow( Window* pParent, WinBits nStyle ) : ...@@ -162,8 +156,6 @@ FloatingWindow::FloatingWindow( Window* pParent, WinBits nStyle ) :
ImplInit( pParent, nStyle ); ImplInit( pParent, nStyle );
} }
FloatingWindow::FloatingWindow( Window* pParent, const ResId& rResId ) : FloatingWindow::FloatingWindow( Window* pParent, const ResId& rResId ) :
SystemWindow( WINDOW_FLOATINGWINDOW ) SystemWindow( WINDOW_FLOATINGWINDOW )
{ {
...@@ -176,8 +168,6 @@ FloatingWindow::FloatingWindow( Window* pParent, const ResId& rResId ) : ...@@ -176,8 +168,6 @@ FloatingWindow::FloatingWindow( Window* pParent, const ResId& rResId ) :
Show(); Show();
} }
void FloatingWindow::ImplLoadRes( const ResId& rResId ) void FloatingWindow::ImplLoadRes( const ResId& rResId )
{ {
SystemWindow::ImplLoadRes( rResId ); SystemWindow::ImplLoadRes( rResId );
...@@ -187,7 +177,7 @@ void FloatingWindow::ImplLoadRes( const ResId& rResId ) ...@@ -187,7 +177,7 @@ void FloatingWindow::ImplLoadRes( const ResId& rResId )
if ( (RSC_FLOATINGWINDOW_WHMAPMODE | RSC_FLOATINGWINDOW_WIDTH | if ( (RSC_FLOATINGWINDOW_WHMAPMODE | RSC_FLOATINGWINDOW_WIDTH |
RSC_FLOATINGWINDOW_HEIGHT) & nObjMask ) RSC_FLOATINGWINDOW_HEIGHT) & nObjMask )
{ {
// Groessenangabe aus der Resource verwenden // use Sizes from the Resource
Size aSize; Size aSize;
MapUnit eSizeMap = MAP_PIXEL; MapUnit eSizeMap = MAP_PIXEL;
...@@ -208,8 +198,6 @@ void FloatingWindow::ImplLoadRes( const ResId& rResId ) ...@@ -208,8 +198,6 @@ void FloatingWindow::ImplLoadRes( const ResId& rResId )
} }
} }
FloatingWindow::~FloatingWindow() FloatingWindow::~FloatingWindow()
{ {
if( mbPopupModeCanceled ) if( mbPopupModeCanceled )
...@@ -226,20 +214,16 @@ FloatingWindow::~FloatingWindow() ...@@ -226,20 +214,16 @@ FloatingWindow::~FloatingWindow()
delete mpImplData; delete mpImplData;
} }
Point FloatingWindow::CalcFloatingPosition( Window* pWindow, const Rectangle& rRect, sal_uLong nFlags, sal_uInt16& rArrangeIndex ) Point FloatingWindow::CalcFloatingPosition( Window* pWindow, const Rectangle& rRect, sal_uLong nFlags, sal_uInt16& rArrangeIndex )
{ {
return ImplCalcPos( pWindow, rRect, nFlags, rArrangeIndex ); return ImplCalcPos( pWindow, rRect, nFlags, rArrangeIndex );
} }
Point FloatingWindow::ImplCalcPos( Window* pWindow, Point FloatingWindow::ImplCalcPos( Window* pWindow,
const Rectangle& rRect, sal_uLong nFlags, const Rectangle& rRect, sal_uLong nFlags,
sal_uInt16& rArrangeIndex ) sal_uInt16& rArrangeIndex )
{ {
// Fenster-Position ermitteln // get window position
Point aPos; Point aPos;
Size aSize = pWindow->GetSizePixel(); Size aSize = pWindow->GetSizePixel();
Rectangle aScreenRect = pWindow->ImplGetFrameWindow()->GetDesktopRectPixel(); Rectangle aScreenRect = pWindow->ImplGetFrameWindow()->GetDesktopRectPixel();
...@@ -397,7 +381,7 @@ Point FloatingWindow::ImplCalcPos( Window* pWindow, ...@@ -397,7 +381,7 @@ Point FloatingWindow::ImplCalcPos( Window* pWindow,
break; break;
} }
// Evt. noch anpassen // adjust if necessary
if ( bBreak && !(nFlags & FLOATWIN_POPUPMODE_NOAUTOARRANGE) ) if ( bBreak && !(nFlags & FLOATWIN_POPUPMODE_NOAUTOARRANGE) )
{ {
if ( (nArrangeAry[nArrangeIndex] == FLOATWIN_POPUPMODE_LEFT) || if ( (nArrangeAry[nArrangeIndex] == FLOATWIN_POPUPMODE_LEFT) ||
...@@ -447,8 +431,6 @@ Point FloatingWindow::ImplCalcPos( Window* pWindow, ...@@ -447,8 +431,6 @@ Point FloatingWindow::ImplCalcPos( Window* pWindow,
return pW->OutputToScreenPixel( aPos ); return pW->OutputToScreenPixel( aPos );
} }
FloatingWindow* FloatingWindow::ImplFloatHitTest( Window* pReference, const Point& rPos, sal_uInt16& rHitTest ) FloatingWindow* FloatingWindow::ImplFloatHitTest( Window* pReference, const Point& rPos, sal_uInt16& rHitTest )
{ {
FloatingWindow* pWin = this; FloatingWindow* pWin = this;
...@@ -505,8 +487,6 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest( Window* pReference, const Poin ...@@ -505,8 +487,6 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest( Window* pReference, const Poin
return NULL; return NULL;
} }
FloatingWindow* FloatingWindow::ImplFindLastLevelFloat() FloatingWindow* FloatingWindow::ImplFindLastLevelFloat()
{ {
FloatingWindow* pWin = this; FloatingWindow* pWin = this;
...@@ -524,8 +504,6 @@ FloatingWindow* FloatingWindow::ImplFindLastLevelFloat() ...@@ -524,8 +504,6 @@ FloatingWindow* FloatingWindow::ImplFindLastLevelFloat()
return pLastFoundWin; return pLastFoundWin;
} }
bool FloatingWindow::ImplIsFloatPopupModeWindow( const Window* pWindow ) bool FloatingWindow::ImplIsFloatPopupModeWindow( const Window* pWindow )
{ {
FloatingWindow* pWin = this; FloatingWindow* pWin = this;
...@@ -542,8 +520,6 @@ bool FloatingWindow::ImplIsFloatPopupModeWindow( const Window* pWindow ) ...@@ -542,8 +520,6 @@ bool FloatingWindow::ImplIsFloatPopupModeWindow( const Window* pWindow )
return false; return false;
} }
IMPL_LINK_NOARG(FloatingWindow, ImplEndPopupModeHdl) IMPL_LINK_NOARG(FloatingWindow, ImplEndPopupModeHdl)
{ {
mnPostId = 0; mnPostId = 0;
...@@ -553,11 +529,9 @@ IMPL_LINK_NOARG(FloatingWindow, ImplEndPopupModeHdl) ...@@ -553,11 +529,9 @@ IMPL_LINK_NOARG(FloatingWindow, ImplEndPopupModeHdl)
return 0; return 0;
} }
bool FloatingWindow::Notify( NotifyEvent& rNEvt ) bool FloatingWindow::Notify( NotifyEvent& rNEvt )
{ {
// Zuerst Basisklasse rufen wegen TabSteuerung // call Base Class first for tab control
bool nRet = SystemWindow::Notify( rNEvt ); bool nRet = SystemWindow::Notify( rNEvt );
if ( !nRet ) if ( !nRet )
{ {
...@@ -578,8 +552,6 @@ bool FloatingWindow::Notify( NotifyEvent& rNEvt ) ...@@ -578,8 +552,6 @@ bool FloatingWindow::Notify( NotifyEvent& rNEvt )
return nRet; return nRet;
} }
void FloatingWindow::StateChanged( StateChangedType nType ) void FloatingWindow::StateChanged( StateChangedType nType )
{ {
SystemWindow::StateChanged( nType ); SystemWindow::StateChanged( nType );
...@@ -591,8 +563,6 @@ void FloatingWindow::StateChanged( StateChangedType nType ) ...@@ -591,8 +563,6 @@ void FloatingWindow::StateChanged( StateChangedType nType )
} }
} }
void FloatingWindow::DataChanged( const DataChangedEvent& rDCEvt ) void FloatingWindow::DataChanged( const DataChangedEvent& rDCEvt )
{ {
SystemWindow::DataChanged( rDCEvt ); SystemWindow::DataChanged( rDCEvt );
...@@ -605,27 +575,21 @@ void FloatingWindow::DataChanged( const DataChangedEvent& rDCEvt ) ...@@ -605,27 +575,21 @@ void FloatingWindow::DataChanged( const DataChangedEvent& rDCEvt )
} }
} }
void FloatingWindow::ImplCallPopupModeEnd() void FloatingWindow::ImplCallPopupModeEnd()
{ {
// PopupMode wurde beendet // PopupMode is finished
mbInPopupMode = false; mbInPopupMode = false;
// Handler asyncron rufen // call Handler asyncron.
if ( !mnPostId ) if ( !mnPostId )
Application::PostUserEvent( mnPostId, LINK( this, FloatingWindow, ImplEndPopupModeHdl ) ); Application::PostUserEvent( mnPostId, LINK( this, FloatingWindow, ImplEndPopupModeHdl ) );
} }
void FloatingWindow::PopupModeEnd() void FloatingWindow::PopupModeEnd()
{ {
maPopupModeEndHdl.Call( this ); maPopupModeEndHdl.Call( this );
} }
void FloatingWindow::SetTitleType( sal_uInt16 nTitle ) void FloatingWindow::SetTitleType( sal_uInt16 nTitle )
{ {
if ( (mnTitle != nTitle) && mpWindowImpl->mpBorderWindow ) if ( (mnTitle != nTitle) && mpWindowImpl->mpBorderWindow )
...@@ -646,8 +610,6 @@ void FloatingWindow::SetTitleType( sal_uInt16 nTitle ) ...@@ -646,8 +610,6 @@ void FloatingWindow::SetTitleType( sal_uInt16 nTitle )
} }
} }
void FloatingWindow::StartPopupMode( const Rectangle& rRect, sal_uLong nFlags ) void FloatingWindow::StartPopupMode( const Rectangle& rRect, sal_uLong nFlags )
{ {
// avoid flickering // avoid flickering
...@@ -729,8 +691,6 @@ void FloatingWindow::StartPopupMode( const Rectangle& rRect, sal_uLong nFlags ) ...@@ -729,8 +691,6 @@ void FloatingWindow::StartPopupMode( const Rectangle& rRect, sal_uLong nFlags )
Show( true, SHOW_NOACTIVATE ); Show( true, SHOW_NOACTIVATE );
} }
void FloatingWindow::StartPopupMode( ToolBox* pBox, sal_uLong nFlags ) void FloatingWindow::StartPopupMode( ToolBox* pBox, sal_uLong nFlags )
{ {
// get selected button // get selected button
...@@ -761,7 +721,7 @@ void FloatingWindow::StartPopupMode( ToolBox* pBox, sal_uLong nFlags ) ...@@ -761,7 +721,7 @@ void FloatingWindow::StartPopupMode( ToolBox* pBox, sal_uLong nFlags )
* don't set since it disables closing floaters with escape * don't set since it disables closing floaters with escape
*/ */
// Flags fuer Positionierung bestimmen // set Flags for positioning
if ( !(nFlags & (FLOATWIN_POPUPMODE_DOWN | FLOATWIN_POPUPMODE_UP | if ( !(nFlags & (FLOATWIN_POPUPMODE_DOWN | FLOATWIN_POPUPMODE_UP |
FLOATWIN_POPUPMODE_LEFT | FLOATWIN_POPUPMODE_RIGHT | FLOATWIN_POPUPMODE_LEFT | FLOATWIN_POPUPMODE_RIGHT |
FLOATWIN_POPUPMODE_NOAUTOARRANGE)) ) FLOATWIN_POPUPMODE_NOAUTOARRANGE)) )
...@@ -772,12 +732,10 @@ void FloatingWindow::StartPopupMode( ToolBox* pBox, sal_uLong nFlags ) ...@@ -772,12 +732,10 @@ void FloatingWindow::StartPopupMode( ToolBox* pBox, sal_uLong nFlags )
nFlags |= FLOATWIN_POPUPMODE_RIGHT; nFlags |= FLOATWIN_POPUPMODE_RIGHT;
} }
// FloatingModus starten // start FloatingMode
StartPopupMode( aRect, nFlags ); StartPopupMode( aRect, nFlags );
} }
void FloatingWindow::ImplEndPopupMode( sal_uInt16 nFlags, sal_uLong nFocusId ) void FloatingWindow::ImplEndPopupMode( sal_uInt16 nFlags, sal_uLong nFocusId )
{ {
if ( !mbInPopupMode ) if ( !mbInPopupMode )
...@@ -787,24 +745,24 @@ void FloatingWindow::ImplEndPopupMode( sal_uInt16 nFlags, sal_uLong nFocusId ) ...@@ -787,24 +745,24 @@ void FloatingWindow::ImplEndPopupMode( sal_uInt16 nFlags, sal_uLong nFocusId )
mbInCleanUp = true; // prevent killing this window due to focus change while working with it mbInCleanUp = true; // prevent killing this window due to focus change while working with it
// Bei allen nachfolgenden PopupMode-Fenster den Modus auch beenden // stop the PopupMode also for all following PopupMode windows
while ( pSVData->maWinData.mpFirstFloat && pSVData->maWinData.mpFirstFloat != this ) while ( pSVData->maWinData.mpFirstFloat && pSVData->maWinData.mpFirstFloat != this )
pSVData->maWinData.mpFirstFloat->EndPopupMode( FLOATWIN_POPUPMODEEND_CANCEL ); pSVData->maWinData.mpFirstFloat->EndPopupMode( FLOATWIN_POPUPMODEEND_CANCEL );
// Fenster aus der Liste austragen // delete window from the list
pSVData->maWinData.mpFirstFloat = mpNextFloat; pSVData->maWinData.mpFirstFloat = mpNextFloat;
mpNextFloat = NULL; mpNextFloat = NULL;
sal_uLong nPopupModeFlags = mnPopupModeFlags; sal_uLong nPopupModeFlags = mnPopupModeFlags;
// Wenn nicht abgerissen wurde, dann Fenster wieder Hiden // hide window again if it was not deleted
if ( !(nFlags & FLOATWIN_POPUPMODEEND_TEAROFF) || if ( !(nFlags & FLOATWIN_POPUPMODEEND_TEAROFF) ||
!(nPopupModeFlags & FLOATWIN_POPUPMODE_ALLOWTEAROFF) ) !(nPopupModeFlags & FLOATWIN_POPUPMODE_ALLOWTEAROFF) )
{ {
Show( false, SHOW_NOFOCUSCHANGE ); Show( false, SHOW_NOFOCUSCHANGE );
// Focus evt. auf ein entsprechendes FloatingWindow weiterschalten // maybe pass focus on to a suitable FloatingWindow
if ( nFocusId ) if ( nFocusId )
Window::EndSaveFocus( nFocusId ); Window::EndSaveFocus( nFocusId );
else if ( pSVData->maWinData.mpFocusWin && pSVData->maWinData.mpFirstFloat && else if ( pSVData->maWinData.mpFocusWin && pSVData->maWinData.mpFirstFloat &&
...@@ -822,21 +780,21 @@ void FloatingWindow::ImplEndPopupMode( sal_uInt16 nFlags, sal_uLong nFocusId ) ...@@ -822,21 +780,21 @@ void FloatingWindow::ImplEndPopupMode( sal_uInt16 nFlags, sal_uLong nFocusId )
mbPopupModeCanceled = (nFlags & FLOATWIN_POPUPMODEEND_CANCEL) != 0; mbPopupModeCanceled = (nFlags & FLOATWIN_POPUPMODEEND_CANCEL) != 0;
// Gegebenenfalls den Title wieder herstellen // redo title
SetTitleType( mnOldTitle ); SetTitleType( mnOldTitle );
// ToolBox wieder auf normal schalten // set ToolBox again to normal
if ( mpImplData->mpBox ) if ( mpImplData->mpBox )
{ {
mpImplData->mpBox->ImplFloatControl( false, this ); mpImplData->mpBox->ImplFloatControl( false, this );
mpImplData->mpBox = NULL; mpImplData->mpBox = NULL;
} }
// Je nach Parameter den PopupModeEnd-Handler rufen // call PopupModeEnd-Handler depending on parameter
if ( !(nFlags & FLOATWIN_POPUPMODEEND_DONTCALLHDL) ) if ( !(nFlags & FLOATWIN_POPUPMODEEND_DONTCALLHDL) )
ImplCallPopupModeEnd(); ImplCallPopupModeEnd();
// Je nach Parameter die restlichen Fenster auch noch schliessen // close all other windows depending on parameter
if ( nFlags & FLOATWIN_POPUPMODEEND_CLOSEALL ) if ( nFlags & FLOATWIN_POPUPMODEEND_CLOSEALL )
{ {
if ( !(nPopupModeFlags & FLOATWIN_POPUPMODE_NEWLEVEL) ) if ( !(nPopupModeFlags & FLOATWIN_POPUPMODE_NEWLEVEL) )
...@@ -852,18 +810,14 @@ void FloatingWindow::ImplEndPopupMode( sal_uInt16 nFlags, sal_uLong nFocusId ) ...@@ -852,18 +810,14 @@ void FloatingWindow::ImplEndPopupMode( sal_uInt16 nFlags, sal_uLong nFocusId )
mbInCleanUp = false; mbInCleanUp = false;
} }
void FloatingWindow::EndPopupMode( sal_uInt16 nFlags ) void FloatingWindow::EndPopupMode( sal_uInt16 nFlags )
{ {
ImplEndPopupMode( nFlags ); ImplEndPopupMode( nFlags );
} }
void FloatingWindow::AddPopupModeWindow( Window* pWindow ) void FloatingWindow::AddPopupModeWindow( Window* pWindow )
{ {
// !!! bisher erst 1 Fenster und noch keine Liste // !!! up-to-now only 1 window and not yet a list
mpFirstPopupModeWin = pWindow; mpFirstPopupModeWin = pWindow;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment