sysui/desktop/icons/locolor/16x16/apps/main.png |binary sysui/desktop/icons/locolor/16x16/apps/startcenter.png |binary sysui/desktop/icons/locolor/32x32/apps/main.png |binary sysui/desktop/icons/locolor/32x32/apps/startcenter.png |binary vcl/WinResTarget_vcl.mk | 2 vcl/win/source/src/salsrc.rc | 90 ++++++++--------- 6 files changed, 46 insertions(+), 46 deletions(-)
New commits: commit 62361c9127a394301ad4a080bb91f10285b50b29 Author: Matthias Seidel <[email protected]> AuthorDate: Wed Sep 12 15:07:37 2018 +0000 Commit: Matthias Seidel <[email protected]> CommitDate: Wed Sep 12 15:07:37 2018 +0000 Use correct locolor icons for startcenter/main diff --git a/sysui/desktop/icons/locolor/16x16/apps/main.png b/sysui/desktop/icons/locolor/16x16/apps/main.png new file mode 100644 index 000000000000..2381a82bd2f3 Binary files /dev/null and b/sysui/desktop/icons/locolor/16x16/apps/main.png differ diff --git a/sysui/desktop/icons/locolor/16x16/apps/startcenter.png b/sysui/desktop/icons/locolor/16x16/apps/startcenter.png index 347d030bc740..c2003664c2ba 100644 Binary files a/sysui/desktop/icons/locolor/16x16/apps/startcenter.png and b/sysui/desktop/icons/locolor/16x16/apps/startcenter.png differ diff --git a/sysui/desktop/icons/locolor/32x32/apps/main.png b/sysui/desktop/icons/locolor/32x32/apps/main.png new file mode 100644 index 000000000000..e06654658bab Binary files /dev/null and b/sysui/desktop/icons/locolor/32x32/apps/main.png differ diff --git a/sysui/desktop/icons/locolor/32x32/apps/startcenter.png b/sysui/desktop/icons/locolor/32x32/apps/startcenter.png index cfaaaba07a60..baae82a7bc39 100644 Binary files a/sysui/desktop/icons/locolor/32x32/apps/startcenter.png and b/sysui/desktop/icons/locolor/32x32/apps/startcenter.png differ commit d5dff5af77cb379ce3fc349776347f68743ee63f Author: Matthias Seidel <[email protected]> AuthorDate: Wed Sep 12 14:46:35 2018 +0000 Commit: Matthias Seidel <[email protected]> CommitDate: Wed Sep 12 14:46:35 2018 +0000 Reverting to sd.ico (StarDesktop?) diff --git a/vcl/WinResTarget_vcl.mk b/vcl/WinResTarget_vcl.mk index 2d41e5448a9e..f0e7dda5b77f 100755 --- a/vcl/WinResTarget_vcl.mk +++ b/vcl/WinResTarget_vcl.mk @@ -49,7 +49,7 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\ vcl/win/source/src/copyf.cur \ vcl/win/source/src/drect.cur \ vcl/win/source/src/movef.cur \ - vcl/win/source/src/oo.ico \ + vcl/win/source/src/sd.ico \ vcl/win/source/src/ase.cur \ vcl/win/source/src/copyf2.cur \ vcl/win/source/src/dtext.cur \ diff --git a/vcl/win/source/src/salsrc.rc b/vcl/win/source/src/salsrc.rc index 5adb26a9cb3f..dc05cb78eef4 100644 --- a/vcl/win/source/src/salsrc.rc +++ b/vcl/win/source/src/salsrc.rc @@ -28,67 +28,67 @@ #include <win/salids.hrc> #endif -SAL_RESID_POINTER_NULL CURSOR NULLPTR.CUR +SAL_RESID_POINTER_NULL CURSOR NULLPTR.CUR #if ( WINVER < 0x0400 ) -SAL_RESID_POINTER_HELP CURSOR HELP.CUR +SAL_RESID_POINTER_HELP CURSOR HELP.CUR #endif #ifndef WNT -SAL_RESID_POINTER_HSIZE CURSOR HSIZE.CUR -SAL_RESID_POINTER_VSIZ CURSOR VSIZE.CUR -SAL_RESID_POINTER_NESWSIZE CURSOR NESWSIZE.CUR -SAL_RESID_POINTER_NWSESIZE CURSOR NWSESIZE.CUR +SAL_RESID_POINTER_HSIZE CURSOR HSIZE.CUR +SAL_RESID_POINTER_VSIZ CURSOR VSIZE.CUR +SAL_RESID_POINTER_NESWSIZE CURSOR NESWSIZE.CUR +SAL_RESID_POINTER_NWSESIZE CURSOR NWSESIZE.CUR #endif -SAL_RESID_POINTER_CROSS CURSOR CROSS.CUR -SAL_RESID_POINTER_MOVE CURSOR MOVE.CUR -SAL_RESID_POINTER_HSPLIT CURSOR HSPLIT.CUR -SAL_RESID_POINTER_VSPLIT CURSOR VSPLIT.CUR -SAL_RESID_POINTER_HSIZEBAR CURSOR HSIZEBAR.CUR -SAL_RESID_POINTER_VSIZEBAR CURSOR VSIZEBAR.CUR -SAL_RESID_POINTER_HAND CURSOR HAND.CUR -SAL_RESID_POINTER_REFHAND CURSOR REFHAND.CUR -SAL_RESID_POINTER_PEN CURSOR PEN.CUR -SAL_RESID_POINTER_MAGNIFY CURSOR MAGNIFY.CUR -SAL_RESID_POINTER_FILL CURSOR FILL.CUR -SAL_RESID_POINTER_ROTATE CURSOR ROTATE.CUR -SAL_RESID_POINTER_HSHEAR CURSOR HSHEAR.CUR -SAL_RESID_POINTER_VSHEAR CURSOR VSHEAR.CUR -SAL_RESID_POINTER_MIRROR CURSOR MIRROR.CUR -SAL_RESID_POINTER_CROOK CURSOR CROOK.CUR -SAL_RESID_POINTER_CROP CURSOR CROP.CUR -SAL_RESID_POINTER_MOVEPOINT CURSOR MOVEPT.CUR +SAL_RESID_POINTER_CROSS CURSOR CROSS.CUR +SAL_RESID_POINTER_MOVE CURSOR MOVE.CUR +SAL_RESID_POINTER_HSPLIT CURSOR HSPLIT.CUR +SAL_RESID_POINTER_VSPLIT CURSOR VSPLIT.CUR +SAL_RESID_POINTER_HSIZEBAR CURSOR HSIZEBAR.CUR +SAL_RESID_POINTER_VSIZEBAR CURSOR VSIZEBAR.CUR +SAL_RESID_POINTER_HAND CURSOR HAND.CUR +SAL_RESID_POINTER_REFHAND CURSOR REFHAND.CUR +SAL_RESID_POINTER_PEN CURSOR PEN.CUR +SAL_RESID_POINTER_MAGNIFY CURSOR MAGNIFY.CUR +SAL_RESID_POINTER_FILL CURSOR FILL.CUR +SAL_RESID_POINTER_ROTATE CURSOR ROTATE.CUR +SAL_RESID_POINTER_HSHEAR CURSOR HSHEAR.CUR +SAL_RESID_POINTER_VSHEAR CURSOR VSHEAR.CUR +SAL_RESID_POINTER_MIRROR CURSOR MIRROR.CUR +SAL_RESID_POINTER_CROOK CURSOR CROOK.CUR +SAL_RESID_POINTER_CROP CURSOR CROP.CUR +SAL_RESID_POINTER_MOVEPOINT CURSOR MOVEPT.CUR SAL_RESID_POINTER_MOVEBEZIERWEIGHT CURSOR MOVEBW.CUR -SAL_RESID_POINTER_MOVEDATA CURSOR MOVEDATA.CUR -SAL_RESID_POINTER_COPYDATA CURSOR COPYDATA.CUR -SAL_RESID_POINTER_LINKDATA CURSOR LINKDATA.CUR +SAL_RESID_POINTER_MOVEDATA CURSOR MOVEDATA.CUR +SAL_RESID_POINTER_COPYDATA CURSOR COPYDATA.CUR +SAL_RESID_POINTER_LINKDATA CURSOR LINKDATA.CUR SAL_RESID_POINTER_MOVEDATALINK CURSOR MOVEDLNK.CUR SAL_RESID_POINTER_COPYDATALINK CURSOR COPYDLNK.CUR -SAL_RESID_POINTER_MOVEFILE CURSOR MOVEF.CUR -SAL_RESID_POINTER_COPYFILE CURSOR COPYF.CUR -SAL_RESID_POINTER_LINKFILE CURSOR LINKF.CUR +SAL_RESID_POINTER_MOVEFILE CURSOR MOVEF.CUR +SAL_RESID_POINTER_COPYFILE CURSOR COPYF.CUR +SAL_RESID_POINTER_LINKFILE CURSOR LINKF.CUR SAL_RESID_POINTER_MOVEFILELINK CURSOR MOVEFLNK.CUR SAL_RESID_POINTER_COPYFILELINK CURSOR COPYFLNK.CUR -SAL_RESID_POINTER_MOVEFILES CURSOR MOVEF2.CUR -SAL_RESID_POINTER_COPYFILES CURSOR COPYF2.CUR +SAL_RESID_POINTER_MOVEFILES CURSOR MOVEF2.CUR +SAL_RESID_POINTER_COPYFILES CURSOR COPYF2.CUR SAL_RESID_POINTER_NOTALLOWED CURSOR NOTALLOW.CUR -SAL_RESID_POINTER_DRAW_LINE CURSOR DLINE.CUR -SAL_RESID_POINTER_DRAW_RECT CURSOR DRECT.CUR +SAL_RESID_POINTER_DRAW_LINE CURSOR DLINE.CUR +SAL_RESID_POINTER_DRAW_RECT CURSOR DRECT.CUR SAL_RESID_POINTER_DRAW_POLYGON CURSOR DPOLYGON.CUR SAL_RESID_POINTER_DRAW_BEZIER CURSOR DBEZIER.CUR -SAL_RESID_POINTER_DRAW_ARC CURSOR DARC.CUR -SAL_RESID_POINTER_DRAW_PIE CURSOR DPIE.CUR +SAL_RESID_POINTER_DRAW_ARC CURSOR DARC.CUR +SAL_RESID_POINTER_DRAW_PIE CURSOR DPIE.CUR SAL_RESID_POINTER_DRAW_CIRCLECUT CURSOR DCIRCCUT.CUR SAL_RESID_POINTER_DRAW_ELLIPSE CURSOR DELLIPSE.CUR SAL_RESID_POINTER_DRAW_FREEHAND CURSOR DFREE.CUR SAL_RESID_POINTER_DRAW_CONNECT CURSOR DCONNECT.CUR -SAL_RESID_POINTER_DRAW_TEXT CURSOR DTEXT.CUR +SAL_RESID_POINTER_DRAW_TEXT CURSOR DTEXT.CUR SAL_RESID_POINTER_DRAW_CAPTION CURSOR DCAPT.CUR -SAL_RESID_POINTER_CHART CURSOR CHART.CUR -SAL_RESID_POINTER_DETECTIVE CURSOR DETECTIV.CUR -SAL_RESID_POINTER_PIVOT_COL CURSOR PIVOTCOL.CUR -SAL_RESID_POINTER_PIVOT_ROW CURSOR PIVOTROW.CUR +SAL_RESID_POINTER_CHART CURSOR CHART.CUR +SAL_RESID_POINTER_DETECTIVE CURSOR DETECTIV.CUR +SAL_RESID_POINTER_PIVOT_COL CURSOR PIVOTCOL.CUR +SAL_RESID_POINTER_PIVOT_ROW CURSOR PIVOTROW.CUR SAL_RESID_POINTER_PIVOT_FIELD CURSOR PIVOTFLD.CUR SAL_RESID_POINTER_PIVOT_DELETE CURSOR PIVOTDEL.CUR -SAL_RESID_POINTER_CHAIN CURSOR CHAIN.CUR +SAL_RESID_POINTER_CHAIN CURSOR CHAIN.CUR SAL_RESID_POINTER_CHAIN_NOTALLOWED CURSOR CHAINNOT.CUR SAL_RESID_POINTER_TIMEEVENT_MOVE CURSOR TIMEMOVE.CUR SAL_RESID_POINTER_TIMEEVENT_SIZE CURSOR TIMESIZE.CUR @@ -103,7 +103,7 @@ SAL_RESID_POINTER_AUTOSCROLL_SE CURSOR ASSE.CUR SAL_RESID_POINTER_AUTOSCROLL_NS CURSOR ASNS.CUR SAL_RESID_POINTER_AUTOSCROLL_WE CURSOR ASWE.CUR SAL_RESID_POINTER_AUTOSCROLL_NSWE CURSOR ASNSWE.CUR -SAL_RESID_POINTER_AIRBRUSH CURSOR AIRBRUSH.CUR +SAL_RESID_POINTER_AIRBRUSH CURSOR AIRBRUSH.CUR SAL_RESID_POINTER_TEXT_VERTICAL CURSOR VTEXT.CUR SAL_RESID_POINTER_TAB_SELECT_S CURSOR TBLSELS.CUR SAL_RESID_POINTER_TAB_SELECT_E CURSOR TBLSELE.CUR @@ -112,7 +112,7 @@ SAL_RESID_POINTER_TAB_SELECT_W CURSOR TBLSELW.CUR SAL_RESID_POINTER_TAB_SELECT_SW CURSOR TBLSELSW.CUR SAL_RESID_POINTER_PAINTBRUSH CURSOR PNTBRSH.CUR -SAL_RESID_BITMAP_50 BITMAP 50.BMP +SAL_RESID_BITMAP_50 BITMAP 50.BMP -SAL_RESID_ICON_DEFAULT ICON OO.ICO +SAL_RESID_ICON_DEFAULT ICON SD.ICO diff --git a/vcl/win/source/src/oo.ico b/vcl/win/source/src/sd.ico similarity index 100% rename from vcl/win/source/src/oo.ico rename to vcl/win/source/src/sd.ico _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
