[Libreoffice-commits] core.git: vcl/source
Christian M. Heller
christian.heller63 at gmail.com
Tue Feb 25 13:18:59 PST 2014
vcl/source/window/dockmgr.cxx | 93 +++---------------------------------------
1 file changed, 7 insertions(+), 86 deletions(-)
New commits:
commit d5688e16e72aea26b2bf281efc71e9fadf74944c
Author: Christian M. Heller <christian.heller63 at gmail.com>
Date: Sat Feb 22 07:46:15 2014 -0500
fdo#39468 Translate German Comments - vcl/source/window/dockmgr.cxx
Conflicts:
vcl/source/window/dockmgr.cxx
Change-Id: I0af8a95eab8b05752bb4497295d26b717021d3fd
Reviewed-on: https://gerrit.libreoffice.org/8169
Tested-by: Caolán McNamara <caolanm at redhat.com>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 0e80b6d..fc865cd 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -37,14 +37,8 @@
#include <vcl/settings.hxx>
-// =======================================================================
-
#define DOCKWIN_FLOATSTYLES (WB_SIZEABLE | WB_MOVEABLE | WB_CLOSEABLE | WB_STANDALONE | WB_PINABLE | WB_ROLLABLE )
-// =======================================================================
-
-
-// =======================================================================
class ImplDockFloatWin2 : public FloatingWindow
{
@@ -81,7 +75,6 @@ public:
sal_uLong GetLastTicks() const { return mnLastTicks; }
};
-// =======================================================================
ImplDockFloatWin2::ImplDockFloatWin2( Window* pParent, WinBits nWinBits,
ImplDockingWindowWrapper* pDockingWin ) :
@@ -91,7 +84,7 @@ ImplDockFloatWin2::ImplDockFloatWin2( Window* pParent, WinBits nWinBits,
mbInMove( false ),
mnLastUserEvent( 0 )
{
- // Daten vom DockingWindow uebernehmen
+ // copy state of DockingWindow
if ( pDockingWin )
{
SetSettings( pDockingWin->GetWindow()->GetSettings() );
@@ -110,16 +103,12 @@ ImplDockFloatWin2::ImplDockFloatWin2( Window* pParent, WinBits nWinBits,
maEndDockTimer.SetTimeout( 50 );
}
-
-
ImplDockFloatWin2::~ImplDockFloatWin2()
{
if( mnLastUserEvent )
Application::RemoveUserEvent( mnLastUserEvent );
}
-
-
IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl)
{
DBG_ASSERT( mpDockWin->IsFloatingMode(), "docktimer called but not floating" );
@@ -264,8 +253,6 @@ void ImplDockFloatWin2::Move()
mnLastUserEvent = Application::PostUserEvent( LINK( this, ImplDockFloatWin2, DockingHdl ) );
}
-
-
void ImplDockFloatWin2::Resize()
{
// forwarding of resize only required if we have no borderwindow ( GetWindow() then returns 'this' )
@@ -273,7 +260,7 @@ void ImplDockFloatWin2::Resize()
{
FloatingWindow::Resize();
Size aSize( GetSizePixel() );
- mpDockWin->GetWindow()->ImplPosSizeWindow( 0, 0, aSize.Width(), aSize.Height(), WINDOW_POSSIZE_POSSIZE ); // is this needed ???
+ mpDockWin->GetWindow()->ImplPosSizeWindow( 0, 0, aSize.Width(), aSize.Height(), WINDOW_POSSIZE_POSSIZE ); // TODO: is this needed ???
}
}
@@ -284,55 +271,41 @@ void ImplDockFloatWin2::setPosSizePixel( long nX, long nY,
FloatingWindow::setPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
}
-
-
-
void ImplDockFloatWin2::TitleButtonClick( sal_uInt16 nButton )
{
FloatingWindow::TitleButtonClick( nButton );
mpDockWin->TitleButtonClick( nButton );
}
-
-
void ImplDockFloatWin2::Pin()
{
FloatingWindow::Pin();
mpDockWin->Pin();
}
-
-
void ImplDockFloatWin2::Roll()
{
FloatingWindow::Roll();
mpDockWin->Roll();
}
-
-
void ImplDockFloatWin2::PopupModeEnd()
{
FloatingWindow::PopupModeEnd();
mpDockWin->PopupModeEnd();
}
-
-
void ImplDockFloatWin2::Resizing( Size& rSize )
{
FloatingWindow::Resizing( rSize );
mpDockWin->Resizing( rSize );
}
-
-
bool ImplDockFloatWin2::Close()
{
return mpDockWin->Close();
}
-// =======================================================================
DockingManager::DockingManager()
{
@@ -437,8 +410,6 @@ bool DockingManager::IsInPopupMode( const Window *pWindow )
return false;
}
-
-
void DockingManager::EndPopupMode( const Window *pWin )
{
ImplDockingWindowWrapper *pWrapper = GetDockingWindowWrapper( pWin );
@@ -446,8 +417,6 @@ void DockingManager::EndPopupMode( const Window *pWin )
pWrapper->GetFloatingWindow()->EndPopupMode();
}
-
-
void DockingManager::AddWindow( const Window *pWindow )
{
ImplDockingWindowWrapper* pWrapper = GetDockingWindowWrapper( pWindow );
@@ -838,8 +807,6 @@ void ImplPopupFloatWin::Tracking( const TrackingEvent& rTEvt )
}
-// =======================================================================
-
ImplDockingWindowWrapper::ImplDockingWindowWrapper( const Window *pWindow )
{
ImplInitData();
@@ -866,8 +833,6 @@ ImplDockingWindowWrapper::~ImplDockingWindowWrapper()
}
}
-
-
bool ImplDockingWindowWrapper::ImplStartDocking( const Point& rPos )
{
if ( !mbDockable )
@@ -882,7 +847,7 @@ bool ImplDockingWindowWrapper::ImplStartDocking( const Point& rPos )
mbLastFloatMode = IsFloatingMode();
mbStartFloat = mbLastFloatMode;
- // FloatingBorder berechnen
+ // calculate FloatingBorder
FloatingWindow* pWin;
if ( mpFloatWin )
pWin = mpFloatWin;
@@ -925,7 +890,6 @@ bool ImplDockingWindowWrapper::ImplStartDocking( const Point& rPos )
return true;
}
-// =======================================================================
void ImplDockingWindowWrapper::ImplInitData()
{
@@ -943,8 +907,6 @@ void ImplDockingWindowWrapper::ImplInitData()
maMaxOutSize = Size( SHRT_MAX, SHRT_MAX );
}
-
-
void ImplDockingWindowWrapper::Tracking( const TrackingEvent& rTEvt )
{
// used during docking of a currently docked window
@@ -1021,8 +983,7 @@ void ImplDockingWindowWrapper::Tracking( const TrackingEvent& rTEvt )
GetWindow()->ShowTracking( aShowTrackRect, nTrackStyle );
- // Maus-Offset neu berechnen, da Rechteck veraendert werden
- // konnte
+ // calculate mouse offset again, as the rectangle was changed
maMouseOff.X() = aPos.X() - aTrackRect.Left();
maMouseOff.Y() = aPos.Y() - aTrackRect.Top();
@@ -1034,9 +995,6 @@ void ImplDockingWindowWrapper::Tracking( const TrackingEvent& rTEvt )
}
}
-
-
-
void ImplDockingWindowWrapper::StartDocking( const Point& rPoint, Rectangle& rRect )
{
DockingData data( rPoint, rRect, IsFloatingMode() );
@@ -1045,8 +1003,6 @@ void ImplDockingWindowWrapper::StartDocking( const Point& rPoint, Rectangle& rRe
mbDocking = true;
}
-
-
bool ImplDockingWindowWrapper::Docking( const Point& rPoint, Rectangle& rRect )
{
DockingData data( rPoint, rRect, IsFloatingMode() );
@@ -1056,8 +1012,6 @@ bool ImplDockingWindowWrapper::Docking( const Point& rPoint, Rectangle& rRect )
return data.mbFloating;
}
-
-
void ImplDockingWindowWrapper::EndDocking( const Rectangle& rRect, bool bFloatMode )
{
Rectangle aRect( rRect );
@@ -1097,8 +1051,6 @@ void ImplDockingWindowWrapper::EndDocking( const Rectangle& rRect, bool bFloatMo
mbStartDockingEnabled = false;
}
-
-
bool ImplDockingWindowWrapper::PrepareToggleFloatingMode()
{
sal_Bool bFloating = sal_True;
@@ -1106,16 +1058,12 @@ bool ImplDockingWindowWrapper::PrepareToggleFloatingMode()
return bFloating;
}
-
-
bool ImplDockingWindowWrapper::Close()
{
// TODO: send event
return true;
}
-
-
void ImplDockingWindowWrapper::ToggleFloatingMode()
{
// notify dockingwindow/toolbox
@@ -1131,8 +1079,6 @@ void ImplDockingWindowWrapper::ToggleFloatingMode()
mbStartDockingEnabled = false;
}
-
-
void ImplDockingWindowWrapper::TitleButtonClick( sal_uInt16 nType )
{
if( nType == TITLE_BUTTON_MENU )
@@ -1149,29 +1095,21 @@ void ImplDockingWindowWrapper::TitleButtonClick( sal_uInt16 nType )
}
}
-
-
void ImplDockingWindowWrapper::Pin()
{
// TODO: send event
}
-
-
void ImplDockingWindowWrapper::Roll()
{
// TODO: send event
}
-
-
void ImplDockingWindowWrapper::PopupModeEnd()
{
// TODO: send event
}
-
-
void ImplDockingWindowWrapper::Resizing( Size& rSize )
{
// TODO: add virtual Resizing() to class Window, so we can get rid of class DockingWindow
@@ -1180,8 +1118,6 @@ void ImplDockingWindowWrapper::Resizing( Size& rSize )
pDockingWindow->Resizing( rSize );
}
-
-
void ImplDockingWindowWrapper::ShowTitleButton( sal_uInt16 nButton, bool bVisible )
{
if ( mpFloatWin )
@@ -1195,8 +1131,6 @@ void ImplDockingWindowWrapper::ShowTitleButton( sal_uInt16 nButton, bool bVisibl
}
}
-
-
void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, sal_uLong nFlags )
{
// do nothing if window is floating
@@ -1299,8 +1233,6 @@ bool ImplDockingWindowWrapper::IsInPopupMode() const
return false;
}
-
-
void ImplDockingWindowWrapper::SetFloatingMode( bool bFloatMode )
{
// do nothing if window is docked and locked
@@ -1339,8 +1271,7 @@ void ImplDockingWindowWrapper::SetFloatingMode( bool bFloatMode )
GetWindow()->mpWindowImpl->mnRightBorder = 0;
GetWindow()->mpWindowImpl->mnBottomBorder = 0;
- // Falls Parent zerstoert wird, muessen wir auch vom
- // BorderWindow den Parent umsetzen
+ // if the parent gets destroyed, we also have to reset the parent of the BorderWindow
if ( mpOldBorderWin )
mpOldBorderWin->SetParent( pWin );
GetWindow()->SetParent( pWin );
@@ -1353,7 +1284,7 @@ void ImplDockingWindowWrapper::SetFloatingMode( bool bFloatMode )
pWin->SetText( GetWindow()->GetText() );
pWin->SetOutputSizePixel( GetWindow()->GetSizePixel() );
pWin->SetPosPixel( maFloatPos );
- // DockingDaten ans FloatingWindow weiterreichen
+ // pass on DockingData to FloatingWindow
pWin->ShowTitleButton( TITLE_BUTTON_DOCKING, mbDockBtn );
pWin->ShowTitleButton( TITLE_BUTTON_HIDE, mbHideBtn );
pWin->SetPin( mbPined );
@@ -1376,7 +1307,7 @@ void ImplDockingWindowWrapper::SetFloatingMode( bool bFloatMode )
{
GetWindow()->Show( false, SHOW_NOFOCUSCHANGE );
- // FloatingDaten wird im FloatingWindow speichern
+ // store FloatingData in FloatingWindow
maFloatPos = mpFloatWin->GetPosPixel();
mbDockBtn = mpFloatWin->IsTitleButtonVisible( TITLE_BUTTON_DOCKING );
mbHideBtn = mpFloatWin->IsTitleButtonVisible( TITLE_BUTTON_HIDE );
@@ -1414,22 +1345,16 @@ void ImplDockingWindowWrapper::SetFloatingMode( bool bFloatMode )
}
}
-
-
void ImplDockingWindowWrapper::SetFloatStyle( WinBits nStyle )
{
mnFloatBits = nStyle;
}
-
-
WinBits ImplDockingWindowWrapper::GetFloatStyle() const
{
return mnFloatBits;
}
-
-
void ImplDockingWindowWrapper::setPosSizePixel( long nX, long nY,
long nWidth, long nHeight,
sal_uInt16 nFlags )
@@ -1440,8 +1365,6 @@ void ImplDockingWindowWrapper::setPosSizePixel( long nX, long nY,
GetWindow()->setPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
}
-
-
Point ImplDockingWindowWrapper::GetPosPixel() const
{
if ( mpFloatWin )
@@ -1450,8 +1373,6 @@ Point ImplDockingWindowWrapper::GetPosPixel() const
return mpDockingWindow->GetPosPixel();
}
-
-
Size ImplDockingWindowWrapper::GetSizePixel() const
{
if ( mpFloatWin )
More information about the Libreoffice-commits
mailing list