Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-01 11:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Remove all the VS stuff from the english resource file and make it readable/editable/translateable

Browse source 
- Remove some redundant resources
- Fix some typos
- Use RegisterClass instead of RegisterClassEx in the MyRegisterClass function: This way we don't need a resource for the small icon, but it works the same
- Add a "rsrc.rc" file

svn path=/trunk/; revision=27821
This commit is contained in:
Colin Finck 2007-07-26 07:43:01 +00:00
parent c277abc3bb
commit 025355738a
5 changed files with 36 additions and 195 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

162
rosapps/magnify/lang/en-US.rc
View file

@ -1,62 +1,4 @@
// Microsoft Visual C++ generated resource script.
//
#include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#define APSTUDIO_HIDDEN_SYMBOLS
#include "windows.h"
#undef APSTUDIO_HIDDEN_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// Neutral resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
#ifdef _WIN32
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_ICON ICON "res/magnify.ico"
#endif // Neutral resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_MAGNIFIER ICON "res/Magnify.ico"
/////////////////////////////////////////////////////////////////////////////
//
// Menu
//
IDC_MAGNIFIER MENU IDC_MAGNIFIER MENU
BEGIN BEGIN
@ -69,33 +11,21 @@ BEGIN
END END
END END
/////////////////////////////////////////////////////////////////////////////
//
// Accelerator
//
IDC_MAGNIFIER ACCELERATORS IDC_MAGNIFIER ACCELERATORS
BEGIN BEGIN
"?", IDM_ABOUT, ASCII, ALT "?", IDM_ABOUT, ASCII, ALT
"/", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT
END END
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_ABOUTBOX DIALOGEX 22, 17, 220, 75 IDD_ABOUTBOX DIALOGEX 22, 17, 220, 75
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_CAPTION | WS_SYSMENU
CAPTION "About" CAPTION "About"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
ICON IDI_MAGNIFIER,IDC_MYICON,14,9,20,20 ICON IDI_ICON,IDC_MYICON,14,9,20,20
LTEXT "Magnifier Version 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX LTEXT "Magnifier Version 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 LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)",IDC_STATIC,48,24,125,22
PUSHBUTTON "Ok",IDOK,162,48,50,14 PUSHBUTTON "OK",IDOK,162,48,50,14
END END
IDD_DIALOGOPTIONS DIALOGEX 0, 0, 153, 182 IDD_DIALOGOPTIONS DIALOGEX 0, 0, 153, 182
@ -105,12 +35,12 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN BEGIN
DEFPUSHBUTTON "Exit",IDOK,96,161,50,14 DEFPUSHBUTTON "Exit",IDOK,96,161,50,14
PUSHBUTTON "Help",IDOK,38,161,50,14 PUSHBUTTON "Help",IDOK,38,161,50,14
LTEXT "Magnification level :",IDC_STATIC,6,12,68,8 LTEXT "Magnification level:",IDC_STATIC,6,12,68,8
COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Tracking",IDC_STATIC,7,25,139,59 GROUPBOX "Tracking",IDC_STATIC,7,25,139,59
GROUPBOX "Presentation",IDC_STATIC,7,87,139,57 GROUPBOX "Presentation",IDC_STATIC,7,87,139,57
CONTROL "Follow mouse cursor",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,42,114,10 CONTROL "Follow mouse cursor",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,42,114,10
CONTROL "Follow keyboard focus",IDC_FOLOWKEYBOARDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,54,114,10 CONTROL "Follow keyboard focus",IDC_FOLLOWKEYBOARDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,54,114,10
CONTROL "Follow text editing",IDC_FOLLOWTEXTEDITINGCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,66,114,10 CONTROL "Follow text editing",IDC_FOLLOWTEXTEDITINGCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,66,114,10
CONTROL "Invert colors",IDC_INVERTCOLORSCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,102,114,10 CONTROL "Invert colors",IDC_INVERTCOLORSCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,102,114,10
CONTROL "Start Minimized",IDC_STARTMINIMIZEDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,114,114,10 CONTROL "Start Minimized",IDC_STARTMINIMIZEDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,114,114,10
@ -123,91 +53,13 @@ CAPTION "ReactOS Magnifier"
FONT 8, "MS Shell Dlg", 400, 0, 0x1 FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN BEGIN
DEFPUSHBUTTON "OK",IDOK,193,76,50,14 DEFPUSHBUTTON "OK",IDOK,193,76,50,14
ICON IDI_MAGNIFIER,IDC_STATIC,7,17,20,20 ICON IDI_ICON,IDC_STATIC,7,17,20,20
LTEXT "Magnifier is intended to provide a minium level of funcionality for users with slight visual impairments. Most users with visual impairments will need a magnigication utility with higher funcionality for deily use.",IDC_STATIC,36,7,207,33 LTEXT "Magnifier is intended to provide a minimum level of functionality for users with slight visual impairments. Most users with visual impairments will need a magnification utility with higher funcionality for daily use.",IDC_STATIC,36,7,207,33
CONTROL "Do not show this message again",IDC_SHOWWARNINGCHECK, CONTROL "Do not show this message again",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10
END END
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE
BEGIN
"#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
"#include ""windows.h""\r\n"
"#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
"\0"
END
3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO
BEGIN
IDD_DIALOGOPTIONS, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 146
TOPMARGIN, 7
BOTTOMMARGIN, 175
END
IDD_WARNINGDIALOG, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 243
TOPMARGIN, 7
BOTTOMMARGIN, 90
END
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// String Table
//
STRINGTABLE STRINGTABLE
BEGIN BEGIN
IDS_APP_TITLE "Magnifier" IDS_APP_TITLE "Magnifier"
IDC_MAGNIFIER "MAGNIFIER" IDC_MAGNIFIER "MAGNIFIER"
END END
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

33
rosapps/magnify/magnifier.c
View file

@ -98,23 +98,20 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
// //
ATOM MyRegisterClass(HINSTANCE hInstance) ATOM MyRegisterClass(HINSTANCE hInstance)
{ {
WNDCLASSEX wcex; WNDCLASS wc;
wcex.cbSize = sizeof(WNDCLASSEX); wc.style = CS_HREDRAW | CS_VREDRAW;
wc.lpfnWndProc = WndProc;
wc.cbClsExtra = 0;
wc.cbWndExtra = 0;
wc.hInstance = hInstance;
wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ICON));
wc.hCursor = LoadCursor(NULL, IDC_ARROW);
wc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1);
wc.lpszMenuName = MAKEINTRESOURCE(IDC_MAGNIFIER);
wc.lpszClassName = szWindowClass;
wcex.style = CS_HREDRAW | CS_VREDRAW; return RegisterClass(&wc);
wcex.lpfnWndProc = WndProc;
wcex.cbClsExtra = 0;
wcex.cbWndExtra = 0;
wcex.hInstance = hInstance;
wcex.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MAGNIFIER));
wcex.hCursor = LoadCursor(NULL, IDC_ARROW);
wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW+1);
wcex.lpszMenuName = MAKEINTRESOURCE(IDC_MAGNIFIER);
wcex.lpszClassName = szWindowClass;
wcex.hIconSm = LoadIcon(wcex.hInstance, MAKEINTRESOURCE(IDI_SMALL));
return RegisterClassEx(&wcex);
} }
// //
@ -463,7 +460,7 @@ INT_PTR CALLBACK OptionsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPar
SendDlgItemMessage(hDlg,IDC_FOLLOWMOUSECHECK,BM_SETCHECK , wParam ,0); SendDlgItemMessage(hDlg,IDC_FOLLOWMOUSECHECK,BM_SETCHECK , wParam ,0);
if (bFollowFocus) if (bFollowFocus)
SendDlgItemMessage(hDlg,IDC_FOLOWKEYBOARDCHECK,BM_SETCHECK , wParam ,0); SendDlgItemMessage(hDlg,IDC_FOLLOWKEYBOARDCHECK,BM_SETCHECK , wParam ,0);
if (bFollowCaret) if (bFollowCaret)
SendDlgItemMessage(hDlg,IDC_FOLLOWTEXTEDITINGCHECK,BM_SETCHECK , wParam ,0); SendDlgItemMessage(hDlg,IDC_FOLLOWTEXTEDITINGCHECK,BM_SETCHECK , wParam ,0);
@ -513,8 +510,8 @@ INT_PTR CALLBACK OptionsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPar
case IDC_FOLLOWMOUSECHECK: case IDC_FOLLOWMOUSECHECK:
bFollowMouse = IsDlgButtonChecked (hDlg, IDC_FOLLOWMOUSECHECK); bFollowMouse = IsDlgButtonChecked (hDlg, IDC_FOLLOWMOUSECHECK);
break; break;
case IDC_FOLOWKEYBOARDCHECK: case IDC_FOLLOWKEYBOARDCHECK:
bFollowFocus = IsDlgButtonChecked (hDlg, IDC_FOLOWKEYBOARDCHECK); bFollowFocus = IsDlgButtonChecked (hDlg, IDC_FOLLOWKEYBOARDCHECK);
break; break;
case IDC_FOLLOWTEXTEDITINGCHECK: case IDC_FOLLOWTEXTEDITINGCHECK:
bFollowCaret = IsDlgButtonChecked (hDlg, IDC_FOLLOWTEXTEDITINGCHECK); bFollowCaret = IsDlgButtonChecked (hDlg, IDC_FOLLOWTEXTEDITINGCHECK);

6
rosapps/magnify/magnify.rc
View file

@ -2,10 +2,14 @@
#include <commctrl.h> #include <commctrl.h>
#include "resource.h" #include "resource.h"
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Magnifier\0" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Magnifier\0"
#define REACTOS_STR_INTERNAL_NAME "magnify\0" #define REACTOS_STR_INTERNAL_NAME "magnify\0"
#define REACTOS_STR_ORIGINAL_FILENAME "magnify.exe\0" #define REACTOS_STR_ORIGINAL_FILENAME "magnify.exe\0"
#include <reactos/version.rc> #include <reactos/version.rc>
#include "lang/en-US.rc" IDI_ICON ICON "res/magnify.ico"
#include "rsrc.rc"

26
rosapps/magnify/resource.h
View file

@ -1,22 +1,19 @@
//{{NO_DEPENDENCIES}} #define IDC_STATIC -1
// Microsoft Visual C++ generated include file.
// Used by Magnifier.rc #define IDI_ICON 101
//
#define IDC_MYICON 2
#define IDD_MAGNIFIER_DIALOG 102 #define IDD_MAGNIFIER_DIALOG 102
#define IDS_APP_TITLE 103 #define IDS_APP_TITLE 103
#define IDD_ABOUTBOX 103 #define IDD_ABOUTBOX 103
#define IDM_ABOUT 104 #define IDM_ABOUT 104
#define IDM_EXIT 105 #define IDM_EXIT 105
#define IDI_MAGNIFIER 107 #define IDC_MYICON 106
#define IDI_SMALL 108
#define IDC_MAGNIFIER 109 #define IDC_MAGNIFIER 109
#define IDR_MAINFRAME 128 #define IDR_MAINFRAME 128
#define IDD_DIALOGOPTIONS 129 #define IDD_DIALOGOPTIONS 129
#define IDD_WARNINGDIALOG 130 #define IDD_WARNINGDIALOG 130
#define IDC_ZOOM 1000 #define IDC_ZOOM 1000
#define IDC_CHECK1 1001 #define IDC_CHECK1 1001
#define IDC_FOLOWKEYBOARDCHECK 1002 #define IDC_FOLLOWKEYBOARDCHECK 1002
#define IDC_FOLLOWTEXTEDITINGCHECK 1003 #define IDC_FOLLOWTEXTEDITINGCHECK 1003
#define IDC_INVERTCOLORSCHECK 1004 #define IDC_INVERTCOLORSCHECK 1004
#define IDC_STARTMINIMIZEDCHECK 1005 #define IDC_STARTMINIMIZEDCHECK 1005
@ -28,16 +25,3 @@
#define ID_FILE_OPTIONS 32771 #define ID_FILE_OPTIONS 32771
#define ID_OPTIONS 32772 #define ID_OPTIONS 32772
#define IDM_OPTIONS 32773 #define IDM_OPTIONS 32773
#define IDC_STATIC -1
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NO_MFC 1
#define _APS_NEXT_RESOURCE_VALUE 131
#define _APS_NEXT_COMMAND_VALUE 32774
#define _APS_NEXT_CONTROL_VALUE 1009
#define _APS_NEXT_SYMED_VALUE 110
#endif
#endif

4
rosapps/magnify/rsrc.rc Normal file
View file

@ -0,0 +1,4 @@
#include <windows.h>
#include "resource.h"
#include "lang/en-US.rc"