diff --git a/reactos/subsys/system/explorer/explorer-sw.rc b/reactos/subsys/system/explorer/explorer-sv.rc similarity index 92% rename from reactos/subsys/system/explorer/explorer-sw.rc rename to reactos/subsys/system/explorer/explorer-sv.rc index c35e6e71877..5d0e6a87ce6 100644 --- a/reactos/subsys/system/explorer/explorer-sw.rc +++ b/reactos/subsys/system/explorer/explorer-sv.rc @@ -15,45 +15,6 @@ ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// German (Germany) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) -#ifdef _WIN32 -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""resource.h""\r\n" - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // German (Germany) resources -///////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////// @@ -460,7 +421,7 @@ BEGIN IDS_NOTIFY_AUTOHIDE "dölj automatiskt" IDS_SHOW_HIDDEN_ICONS "Visa dolda ikoner" IDS_HIDE_ICONS "Dölj ikoner" - IDS_TERMINATE "Logga ut" + IDS_TERMINATE "Avsluta Explorer" END STRINGTABLE DISCARDABLE diff --git a/reactos/subsys/system/explorer/explorer_intres.rc b/reactos/subsys/system/explorer/explorer_intres.rc index ee147cd72bf..34ab58452a0 100644 --- a/reactos/subsys/system/explorer/explorer_intres.rc +++ b/reactos/subsys/system/explorer/explorer_intres.rc @@ -104,7 +104,7 @@ BEGIN "#include ""explorer-en.rc""\r\n" "#include ""explorer-de.rc""\r\n" "#include ""explorer-es.rc""\r\n" - "#include ""explorer-sw.rc""\r\n" + "#include ""explorer-sv.rc""\r\n" "#include ""explorer-pt.rc""\r\n" "#include ""explorer-cz.rc""\r\n" "#include ""explorer-ro.rc""\r\n" @@ -187,7 +187,7 @@ END #include "explorer-de.rc" #include "explorer-es.rc" #include "explorer-fr.rc" -#include "explorer-sw.rc" +#include "explorer-sv.rc" #include "explorer-pt.rc" #include "explorer-cz.rc" #include "explorer-ro.rc" diff --git a/reactos/subsys/system/explorer/res/logov.bmp b/reactos/subsys/system/explorer/res/logov.bmp index 6e9b865f1a2..2553b3d1a4c 100644 Binary files a/reactos/subsys/system/explorer/res/logov.bmp and b/reactos/subsys/system/explorer/res/logov.bmp differ diff --git a/reactos/subsys/system/explorer/res/logov16.bmp b/reactos/subsys/system/explorer/res/logov16.bmp index a36b06df87f..5242d36e74c 100644 Binary files a/reactos/subsys/system/explorer/res/logov16.bmp and b/reactos/subsys/system/explorer/res/logov16.bmp differ diff --git a/reactos/subsys/system/explorer/res/logov256.bmp b/reactos/subsys/system/explorer/res/logov256.bmp index d73979df571..ec834e85fe9 100644 Binary files a/reactos/subsys/system/explorer/res/logov256.bmp and b/reactos/subsys/system/explorer/res/logov256.bmp differ diff --git a/reactos/subsys/system/explorer/taskbar/startmenu.cpp b/reactos/subsys/system/explorer/taskbar/startmenu.cpp index 45bd331c97a..34131ea589b 100644 --- a/reactos/subsys/system/explorer/taskbar/startmenu.cpp +++ b/reactos/subsys/system/explorer/taskbar/startmenu.cpp @@ -1795,14 +1795,14 @@ void StartMenuRoot::Paint(PaintCanvas& canvas) ClientRect clnt(_hwnd); int h = min(_logo_size.cy, clnt.bottom); - RECT rect = {0, 0, _logo_size.cx, clnt.bottom-h}; + RECT rect = {0, clnt.bottom-h, _logo_size.cx, clnt.bottom}; HBRUSH hbr = CreateSolidBrush(GetPixel(mem_dc, 0, 0)); FillRect(canvas, &rect, hbr); DeleteObject(hbr); PatBlt(canvas, _logo_size.cx, 0, 1, clnt.bottom, WHITENESS); - BitBlt(canvas, 0, clnt.bottom-h, _logo_size.cx, h, mem_dc, 0, 0, SRCCOPY); + BitBlt(canvas, 0, clnt.bottom, _logo_size.cx, h, mem_dc, 0, clnt.bottom-h, SRCCOPY); super::Paint(canvas); }