Author: cwittich Date: Thu Jun 1 20:25:13 2006 New Revision: 22145
URL: http://svn.reactos.ru/svn/reactos?rev=22145&view=rev Log: -added a worldmap picture (source: http://en.wikipedia.org/wiki/Image:Earth_satellite_plane.jpg)
Modified: trunk/reactos/dll/cpl/timedate/Cz.rc trunk/reactos/dll/cpl/timedate/De.rc trunk/reactos/dll/cpl/timedate/Dk.rc trunk/reactos/dll/cpl/timedate/En.rc trunk/reactos/dll/cpl/timedate/Es.rc trunk/reactos/dll/cpl/timedate/Fr.rc trunk/reactos/dll/cpl/timedate/Gr.rc trunk/reactos/dll/cpl/timedate/Hu.rc trunk/reactos/dll/cpl/timedate/Ja.rc trunk/reactos/dll/cpl/timedate/Nl.rc trunk/reactos/dll/cpl/timedate/Pl.rc trunk/reactos/dll/cpl/timedate/Ru.rc trunk/reactos/dll/cpl/timedate/Sv.rc trunk/reactos/dll/cpl/timedate/resource.h trunk/reactos/dll/cpl/timedate/timedate.c trunk/reactos/dll/cpl/timedate/timedate.rc
Modified: trunk/reactos/dll/cpl/timedate/Cz.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Cz.rc?rev=2... ============================================================================== --- trunk/reactos/dll/cpl/timedate/Cz.rc (original) +++ trunk/reactos/dll/cpl/timedate/Cz.rc Thu Jun 1 20:25:13 2006 @@ -29,6 +29,7 @@ BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE AUTOCHECKBOX "Provádìt zmìnu na letní èas a zpìt automaticky", IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP END
Modified: trunk/reactos/dll/cpl/timedate/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/De.rc?rev=2... ============================================================================== --- trunk/reactos/dll/cpl/timedate/De.rc (original) +++ trunk/reactos/dll/cpl/timedate/De.rc Thu Jun 1 20:25:13 2006 @@ -30,6 +30,7 @@ BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE AUTOCHECKBOX "&Uhr automatisch auf Sommer-/Winterzeit umstellen", IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP END
Modified: trunk/reactos/dll/cpl/timedate/Dk.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Dk.rc?rev=2... ============================================================================== --- trunk/reactos/dll/cpl/timedate/Dk.rc (original) +++ trunk/reactos/dll/cpl/timedate/Dk.rc Thu Jun 1 20:25:13 2006 @@ -30,6 +30,7 @@ BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE AUTOCHECKBOX "Justere uret automatisk efter &Sommertid/Vintertid.", IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP END
Modified: trunk/reactos/dll/cpl/timedate/En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/En.rc?rev=2... ============================================================================== --- trunk/reactos/dll/cpl/timedate/En.rc (original) +++ trunk/reactos/dll/cpl/timedate/En.rc Thu Jun 1 20:25:13 2006 @@ -30,6 +30,7 @@ BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes", IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP END
Modified: trunk/reactos/dll/cpl/timedate/Es.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Es.rc?rev=2... ============================================================================== --- trunk/reactos/dll/cpl/timedate/Es.rc (original) +++ trunk/reactos/dll/cpl/timedate/Es.rc Thu Jun 1 20:25:13 2006 @@ -29,6 +29,7 @@ BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes", IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP END
Modified: trunk/reactos/dll/cpl/timedate/Fr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Fr.rc?rev=2... ============================================================================== --- trunk/reactos/dll/cpl/timedate/Fr.rc (original) +++ trunk/reactos/dll/cpl/timedate/Fr.rc Thu Jun 1 20:25:13 2006 @@ -29,6 +29,7 @@ BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE AUTOCHECKBOX "Ajuster automatiquement l'heure lors du &passage à l'heure d'été" IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP END
Modified: trunk/reactos/dll/cpl/timedate/Gr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Gr.rc?rev=2... ============================================================================== --- trunk/reactos/dll/cpl/timedate/Gr.rc (original) +++ trunk/reactos/dll/cpl/timedate/Gr.rc Thu Jun 1 20:25:13 2006 @@ -30,6 +30,7 @@ BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE AUTOCHECKBOX "Áõôüìáôç ñýèìéóç ñïëïãéïý ãéá &áëëáãÝò", IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP END
Modified: trunk/reactos/dll/cpl/timedate/Hu.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Hu.rc?rev=2... ============================================================================== --- trunk/reactos/dll/cpl/timedate/Hu.rc (original) +++ trunk/reactos/dll/cpl/timedate/Hu.rc Thu Jun 1 20:25:13 2006 @@ -31,6 +31,7 @@ BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE AUTOCHECKBOX "Automatikus átállás a nyári idõszámításra", IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP END
Modified: trunk/reactos/dll/cpl/timedate/Ja.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Ja.rc?rev=2... ============================================================================== --- trunk/reactos/dll/cpl/timedate/Ja.rc (original) +++ trunk/reactos/dll/cpl/timedate/Ja.rc Thu Jun 1 20:25:13 2006 @@ -30,6 +30,7 @@ BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE AUTOCHECKBOX "©®IÉT}[ ^C̲®ð·é(&D)", IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP END
Modified: trunk/reactos/dll/cpl/timedate/Nl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Nl.rc?rev=2... ============================================================================== --- trunk/reactos/dll/cpl/timedate/Nl.rc (original) +++ trunk/reactos/dll/cpl/timedate/Nl.rc Thu Jun 1 20:25:13 2006 @@ -29,6 +29,7 @@ BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE AUTOCHECKBOX "&Klok automatisch aanpassen aan zomertijd", IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP END
Modified: trunk/reactos/dll/cpl/timedate/Pl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Pl.rc?rev=2... ============================================================================== --- trunk/reactos/dll/cpl/timedate/Pl.rc (original) +++ trunk/reactos/dll/cpl/timedate/Pl.rc Thu Jun 1 20:25:13 2006 @@ -31,6 +31,7 @@ BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE AUTOCHECKBOX "&Automatycznie uwzglêdnij zmiany czasu", IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP END
Modified: trunk/reactos/dll/cpl/timedate/Ru.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Ru.rc?rev=2... ============================================================================== --- trunk/reactos/dll/cpl/timedate/Ru.rc (original) +++ trunk/reactos/dll/cpl/timedate/Ru.rc Thu Jun 1 20:25:13 2006 @@ -29,6 +29,7 @@ BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE AUTOCHECKBOX "Àâòîìàòè&÷åñêèé ïåðåõîä íà ëåòíåå âðåìÿ è îáðàòíî", IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP END
Modified: trunk/reactos/dll/cpl/timedate/Sv.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Sv.rc?rev=2... ============================================================================== --- trunk/reactos/dll/cpl/timedate/Sv.rc (original) +++ trunk/reactos/dll/cpl/timedate/Sv.rc Thu Jun 1 20:25:13 2006 @@ -34,6 +34,7 @@ BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE AUTOCHECKBOX "&Justera klockan automatiskt för sommar- och vintertid", IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP END
Modified: trunk/reactos/dll/cpl/timedate/resource.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/resource.h?... ============================================================================== --- trunk/reactos/dll/cpl/timedate/resource.h (original) +++ trunk/reactos/dll/cpl/timedate/resource.h Thu Jun 1 20:25:13 2006 @@ -10,12 +10,14 @@ #define IDC_MONTHCALENDAR 103 #define IDC_TIMEZONE 106 #define IDC_TIMEPICKER 107 -#define IDC_YEAR 108 -#define IDC_YEARTEXT 109 +#define IDC_YEAR 108 +#define IDC_YEARTEXT 109
#define IDD_TIMEZONEPAGE 110 #define IDC_TIMEZONELIST 111 #define IDC_AUTODAYLIGHT 113 +#define IDC_WORLD_BACKGROUND 114 +#define IDC_WORLD 115
#define IDD_INETTIMEPAGE 120 #define IDC_SERVERLIST 121
Modified: trunk/reactos/dll/cpl/timedate/timedate.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.c?... ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.c (original) +++ trunk/reactos/dll/cpl/timedate/timedate.c Thu Jun 1 20:25:13 2006 @@ -50,6 +50,8 @@ PTIMEZONE_ENTRY TimeZoneListHead = NULL; PTIMEZONE_ENTRY TimeZoneListTail = NULL;
+static HBITMAP hBitmap = NULL; +static int cxSource, cySource;
/* Applets */ APPLET Applets[NUM_APPLETS] = @@ -786,14 +788,41 @@ WPARAM wParam, LPARAM lParam) { + BITMAP bitmap; + switch (uMsg) { case WM_INITDIALOG: CreateTimeZoneList(); ShowTimeZoneList(GetDlgItem(hwndDlg, IDC_TIMEZONELIST)); GetAutoDaylightInfo(GetDlgItem(hwndDlg, IDC_AUTODAYLIGHT)); - break; - + hBitmap = LoadImage(hApplet, MAKEINTRESOURCE(IDC_WORLD), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + if (hBitmap != NULL) + { + GetObject(hBitmap, sizeof(BITMAP), &bitmap); + + cxSource = bitmap.bmWidth; + cySource = bitmap.bmHeight; + } + break; + + case WM_DRAWITEM: + { + LPDRAWITEMSTRUCT lpDrawItem; + PAINTSTRUCT ps; + HDC hdc, hdcMem; + lpDrawItem = (LPDRAWITEMSTRUCT) lParam; + hdc = BeginPaint(hwndDlg, &ps); + hdcMem = CreateCompatibleDC(hdc); + SelectObject(hdcMem, hBitmap); + StretchBlt(lpDrawItem->hDC, lpDrawItem->rcItem.left, lpDrawItem->rcItem.top, + lpDrawItem->rcItem.right - lpDrawItem->rcItem.left, + lpDrawItem->rcItem.bottom - lpDrawItem->rcItem.top, + hdcMem, 0, 0, cxSource, cySource, SRCCOPY); + DeleteDC(hdcMem); + EndPaint(hwndDlg, &ps); + break; + } case WM_COMMAND: if ((LOWORD(wParam) == IDC_TIMEZONELIST && HIWORD(wParam) == CBN_SELCHANGE) || (LOWORD(wParam) == IDC_AUTODAYLIGHT && HIWORD(wParam) == BN_CLICKED)) @@ -805,6 +834,7 @@
case WM_DESTROY: DestroyTimeZoneList(); + DeleteObject(hBitmap); break;
case WM_NOTIFY:
Modified: trunk/reactos/dll/cpl/timedate/timedate.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.rc... ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.rc (original) +++ trunk/reactos/dll/cpl/timedate/timedate.rc Thu Jun 1 20:25:13 2006 @@ -14,6 +14,7 @@
IDC_CPLICON ICON "resources/applet.ico" +IDC_WORLD BITMAP "resources/world.bmp"
#include "En.rc" #include "Cz.rc"