[Libreoffice-commits] core.git: vcl/source
Luc Castermans
luc.castermans at gmail.com
Tue Feb 18 21:39:26 CET 2014
vcl/source/window/brdwin.cxx | 48 +++++++++++++++++++----------------------
vcl/source/window/cursor.cxx | 11 ++++-----
vcl/source/window/decoview.cxx | 6 +----
vcl/source/window/dialog.cxx | 34 +++++++++++------------------
4 files changed, 44 insertions(+), 55 deletions(-)
New commits:
commit e52754170270e6b799af207f43369e530d9e176e
Author: Luc Castermans <luc.castermans at gmail.com>
Date: Tue Feb 18 21:31:42 2014 +0100
Translated German comments - find-german-comments clean
Change-Id: I2521bb87dbd0d4f896b99865c741cc4900b4d31c
Reviewed-on: https://gerrit.libreoffice.org/8113
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index a70bd1e..1a5da7b 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -44,7 +44,7 @@ using namespace ::com::sun::star::uno;
static void ImplGetPinImage( sal_uInt16 nStyle, sal_Bool bPinIn, Image& rImage )
{
- // ImageListe laden, wenn noch nicht vorhanden
+ // load ImageList if not available yet
ImplSVData* pSVData = ImplGetSVData();
if ( !pSVData->maCtrlData.mpPinImgList )
{
@@ -59,7 +59,7 @@ static void ImplGetPinImage( sal_uInt16 nStyle, sal_Bool bPinIn, Image& rImage )
}
}
- // Image ermitteln und zurueckgeben
+ // get and return Image
sal_uInt16 nId;
if ( nStyle & BUTTON_DRAW_PRESSED )
{
@@ -82,14 +82,14 @@ static void ImplGetPinImage( sal_uInt16 nStyle, sal_Bool bPinIn, Image& rImage )
void Window::ImplCalcSymbolRect( Rectangle& rRect )
{
- // Den Rand den der Button in der nicht Default-Darstellung freilaesst,
- // dazuaddieren, da wir diesen bei kleinen Buttons mit ausnutzen wollen
+ // Add border, not shown in the non-default representation,
+ // as we want to use it for small buttons
rRect.Left()--;
rRect.Top()--;
rRect.Right()++;
rRect.Bottom()++;
- // Zwischen dem Symbol und dem Button-Rand lassen wir 5% Platz
+ // we leave 5% room between the symbol and the button border
long nExtraWidth = ((rRect.GetWidth()*50)+500)/1000;
long nExtraHeight = ((rRect.GetHeight()*50)+500)/1000;
rRect.Left() += nExtraWidth;
@@ -103,7 +103,7 @@ void Window::ImplCalcSymbolRect( Rectangle& rRect )
static void ImplDrawBrdWinSymbol( OutputDevice* pDev,
const Rectangle& rRect, SymbolType eSymbol )
{
- // Zwischen dem Symbol und dem Button lassen wir 5% Platz
+ // we leave 5% room between the symbol and the button border
DecorationView aDecoView( pDev );
Rectangle aTempRect = rRect;
Window::ImplCalcSymbolRect( aTempRect );
@@ -488,7 +488,7 @@ sal_Bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const T
pData->mnCloseState &= ~BUTTON_DRAW_PRESSED;
DrawWindow( BORDERWINDOW_DRAW_CLOSE );
- // Bei Abbruch kein Click-Handler rufen
+ // do not call a Click-Handler when aborting
if ( !rTEvt.IsTrackingCanceled() )
{
// dispatch to correct window type (why is Close() not virtual ??? )
@@ -510,7 +510,7 @@ sal_Bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const T
pData->mnRollState &= ~BUTTON_DRAW_PRESSED;
DrawWindow( BORDERWINDOW_DRAW_ROLL );
- // Bei Abbruch kein Click-Handler rufen
+ // do not call a Click-Handler when aborting
if ( !rTEvt.IsTrackingCanceled() )
{
if ( pBorderWindow->ImplGetClientWindow()->IsSystemWindow() )
@@ -532,7 +532,7 @@ sal_Bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const T
pData->mnDockState &= ~BUTTON_DRAW_PRESSED;
DrawWindow( BORDERWINDOW_DRAW_DOCK );
- // Bei Abbruch kein Click-Handler rufen
+ // do not call a Click-Handler when aborting
if ( !rTEvt.IsTrackingCanceled() )
{
if ( pBorderWindow->ImplGetClientWindow()->IsSystemWindow() )
@@ -560,7 +560,7 @@ sal_Bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const T
pData->mnHideState &= ~BUTTON_DRAW_PRESSED;
DrawWindow( BORDERWINDOW_DRAW_HIDE );
- // Bei Abbruch kein Click-Handler rufen
+ // do not call a Click-Handler when aborting
if ( !rTEvt.IsTrackingCanceled() )
{
if ( pBorderWindow->ImplGetClientWindow()->IsSystemWindow() )
@@ -578,7 +578,7 @@ sal_Bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const T
pData->mnHelpState &= ~BUTTON_DRAW_PRESSED;
DrawWindow( BORDERWINDOW_DRAW_HELP );
- // Bei Abbruch kein Click-Handler rufen
+ // do not call a Click-Handler when aborting
if ( !rTEvt.IsTrackingCanceled() )
{
}
@@ -591,7 +591,7 @@ sal_Bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const T
pData->mnPinState &= ~BUTTON_DRAW_PRESSED;
DrawWindow( BORDERWINDOW_DRAW_PIN );
- // Bei Abbruch kein Click-Handler rufen
+ // do not call a Click-Handler when aborting
if ( !rTEvt.IsTrackingCanceled() )
{
if ( pBorderWindow->ImplGetClientWindow()->IsSystemWindow() )
@@ -607,7 +607,7 @@ sal_Bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const T
{
if ( pData->mbDragFull )
{
- // Bei Abbruch alten Zustand wieder herstellen
+ // restore old state when aborting
if ( rTEvt.IsTrackingCanceled() )
pBorderWindow->SetPosSizePixel( Point( pData->mnTrackX, pData->mnTrackY ), Size( pData->mnTrackWidth, pData->mnTrackHeight ) );
}
@@ -998,7 +998,7 @@ OUString ImplBorderWindowView::ImplRequestHelp( ImplBorderFrameData* pData,
long ImplBorderWindowView::ImplCalcTitleWidth( const ImplBorderFrameData* pData ) const
{
- // kein sichtbarer Title, dann auch keine Breite
+ // title is not visible therefore no width
if ( !pData->mnTitleHeight )
return 0;
@@ -1199,8 +1199,7 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei
if( ! mbNWFBorder )
{
sal_uInt16 nStyle = FRAME_DRAW_NODRAW;
- // Wenn Border umgesetzt wurde oder BorderWindow ein Frame-Fenster
- // ist, dann Border nach aussen
+ // move border outside if border was converted or if the BorderWindow is a frame window,
if ( mpBorderWindow->mbSmallOutBorder )
nStyle |= FRAME_DRAW_DOUBLEOUT;
else if ( nBorderStyle & WINDOW_BORDER_NWF )
@@ -1392,8 +1391,7 @@ void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice*
if ( nDrawFlags & BORDERWINDOW_DRAW_FRAME )
{
sal_uInt16 nStyle = 0;
- // Wenn Border umgesetzt wurde oder BorderWindow ein Frame-Fenster
- // ist, dann Border nach aussen
+ // move border outside if border was converted or if the border window is a frame window,
if ( mpBorderWindow->mbSmallOutBorder )
nStyle |= FRAME_DRAW_DOUBLEOUT;
else if ( nBorderStyle & WINDOW_BORDER_NWF )
@@ -1861,7 +1859,7 @@ void ImplBorderWindow::ImplInit( Window* pParent,
SystemParentData* pSystemParentData
)
{
- // Alle WindowBits entfernen, die wir nicht haben wollen
+ // remove all unwanted WindowBits
WinBits nOrgStyle = nStyle;
WinBits nTestStyle = (WB_MOVEABLE | WB_SIZEABLE | WB_ROLLABLE | WB_PINABLE | WB_CLOSEABLE | WB_STANDALONE | WB_DIALOGCONTROL | WB_NODIALOGCONTROL | WB_SYSTEMFLOATWIN | WB_INTROWIN | WB_DEFAULTWIN | WB_TOOLTIPWIN | WB_NOSHADOW | WB_OWNERDRAWDECORATION | WB_SYSTEMCHILDWINDOW | WB_NEEDSFOCUS | WB_POPUP);
if ( nTypeStyle & BORDERWINDOW_STYLE_APP )
@@ -2005,8 +2003,8 @@ void ImplBorderWindow::Activate()
void ImplBorderWindow::Deactivate()
{
- // Fenster die immer Active sind, nehmen wir von dieser Regel aus,
- // genauso, wenn ein Menu aktiv wird, ignorieren wir das Deactivate
+ // remove active windows from the ruler, also ignore the Deactivate
+ // if a menu becomes active
if ( GetActivateMode() && !ImplGetSVData()->maWinData.mbNoDeactivate )
SetDisplayActive( sal_False );
Window::Deactivate();
@@ -2016,14 +2014,14 @@ void ImplBorderWindow::Deactivate()
void ImplBorderWindow::RequestHelp( const HelpEvent& rHEvt )
{
- // no keyboard help for border win
+ // no keyboard help for border window
if ( rHEvt.GetMode() & (HELPMODE_BALLOON | HELPMODE_QUICK) && !rHEvt.KeyboardActivated() )
{
Point aMousePosPixel = ScreenToOutputPixel( rHEvt.GetMousePosPixel() );
Rectangle aHelpRect;
OUString aHelpStr( mpBorderView->RequestHelp( aMousePosPixel, aHelpRect ) );
- // Rechteck ermitteln
+ // retrieve rectangle
if ( !aHelpStr.isEmpty() )
{
aHelpRect.SetPos( OutputToScreenPixel( aHelpRect.TopLeft() ) );
@@ -2198,7 +2196,7 @@ void ImplBorderWindow::InvalidateBorder()
{
if ( IsReallyVisible() )
{
- // Nur wenn wir einen Border haben, muessen wir auch invalidieren
+ // invalidate only if we have a border
sal_Int32 nLeftBorder;
sal_Int32 nTopBorder;
sal_Int32 nRightBorder;
@@ -2212,7 +2210,7 @@ void ImplBorderWindow::InvalidateBorder()
aWinRect.Top() += nTopBorder;
aWinRect.Right() -= nRightBorder;
aWinRect.Bottom() -= nBottomBorder;
- // kein Output-Bereich mehr, dann alles invalidieren
+ // no output area anymore, now invalidate all
if ( (aWinRect.Right() < aWinRect.Left()) ||
(aWinRect.Bottom() < aWinRect.Top()) )
Invalidate( INVALIDATE_NOCHILDREN );
diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx
index 77baa2b..64c3ee9 100644
--- a/vcl/source/window/cursor.cxx
+++ b/vcl/source/window/cursor.cxx
@@ -135,17 +135,16 @@ void Cursor::ImplDraw()
mpData->mnDirection = mnDirection;
long nOffsetY = pWindow->LogicToPixel( Size( 0, mnOffsetY ) ).Height();
- // Position um den Offset korrigieren
+ // correct the position with the offset
mpData->maPixPos.Y() -= nOffsetY;
mpData->maPixRotOff = mpData->maPixPos;
mpData->maPixRotOff.Y() += nOffsetY;
- // Wenn groesse 0 ist, nehmen wir die breite, die in den
- // Settings eingestellt ist
+ // use width (as set in Settings) if size is 0,
if ( !mpData->maPixSize.Width() )
mpData->maPixSize.Width() = pWindow->GetSettings().GetStyleSettings().GetCursorSize();
- // Ausgabeflaeche berechnen und ausgeben
+ // calculate output area and display
ImplCursorInvert( mpData );
mpData->mbCurVisible = true;
}
@@ -172,8 +171,8 @@ void Cursor::ImplDoShow( bool bDrawDirect, bool bRestore )
pWindow = mpWindow;
else
{
- // Gibt es ein aktives Fenster und ist der Cursor in dieses Fenster
- // selektiert, dann zeige den Cursor an
+ // show the cursor, if there is an active window and the cursor
+ // has been selected in this window
pWindow = Application::GetFocusWindow();
if ( !pWindow || (pWindow->mpWindowImpl->mpCursor != this) || pWindow->mpWindowImpl->mbInPaint
|| !pWindow->mpWindowImpl->mpFrameData->mbHasFocus )
diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index 056296b..37c6b8c 100644
--- a/vcl/source/window/decoview.cxx
+++ b/vcl/source/window/decoview.cxx
@@ -548,8 +548,7 @@ void ImplDrawButton( OutputDevice *const pDev, Rectangle aFillRect,
if ( !(nStyle & BUTTON_DRAW_NOFILL) )
{
- // Hack: Auf Druckern wollen wir im MonoChrom-Modus trotzdem
- // erstmal graue Buttons haben
+ // Hack: in monochrome mode on printers we like to have grey buttons
if ( pDev->GetOutDevType() == OUTDEV_PRINTER )
pDev->SetFillColor( Color( COL_LIGHTGRAY ) );
else
@@ -1000,8 +999,7 @@ Rectangle DecorationView::DrawButton( const Rectangle& rRect, sal_uInt16 nStyle
mpOutDev->SetLineColor( maOldLineColor );
mpOutDev->SetFillColor( maOldFillColor );
- // Ein Border freilassen, der jedoch bei Default-Darstellung
- // mitbenutzt wird
+ // keep border free, altough it is used at default representation
++aRect.Left();
++aRect.Top();
--aRect.Right();
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 3633699..4be4403 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -188,7 +188,7 @@ void ImplWindowAutoMnemonic( Window* pWindow )
Window* pGetChild;
Window* pChild;
- // Die schon vergebenen Mnemonics registieren
+ // register the assigned mnemonics
pGetChild = pWindow->GetWindow( WINDOW_FIRSTCHILD );
while ( pGetChild )
{
@@ -197,7 +197,7 @@ void ImplWindowAutoMnemonic( Window* pWindow )
pGetChild = nextLogicalChildOfParent(pWindow, pGetChild);
}
- // Bei TabPages auch noch die Controls vom Dialog beruecksichtigen
+ // take the Controls of the dialog into account for TabPages
if ( pWindow->GetType() == WINDOW_TABPAGE )
{
Window* pParent = pWindow->GetParent();
@@ -216,7 +216,7 @@ void ImplWindowAutoMnemonic( Window* pWindow )
}
}
- // Die Mnemonics an die Controls vergeben, die noch keinen haben
+ // assign mnemonics to Controls which have none
pGetChild = pWindow->GetWindow( WINDOW_FIRSTCHILD );
while ( pGetChild )
{
@@ -398,7 +398,7 @@ void Dialog::ImplInit( Window* pParent, WinBits nStyle )
Dialog* pExeDlg = pSVData->maWinData.mpLastExecuteDlg;
while ( pExeDlg )
{
- // Nur wenn er sichtbar und enabled ist
+ // only if visible and enabled
if ( pParent->ImplGetFirstOverlapWindow()->IsWindowOrChild( pExeDlg, sal_True ) &&
pExeDlg->IsReallyVisible() &&
pExeDlg->IsEnabled() && pExeDlg->IsInputEnabled() && !pExeDlg->IsInModalMode() )
@@ -596,7 +596,7 @@ IMPL_LINK_NOARG(Dialog, ImplAsyncCloseHdl)
bool Dialog::Notify( NotifyEvent& rNEvt )
{
- // Zuerst Basisklasse rufen wegen TabSteuerung
+ // first call the base class due to Tab control
bool nRet = SystemWindow::Notify( rNEvt );
if ( !nRet )
{
@@ -848,11 +848,11 @@ sal_Bool Dialog::ImplStartExecuteModal()
ImplSVData* pSVData = ImplGetSVData();
- // Dialoge, die sich in Execute befinden, miteinander verketten
+ // link all dialogs which are being executed
mpPrevExecuteDlg = pSVData->maWinData.mpLastExecuteDlg;
pSVData->maWinData.mpLastExecuteDlg = this;
- // Capture beenden, damit der Dialog bedient werden kann
+ // stop capturing, in order to have control over the dialog
if ( pSVData->maWinData.mpTrackWin )
pSVData->maWinData.mpTrackWin->EndTracking( ENDTRACK_CANCEL );
if ( pSVData->maWinData.mpCaptureWin )
@@ -1007,7 +1007,7 @@ void Dialog::EndDialog( long nResult )
{
SetModalInputMode( sal_False );
- // Dialog aus der Kette der Dialoge die in Execute stehen entfernen
+ // remove dialog from the list of dialogs which are being executed
ImplSVData* pSVData = ImplGetSVData();
Dialog* pExeDlg = pSVData->maWinData.mpLastExecuteDlg;
while ( pExeDlg )
@@ -1176,22 +1176,20 @@ void Dialog::GrabFocusToFirstControl()
{
Window* pFocusControl;
- // Wenn Dialog den Focus hat, versuchen wr trotzdem
- // ein Focus-Control zu finden
+ // find focus control, even if the dialog has focus
if ( HasFocus() )
pFocusControl = NULL;
else
{
- // Wenn schon ein Child-Fenster mal den Focus hatte,
- // dann dieses bevorzugen
+ // prefer a child window which had focus before
pFocusControl = ImplGetFirstOverlapWindow()->mpWindowImpl->mpLastFocusWindow;
- // Control aus der Dialog-Steuerung suchen
+ // find the control out of the dialog control
if ( pFocusControl )
pFocusControl = ImplFindDlgCtrlWindow( pFocusControl );
}
- // Kein Control hatte vorher den Focus, oder das Control
- // befindet sich nicht in der Tab-Steuerung, dann das erste
- // Control in der TabSteuerung den Focus geben
+ // no control had the focus before or the control is not
+ // part of the tab-control, now give focus to the
+ // first control in the tab-control
if ( !pFocusControl ||
!(pFocusControl->GetStyle() & WB_TABSTOP) ||
!isVisibleInLayout(pFocusControl) ||
@@ -1207,10 +1205,6 @@ void Dialog::GrabFocusToFirstControl()
void Dialog::GetDrawWindowBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const
{
ImplBorderWindow aImplWin( (Window*)this, WB_BORDER|WB_STDWORK, BORDERWINDOW_STYLE_OVERLAP );
-// aImplWin.SetText( GetText() );
-// aImplWin.SetPosSizePixel( aPos.X(), aPos.Y(), aSize.Width(), aSize.Height() );
-// aImplWin.SetDisplayActive( sal_True );
-// aImplWin.InitView();
aImplWin.GetBorder( rLeftBorder, rTopBorder, rRightBorder, rBottomBorder );
}
More information about the Libreoffice-commits
mailing list