[Libreoffice-commits] core.git: 6 commits - clone/dictionaries clone/help cui/uiconfig sw/uiconfig vcl/win
Stefan Knorr
heinzlesspam at gmail.com
Sun Jul 28 03:33:54 PDT 2013
clone/dictionaries | 1
clone/help | 1
cui/uiconfig/ui/insertplugin.ui | 6 -
cui/uiconfig/ui/optviewpage.ui | 5 -
sw/uiconfig/swriter/ui/insertfootnote.ui | 96 +++++++++++++---------------
sw/uiconfig/swriter/ui/previewzoomdialog.ui | 7 +-
sw/uiconfig/swriter/ui/wordcount.ui | 16 ++--
vcl/win/source/app/saltimer.cxx | 4 -
vcl/win/source/gdi/salbmp.cxx | 4 -
vcl/win/source/gdi/salgdi.cxx | 52 ---------------
vcl/win/source/gdi/salgdi2.cxx | 4 -
vcl/win/source/gdi/salprn.cxx | 2
vcl/win/source/window/salframe.cxx | 6 -
13 files changed, 76 insertions(+), 128 deletions(-)
New commits:
commit 0f3af36ba158d01408cd2dc024030a861512ad90
Author: Stefan Knorr <heinzlesspam at gmail.com>
Date: Sun Jul 28 00:21:09 2013 +0200
Change Page Preview Zoom dialog's button layout to be horizontal
Change-Id: I7f1bd32ebf4c9e6df794404d4177043e1b5cb790
diff --git a/sw/uiconfig/swriter/ui/previewzoomdialog.ui b/sw/uiconfig/swriter/ui/previewzoomdialog.ui
index 8c06a51..f0a4b1b 100644
--- a/sw/uiconfig/swriter/ui/previewzoomdialog.ui
+++ b/sw/uiconfig/swriter/ui/previewzoomdialog.ui
@@ -23,12 +23,12 @@
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="layout_style">start</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
@@ -71,6 +71,7 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
+ <property name="secondary">True</property>
</packing>
</child>
</object>
@@ -86,6 +87,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
+ <property name="margin_left">6</property>
+ <property name="margin_right">6</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="row_spacing">6</property>
commit e437dab84256bfabf2c5f5164d6ec55476281701
Author: Stefan Knorr <heinzlesspam at gmail.com>
Date: Sun Jul 28 00:04:29 2013 +0200
Try to improve visual appearance of Word Count dialog
Change-Id: Ie51aeb7de1ac0efd2ae90bccd5121e9f34fbe88b
diff --git a/clone/dictionaries b/clone/dictionaries
new file mode 160000
index 0000000..53e9940
--- /dev/null
+++ b/clone/dictionaries
@@ -0,0 +1 @@
+Subproject commit 53e9940d33caa1e8a00ddaadfb57e5d668d35378
diff --git a/clone/help b/clone/help
new file mode 160000
index 0000000..a43f72a
--- /dev/null
+++ b/clone/help
@@ -0,0 +1 @@
+Subproject commit a43f72ace3d84b3ba0df35ec589a21a1d5de2299
diff --git a/sw/uiconfig/swriter/ui/wordcount.ui b/sw/uiconfig/swriter/ui/wordcount.ui
index 0aff653..3570476 100644
--- a/sw/uiconfig/swriter/ui/wordcount.ui
+++ b/sw/uiconfig/swriter/ui/wordcount.ui
@@ -28,6 +28,7 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
+ <property name="secondary">True</property>
</packing>
</child>
<child>
@@ -57,6 +58,8 @@
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_left">6</property>
+ <property name="margin_right">6</property>
<property name="hexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
@@ -64,8 +67,8 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="xpad">10</property>
+ <property name="margin_bottom">6</property>
+ <property name="xalign">1</property>
<property name="label" translatable="yes">Words</property>
</object>
<packing>
@@ -79,8 +82,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="xpad">10</property>
+ <property name="xalign">1</property>
<property name="label" translatable="yes">Characters including spaces</property>
</object>
<packing>
@@ -94,8 +96,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="xpad">10</property>
+ <property name="xalign">1</property>
<property name="label" translatable="yes">Characters excluding spaces</property>
</object>
<packing>
@@ -245,8 +246,7 @@
<object class="GtkLabel" id="cjkcharsft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="xalign">0</property>
- <property name="xpad">10</property>
+ <property name="xalign">1</property>
<property name="label" translatable="yes">Asian characters and Korean syllables</property>
</object>
<packing>
commit 9e033148e043d03786619fd576f8d26f37dc6558
Author: Stefan Knorr <heinzlesspam at gmail.com>
Date: Sun Jul 28 00:03:25 2013 +0200
Change Insert Footnote's button layout to be horizontal
Change-Id: I04ae00e5cb81abfe12d7b08bc4f31927988dc09d
diff --git a/sw/uiconfig/swriter/ui/insertfootnote.ui b/sw/uiconfig/swriter/ui/insertfootnote.ui
index 5a836a9..ef1a037 100644
--- a/sw/uiconfig/swriter/ui/insertfootnote.ui
+++ b/sw/uiconfig/swriter/ui/insertfootnote.ui
@@ -9,21 +9,44 @@
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="layout_style">start</property>
+ <property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="ok">
- <property name="label">gtk-ok</property>
+ <object class="GtkGrid" id="grid2">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_homogeneous">True</property>
+ <child>
+ <object class="GtkButton" id="prev">
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="image">image1</property>
+ <property name="image_position">right</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="next">
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="image">image2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -32,10 +55,12 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="cancel">
- <property name="label">gtk-cancel</property>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
@@ -46,8 +71,8 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="help">
- <property name="label">gtk-help</property>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -60,37 +85,12 @@
</packing>
</child>
<child>
- <object class="GtkGrid" id="grid2">
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="column_homogeneous">True</property>
- <child>
- <object class="GtkButton" id="prev">
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="image">image1</property>
- <property name="image_position">right</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="next">
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="image">image2</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -147,7 +147,7 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
+ <property name="width">3</property>
<property name="height">1</property>
</packing>
</child>
@@ -179,7 +179,7 @@
<property name="halign">start</property>
<property name="valign">center</property>
<property name="invisible_char">•</property>
- <property name="width_chars">2</property>
+ <property name="width_chars">4</property>
<property name="progress_fraction">0.0099999997764825821</property>
<property name="progress_pulse_step">0.090000003576278687</property>
<accessibility>
@@ -214,12 +214,6 @@
<property name="height">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
</object>
commit 5eeef5cb0814db643d31e3c5f0f4c4332e36f822
Author: Stefan Knorr <heinzlesspam at gmail.com>
Date: Sat Jul 27 22:38:14 2013 +0200
Fix problem in German UI with cutoff label in options page
Change-Id: I8943aa1576f859db7e7f98fa0fa7d751116f0a8e
diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index c5ac1fb..6c081c8 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -101,7 +101,7 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
+ <property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
@@ -151,9 +151,6 @@
<property name="height">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="left_attach">0</property>
commit 5e77e5070f9ac55a9296a540f5362c98c7d7bfdb
Author: Stefan Knorr <heinzlesspam at gmail.com>
Date: Sat Jul 27 22:32:57 2013 +0200
Change Insert Plugin dialog's button layout to be horizontal
Change-Id: I75c512d52f09f57907ba076672b56743f1a22fde
diff --git a/cui/uiconfig/ui/insertplugin.ui b/cui/uiconfig/ui/insertplugin.ui
index 481c5d1..c992af4 100644
--- a/cui/uiconfig/ui/insertplugin.ui
+++ b/cui/uiconfig/ui/insertplugin.ui
@@ -9,6 +9,7 @@
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkBox" id="box3">
@@ -106,7 +107,6 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="hscrollbar_policy">never</property>
- <property name="vscrollbar_policy">always</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTextView" id="pluginoptions:border">
@@ -146,8 +146,7 @@
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="layout_style">start</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
@@ -190,6 +189,7 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
+ <property name="secondary">True</property>
</packing>
</child>
</object>
commit 3a4a27c6ee882fae3d08a0e024731f55fbfe067f
Author: Stefan Knorr <heinzlesspam at gmail.com>
Date: Wed Jun 26 16:36:20 2013 +0200
Few comment translations, commented-out code removal, comment spellcheck
Change-Id: Icd27eb2d11bf6ddd9932a1d0c8c9aa3494962bc8
diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx
index 47d1637..95ab585 100644
--- a/vcl/win/source/app/saltimer.cxx
+++ b/vcl/win/source/app/saltimer.cxx
@@ -29,7 +29,7 @@
// =======================================================================
-// Maximale Periode
+// maximum period
#define MAX_SYSPERIOD 65533
// =======================================================================
@@ -38,7 +38,7 @@ void ImplSalStartTimer( sal_uLong nMS, sal_Bool bMutex )
{
SalData* pSalData = GetSalData();
- // Remenber the time of the timer
+ // Remember the time of the timer
pSalData->mnTimerMS = nMS;
if ( !bMutex )
pSalData->mnTimerOrgMS = nMS;
diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx
index 2094dc6..5bec989 100644
--- a/vcl/win/source/gdi/salbmp.cxx
+++ b/vcl/win/source/gdi/salbmp.cxx
@@ -840,10 +840,10 @@ HANDLE WinSalBitmap::ImplCopyDIBOrDDB( HANDLE hHdl, bool bDIB )
{
BITMAP aBmp;
- // Source-Bitmap nach Groesse befragen
+ // find out size of source bitmap
WIN_GetObject( hHdl, sizeof( BITMAP ), (LPSTR) &aBmp );
- // Destination-Bitmap erzeugen
+ // create destination bitmap
if ( (hCopy = CreateBitmapIndirect( &aBmp )) != 0 )
{
HDC hBmpDC = CreateCompatibleDC( 0 );
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index 86b99be..8928d51 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -175,7 +175,7 @@ void ImplInitSalGDI()
if ( (nBitCount > 8) && (nBitCount < 24) )
{
- // test, if we have to dither
+ // test if we have to dither
HDC hMemDC = ::CreateCompatibleDC( hDC );
HBITMAP hMemBmp = ::CreateCompatibleBitmap( hDC, 8, 8 );
HBITMAP hBmpOld = (HBITMAP) ::SelectObject( hMemDC, hMemBmp );
@@ -551,7 +551,7 @@ HDC ImplGetCachedDC( sal_uLong nID, HBITMAP hBmp )
{
HDC hDC = GetDC( 0 );
- // create new DC sith DefaultBitmap
+ // create new DC with DefaultBitmap
pC->mhDC = CreateCompatibleDC( hDC );
if( pSalData->mhDitherPal )
@@ -883,7 +883,6 @@ bool WinSalGraphics::setClipRegion( const Region& i_rClip )
RectangleVector aRectangles;
i_rClip.GetRegionRectangles(aRectangles);
- //sal_uLong nRectCount = i_rClip.GetRectCount();
sal_uLong nRectBufSize = sizeof(RECT)*aRectangles.size();
if ( aRectangles.size() < SAL_CLIPRECT_COUNT )
{
@@ -956,53 +955,6 @@ bool WinSalGraphics::setClipRegion( const Region& i_rClip )
}
}
- //ImplRegionInfo aInfo;
- //long nX, nY, nW, nH;
- //bool bRegionRect = i_rClip.ImplGetFirstRect(aInfo, nX, nY, nW, nH );
- //while( bRegionRect )
- //{
- // if ( nW && nH )
- // {
- // long nRight = nX + nW;
- // long nBottom = nY + nH;
- //
- // if ( bFirstClipRect )
- // {
- // pBoundRect->left = nX;
- // pBoundRect->top = nY;
- // pBoundRect->right = nRight;
- // pBoundRect->bottom = nBottom;
- // bFirstClipRect = false;
- // }
- // else
- // {
- // if ( nX < pBoundRect->left )
- // pBoundRect->left = (int)nX;
- //
- // if ( nY < pBoundRect->top )
- // pBoundRect->top = (int)nY;
- //
- // if ( nRight > pBoundRect->right )
- // pBoundRect->right = (int)nRight;
- //
- // if ( nBottom > pBoundRect->bottom )
- // pBoundRect->bottom = (int)nBottom;
- // }
- //
- // pNextClipRect->left = (int)nX;
- // pNextClipRect->top = (int)nY;
- // pNextClipRect->right = (int)nRight;
- // pNextClipRect->bottom = (int)nBottom;
- // pNextClipRect++;
- // }
- // else
- // {
- // mpClipRgnData->rdh.nCount--;
- // mpClipRgnData->rdh.nRgnSize -= sizeof( RECT );
- // }
- // bRegionRect = i_rClip.ImplGetNextRect( aInfo, nX, nY, nW, nH );
- //}
-
// create clip region from ClipRgnData
if ( mpClipRgnData->rdh.nCount == 1 )
{
diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx
index 2585d13..1c8c43a 100644
--- a/vcl/win/source/gdi/salgdi2.cxx
+++ b/vcl/win/source/gdi/salgdi2.cxx
@@ -151,7 +151,7 @@ void WinSalGraphics::copyArea( long nDestX, long nDestY,
int nOldClipRgnType = ERROR;
HRGN hInvalidateRgn = 0;
- // do we have to invalidate also the overlaping regions?
+ // do we have to invalidate also the overlapping regions?
if ( (nFlags & SAL_COPYAREA_WINDOWINVALIDATE) && mbWindow )
{
// compute and invalidate those parts that were either off-screen or covered by other windows
@@ -200,7 +200,7 @@ void WinSalGraphics::copyArea( long nDestX, long nDestY,
{
hWndTopWindow = ::GetParent( hWndTopWindow );
- // Test, if the Parent clips our window
+ // Test if the Parent clips our window
GetClientRect( hWndTopWindow, &aTempRect );
POINT aPt2;
aPt2.x = 0;
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index bc90743..5db443a 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -261,7 +261,7 @@ OUString WinSalInstance::GetDefaultPrinter()
GetProfileStringA( aImplWindows, aImplDevice, "", szBuffer, sizeof( szBuffer ) );
if ( szBuffer[0] )
{
- // Printername suchen
+ // search for printer name
char* pBuf = szBuffer;
char* pTmp = pBuf;
while ( *pTmp && (*pTmp != ',') )
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index dca67c9..63454c2 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -3231,7 +3231,7 @@ static long ImplHandleMouseMsg( HWND hWnd, UINT nMsg,
pSalData->mpMouseLeaveTimer = new AutoTimer;
pSalData->mpMouseLeaveTimer->SetTimeout( SAL_MOUSELEAVE_TIMEOUT );
pSalData->mpMouseLeaveTimer->Start();
- // We dont need to set a timeout handler, because we test
+ // We don't need to set a timeout handler, because we test
// for mouseleave in the timeout callback
}
aMouseEvt.mnButton = 0;
@@ -3251,7 +3251,7 @@ static long ImplHandleMouseMsg( HWND hWnd, UINT nMsg,
delete pSalData->mpMouseLeaveTimer;
pSalData->mpMouseLeaveTimer = NULL;
}
- // Mouse-Coordinaates are relativ to the screen
+ // Mouse-Coordinates are relative to the screen
POINT aPt;
aPt.x = (short)LOWORD( lParam );
aPt.y = (short)HIWORD( lParam );
@@ -3298,7 +3298,7 @@ static long ImplHandleMouseMsg( HWND hWnd, UINT nMsg,
}
// check if this window was destroyed - this might happen if we are the help window
- // and sent a mouse leave message to the application which killed the help window, ie ourself
+ // and sent a mouse leave message to the application which killed the help window, ie ourselves
if( !IsWindow( hWnd ) )
return 0;
More information about the Libreoffice-commits
mailing list