Hello Philipp,
Your inputs made sense, thanks for reviewing. Herewith the updates. As
before GPL/MPL is valid.
Let me find another target...
Luc
2011/11/19 Philipp Weissenbacher <p.weissenbac...@gmail.com>
> Hoi Luc, all,
>
> Not sure if that really matters, but I think that
> // Klammerung, da in diesem Handler das Window zerstoert werden darf
> // Parentheses, as in this handler the window could be destroyed
> "could" should be "can".
>
> On line 925 (in the patch):
> I would translate it like this:
> If the Overlap-Window has changed, we need to test whether
> OverlapWindows that had the
> Child window as their parent need to be put into the window hierarchy.
>
> Line 992/993:
> I think that
> If it is a SystemWindow it automatically pops up on top of all other
> windows if needed.
> is a bit clearer.
>
> Line 1083:
> I think you meant "was sent once"; I think "... already sent" is more
> appropriate.
>
> Otherwise very nice patch! And let's hang in there and get all the
> German comments out!
>
> Cheers,
> Philipp
>
> On 19 November 2011 00:41, Luc Castermans <luc.casterm...@gmail.com>
> wrote:
> > Gents,
> >
> > Triggered by Lionel I attacked this close to 10k lines beast and
> translated
> > comments from German to English.
> >
> > My contribution is under GPL/MPL. as my last and future ones.
> >
> > thanks,
> >
> > --
> > Luc Castermans
> > mailto:luc.casterm...@gmail.com
> >
> > _______________________________________________
> > LibreOffice mailing list
> > LibreOffice@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/libreoffice
> >
> >
>
--
Luc Castermans
mailto:luc.casterm...@gmail.com
From a16bac0b574e17223971bd5f529d8ad47c5fd54d Mon Sep 17 00:00:00 2001
From: Luc Castermans <luc.casterm...@gmail.com>
Date: Sat, 19 Nov 2011 16:47:00 +0100
Subject: [PATCH] corrected input from Philipp on translations. Thanks,
---
vcl/source/window/window.cxx | 44 ++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index db2f109..a9c668e 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -645,7 +645,7 @@ void Window::ImplInitWindowData( WindowType nType )
mpWindowImpl->mnWaitCount = 0; // Wait-Count (>1 == Warte-MousePointer)
mpWindowImpl->mnPaintFlags = 0; // Flags for ImplCallPaint
mpWindowImpl->mnParentClipMode = 0; // Flags for Parent-ClipChildren-Mode
- mpWindowImpl->mnActivateMode = 0; // Wird bei System/Overlap-Windows umgesetzt
+ mpWindowImpl->mnActivateMode = 0; // Will be converted in System/Overlap-Windows
mpWindowImpl->mnDlgCtrlFlags = 0; // DialogControl-Flags
mpWindowImpl->mnLockCount = 0; // LockCount
mpWindowImpl->meAlwaysInputMode = AlwaysInputNone; // neither AlwaysEnableInput nor AlwaysDisableInput called
@@ -771,7 +771,7 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSyste
ImplInsertWindow( pParent );
mpWindowImpl->mnStyle = nStyle;
- // Overlap-Window-Daten
+ // Overlap-Window-Data
if ( mpWindowImpl->mbOverlapWin )
{
mpWindowImpl->mpOverlapData = new ImplOverlapData;
@@ -1055,7 +1055,7 @@ void Window::ImplInsertWindow( Window* pParent )
mpWindowImpl->mpNextOverlap = mpWindowImpl->mpFrameData->mpFirstOverlap;
mpWindowImpl->mpFrameData->mpFirstOverlap = this;
- // Overlap-Windows sind per default die obersten
+ // Overlap-Windows are per default the upper
mpWindowImpl->mpNext = pFirstOverlapParent->mpWindowImpl->mpFirstOverlap;
pFirstOverlapParent->mpWindowImpl->mpFirstOverlap = this;
if ( !pFirstOverlapParent->mpWindowImpl->mpLastOverlap )
@@ -4647,7 +4647,7 @@ void Window::SimulateKeyPress( sal_uInt16 nKeyCode ) const
void Window::MouseMove( const MouseEvent& rMEvt )
{
- { // Parentheses, as in this handler the window could be destroyed
+ { // Parentheses, as in this handler the window can be destroyed
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
@@ -4660,7 +4660,7 @@ void Window::MouseMove( const MouseEvent& rMEvt )
void Window::MouseButtonDown( const MouseEvent& rMEvt )
{
- { // Parentheses, as in this handler the window could be destroyed
+ { // Parentheses, as in this handler the window can be destroyed
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
@@ -4673,7 +4673,7 @@ void Window::MouseButtonDown( const MouseEvent& rMEvt )
void Window::MouseButtonUp( const MouseEvent& rMEvt )
{
- { // Parentheses, as in this handler the window could be destroyed
+ { // Parentheses, as in this handler the window can be destroyed
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
@@ -4686,7 +4686,7 @@ void Window::MouseButtonUp( const MouseEvent& rMEvt )
void Window::KeyInput( const KeyEvent& rKEvt )
{
- { // Parentheses, as in this handler the window could be destroyed
+ { // Parentheses, as in this handler the window can be destroyed
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
@@ -4699,7 +4699,7 @@ void Window::KeyInput( const KeyEvent& rKEvt )
void Window::KeyUp( const KeyEvent& rKEvt )
{
- { // Parentheses, as in this handler the window could be destroyed
+ { // Parentheses, as in this handler the window can be destroyed
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
@@ -4718,7 +4718,7 @@ void Window::PrePaint()
void Window::Paint( const Rectangle& rRect )
{
- { // Parentheses, as in this handler the window could be destroyed
+ { // Parentheses, as in this handler the window can be destroyed
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
@@ -4770,7 +4770,7 @@ void Window::Deactivate()
void Window::GetFocus()
{
- { // Parentheses, as in this handler the window could be destroyed
+ { // Parentheses, as in this handler the window can be destroyed
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
@@ -4790,7 +4790,7 @@ void Window::GetFocus()
void Window::LoseFocus()
{
- { // Parentheses, as in this handler the window could be destroyed
+ { // Parentheses, as in this handler the window can be destroyed
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
@@ -4802,7 +4802,7 @@ void Window::LoseFocus()
void Window::RequestHelp( const HelpEvent& rHEvt )
{
- { // Parentheses, as in this handler the window could be destroyed
+ { // Parentheses, as in this handler the window can be destroyed
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
@@ -4858,7 +4858,7 @@ void Window::RequestHelp( const HelpEvent& rHEvt )
void Window::Command( const CommandEvent& rCEvt )
{
- { // Parentheses, as in this handler the window could be destroyed
+ { // Parentheses, as in this handler the window can be destroyed
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
@@ -5006,7 +5006,7 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt )
long Window::PreNotify( NotifyEvent& rNEvt )
{
- { // Parentheses, as in this handler the window could be destroyed
+ { // Parentheses, as in this handler the window can be destroyed
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
@@ -5053,7 +5053,7 @@ long Window::PreNotify( NotifyEvent& rNEvt )
long Window::Notify( NotifyEvent& rNEvt )
{
- { // Parentheses, as in this handler the window could be destroyed
+ { // Parentheses, as in this handler the window can be destroyed
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
}
@@ -6119,12 +6119,9 @@ void Window::SetParent( Window* pNewParent )
if ( ImplUpdatePos() )
ImplUpdateSysObjPos();
- // if the overlap window was changed, test if
- // also overlap windows having the child window as parent should
- // be converted in the window hierachy
- //
- // Original German comment reads: "...in der Window-Hirachie umgesetzt werden muessen"
- // not clear how to translate "umgesetzt" in this case
+ // If the Overlap-Window has changed, we need to test whether
+ // OverlapWindows that had the Child window as their parent
+ // need to be put into the window hierarchy.
if ( ImplIsOverlapWindow() )
{
if ( bNewFrame )
@@ -6328,7 +6325,8 @@ void Window::Show( sal_Bool bVisible, sal_uInt16 nFlags )
// such that these can initialise themselves
ImplCallInitShow();
- // if required it will shift frontward wenn it is a SystemWindow,
+ // If it is a SystemWindow it automatically pops up on top of
+ // all other windows if needed.
if ( ImplIsOverlapWindow() && !(nFlags & SHOW_NOACTIVATE) )
{
ImplStartToTop(( nFlags & SHOW_FOREGROUNDTASK ) ? TOTOP_FOREGROUNDTASK : 0 );
@@ -6934,7 +6932,7 @@ void Window::SetZOrder( Window* pRefWindow, sal_uInt16 nFlags )
// for HTML-documents with many controls. If this
// check gives problems a flag should be introduced
// which checks if the window after Show was
- // sent ones
+ // already sent
if ( !bInitWinClipRegion )
{
--
1.7.2.5
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
