- Italian translations and various fixes to Magnify (fixes part of bug #3241 as well)
Changes by me:
- Shorten the german dialog string a bit, so that it won't be truncated. Strings for Static controls can only be 256 characters long.
A french translator should change the text as well, because it's longer than 256 characters.
See issue #3245 for more details.
svn path=/trunk/; revision=33513
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "Èçõîä",IDOK,96,161,50,14
- PUSHBUTTON "Ïîìîù",IDOK,38,161,50,14
+ PUSHBUTTON "Ïîìîù",IDC_BUTTON_HELP,38,161,50,14
LTEXT "Óâåëè÷åíèå:",IDC_STATIC,6,8,68,8
COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Ïðîñëåäÿâàíå",IDC_STATIC,7,25,195,59
END
+
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "Beenden",IDOK,96,161,50,14
- PUSHBUTTON "Hilfe",IDOK,38,161,50,14
+ PUSHBUTTON "Hilfe",IDC_BUTTON_HELP,38,161,50,14
LTEXT "Vergrößerungsgrad:",IDC_STATIC,6,12,68,8
COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Folgen",IDC_STATIC,7,25,139,59
BEGIN
DEFPUSHBUTTON "OK",IDOK,193,76,50,14
ICON IDI_ICON,IDC_STATIC,7,17,20,20
- LTEXT "Die Bildschirmlupe ist für Personen mit leichten visuellen Einschränkungen gedacht und stellt lediglich Grundfunktionen zur Verfügung. Die meisten Nutzer mit visuellen Einschränkungen werden eine Bildschirm-Lupe mit mehr Funktionen für die alltägliche Nutzung benötigen.",IDC_STATIC,36,7,207,33
+ LTEXT "Die Bildschirmlupe ist für Personen mit leichten visuellen Einschränkungen gedacht und stellt lediglich Grundfunktionen zur Verfügung. Die meisten Nutzer werden jedoch eine Bildschirmlupe mit mehr Funktionen für die alltägliche Nutzung benötigen.",IDC_STATIC,36,7,207,33
CONTROL "Diese Nachricht nicht mehr anzeigen",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10
END
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "Exit",IDOK,96,161,50,14
- PUSHBUTTON "Help",IDOK,38,161,50,14
+ PUSHBUTTON "Help",IDC_BUTTON_HELP,38,161,50,14
LTEXT "Magnification level:",IDC_STATIC,6,8,68,8
COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Tracking",IDC_STATIC,7,25,139,59
FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
BEGIN\r
DEFPUSHBUTTON "Salir",IDOK,96,161,50,14\r
- PUSHBUTTON "Ayuda",IDOK,38,161,50,14\r
+ PUSHBUTTON "Ayuda",IDC_BUTTON_HELP,38,161,50,14\r
LTEXT "Nivel de aumento:",IDC_STATIC,6,8,68,8\r
COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
GROUPBOX "Rastreando",IDC_STATIC,7,25,139,59\r
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "Quitter",IDOK,96,161,50,14
- PUSHBUTTON "Aider",IDOK,38,161,50,14
+ PUSHBUTTON "Aider",IDC_BUTTON_HELP,38,161,50,14
LTEXT "Coefficient d'agrandissement:",IDC_STATIC,6,8,68,8
COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Poursuite",IDC_STATIC,7,25,139,59
--- /dev/null
+LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+
+IDC_MAGNIFIER MENU
+BEGIN
+ POPUP "&File"
+ BEGIN
+ MENUITEM "E&sci", IDM_EXIT
+ MENUITEM "&Opzioni", IDM_OPTIONS
+ MENUITEM SEPARATOR
+ MENUITEM "&Informazioni su Magnifier", IDM_ABOUT
+ END
+END
+
+IDC_MAGNIFIER ACCELERATORS
+BEGIN
+ "?", IDM_ABOUT, ASCII, ALT
+ "/", IDM_ABOUT, ASCII, ALT
+END
+
+IDD_ABOUTBOX DIALOGEX 22, 17, 220, 75
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_CAPTION | WS_SYSMENU
+CAPTION "Informazioni Magnifier"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+ ICON IDI_ICON,IDC_MYICON,14,9,20,20
+ LTEXT "Magnifier Versione 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX
+ LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)",IDC_STATIC,48,24,125,22
+ PUSHBUTTON "OK",IDOK,162,48,50,14
+END
+
+IDD_DIALOGOPTIONS DIALOGEX 0, 0, 153, 182
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Impostazioni di Magnifier"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+ DEFPUSHBUTTON "Uscita",IDOK,96,161,50,14
+ PUSHBUTTON "Aiuto",IDC_BUTTON_HELP,38,161,50,14
+ LTEXT "Livello d'ingrandimento:",IDC_STATIC,6,8,78,8
+ COMBOBOX IDC_ZOOM,96,6,48,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+ GROUPBOX "Proseguimento",IDC_STATIC,7,25,139,59
+ GROUPBOX "Presentazione",IDC_STATIC,7,87,139,57
+ CONTROL "Seguire il cursore del mouse",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,42,114,10
+ CONTROL "Seguire la selezione da tastiera",IDC_FOLLOWKEYBOARDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,54,120,10
+ CONTROL "Seguire l'immissione di testo",IDC_FOLLOWTEXTEDITINGCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,66,114,10
+ CONTROL "Inverti i colori",IDC_INVERTCOLORSCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,102,114,10
+ CONTROL "Avvio in minimizzato",IDC_STARTMINIMIZEDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,114,114,10
+ CONTROL "Mostra Magnifier",IDC_SHOWMAGNIFIERCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,126,114,10
+END
+
+IDD_WARNINGDIALOG DIALOGEX 0, 0, 250, 97
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
+CAPTION "ReactOS Magnifier"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,193,76,50,14
+ ICON IDI_ICON,IDC_STATIC,7,17,20,20
+ LTEXT "Magnifier é stato realizzato per fornire un livello minimo di funzionalità agli utenti affetti da problemi visivi. La maggior parte di questi utenti avrà bisogno di un programma di utilità dotato di maggiori funzioni per l'uso quotidiano.",IDC_STATIC,36,7,207,33
+ CONTROL "Non mostrare più questo messaggio",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10
+END
+
+STRINGTABLE
+BEGIN
+ IDS_APP_TITLE "Lente d'ingrandimento"
+END
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "Wyj\9ccie",IDOK,96,161,50,14
- PUSHBUTTON "Pomoc",IDOK,38,161,50,14
+ PUSHBUTTON "Pomoc",IDC_BUTTON_HELP,38,161,50,14
LTEXT "Stopieñ powiêkszenia:",IDC_STATIC,6,8,68,8
COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
GROUPBOX "\8cledzenia",IDC_STATIC,7,25,139,59
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "Â&ûõîä",IDOK,94,158,50,14
- PUSHBUTTON "&Ñïðàâêà",IDOK,34,158,50,14
+ PUSHBUTTON "&Ñïðàâêà",IDC_BUTTON_HELP,34,158,50,14
LTEXT "Óâåëè÷åíèå:",IDC_STATIC,6,8,68,8
COMBOBOX IDC_ZOOM,92,6,85,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Ñëåæåíèå",IDC_STATIC,7,25,170,59
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "Koniec",IDOK,96,161,50,14
- PUSHBUTTON "Pomocník",IDOK,38,161,50,14
+ PUSHBUTTON "Pomocník",IDC_BUTTON_HELP,38,161,50,14
LTEXT "Úroveò zväè\9aenia:",IDC_STATIC,6,8,68,8
COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Sledovanie",IDC_STATIC,7,25,139,59
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "Âèõ³ä",IDOK,96,161,50,14
- PUSHBUTTON "Äîâ³äêà",IDOK,38,161,50,14
+ PUSHBUTTON "Äîâ³äêà",IDC_BUTTON_HELP,38,161,50,14
LTEXT "Çá³ëüøåííÿ:",IDC_STATIC,6,8,68,8
COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
GROUPBOX "³äñòåæåííÿ",IDC_STATIC,7,25,139,59
\r
int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)\r
{\r
- UNREFERENCED_PARAMETER(hPrevInstance);\r
- UNREFERENCED_PARAMETER(lpCmdLine);\r
-\r
// TODO: Place code here.\r
MSG msg;\r
HACCEL hAccelTable;\r
\r
+ UNREFERENCED_PARAMETER(hPrevInstance);\r
+ UNREFERENCED_PARAMETER(lpCmdLine);\r
+\r
// Initialize global strings\r
LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING);\r
MyRegisterClass(hInstance);\r
return FALSE;\r
}\r
\r
- ShowWindow(hMainWnd, nCmdShow);\r
+ ShowWindow(hMainWnd, (bStartMinimized) ? SW_MINIMIZE : nCmdShow);\r
UpdateWindow(hMainWnd);\r
\r
+ if (bShowWarning)\r
+ {\r
+ DialogBox (hInstance, MAKEINTRESOURCE(IDD_WARNINGDIALOG), hMainWnd, (DLGPROC)WarningProc);\r
+ }\r
+\r
return TRUE;\r
}\r
\r
RECT R;\r
RECT appRect;\r
DWORD rop = SRCCOPY;\r
- HCURSOR hCursor;\r
- CURSORINFO info;\r
+ CURSORINFO cinfo;\r
+ ICONINFO iinfo;\r
+\r
+ int Width, Height, AppWidth, AppHeight;\r
+ LONG blitAreaWidth, blitAreaHeight, blitAreaX, blitAreaY;\r
\r
desktopHdc = GetWindowDC (hDesktopWindow);\r
\r
GetClientRect(hMainWnd, &appRect);\r
GetWindowRect(hDesktopWindow, &R);\r
\r
- memset(&info, 0, sizeof(info));\r
- info.cbSize = sizeof(info);\r
- GetCursorInfo(&info);\r
- hCursor = info.hCursor;\r
+ memset(&cinfo, 0, sizeof(cinfo));\r
+ cinfo.cbSize = sizeof(cinfo);\r
+ GetCursorInfo(&cinfo);\r
+ GetIconInfo(cinfo.hCursor, &iinfo);\r
\r
/* Create a memory DC compatible with client area DC.*/\r
HdcStrech = CreateCompatibleDC(desktopHdc);\r
/* Draw the mouse pointer in the right position */\r
DrawIcon(\r
HdcStrech ,\r
- pMouse.x - 10,\r
- pMouse.y - 10,\r
- hCursor);\r
+ pMouse.x - iinfo.xHotspot, // - 10,\r
+ pMouse.y - iinfo.yHotspot, // - 10,\r
+ cinfo.hCursor);\r
\r
- int Width = (R.right - R.left);\r
- int Height = (R.bottom - R.top);\r
+ Width = (R.right - R.left);\r
+ Height = (R.bottom - R.top);\r
\r
- int AppWidth = (appRect.right - appRect.left);\r
- int AppHeight = (appRect.bottom - appRect.top);\r
+ AppWidth = (appRect.right - appRect.left);\r
+ AppHeight = (appRect.bottom - appRect.top);\r
\r
- LONG blitAreaWidth = AppWidth / iZoom;\r
- LONG blitAreaHeight = AppHeight / iZoom;\r
+ blitAreaWidth = AppWidth / iZoom;\r
+ blitAreaHeight = AppHeight / iZoom;\r
\r
- LONG blitAreaX = (cp.x) - (blitAreaWidth /2);\r
- LONG blitAreaY = (cp.y) - (blitAreaHeight /2);\r
+ blitAreaX = (cp.x) - (blitAreaWidth /2);\r
+ blitAreaY = (cp.y) - (blitAreaHeight /2);\r
\r
if (blitAreaX < 0)\r
{\r
POINT pNewMouse;\r
POINT pNewCaret;\r
POINT pNewFocus;\r
+ HWND hwnd1, hwnd2, hwnd3;\r
+ DWORD a, b;\r
+ RECT controlRect;\r
\r
//Get current mouse position\r
GetCursorPos (&pNewMouse);\r
\r
//Get caret position\r
- HWND hwnd1 = GetForegroundWindow ();\r
- DWORD a = GetWindowThreadProcessId(hwnd1, NULL);\r
- DWORD b = GetCurrentThreadId();\r
+ hwnd1 = GetForegroundWindow ();\r
+ a = GetWindowThreadProcessId(hwnd1, NULL);\r
+ b = GetCurrentThreadId();\r
AttachThreadInput (a, b, TRUE);\r
- HWND hwnd2 = GetFocus();\r
+ hwnd2 = GetFocus();\r
\r
GetCaretPos( &pNewCaret);\r
ClientToScreen (hwnd2, (LPPOINT) &pNewCaret);\r
AttachThreadInput (a, b, FALSE);\r
\r
//Get current control focus\r
- HWND hwnd3 = GetFocus ();\r
- RECT controlRect;\r
+ hwnd3 = GetFocus ();\r
GetWindowRect (hwnd3 , &controlRect);\r
pNewFocus.x = controlRect.left;\r
pNewFocus.y = controlRect.top;\r
//Get the desktop window\r
hDesktopWindow = GetDesktopWindow();\r
\r
- if (bShowWarning)\r
- {\r
- DialogBox (hInst, MAKEINTRESOURCE(IDD_WARNINGDIALOG), hWnd, (DLGPROC)WarningProc);\r
- }\r
-\r
- if (bStartMinimized)\r
- {\r
- ShowWindow (hMainWnd, SW_MINIMIZE );\r
- }\r
-\r
//Set the timer\r
SetTimer (hWnd , 1, REPAINT_SPEED , NULL);\r
break;\r
return (INT_PTR)TRUE;\r
}\r
case WM_COMMAND:\r
- if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL)\r
- {\r
- EndDialog(hDlg, LOWORD(wParam));\r
- return (INT_PTR)TRUE;\r
- }\r
- if (LOWORD(wParam) == IDOK)\r
- {\r
- }\r
- if (LOWORD(wParam) == IDHELP)\r
- {\r
- MessageBox(hDlg , TEXT("Magnifier help not available yet!") , TEXT("Help") , MB_OK);\r
- }\r
switch(LOWORD(wParam))\r
{\r
+ case IDOK:\r
+ case IDCANCEL:\r
+ EndDialog(hDlg, LOWORD(wParam));\r
+ return (INT_PTR)TRUE;\r
+\r
+ case IDC_BUTTON_HELP:\r
+ /* unimplemented */\r
+ MessageBox(hDlg , TEXT("Magnifier help not available yet!") , TEXT("Help") , MB_OK);\r
+ break;\r
case IDC_ZOOM:\r
if(HIWORD(wParam) == CBN_SELCHANGE)\r
{\r
#define IDD_DIALOGOPTIONS 129\r
#define IDD_WARNINGDIALOG 130\r
#define IDC_ZOOM 1000\r
-#define IDC_CHECK1 1001\r
#define IDC_FOLLOWKEYBOARDCHECK 1002\r
#define IDC_FOLLOWTEXTEDITINGCHECK 1003\r
#define IDC_INVERTCOLORSCHECK 1004\r
#define IDC_SHOWMAGNIFIER 1006\r
#define IDC_SHOWMAGNIFIERCHECK 1006\r
#define IDC_FOLLOWMOUSECHECK 1007\r
+#define IDC_BUTTON_HELP 1008\r
#define IDC_SHOWWARNINGCHECK 1009\r
-#define IDC_BUTTON1 1008\r
#define ID_FILE_OPTIONS 32771\r
#define ID_OPTIONS 32772\r
#define IDM_OPTIONS 32773\r
#include "lang/es-ES.rc"
#include "lang/de-DE.rc"
#include "lang/fr-FR.rc"
+#include "lang/it-IT.rc"
#include "lang/pl-PL.rc"
#include "lang/ru-RU.rc"
#include "lang/sk-SK.rc"
projects / reactos.git / commitdiff