Re: [ros-dev] [ros-diffs] [janderwald] 22425: change to dialog font to MS S hell Dlg patch by EmuandCo
Hi,
These changes are only half correct. In order for the MS Shell Dlg font to be correctly mapped to the current user interface font, the DS_SHELLFONT must also be added to the dialog using DIALOGEX.
As a second note (I don't have the code handy), do we actually map MS Shell Dlg fonts current interface fonts? It should be a value specified in the registry
Regards, Ged.
-----Original Message----- From: janderwald@svn.reactos.org [mailto:janderwald@svn.reactos.org] Sent: 19 June 2006 18:31 To: ros-diffs@reactos.org Subject: [ros-diffs] [janderwald] 22425: change to dialog font to MS Shell Dlg patch by EmuandCo
Author: janderwald Date: Mon Jun 19 21:31:18 2006 New Revision: 22425
URL: http://svn.reactos.ru/svn/reactos?rev=22425&view=rev Log: change to dialog font to MS Shell Dlg patch by EmuandCo
Added: trunk/reactos/base/applications/sm/De.rc Modified: trunk/reactos/base/applications/screensavers/matrix/matrix.rc trunk/reactos/base/applications/servman/De.rc trunk/reactos/base/applications/servman/En.rc trunk/reactos/base/applications/servman/Ru.rc trunk/reactos/base/applications/sm/sm.rc trunk/reactos/base/applications/sndvol32/De.rc trunk/reactos/base/applications/taskmgr/Cz.rc trunk/reactos/base/applications/taskmgr/De.rc trunk/reactos/base/applications/taskmgr/Dk.rc trunk/reactos/base/applications/taskmgr/En.rc trunk/reactos/base/applications/taskmgr/Es.rc trunk/reactos/base/applications/taskmgr/Fr.rc trunk/reactos/base/applications/taskmgr/Hu.rc trunk/reactos/base/applications/taskmgr/Nl.rc trunk/reactos/base/applications/taskmgr/Sv.rc trunk/reactos/base/applications/taskmgr/Uk.rc trunk/reactos/base/applications/winefile/de.rc trunk/reactos/base/applications/winefile/en.rc trunk/reactos/base/applications/winefile/es.rc trunk/reactos/base/applications/winefile/fr.rc trunk/reactos/base/applications/wordpad/En.rc
Modified: trunk/reactos/base/applications/screensavers/matrix/matrix.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/screensave rs/matrix/matrix.rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/screensavers/matrix/matrix.rc (original) +++ trunk/reactos/base/applications/screensavers/matrix/matrix.rc Mon Jun 19 21:31:18 2006 @@ -29,7 +29,7 @@ IDD_CONFIG DIALOG DISCARDABLE 0, 0, 340, 183 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Matrix ScreenSaver Configuration" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Decode &Speed",IDC_STATIC,7,7,128,36 LTEXT "Slower",IDC_STATIC,13,24,22,8
Modified: trunk/reactos/base/applications/servman/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/De .rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/servman/De.rc (original) +++ trunk/reactos/base/applications/servman/De.rc Mon Jun 19 21:31:18 2006 @@ -31,7 +31,7 @@ IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,190,182 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Über den Service Manager" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Service Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,48,7,130,26 @@ -44,7 +44,7 @@
IDD_DLG_GENERAL DIALOGEX 6,6,253,225 CAPTION "Allgemein" -FONT 8,"MS Sans Serif",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE 0x10CF0000 BEGIN CONTROL "Dienstname:",IDC_STATIC,"Static",0x50000000,4,11,53,11
Modified: trunk/reactos/base/applications/servman/En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/En .rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/servman/En.rc (original) +++ trunk/reactos/base/applications/servman/En.rc Mon Jun 19 21:31:18 2006 @@ -63,7 +63,7 @@
IDD_ABOUTBOX DIALOGEX 22,16,190,182 CAPTION "About Service Manager" -FONT 8,"Tahoma",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Service Manager v0.5.1\nCopyright (C) 2005-2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26 @@ -74,7 +74,7 @@
IDD_DLG_GENERAL DIALOGEX 6,6,253,225 CAPTION "General" -FONT 8,"Tahoma",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP BEGIN LTEXT "", IDC_SERV_NAME, 70,11,176,11, WS_CHILD | WS_VISIBLE @@ -100,7 +100,7 @@
IDD_DLG_DEPEND DIALOGEX 6,6,253,225 CAPTION "Dependencies" -FONT 8,"Tahoma",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP BEGIN CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70, 236, 68, 0x00000200 @@ -112,7 +112,7 @@
IDD_DLG_CREATE DIALOGEX 6,6,225,209 CAPTION "Create a service" -FONT 8,"Tahoma",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP BEGIN EDITTEXT IDC_CREATE_SERVNAME, 72, 12, 150, 11, WS_CHILD | WS_VISIBLE | WS_EX_CLIENTEDGE @@ -132,7 +132,7 @@
IDD_DLG_DELETE DIALOGEX 6,6,185,148 CAPTION "Delete a service" -FONT 8,"Tahoma",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | DS_MODALFRAME BEGIN ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 @@ -146,7 +146,7 @@
IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 CAPTION "Options" -FONT 8,"MS Sans Serif",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE 0x10CF0000 BEGIN LTEXT "", IDC_CREATE_HELP, 6, 5, 200, 150 @@ -155,7 +155,7 @@
IDD_DLG_PROGRESS DIALOGEX 6,6,255,89 CAPTION "Service Control" -FONT 8,"MS Sans Serif",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME EXSTYLE WS_EX_TOOLWINDOW BEGIN
Modified: trunk/reactos/base/applications/servman/Ru.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/Ru .rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/servman/Ru.rc (original) +++ trunk/reactos/base/applications/servman/Ru.rc Mon Jun 19 21:31:18 2006 @@ -63,7 +63,7 @@
IDD_ABOUTBOX DIALOGEX 22,16,190,182 CAPTION "Î Service Manager" -FONT 8,"Tahoma",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Service Manager v0.5\nCopyright (C) 2005-2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26 @@ -74,7 +74,7 @@
IDD_DLG_GENERAL DIALOGEX 6,6,253,225 CAPTION "Îáùèå" -FONT 8,"Tahoma",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP BEGIN LTEXT "", IDC_SERV_NAME, 70,11,176,11, WS_CHILD | WS_VISIBLE @@ -100,7 +100,7 @@
IDD_DLG_DEPEND DIALOGEX 6,6,253,225 CAPTION "Çàâèñèìîñòè" -FONT 8,"Tahoma",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP BEGIN CONTROL "",IDC_DEPEND_TREE1,"SysTreeView32",0x50010007,8,70,236,68,0x00000200 @@ -112,7 +112,7 @@
IDD_DLG_CREATE DIALOGEX 6,6,225,209 CAPTION "Ñîçäàòü ñëóæáó" -FONT 8,"Tahoma",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP BEGIN CONTROL "",IDC_CREATE_SERVNAME,"Edit",0x50010000,72,12,150,11,0x00000200 @@ -132,7 +132,7 @@
IDD_DLG_DELETE DIALOGEX 6,6,185,148 CAPTION "Óäàëèòü ñëóæáó" -FONT 8,"Tahoma",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | DS_MODALFRAME BEGIN ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 @@ -146,7 +146,7 @@
IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 CAPTION "Íàñòðîéêè" -FONT 8,"MS Sans Serif",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE 0x10CF0000 BEGIN LTEXT "", IDC_CREATE_HELP, 6, 5, 200, 150 @@ -155,7 +155,7 @@
IDD_DLG_PROGRESS DIALOGEX 6,6,255,89 CAPTION "Service Control" -FONT 8,"MS Sans Serif",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME EXSTYLE WS_EX_TOOLWINDOW BEGIN
Added: trunk/reactos/base/applications/sm/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/sm/De.rc?r ev=22425&view=auto ============================================================================ == --- trunk/reactos/base/applications/sm/De.rc (added) +++ trunk/reactos/base/applications/sm/De.rc Mon Jun 19 21:31:18 2006 @@ -1,0 +1,56 @@ +#include "resource.h" +/* + * German language file by Daniel Reimer <EmuandCo> 2006-06-15 + * Moved all hardcoded strings to En.rc. + * By Magnus Olsen 2005 magnus@itkonsult-olsen.com + */ + +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +STRINGTABLE DISCARDABLE +{ +IDS_boot, "boot subsystem_name" + +IDS_help, "help [command]" + +IDS_info, "info [subsystem_id]" + +IDS_reboot, "reboot subsystem_id" + +IDS_shutdown,"shutdown subsystem_id" + + + +IDS_boot_msg, "bootstrap an optional environment subsystem;" + +IDS_help_msg, "print help for command;" + +IDS_info_msg, "print information about a booted subsystem\n\ +if subsystem_id is omitted, a list of booted\n\ +environment subsystems is printed." + +IDS_reboot_msg, "reboot an optional environment subsystem;" +IDS_shutdown_msg, "shutdown an optional environment subsystem;" + +IDS_Unknown, "Unknown command '%s'.\n" + +IDS_SM1, "SM SubSystem Directory\n\n\ +SSID PID Flags\n\ +---- -------- ------------\n" + +IDS_SM2, "%04x %08lx %04x\n" + +IDS_ID, "SubSystem ID: %d\n\ + Flags: %04x\n\ + Process ID: %ld\n" + +IDS_Not_Imp, "not implemented\n" + +IDS_Mangers, "ReactOS/Win32 - Session Manager Control Tool\n\n" + +IDS_USING, "Usage:\n\ +\tsm\n\ +\tsm help [command]\n\ +\tsm command [arguments]\n\n'sm help' will print the list of valid commands.\n" + +IDS_FAILS_MNG, "Failed to connect to the Session Manager! (Status=0x%08lx)\n" +}
Modified: trunk/reactos/base/applications/sm/sm.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/sm/sm.rc?r ev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/sm/sm.rc (original) +++ trunk/reactos/base/applications/sm/sm.rc Mon Jun 19 21:31:18 2006 @@ -5,6 +5,7 @@ #include <reactos/version.rc>
#include "En.rc" +#include "De.rc" #include "Ja.rc" #include "Hu.rc" #include "Ru.rc"
Modified: trunk/reactos/base/applications/sndvol32/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/sndvol32/D e.rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/sndvol32/De.rc (original) +++ trunk/reactos/base/applications/sndvol32/De.rc Mon Jun 19 21:31:18 2006 @@ -1,4 +1,4 @@ -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
IDM_MAINMENU MENU DISCARDABLE BEGIN @@ -31,8 +31,8 @@ LTEXT "&Mixer:", -1, 7,8,48,9 COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "Lautstärke regeln für:", -1, 7,25,211,77 - PUSHBUTTON "Wie&dergabe", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Aufnahme", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "Wie&dergabe", IDC_PLAYBACK, 13,43,50,8, BS_AUTORADIOBUTTON + PUSHBUTTON "&Aufnahme", IDC_RECORDING, 13,61,50,8, BS_AUTORADIOBUTTON PUSHBUTTON "A&ndere:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "Show the following volume controls:", IDC_LABELCONTROLS, 7, 109, 162, 8
Modified: trunk/reactos/base/applications/taskmgr/Cz.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/taskmgr/Cz .rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/taskmgr/Cz.rc (original) +++ trunk/reactos/base/applications/taskmgr/Cz.rc Mon Jun 19 21:31:18 2006 @@ -164,7 +164,7 @@ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "O správci úloh" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Správce úloh v1.0\nCopyright (C) 1999 - 2001\n Brian Palmer (brianp@reactos.org)", IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, @@ -181,14 +181,14 @@ WS_THICKFRAME CAPTION "Správce úloh" MENU IDR_TASKMANAGER -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 END
IDD_APPLICATION_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 @@ -199,7 +199,7 @@
IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | @@ -212,7 +212,7 @@ //IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Využití CPU",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT GROUPBOX "Využití RAM",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT @@ -271,7 +271,7 @@ IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Kanály ladìní" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | @@ -282,7 +282,7 @@ IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 231, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Afinita procesoru" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,120,133,50,14 PUSHBUTTON "Storno",IDCANCEL,174,133,50,14 @@ -357,7 +357,7 @@ IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 195, 199 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Vyberte sloupce" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,84,178,50,14 PUSHBUTTON "Storno",IDCANCEL,138,178,50,14
Modified: trunk/reactos/base/applications/taskmgr/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/taskmgr/De .rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/taskmgr/De.rc (original) +++ trunk/reactos/base/applications/taskmgr/De.rc Mon Jun 19 21:31:18 2006 @@ -164,7 +164,7 @@ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Info über Task-Manager" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Task Manager v1.0\nCopyright (C) 1999 - 2001\nvon Brian Palmer (brianp@reactos.org)", IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, @@ -181,7 +181,7 @@ WS_THICKFRAME CAPTION "Task-Manager" MENU IDR_TASKMANAGER -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 @@ -189,7 +189,7 @@
IDD_APPLICATION_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | @@ -201,7 +201,7 @@
IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | @@ -215,7 +215,7 @@ //IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "CPU-Auslastung",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT GROUPBOX "Auslagerungsdatei",IDC_MEM_USAGE_FRAME,0,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT //5,63,60,54 @@ -275,7 +275,7 @@ IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Debug-Kanäle" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | @@ -287,7 +287,7 @@ IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 231, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Prozessorzugehörigkeit" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,120,133,50,14 PUSHBUTTON "Abbrechen",IDCANCEL,174,133,50,14 @@ -362,7 +362,7 @@ IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 240, 199 //0, 0, 195, 199 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Spalten auswählen" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,124,178,50,14 //84 PUSHBUTTON "Abbrechen",IDCANCEL,178,178,50,14 //138
Modified: trunk/reactos/base/applications/taskmgr/Dk.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/taskmgr/Dk .rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/taskmgr/Dk.rc (original) +++ trunk/reactos/base/applications/taskmgr/Dk.rc Mon Jun 19 21:31:18 2006 @@ -163,7 +163,7 @@ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Omkring Opgavestyring" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Opgavestyring v1.0\nKopibeskyttet (C) 1999 - 2001\naf Brian Palmer (brianp@reactos.org)", IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, @@ -180,14 +180,14 @@ WS_THICKFRAME CAPTION "Opgavestyring" MENU IDR_TASKMANAGER -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 END
IDD_APPLICATION_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 @@ -199,7 +199,7 @@ IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN CAPTION "KMK" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | @@ -212,7 +212,7 @@ //IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "CPU Forbrug",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT GROUPBOX "Hukommelse Forbrug",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT @@ -271,7 +271,7 @@ IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Debug Kanaler" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | @@ -282,7 +282,7 @@ IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 231, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Processor Affinitet" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,120,133,50,14 PUSHBUTTON "Fortryd",IDCANCEL,174,133,50,14 @@ -357,7 +357,7 @@ IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 195, 199 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Vælg Kolonner" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,84,178,50,14 PUSHBUTTON "Fortryd",IDCANCEL,138,178,50,14
Modified: trunk/reactos/base/applications/taskmgr/En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/taskmgr/En .rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/taskmgr/En.rc (original) +++ trunk/reactos/base/applications/taskmgr/En.rc Mon Jun 19 21:31:18 2006 @@ -164,7 +164,7 @@ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "About Task Manager" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Task Manager v1.0\nCopyright (C) 1999 - 2001\nby Brian Palmer (brianp@reactos.org)", IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, @@ -181,14 +181,14 @@ WS_THICKFRAME CAPTION "Task Manager" MENU IDR_TASKMANAGER -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 END
IDD_APPLICATION_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 @@ -199,7 +199,7 @@
IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | @@ -212,7 +212,7 @@ //IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "CPU Usage",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT GROUPBOX "MEM Usage",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT @@ -271,7 +271,7 @@ IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Debug Channels" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | @@ -282,7 +282,7 @@ IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 231, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Processor Affinity" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,120,133,50,14 PUSHBUTTON "Cancel",IDCANCEL,174,133,50,14 @@ -357,7 +357,7 @@ IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 195, 199 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select Columns" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,84,178,50,14 PUSHBUTTON "Cancel",IDCANCEL,138,178,50,14
Modified: trunk/reactos/base/applications/taskmgr/Es.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/taskmgr/Es .rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/taskmgr/Es.rc (original) +++ trunk/reactos/base/applications/taskmgr/Es.rc Mon Jun 19 21:31:18 2006 @@ -181,7 +181,7 @@ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Acerca del Administrador de Tareas" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Task Manager v1.0\nCopyright (C) 1999 - 2001\nby Brian Palmer (brianp@reactos.org)", IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, @@ -198,7 +198,7 @@ WS_THICKFRAME CAPTION "Administrador de Tareas" MENU IDR_TASKMANAGER -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 @@ -206,7 +206,7 @@
IDD_APPLICATION_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | @@ -218,7 +218,7 @@
IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | @@ -232,7 +232,7 @@ //IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Uso de la CPU",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT GROUPBOX "Uso de la MEMORIA",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT @@ -293,7 +293,7 @@ IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Canales de Depuracion" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | @@ -305,7 +305,7 @@ IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 231, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Afinidad del Procesador" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Aceptar",IDOK,120,133,50,14 PUSHBUTTON "Cancelar",IDCANCEL,174,133,50,14 @@ -380,7 +380,7 @@ IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 195, 199 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Seleccionar Columnas" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Aceptar",IDOK,84,178,50,14 PUSHBUTTON "Cancelar",IDCANCEL,138,178,50,14
Modified: trunk/reactos/base/applications/taskmgr/Fr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/taskmgr/Fr .rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/taskmgr/Fr.rc (original) +++ trunk/reactos/base/applications/taskmgr/Fr.rc Mon Jun 19 21:31:18 2006 @@ -164,7 +164,7 @@ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "à propos du Gestionnaire des tâches" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Gestionnaire des tâches v1.0\nCopyright (C) 1999 - 2001\nby Brian Palmer (brianp@reactos.org)\nTraduit par Benoit Plante - 2005", IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, @@ -181,14 +181,14 @@ WS_THICKFRAME CAPTION "Gestionnaire des tâches" MENU IDR_TASKMANAGER -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 END
IDD_APPLICATION_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 @@ -199,7 +199,7 @@
IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | @@ -212,7 +212,7 @@ //IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Util. de l'UC",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT GROUPBOX "Util. du fichier",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT @@ -271,7 +271,7 @@ IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Cannaux de débogage" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | @@ -282,7 +282,7 @@ IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 231, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Affinité du processeur" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,120,133,50,14 PUSHBUTTON "Annuler",IDCANCEL,174,133,50,14 @@ -357,7 +357,7 @@ IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 195, 199 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Sélection de colonnes" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,84,178,50,14 PUSHBUTTON "Annuler",IDCANCEL,138,178,50,14
Modified: trunk/reactos/base/applications/taskmgr/Hu.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/taskmgr/Hu .rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/taskmgr/Hu.rc (original) +++ trunk/reactos/base/applications/taskmgr/Hu.rc Mon Jun 19 21:31:18 2006 @@ -165,7 +165,7 @@ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Feladatkezelõ" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Feladatkezelõ /Task Manager/ v1.0\nCopyright (C) 1999 - 2001\nby Brian Palmer (brianp@reactos.org)", IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, @@ -182,14 +182,14 @@ WS_THICKFRAME CAPTION "Feladatkezelõ" MENU IDR_TASKMANAGER -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 END
IDD_APPLICATION_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 @@ -200,7 +200,7 @@
IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | @@ -213,7 +213,7 @@ //IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "CPU használat",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT GROUPBOX "Memória használat",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT @@ -272,7 +272,7 @@ IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Hibakeresõ csatornák" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | @@ -283,7 +283,7 @@ IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 231, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Processor Affinity" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,120,133,50,14 PUSHBUTTON "Mégse",IDCANCEL,174,133,50,14 @@ -358,7 +358,7 @@ IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 195, 199 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Oszlopok kiválasztása" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,84,178,50,14 PUSHBUTTON "Mégse",IDCANCEL,138,178,50,14
Modified: trunk/reactos/base/applications/taskmgr/Nl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/taskmgr/Nl .rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/taskmgr/Nl.rc (original) +++ trunk/reactos/base/applications/taskmgr/Nl.rc Mon Jun 19 21:31:18 2006 @@ -164,7 +164,7 @@ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Over Taak Beheer" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Taak Beheer v1.0\nCopyright (C) 1999 - 2001\nby Brian Palmer (brianp@reactos.org)", IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, @@ -181,14 +181,14 @@ WS_THICKFRAME CAPTION "Taak Beheer" MENU IDR_TASKMANAGER -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 END
IDD_APPLICATION_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 @@ -199,7 +199,7 @@
IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | @@ -212,7 +212,7 @@ //IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Weergave van CPU-gebruik",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT GROUPBOX "Weergave van geheugengebruik",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT @@ -271,7 +271,7 @@ IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Debug kanalen" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | @@ -282,7 +282,7 @@ IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 231, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Processoraffiniteit" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,120,133,50,14 PUSHBUTTON "Annuleren",IDCANCEL,174,133,50,14 @@ -357,7 +357,7 @@ IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 195, 199 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Kolommen selecteren" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,84,178,50,14 PUSHBUTTON "Annuleren",IDCANCEL,138,178,50,14
Modified: trunk/reactos/base/applications/taskmgr/Sv.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/taskmgr/Sv .rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/taskmgr/Sv.rc (original) +++ trunk/reactos/base/applications/taskmgr/Sv.rc Mon Jun 19 21:31:18 2006 @@ -181,7 +181,7 @@ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Om Aktivitetshanteraren" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Aktivitetshanteraren v1.0\nCopyright (C) 1999 - 2001\nby Brian Palmer (brianp@reactos.org)", IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, @@ -198,14 +198,14 @@ WS_THICKFRAME CAPTION "Aktivitetshanteraren" MENU IDR_TASKMANAGER -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 END
IDD_APPLICATION_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 @@ -216,7 +216,7 @@
IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | @@ -229,7 +229,7 @@ //IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Processoranv.",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT GROUPBOX "Minnesanv.",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT @@ -288,7 +288,7 @@ IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Felsökningskanaler" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | @@ -299,7 +299,7 @@ IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 231, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Processorsamhörighet" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,120,133,50,14 PUSHBUTTON "Avbryt",IDCANCEL,174,133,50,14 @@ -374,7 +374,7 @@ IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 275, 199 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Välj kolumner" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,84,178,50,14 PUSHBUTTON "Avbryt",IDCANCEL,138,178,50,14
Modified: trunk/reactos/base/applications/taskmgr/Uk.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/taskmgr/Uk .rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/taskmgr/Uk.rc (original) +++ trunk/reactos/base/applications/taskmgr/Uk.rc Mon Jun 19 21:31:18 2006 @@ -164,7 +164,7 @@ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Ïðî Äèñïåò÷åð çàâäàíü" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Äèñïåò÷åð çàâäàíü v1.0\nCopyright (C) 1999 - 2001\nby Brian Palmer (brianp@reactos.org)", IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, @@ -181,14 +181,14 @@ WS_THICKFRAME CAPTION "Äèñïåò÷åð çàâäàíü" MENU IDR_TASKMANAGER -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 END
IDD_APPLICATION_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 @@ -199,7 +199,7 @@
IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | @@ -212,7 +212,7 @@ //IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Âèêîðèñòàííÿ ÖÏ",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT GROUPBOX "Âèêîðèñòàííÿ ïàì'ÿò³",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT @@ -271,7 +271,7 @@ IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Íàëàãîäæåííÿ êàíàë³â" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | @@ -282,7 +282,7 @@ IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 231, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "³äïîâ³äí³ñòü ïðîöåñîð³â" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,120,133,50,14 PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,174,133,50,14 @@ -357,7 +357,7 @@ IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 195, 199 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Âèá³ð ñòîâïö³â" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,84,178,50,14 PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,138,178,50,14
Modified: trunk/reactos/base/applications/winefile/de.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/winefile/d e.rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/winefile/de.rc (original) +++ trunk/reactos/base/applications/winefile/de.rc Mon Jun 19 21:31:18 2006 @@ -176,7 +176,7 @@ IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Angaben auswählen" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Name:",-1,7,8,22,10 EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL @@ -198,7 +198,7 @@ IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Eigenschaften für %s" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,191,7,50,14 PUSHBUTTON "Abbrechen",IDCANCEL,191,29,50,14
Modified: trunk/reactos/base/applications/winefile/en.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/winefile/e n.rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/winefile/en.rc (original) +++ trunk/reactos/base/applications/winefile/en.rc Mon Jun 19 21:31:18 2006 @@ -180,7 +180,7 @@ IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "By File Type" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Name:",-1,7,8,22,10 EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL @@ -202,7 +202,7 @@ IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Properties for %s" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,191,7,50,14 PUSHBUTTON "Cancel",IDCANCEL,191,29,50,14
Modified: trunk/reactos/base/applications/winefile/es.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/winefile/e s.rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/winefile/es.rc (original) +++ trunk/reactos/base/applications/winefile/es.rc Mon Jun 19 21:31:18 2006 @@ -175,7 +175,7 @@ IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "By File Type" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Nombre:",-1,7,8,22,10 EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL @@ -197,7 +197,7 @@ IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Properties for %s" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Aceptar",IDOK,191,7,50,14 PUSHBUTTON "Cancelar",IDCANCEL,191,29,50,14
Modified: trunk/reactos/base/applications/winefile/fr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/winefile/f r.rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/winefile/fr.rc (original) +++ trunk/reactos/base/applications/winefile/fr.rc Mon Jun 19 21:31:18 2006 @@ -180,7 +180,7 @@ IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Par type de fichier" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Name:",-1,7,8,22,10 EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL @@ -202,7 +202,7 @@ IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Propriétés de %s" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,191,7,50,14 PUSHBUTTON "Annuler",IDCANCEL,191,29,50,14
Modified: trunk/reactos/base/applications/wordpad/En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/wordpad/En .rc?rev=22425&r1=22424&r2=22425&view=diff ============================================================================ == --- trunk/reactos/base/applications/wordpad/En.rc (original) +++ trunk/reactos/base/applications/wordpad/En.rc Mon Jun 19 21:31:18 2006 @@ -84,7 +84,7 @@
IDD_NEWDOCSEL DIALOGEX 6,6,159,67 CAPTION "New" -FONT 8,"Tahoma",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | DS_MODALFRAME BEGIN LTEXT "New document Type:", IDC_STATIC, 4, 3, 72, 9 @@ -96,7 +96,7 @@
IDD_ABOUTBOX DIALOGEX 22,16,190,182 CAPTION "About WordPad" -FONT 8,"Tahoma",0,0 +FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "WordPad II v0.1\nCopyright (C) 2006\nGed Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 150, 36
************************************************************************ The information contained in this message or any of its attachments is confidential and is intended for the exclusive use of the addressee. The information may also be legally privileged. The views expressed may not be company policy, but the personal views of the originator. If you are not the addressee, any disclosure, reproduction, distribution or other dissemination or use of this communication is strictly prohibited. If you have received this message in error, please contact postmaster@exideuk.co.uk mailto:postmaster@exideuk.co.uk and then delete this message.
Exide Technologies is an industrial and transportation battery producer and recycler with operations in 89 countries. Further information can be found at www.exide.com
Murphy, Ged (Bolton) wrote:
As a second note (I don't have the code handy), do we actually map MS Shell Dlg fonts current interface fonts? It should be a value specified in the registry
Ok, I'm home now, and I checked. Yes, it appears we map to Bitstream Vera Sans ;)
Although for some reason, we use HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes instead of HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes
Ged.
From: janderwald@svn.reactos.org [mailto:janderwald@svn.reactos.org] Sent: 19 June 2006 18:31 To: ros-diffs@reactos.org Subject: [ros-diffs] [janderwald] 22425: change to dialog font to MS Shell Dlg patch by EmuandCo
I though such patches should wait until we discussed a bit more about a fonts and a guideline to prevent inconsistent font usage. (see other mailing list thread about the same topic!)
MS has changed the Win standard font several times. MS Shell, Sans Serif, Segoe UI, etc.
We should check which (already available) font in our ReactOS tree does look good for most purposes and propose that font as our default font for guideline.
Klemens
Klemens Friedl wrote:
From: janderwald@svn.reactos.org [mailto:janderwald@svn.reactos.org] Sent: 19 June 2006 18:31 To: ros-diffs@reactos.org Subject: [ros-diffs] [janderwald] 22425: change to dialog font to MS Shell Dlg patch by EmuandCo
I though such patches should wait until we discussed a bit more about a fonts and a guideline to prevent inconsistent font usage. (see other mailing list thread about the same topic!)
MS has changed the Win standard font several times. MS Shell, Sans Serif, Segoe UI, etc.
We should check which (already available) font in our ReactOS tree does look good for most purposes and propose that font as our default font for guideline.
The whole point of having MS Shell Dlg is to control the fonts together. MS Shell Dlg is not a real font, it's a registry value which maps to the current user interface font. The font can be changed in the registry to point to any font we please, so as soon as we implement a Tahoma equivalent, it's quick and easy to change the whole OS over to that default font.
This is the correct way to go for consistency and changeability.
Ged.
I will fix all my patches the way you told me in the next days.
-
Daniel Reimer -
Ged Murphy -
Klemens Friedl -
Murphy, Ged (Bolton)