Ros-diffs December 2007

ros-diffs@reactos.org

22 participants
605 discussions

[ekohl] 30958: - Add icons for user, locked user and group. - Enable users to change their name and password (not fully working yet). - Use the IDI_ prefix for icons.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Dec 2 17:35:59 2007 New Revision: 30958 URL: http://svn.reactos.org/svn/reactos?rev=30958&view=rev Log: - Add icons for user, locked user and group. - Enable users to change their name and password (not fully working yet). - Use the IDI_ prefix for icons. Added: trunk/reactos/dll/cpl/usrmgr/resources/group.ico (with props) trunk/reactos/dll/cpl/usrmgr/resources/locked.ico (with props) trunk/reactos/dll/cpl/usrmgr/resources/user.ico (with props) Modified: trunk/reactos/dll/cpl/usrmgr/groups.c trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc trunk/reactos/dll/cpl/usrmgr/resource.h trunk/reactos/dll/cpl/usrmgr/users.c trunk/reactos/dll/cpl/usrmgr/usrmgr.c trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild trunk/reactos/dll/cpl/usrmgr/usrmgr.rc Modified: trunk/reactos/dll/cpl/usrmgr/groups.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/groups.c?re… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/groups.c (original) +++ trunk/reactos/dll/cpl/usrmgr/groups.c Sun Dec 2 17:35:59 2007 @@ -29,8 +29,8 @@ GetClientRect(hwndListView, &rect); memset(&column, 0x00, sizeof(column)); - column.mask=LVCF_FMT | LVCF_WIDTH | LVCF_SUBITEM | LVCF_TEXT; - column.fmt=LVCFMT_LEFT; + column.mask = LVCF_FMT | LVCF_WIDTH | LVCF_SUBITEM | LVCF_TEXT; + column.fmt = LVCFMT_LEFT; column.cx = (INT)((rect.right - rect.left) * 0.40); column.iSubItem = 0; LoadString(hApplet, IDS_NAME, szStr, sizeof(szStr) / sizeof(szStr[0])); Modified: trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc Sun Dec 2 17:35:59 2007 @@ -12,7 +12,7 @@ CAPTION "Users" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, + CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE END @@ -22,7 +22,7 @@ CAPTION "Groups" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, + CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE END @@ -33,6 +33,31 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "This space is intentionally left blank", IDC_STATIC, 66, 90, 112, 8 +END + + +IDD_USER_GENERAL DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USER_NAME, 7, 7, 112, 8 + +END + + + +IDD_CHANGE_PASSWORD DIALOGEX DISCARDABLE 0, 0, 267, 74 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Change Password" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_EDIT_PASSWORD1,107,7,153,14,ES_AUTOHSCROLL + RTEXT "New Password:", -1,7,10,96,8 + EDITTEXT IDC_EDIT_PASSWORD2,107,25,153,14,ES_AUTOHSCROLL + RTEXT "Repeat Password:", -1,7,28,96,8 + DEFPUSHBUTTON "OK",IDOK,156,53,50,14 + PUSHBUTTON "Abbrechen",IDCANCEL,210,53,50,14 END Modified: trunk/reactos/dll/cpl/usrmgr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/resource.h?… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/resource.h (original) +++ trunk/reactos/dll/cpl/usrmgr/resource.h Sun Dec 2 17:35:59 2007 @@ -13,10 +13,14 @@ #define ICONSIZE 16 -/* ids */ -#define IDC_USRMGR_ICON 40 -#define IDC_USRMGR_ICON2 100 // Needed for theme compatability with Windows. +/* Icons */ +#define IDI_USRMGR_ICON 40 +#define IDI_USRMGR_ICON2 100 // Needed for theme compatibility with Windows. +#define IDI_USER 41 +#define IDI_LOCKED_USER 42 +#define IDI_GROUP 43 + #define IDD_USERS 100 #define IDD_GROUPS 101 @@ -29,6 +33,26 @@ #define IDC_STATIC -1 +/* Dialogs */ + +#define IDD_USER_GENERAL 310 +#define IDC_USER_NAME 311 +#define IDC_USER_FULLNAME 312 +#define IDC_USER_DESCRIPTION 313 +#define IDC_USER_PW_CHANGE 314 +#define IDC_USER_PW_NOCHANGE 315 +#define IDC_USER_PW_EXPIRE 316 +#define IDC_USER_DEACTIVATE 317 +#define IDC_USER_LOCK 318 + + +#define IDD_CHANGE_PASSWORD 350 +#define IDC_EDIT_PASSWORD1 351 +#define IDC_EDIT_PASSWORD2 352 + + +/* Strings */ + #define IDS_CPLNAME 2000 #define IDS_CPLDESCRIPTION 2001 @@ -36,7 +60,9 @@ #define IDS_FULLNAME 2101 #define IDS_DESCRIPTION 2102 + /* Menus */ + #define IDM_POPUP_GROUP 120 #define IDM_GROUP_ADD_MEMBER 121 #define IDM_GROUP_NEW 122 Added: trunk/reactos/dll/cpl/usrmgr/resources/group.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/resources/g… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/usrmgr/resources/group.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/usrmgr/resources/locked.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/resources/l… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/usrmgr/resources/locked.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/usrmgr/resources/user.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/resources/u… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/usrmgr/resources/user.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/cpl/usrmgr/users.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/users.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/users.c (original) +++ trunk/reactos/dll/cpl/usrmgr/users.c Sun Dec 2 17:35:59 2007 @@ -20,6 +20,69 @@ } USER_DATA, *PUSER_DATA; + +static BOOL +SetPassword(HWND hwndDlg) +{ + TCHAR szPassword1[256]; + TCHAR szPassword2[256]; + UINT uLen1; + UINT uLen2; + + uLen1 = GetDlgItemText(hwndDlg, IDC_EDIT_PASSWORD1, szPassword1, 256); + uLen2 = GetDlgItemText(hwndDlg, IDC_EDIT_PASSWORD2, szPassword2, 256); + + /* Check the passwords */ + if (uLen1 != uLen2 || _tcscmp(szPassword1, szPassword2) != 0) + { + MessageBox(hwndDlg, + TEXT("The passwords you entered are not the same!"), + TEXT("ERROR"), + MB_OK | MB_ICONERROR); + return FALSE; + } + + + return TRUE; +} + + +INT_PTR CALLBACK +ChangePasswordDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + UNREFERENCED_PARAMETER(wParam); + + switch (uMsg) + { + case WM_INITDIALOG: + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + if (SetPassword(hwndDlg)) + EndDialog(hwndDlg, 0); + break; + + case IDCANCEL: + EndDialog(hwndDlg, 0); + break; + } + break; + + default: + return FALSE; + } + + return TRUE; +} + + + static VOID SetUsersListColumns(HWND hwndListView) { @@ -120,7 +183,46 @@ } -static VOID +static BOOL +OnEndLabelEdit(LPNMLVDISPINFO pnmv) +{ + TCHAR szOldUserName[UNLEN]; + TCHAR szNewUserName[UNLEN]; + USER_INFO_0 useri0; + NET_API_STATUS status; + + if (pnmv->item.iItem == -1) + return FALSE; + + ListView_GetItemText(pnmv->hdr.hwndFrom, + pnmv->item.iItem, 0, + szOldUserName, + UNLEN); + lstrcpy(szNewUserName, pnmv->item.pszText); + + if (lstrcmp(szOldUserName, szNewUserName) == 0) + return FALSE; + + useri0.usri0_name = szNewUserName; + + status = NetUserSetInfo(NULL, szOldUserName, 0, (LPBYTE)&useri0, NULL); + if (status != NERR_Success) + { + TCHAR szText[256]; + wsprintf(szText, _T("Error: %u"), status); + MessageBox(NULL, szText, _T("NetUserSetInfo"), MB_ICONERROR | MB_OK); + return FALSE; + } + + ListView_SetItemText(pnmv->hdr.hwndFrom, + pnmv->item.iItem, 0, + szNewUserName); + + return TRUE; +} + + +static BOOL OnNotify(HWND hwndDlg, PUSER_DATA pUserData, NMHDR *phdr) { LPNMLISTVIEW lpnmlv = (LPNMLISTVIEW)phdr; @@ -143,6 +245,9 @@ case NM_DBLCLK: break; + case LVN_ENDLABELEDIT: + return OnEndLabelEdit((LPNMLVDISPINFO)phdr); + case NM_RCLICK: ClientToScreen(GetDlgItem(hwndDlg, IDC_USERS_LIST), &lpnmlv->ptAction); TrackPopupMenu(GetSubMenu(pUserData->hPopupMenu, (lpnmlv->iItem == -1) ? 0 : 1), @@ -151,6 +256,8 @@ } break; } + + return FALSE; } @@ -180,6 +287,28 @@ case WM_COMMAND: switch (LOWORD(wParam)) { + case IDM_USER_CHANGE_PASSWORD: + DialogBoxParam(hApplet, + MAKEINTRESOURCE(IDD_CHANGE_PASSWORD), + hwndDlg, + ChangePasswordDlgProc, + (LPARAM)NULL); + break; + + case IDM_USER_RENAME: + { + INT nItem; + HWND hwndLV; + + hwndLV = GetDlgItem(hwndDlg, IDC_USERS_LIST); + nItem = ListView_GetNextItem(hwndLV, -1, LVNI_SELECTED); + if (nItem != -1) + { + (void)ListView_EditLabel(hwndLV, nItem); + } + } + break; + case IDM_USER_PROPERTIES: MessageBeep(-1); break; @@ -187,8 +316,7 @@ break; case WM_NOTIFY: - OnNotify(hwndDlg, pUserData, (NMHDR *)lParam); - break; + return OnNotify(hwndDlg, pUserData, (NMHDR *)lParam); case WM_DESTROY: DestroyMenu(pUserData->hPopupMenu); Modified: trunk/reactos/dll/cpl/usrmgr/usrmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.c?re… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/usrmgr.c (original) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.c Sun Dec 2 17:35:59 2007 @@ -20,7 +20,7 @@ APPLET Applets[NUM_APPLETS] = { { - IDC_USRMGR_ICON, + IDI_USRMGR_ICON, IDS_CPLNAME, IDS_CPLDESCRIPTION, UsrmgrApplet @@ -60,7 +60,7 @@ psh.dwFlags = PSH_PROPSHEETPAGE; psh.hwndParent = NULL; psh.hInstance = hApplet; - psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_USRMGR_ICON)); + psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_USRMGR_ICON)); psh.pszCaption = Caption; psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); psh.nStartPage = 0; Modified: trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.rbui… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild (original) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild Sun Dec 2 17:35:59 2007 @@ -5,6 +5,7 @@ <include base="usrmgr">.</include> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x609</define> <library>kernel32</library> <library>user32</library> <library>gdi32</library> Modified: trunk/reactos/dll/cpl/usrmgr/usrmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/usrmgr.rc (original) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.rc Sun Dec 2 17:35:59 2007 @@ -11,7 +11,11 @@ 123 24 DISCARDABLE "manifest.xml" -IDC_USRMGR_ICON ICON "resources/applet.ico" -IDC_USRMGR_ICON2 ICON "resources/applet.ico" +IDI_USRMGR_ICON ICON "resources/applet.ico" +IDI_USRMGR_ICON2 ICON "resources/applet.ico" + +IDI_USER ICON "resources/user.ico" +IDI_LOCKED_USER ICON "resources/locked.ico" +IDI_GROUP ICON "resources/group.ico" #include "rsrc.rc"

16 years, 9 months

[ekohl] 30957: - Make local functions static. - Reorder functions to reduce the number of required prototypes. - Use Win32 types instead of generic types (e.g. int -> INT) and add missing VOIDs. - No code changes.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Dec 2 17:25:17 2007 New Revision: 30957 URL: http://svn.reactos.org/svn/reactos?rev=30957&view=rev Log: - Make local functions static. - Reorder functions to reduce the number of required prototypes. - Use Win32 types instead of generic types (e.g. int -> INT) and add missing VOIDs. - No code changes. Modified: trunk/reactos/dll/cpl/powercfg/advanced.c trunk/reactos/dll/cpl/powercfg/alarms.c trunk/reactos/dll/cpl/powercfg/hibernate.c trunk/reactos/dll/cpl/powercfg/powercfg.c trunk/reactos/dll/cpl/powercfg/powercfg.h trunk/reactos/dll/cpl/powercfg/powershemes.c Modified: trunk/reactos/dll/cpl/powercfg/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/advanced.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/advanced.c (original) +++ trunk/reactos/dll/cpl/powercfg/advanced.c Sun Dec 2 17:25:17 2007 @@ -22,66 +22,15 @@ #include "resource.h" #include "powercfg.h" -HWND hAdv=0; - -void Adv_InitDialog(); -void Adv_SaveData(HWND hwndDlg); +HWND hAdv = 0; static POWER_ACTION g_SystemBatteries[3]; static POWER_ACTION g_PowerButton[5]; static POWER_ACTION g_SleepButton[5]; -/* Property page dialog callback */ -INT_PTR CALLBACK -advancedProc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - switch(uMsg) - { - case WM_INITDIALOG: - hAdv = hwndDlg; - Adv_InitDialog(); - return TRUE; - break; - case WM_COMMAND: - switch(LOWORD(wParam)) - { - case IDC_SYSTRAYBATTERYMETER: - case IDC_PASSWORDLOGON: - case IDC_VIDEODIMDISPLAY: - if (HIWORD(wParam) == BN_CLICKED) - { - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - } - break; - case IDC_LIDCLOSE: - case IDC_POWERBUTTON: - case IDC_SLEEPBUTTON: - if (HIWORD(wParam) == CBN_SELCHANGE) - { - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - } - break; - } - break; - case WM_NOTIFY: - { - LPNMHDR lpnm = (LPNMHDR)lParam; - if (lpnm->code == (UINT)PSN_APPLY) - { - Adv_SaveData(hwndDlg); - } - return TRUE; - } - } - return FALSE; -} - -static void AddItem(HWND hDlgCtrl, int ResourceId, LPARAM lParam, POWER_ACTION * lpAction) + +static VOID +AddItem(HWND hDlgCtrl, INT ResourceId, LPARAM lParam, POWER_ACTION * lpAction) { TCHAR szBuffer[MAX_PATH]; LRESULT Index; @@ -96,11 +45,12 @@ } } -static int FindActionIndex(POWER_ACTION * lpAction, DWORD dwActionSize, POWER_ACTION poAction) -{ - int Index; - - for (Index = 0; Index < (int) dwActionSize; Index++) +static INT +FindActionIndex(POWER_ACTION * lpAction, DWORD dwActionSize, POWER_ACTION poAction) +{ + INT Index; + + for (Index = 0; Index < (INT)dwActionSize; Index++) { if (lpAction[Index] == poAction) return Index; @@ -109,7 +59,8 @@ return -1; } -static BOOLEAN IsBatteryUsed() +static BOOLEAN +IsBatteryUsed(VOID) { SYSTEM_BATTERY_STATE sbs; @@ -128,7 +79,8 @@ return FALSE; } -POWER_ACTION GetPowerActionFromPolicy(POWER_ACTION_POLICY * Policy) +POWER_ACTION +GetPowerActionFromPolicy(POWER_ACTION_POLICY *Policy) { POWER_ACTION poAction = PowerActionNone; /* @@ -171,10 +123,11 @@ return poAction; } -void ShowCurrentPowerActionPolicy(HWND hDlgCtrl, - POWER_ACTION * lpAction, - DWORD dwActionSize, - POWER_ACTION_POLICY * Policy) +VOID +ShowCurrentPowerActionPolicy(HWND hDlgCtrl, + POWER_ACTION *lpAction, + DWORD dwActionSize, + POWER_ACTION_POLICY *Policy) { int poActionIndex; POWER_ACTION poAction; @@ -190,8 +143,9 @@ SendMessage(hDlgCtrl, CB_SETCURSEL, (WPARAM)poActionIndex, (LPARAM)0); } -BOOLEAN SaveCurrentPowerActionPolicy(IN HWND hDlgCtrl, - OUT POWER_ACTION_POLICY * Policy) +BOOLEAN +SaveCurrentPowerActionPolicy(IN HWND hDlgCtrl, + OUT POWER_ACTION_POLICY *Policy) { LRESULT Index; LRESULT ItemData; @@ -236,7 +190,8 @@ //------------------------------------------------------------------- -void ShowCurrentPowerActionPolicies(HWND hwndDlg) +VOID +ShowCurrentPowerActionPolicies(HWND hwndDlg) { TCHAR szAction[MAX_PATH]; @@ -323,7 +278,8 @@ } } -void Adv_InitDialog() +VOID +Adv_InitDialog(VOID) { HWND hList1; HWND hList2; @@ -445,7 +401,8 @@ } -void Adv_SaveData(HWND hwndDlg) +static VOID +Adv_SaveData(HWND hwndDlg) { BOOL bSystrayBatteryMeter; BOOL bPasswordLogon; @@ -529,3 +486,51 @@ Adv_InitDialog(); } + +/* Property page dialog callback */ +INT_PTR CALLBACK +AdvancedDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch(uMsg) + { + case WM_INITDIALOG: + hAdv = hwndDlg; + Adv_InitDialog(); + return TRUE; + break; + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDC_SYSTRAYBATTERYMETER: + case IDC_PASSWORDLOGON: + case IDC_VIDEODIMDISPLAY: + if (HIWORD(wParam) == BN_CLICKED) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + case IDC_LIDCLOSE: + case IDC_POWERBUTTON: + case IDC_SLEEPBUTTON: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } + break; + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + if (lpnm->code == (UINT)PSN_APPLY) + { + Adv_SaveData(hwndDlg); + } + return TRUE; + } + } + return FALSE; +} Modified: trunk/reactos/dll/cpl/powercfg/alarms.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/alarms.c?… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/alarms.c (original) +++ trunk/reactos/dll/cpl/powercfg/alarms.c Sun Dec 2 17:25:17 2007 @@ -20,35 +20,8 @@ #include "resource.h" #include "powercfg.h" -BOOLEAN Ala_InitData(HWND); - -/* Property page dialog callback */ -INT_PTR CALLBACK -alarmsProc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - switch(uMsg) - { - case WM_INITDIALOG: - if (!Ala_InitData(hwndDlg)) - { - //TODO - //handle initialization error - } - return TRUE; - default: - break; - } - return FALSE; -} - -BOOLEAN Ala_InitData(HWND hwndDlg) +static BOOLEAN +Ala_InitData(HWND hwndDlg) { TCHAR szAction[MAX_PATH]; TCHAR szText[MAX_PATH]; @@ -197,3 +170,27 @@ return TRUE; } + +/* Property page dialog callback */ +INT_PTR CALLBACK +AlarmsDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + switch(uMsg) + { + case WM_INITDIALOG: + if (!Ala_InitData(hwndDlg)) + { + //TODO + //handle initialization error + } + return TRUE; + default: + break; + } + return FALSE; +} Modified: trunk/reactos/dll/cpl/powercfg/hibernate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/hibernate… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/hibernate.c (original) +++ trunk/reactos/dll/cpl/powercfg/hibernate.c Sun Dec 2 17:25:17 2007 @@ -26,48 +26,12 @@ #include "powercfg.h" -void Hib_InitDialog(HWND); -INT_PTR Hib_SaveData(HWND); BOOLEAN Pos_InitData(); void Adv_InitDialog(); -/* Property page dialog callback */ -INT_PTR CALLBACK -hibernateProc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - switch(uMsg) - { - case WM_INITDIALOG: - Hib_InitDialog(hwndDlg); - return TRUE; - case WM_COMMAND: - switch(LOWORD(wParam)) - { - case IDC_HIBERNATEFILE: - if (HIWORD(wParam) == BN_CLICKED) - { - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - } - } - break; - case WM_NOTIFY: - { - LPNMHDR lpnm = (LPNMHDR)lParam; - if (lpnm->code == (UINT)PSN_APPLY) - { - return Hib_SaveData(hwndDlg); - } - } - } - return FALSE; -} -void Hib_InitDialog(HWND hwndDlg) +static VOID +Hib_InitDialog(HWND hwndDlg) { SYSTEM_POWER_CAPABILITIES PowerCaps; MEMORYSTATUSEX msex; @@ -145,7 +109,8 @@ } } -INT_PTR Hib_SaveData(HWND hwndDlg) +INT_PTR +Hib_SaveData(HWND hwndDlg) { BOOLEAN bHibernate; @@ -161,3 +126,37 @@ return FALSE; } + +/* Property page dialog callback */ +INT_PTR CALLBACK +HibernateDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch(uMsg) + { + case WM_INITDIALOG: + Hib_InitDialog(hwndDlg); + return TRUE; + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDC_HIBERNATEFILE: + if (HIWORD(wParam) == BN_CLICKED) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + } + break; + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + if (lpnm->code == (UINT)PSN_APPLY) + { + return Hib_SaveData(hwndDlg); + } + } + } + return FALSE; +} Modified: trunk/reactos/dll/cpl/powercfg/powercfg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.c (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.c Sun Dec 2 17:25:17 2007 @@ -22,10 +22,7 @@ #define NUM_APPLETS (1) static LONG APIENTRY Applet1(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam); -INT_PTR CALLBACK powershemesProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); -INT_PTR CALLBACK alarmsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); -INT_PTR CALLBACK advancedProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); -INT_PTR CALLBACK hibernateProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); + HINSTANCE hApplet = 0; GLOBAL_POWER_POLICY gGPP; @@ -76,39 +73,6 @@ } -/* Property Sheet Callback */ -int CALLBACK -PropSheetProc( - HWND hwndDlg, - UINT uMsg, - LPARAM lParam -) -{ - UNREFERENCED_PARAMETER(hwndDlg); - switch(uMsg) - { - case PSCB_BUTTONPRESSED: - switch(lParam) - { - case PSBTN_OK: /* OK */ - break; - case PSBTN_CANCEL: /* Cancel */ - break; - case PSBTN_APPLYNOW: /* Apply now */ - break; - case PSBTN_FINISH: /* Close */ - break; - default: - return FALSE; - } - break; - - case PSCB_INITIALIZED: - break; - } - return TRUE; -} - /* First Applet */ static LONG APIENTRY Applet1(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) @@ -130,7 +94,7 @@ ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_USECALLBACK | PSH_PROPTITLE; + psh.dwFlags = PSH_PROPTITLE; psh.hwndParent = NULL; psh.hInstance = hApplet; psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON_1)); @@ -138,18 +102,17 @@ psh.nPages = 0; psh.nStartPage = 0; psh.phpage = hpsp; - psh.pfnCallback = PropSheetProc; - InitPropSheetPage(&psh, IDD_PROPPAGEPOWERSHEMES, (DLGPROC) powershemesProc); + InitPropSheetPage(&psh, IDD_PROPPAGEPOWERSHEMES, (DLGPROC)PowerSchemesDlgProc); if (GetPwrCapabilities(&spc)) { if (spc.SystemBatteriesPresent) { - InitPropSheetPage(&psh, IDD_PROPPAGEALARMS, (DLGPROC) alarmsProc); + InitPropSheetPage(&psh, IDD_PROPPAGEALARMS, (DLGPROC)AlarmsDlgProc); } } - InitPropSheetPage(&psh, IDD_PROPPAGEADVANCED, (DLGPROC) advancedProc); - InitPropSheetPage(&psh, IDD_PROPPAGEHIBERNATE, (DLGPROC) hibernateProc); + InitPropSheetPage(&psh, IDD_PROPPAGEADVANCED, (DLGPROC)AdvancedDlgProc); + InitPropSheetPage(&psh, IDD_PROPPAGEHIBERNATE, (DLGPROC)HibernateDlgProc); /* Load additional pages provided by shell extensions */ hpsxa = SHCreatePropSheetExtArray(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Power"), MAX_POWER_PAGES - psh.nPages); @@ -166,11 +129,10 @@ /* Control Panel Callback */ LONG CALLBACK -CPlApplet( - HWND hwndCPl, - UINT uMsg, - LPARAM lParam1, - LPARAM lParam2) +CPlApplet(HWND hwndCPl, + UINT uMsg, + LPARAM lParam1, + LPARAM lParam2) { int i = (int)lParam1; @@ -203,12 +165,10 @@ } -BOOLEAN -WINAPI -DllMain( - HINSTANCE hinstDLL, - DWORD dwReason, - LPVOID lpvReserved) +BOOLEAN WINAPI +DllMain(HINSTANCE hinstDLL, + DWORD dwReason, + LPVOID lpvReserved) { UNREFERENCED_PARAMETER(lpvReserved); switch(dwReason) Modified: trunk/reactos/dll/cpl/powercfg/powercfg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.h (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.h Sun Dec 2 17:25:17 2007 @@ -18,6 +18,11 @@ #define MAX_POWER_PAGES 32 +INT_PTR CALLBACK PowerSchemesDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK AlarmsDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK AdvancedDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK HibernateDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); + #endif /* __CPL_SAMPLE_H */ /* EOF */ Modified: trunk/reactos/dll/cpl/powercfg/powershemes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powershem… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powershemes.c (original) +++ trunk/reactos/dll/cpl/powercfg/powershemes.c Sun Dec 2 17:25:17 2007 @@ -49,132 +49,9 @@ UINT guiIndex = 0; HWND hwndDialog; -void LoadConfig(HWND hwndDlg); -void Pos_InitPage(HWND hwndDlg); -BOOLEAN Pos_InitData(); -void Pos_SaveData(HWND hwndDlg); - - -BOOLEAN CreateEnergyList(HWND hwnd); - -static -BOOLEAN DelScheme(HWND hwnd) -{ - INT iCurSel; - HWND hList; - TCHAR szBuf[1024], szBufT[1024]; - UINT DelScheme; - - hList = GetDlgItem(hwnd, IDC_ENERGYLIST); - - iCurSel = SendMessage(hList, CB_GETCURSEL, 0, 0); - if (iCurSel == CB_ERR) return FALSE; - - SendMessage(hList, CB_SETCURSEL, iCurSel, 0); - - DelScheme = SendMessage(hList, CB_GETITEMDATA, (WPARAM)iCurSel, 0); - if (DelScheme == (UINT)CB_ERR) return FALSE; - - LoadString(hApplet, IDS_DEL_SCHEME_TITLE, szBufT, sizeof(szBufT) / sizeof(TCHAR)); - LoadString(hApplet, IDS_DEL_SCHEME, szBuf, sizeof(szBuf) / sizeof(TCHAR)); - - if (MessageBox(hwnd, (LPCTSTR)szBuf, (LPCTSTR)szBufT, MB_OKCANCEL | MB_ICONQUESTION) == IDOK) - { - UINT Current; - - if (GetActivePwrScheme(&Current)) - { - SendMessage(hList, CB_SETCURSEL, (WPARAM)0, 0); - SendMessage(hList, CB_DELETESTRING, (WPARAM)iCurSel, 0); - if (Current == DelScheme) Pos_SaveData(hwnd); - } - - if (DeletePwrScheme(DelScheme) != 0) return TRUE; - } - - return FALSE; -} - -/* Property page dialog callback */ -INT_PTR CALLBACK -powershemesProc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - switch(uMsg) - { - case WM_INITDIALOG: - hPos = hwndDlg; - hwndDialog = hwndDlg; - if (!Pos_InitData()) - { - //TODO - // initialization failed - // handle error - MessageBox(hwndDlg,_T("Pos_InitData failed\n"), NULL, MB_OK); - - } - if (!CreateEnergyList(GetDlgItem(hwndDlg, IDC_ENERGYLIST))) - { - //TODO - // initialization failed - // handle error - MessageBox(hwndDlg,_T("CreateEnergyList failed\n"), NULL, MB_OK); - } - return TRUE; - case WM_COMMAND: - switch(LOWORD(wParam)) - { - case IDC_ENERGYLIST: - if (HIWORD(wParam) == CBN_SELCHANGE) - { - LoadConfig(hwndDlg); - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - } - break; - case IDC_DELETE_BTN: - { - DelScheme(hwndDlg); - } - break; - case IDC_SAVEAS_BTN: - { - - } - break; - case IDC_MONITORACLIST: - case IDC_MONITORDCLIST: - case IDC_DISKACLIST: - case IDC_DISKDCLIST: - case IDC_STANDBYACLIST: - case IDC_STANDBYDCLIST: - case IDC_HYBERNATEACLIST: - case IDC_HYBERNATEDCLIST: - if (HIWORD(wParam) == CBN_SELCHANGE) - { - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - } - break; - } - break; - case WM_NOTIFY: - { - LPNMHDR lpnm = (LPNMHDR)lParam; - if (lpnm->code == (UINT)PSN_APPLY) - { - Pos_SaveData(hwndDlg); - } - return TRUE; - } - break; - } - return FALSE; -} - -BOOLEAN Pos_InitData() + +BOOLEAN +Pos_InitData(VOID) { SYSTEM_POWER_CAPABILITIES spc; /* @@ -271,8 +148,104 @@ return TRUE; } -BOOLEAN CALLBACK callback_EnumPwrScheme(UINT uiIndex, DWORD dwName, LPTSTR sName, DWORD dwDesc, - LPWSTR sDesc, PPOWER_POLICY pp,LPARAM lParam ) + +static VOID +LoadConfig(HWND hwndDlg) +{ + INT i=0, iCurSel=0; + UINT uiIndex; + TCHAR szProfile[MAX_PATH]; + TCHAR szTemp[MAX_PATH]; + TCHAR szConfig[MAX_PATH]; + POWER_POLICY pp; + + iCurSel = (INT)SendDlgItemMessage(hwndDlg, IDC_ENERGYLIST, + CB_GETCURSEL, + 0, + 0); + if (iCurSel == CB_ERR) + return; + + memcpy(&pp, &gPP[iCurSel], sizeof(POWER_POLICY)); + + uiIndex = (UINT)SendDlgItemMessage(hwndDlg, IDC_ENERGYLIST, CB_GETCURSEL, 0, 0); + if(uiIndex != CB_ERR) + { + SendDlgItemMessage(hwndDlg, IDC_ENERGYLIST, CB_GETLBTEXT, uiIndex, (LPARAM)szProfile); + if(LoadString(hApplet, IDS_CONFIG1, szTemp, MAX_PATH)) + { + _stprintf(szConfig,szTemp,szProfile); + SetWindowText(GetDlgItem(hwndDlg, IDC_GRPDETAIL),szConfig); + } + } + + for(i=0;i<17;i++) + { + if (Sec[i]==pp.user.VideoTimeoutAc) + { + SendDlgItemMessage(hwndDlg, IDC_MONITORACLIST, + CB_SETCURSEL, + i, + (LPARAM)0); + } + + if (Sec[i]==pp.user.VideoTimeoutDc) + { + SendDlgItemMessage(hwndDlg, IDC_MONITORDCLIST, + CB_SETCURSEL, + i, + (LPARAM)0); + } + if (Sec[i]==pp.user.SpindownTimeoutAc) + { + SendDlgItemMessage(hwndDlg, IDC_DISKACLIST, + CB_SETCURSEL, + i-2, + (LPARAM)0); + } + if (Sec[i]==pp.user.SpindownTimeoutDc)//IdleTimeoutDc) + { + SendDlgItemMessage(hwndDlg, IDC_DISKDCLIST, + CB_SETCURSEL, + i-2, + (LPARAM)0); + } + if (Sec[i]==pp.user.IdleTimeoutAc) + { + SendDlgItemMessage(hwndDlg, IDC_STANDBYACLIST, + CB_SETCURSEL, + i, + (LPARAM)0); + } + if (Sec[i]==pp.user.IdleTimeoutDc) + { + SendDlgItemMessage(hwndDlg, IDC_STANDBYDCLIST, + CB_SETCURSEL, + i, + (LPARAM)0); + } + + if (Sec[i]==pp.mach.DozeS4TimeoutAc) + { + SendDlgItemMessage(hwndDlg, IDC_HYBERNATEACLIST, + CB_SETCURSEL, + i, + (LPARAM)0); + } + if (Sec[i]==pp.mach.DozeS4TimeoutDc) + { + SendDlgItemMessage(hwndDlg, IDC_HYBERNATEDCLIST, + CB_SETCURSEL, + i, + (LPARAM)0); + } + } +} + + +BOOLEAN CALLBACK +callback_EnumPwrScheme(UINT uiIndex, DWORD dwName, LPTSTR sName, DWORD dwDesc, + LPWSTR sDesc, PPOWER_POLICY pp,LPARAM lParam) { int index; @@ -318,7 +291,213 @@ return TRUE; } -BOOLEAN CreateEnergyList(HWND hwnd) + +static VOID +Pos_InitPage(HWND hwndDlg) +{ + int ifrom=0,i=0,imin=0; + HWND hwnd = NULL; + TCHAR szName[MAX_PATH]; + LRESULT index; + + for(i=1;i<9;i++) + { + switch(i) + { + case 1: + hwnd=GetDlgItem(hwndDlg, IDC_MONITORACLIST); + imin=IDS_TIMEOUT1; + break; + case 2: + hwnd=GetDlgItem(hwndDlg, IDC_STANDBYACLIST); + imin=IDS_TIMEOUT1; + break; + case 3: + hwnd=GetDlgItem(hwndDlg, IDC_DISKACLIST); + imin=IDS_TIMEOUT3; + break; + case 4: + hwnd=GetDlgItem(hwndDlg, IDC_HYBERNATEACLIST); + imin=IDS_TIMEOUT3; + break; + case 5: + hwnd=GetDlgItem(hwndDlg, IDC_MONITORDCLIST); + imin=IDS_TIMEOUT1; + break; + case 6: + hwnd=GetDlgItem(hwndDlg, IDC_STANDBYDCLIST); + imin=IDS_TIMEOUT1; + break; + case 7: + hwnd=GetDlgItem(hwndDlg, IDC_DISKDCLIST); + imin=IDS_TIMEOUT3; + break; + case 8: + hwnd=GetDlgItem(hwndDlg, IDC_HYBERNATEDCLIST); + imin=IDS_TIMEOUT3; + break; + default: + return; + } + for (ifrom=imin;ifrom<(IDS_TIMEOUT15+1);ifrom++) + { + if (LoadString(hApplet, ifrom, szName, MAX_PATH)) + { + index = SendMessage(hwnd, + CB_ADDSTRING, + 0, + (LPARAM)szName); + + if (index == CB_ERR) + return; + + SendMessage(hwnd, + CB_SETITEMDATA, + index, + (LPARAM)Sec[ifrom-IDS_TIMEOUT16]); + } + } + if (LoadString(hApplet, IDS_TIMEOUT16, szName, MAX_PATH)) + { + index = SendMessage(hwnd, + CB_ADDSTRING, + 0, + (LPARAM)szName); + if (index == CB_ERR) + return; + + SendMessage(hwnd, + CB_SETITEMDATA, + index, + (LPARAM)Sec[0]); + } + } +} + + +static VOID +Pos_SaveData(HWND hwndDlg) +{ + INT iCurSel=0,tmp=0; + + iCurSel = (INT) SendDlgItemMessage(hwndDlg, IDC_ENERGYLIST, + CB_GETCURSEL, + 0, + 0); + if (iCurSel == CB_ERR) + return; + + tmp = (INT) SendDlgItemMessage(hwndDlg, IDC_MONITORDCLIST, + CB_GETCURSEL, + 0, + (LPARAM)0); + if (tmp > 0 && tmp < 16) + { + gPP[iCurSel].user.VideoTimeoutAc = Sec[tmp]; + } + tmp = (INT) SendDlgItemMessage(hwndDlg, IDC_MONITORDCLIST, + CB_GETCURSEL, + 0, + (LPARAM)0); + if (tmp > 0 && tmp < 16) + { + gPP[iCurSel].user.VideoTimeoutDc = Sec[tmp]; + } + tmp = (INT) SendDlgItemMessage(hwndDlg, IDC_DISKACLIST, + CB_GETCURSEL, + 0, + (LPARAM)0); + if (tmp > 0 && tmp < 16) + { + gPP[iCurSel].user.SpindownTimeoutAc = Sec[tmp+2]; + } + tmp = (INT) SendDlgItemMessage(hwndDlg, IDC_DISKDCLIST, + CB_GETCURSEL, + 0, + (LPARAM)0); + if (tmp > 0 && tmp < 16) + { + gPP[iCurSel].user.SpindownTimeoutDc = Sec[tmp+2]; + } + tmp = (INT) SendDlgItemMessage(hwndDlg, IDC_STANDBYACLIST, + CB_GETCURSEL, + 0, + (LPARAM)0); + if (tmp > 0 && tmp < 16) + { + gPP[iCurSel].user.IdleTimeoutAc = Sec[tmp]; + } + tmp = (INT) SendDlgItemMessage(hwndDlg, IDC_STANDBYDCLIST, + CB_GETCURSEL, + 0, + (LPARAM)0); + if (tmp > 0 && tmp < 16) + { + gPP[iCurSel].user.IdleTimeoutDc = Sec[tmp]; + } + tmp = (INT) SendDlgItemMessage(hwndDlg, IDC_HYBERNATEACLIST, + CB_GETCURSEL, + 0, + (LPARAM)0); + if (tmp > 0 && tmp < 16) + { + gPP[iCurSel].mach.DozeS4TimeoutAc = Sec[tmp]; + } + tmp = (INT) SendDlgItemMessage(hwndDlg, IDC_HYBERNATEDCLIST, + CB_GETCURSEL, + 0, + (LPARAM)0); + if (tmp > 0 && tmp < 16) + { + gPP[iCurSel].mach.DozeS4TimeoutDc = Sec[tmp]; + } + + SetActivePwrScheme(iCurSel,NULL,&gPP[iCurSel]); + LoadConfig(hwndDlg); +} + + +static BOOLEAN +DelScheme(HWND hwnd) +{ + INT iCurSel; + HWND hList; + TCHAR szBuf[1024], szBufT[1024]; + UINT DelScheme; + + hList = GetDlgItem(hwnd, IDC_ENERGYLIST); + + iCurSel = SendMessage(hList, CB_GETCURSEL, 0, 0); + if (iCurSel == CB_ERR) return FALSE; + + SendMessage(hList, CB_SETCURSEL, iCurSel, 0); + + DelScheme = SendMessage(hList, CB_GETITEMDATA, (WPARAM)iCurSel, 0); + if (DelScheme == (UINT)CB_ERR) return FALSE; + + LoadString(hApplet, IDS_DEL_SCHEME_TITLE, szBufT, sizeof(szBufT) / sizeof(TCHAR)); + LoadString(hApplet, IDS_DEL_SCHEME, szBuf, sizeof(szBuf) / sizeof(TCHAR)); + + if (MessageBox(hwnd, (LPCTSTR)szBuf, (LPCTSTR)szBufT, MB_OKCANCEL | MB_ICONQUESTION) == IDOK) + { + UINT Current; + + if (GetActivePwrScheme(&Current)) + { + SendMessage(hList, CB_SETCURSEL, (WPARAM)0, 0); + SendMessage(hList, CB_DELETESTRING, (WPARAM)iCurSel, 0); + if (Current == DelScheme) Pos_SaveData(hwnd); + } + + if (DeletePwrScheme(DelScheme) != 0) return TRUE; + } + + return FALSE; +} + + +static BOOLEAN +CreateEnergyList(HWND hwnd) { BOOLEAN retval; POWER_POLICY pp; @@ -368,256 +547,82 @@ return retval; } -void Pos_InitPage(HWND hwndDlg) -{ - int ifrom=0,i=0,imin=0; - HWND hwnd = NULL; - TCHAR szName[MAX_PATH]; - LRESULT index; - - for(i=1;i<9;i++) - { - switch(i) - { - case 1: - hwnd=GetDlgItem(hwndDlg, IDC_MONITORACLIST); - imin=IDS_TIMEOUT1; - break; - case 2: - hwnd=GetDlgItem(hwndDlg, IDC_STANDBYACLIST); - imin=IDS_TIMEOUT1; - break; - case 3: - hwnd=GetDlgItem(hwndDlg, IDC_DISKACLIST); - imin=IDS_TIMEOUT3; - break; - case 4: - hwnd=GetDlgItem(hwndDlg, IDC_HYBERNATEACLIST); - imin=IDS_TIMEOUT3; - break; - case 5: - hwnd=GetDlgItem(hwndDlg, IDC_MONITORDCLIST); - imin=IDS_TIMEOUT1; - break; - case 6: - hwnd=GetDlgItem(hwndDlg, IDC_STANDBYDCLIST); - imin=IDS_TIMEOUT1; - break; - case 7: - hwnd=GetDlgItem(hwndDlg, IDC_DISKDCLIST); - imin=IDS_TIMEOUT3; - break; - case 8: - hwnd=GetDlgItem(hwndDlg, IDC_HYBERNATEDCLIST); - imin=IDS_TIMEOUT3; - break; - default: - return; - } - for (ifrom=imin;ifrom<(IDS_TIMEOUT15+1);ifrom++) - { - if (LoadString(hApplet, ifrom, szName, MAX_PATH)) + +/* Property page dialog callback */ +INT_PTR CALLBACK +PowerSchemesDlgProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam +) +{ + switch(uMsg) + { + case WM_INITDIALOG: + hPos = hwndDlg; + hwndDialog = hwndDlg; + if (!Pos_InitData()) + { + //TODO + // initialization failed + // handle error + MessageBox(hwndDlg,_T("Pos_InitData failed\n"), NULL, MB_OK); + + } + if (!CreateEnergyList(GetDlgItem(hwndDlg, IDC_ENERGYLIST))) + { + //TODO + // initialization failed + // handle error + MessageBox(hwndDlg,_T("CreateEnergyList failed\n"), NULL, MB_OK); + } + return TRUE; + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDC_ENERGYLIST: + if (HIWORD(wParam) == CBN_SELCHANGE) { - index = SendMessage(hwnd, - CB_ADDSTRING, - 0, - (LPARAM)szName); - - if (index == CB_ERR) - return; - - SendMessage(hwnd, - CB_SETITEMDATA, - index, - (LPARAM)Sec[ifrom-IDS_TIMEOUT16]); + LoadConfig(hwndDlg); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } - } - if (LoadString(hApplet, IDS_TIMEOUT16, szName, MAX_PATH)) - { - index = SendMessage(hwnd, - CB_ADDSTRING, - 0, - (LPARAM)szName); - if (index == CB_ERR) - return; - - SendMessage(hwnd, - CB_SETITEMDATA, - index, - (LPARAM)Sec[0]); - } - } -} - -void LoadConfig(HWND hwndDlg) -{ - INT i=0, iCurSel=0; - UINT uiIndex; - TCHAR szProfile[MAX_PATH]; - TCHAR szTemp[MAX_PATH]; - TCHAR szConfig[MAX_PATH]; - POWER_POLICY pp; - - iCurSel = (INT)SendDlgItemMessage(hwndDlg, IDC_ENERGYLIST, - CB_GETCURSEL, - 0, - 0); - if (iCurSel == CB_ERR) - return; - - memcpy(&pp, &gPP[iCurSel], sizeof(POWER_POLICY)); - - uiIndex = (UINT)SendDlgItemMessage(hwndDlg, IDC_ENERGYLIST, CB_GETCURSEL, 0, 0); - if(uiIndex != CB_ERR) - { - SendDlgItemMessage(hwndDlg, IDC_ENERGYLIST, CB_GETLBTEXT, uiIndex, (LPARAM)szProfile); - if(LoadString(hApplet, IDS_CONFIG1, szTemp, MAX_PATH)) - { - _stprintf(szConfig,szTemp,szProfile); - SetWindowText(GetDlgItem(hwndDlg, IDC_GRPDETAIL),szConfig); - } - } - - for(i=0;i<17;i++) - { - if (Sec[i]==pp.user.VideoTimeoutAc) - { - SendDlgItemMessage(hwndDlg, IDC_MONITORACLIST, - CB_SETCURSEL, - i, - (LPARAM)0); - } - - if (Sec[i]==pp.user.VideoTimeoutDc) - { - SendDlgItemMessage(hwndDlg, IDC_MONITORDCLIST, - CB_SETCURSEL, - i, - (LPARAM)0); - } - if (Sec[i]==pp.user.SpindownTimeoutAc) - { - SendDlgItemMessage(hwndDlg, IDC_DISKACLIST, - CB_SETCURSEL, - i-2, - (LPARAM)0); - } - if (Sec[i]==pp.user.SpindownTimeoutDc)//IdleTimeoutDc) - { - SendDlgItemMessage(hwndDlg, IDC_DISKDCLIST, - CB_SETCURSEL, - i-2, - (LPARAM)0); - } - if (Sec[i]==pp.user.IdleTimeoutAc) - { - SendDlgItemMessage(hwndDlg, IDC_STANDBYACLIST, - CB_SETCURSEL, - i, - (LPARAM)0); - } - if (Sec[i]==pp.user.IdleTimeoutDc) - { - SendDlgItemMessage(hwndDlg, IDC_STANDBYDCLIST, - CB_SETCURSEL, - i, - (LPARAM)0); - } - - if (Sec[i]==pp.mach.DozeS4TimeoutAc) - { - SendDlgItemMessage(hwndDlg, IDC_HYBERNATEACLIST, - CB_SETCURSEL, - i, - (LPARAM)0); - } - if (Sec[i]==pp.mach.DozeS4TimeoutDc) - { - SendDlgItemMessage(hwndDlg, IDC_HYBERNATEDCLIST, - CB_SETCURSEL, - i, - (LPARAM)0); - } - } - -} - -void Pos_SaveData(HWND hwndDlg) -{ - INT iCurSel=0,tmp=0; - - iCurSel = (INT) SendDlgItemMessage(hwndDlg, IDC_ENERGYLIST, - CB_GETCURSEL, - 0, - 0); - if (iCurSel == CB_ERR) - return; - - tmp = (INT) SendDlgItemMessage(hwndDlg, IDC_MONITORDCLIST, - CB_GETCURSEL, - 0, - (LPARAM)0); - if (tmp > 0 && tmp < 16) - { - gPP[iCurSel].user.VideoTimeoutAc = Sec[tmp]; - } - tmp = (INT) SendDlgItemMessage(hwndDlg, IDC_MONITORDCLIST, - CB_GETCURSEL, - 0, - (LPARAM)0); - if (tmp > 0 && tmp < 16) - { - gPP[iCurSel].user.VideoTimeoutDc = Sec[tmp]; - } - tmp = (INT) SendDlgItemMessage(hwndDlg, IDC_DISKACLIST, - CB_GETCURSEL, - 0, - (LPARAM)0); - if (tmp > 0 && tmp < 16) - { - gPP[iCurSel].user.SpindownTimeoutAc = Sec[tmp+2]; - } - tmp = (INT) SendDlgItemMessage(hwndDlg, IDC_DISKDCLIST, - CB_GETCURSEL, - 0, - (LPARAM)0); - if (tmp > 0 && tmp < 16) - { - gPP[iCurSel].user.SpindownTimeoutDc = Sec[tmp+2]; - } - tmp = (INT) SendDlgItemMessage(hwndDlg, IDC_STANDBYACLIST, - CB_GETCURSEL, - 0, - (LPARAM)0); - if (tmp > 0 && tmp < 16) - { - gPP[iCurSel].user.IdleTimeoutAc = Sec[tmp]; - } - tmp = (INT) SendDlgItemMessage(hwndDlg, IDC_STANDBYDCLIST, - CB_GETCURSEL, - 0, - (LPARAM)0); - if (tmp > 0 && tmp < 16) - { - gPP[iCurSel].user.IdleTimeoutDc = Sec[tmp]; - } - tmp = (INT) SendDlgItemMessage(hwndDlg, IDC_HYBERNATEACLIST, - CB_GETCURSEL, - 0, - (LPARAM)0); - if (tmp > 0 && tmp < 16) - { - gPP[iCurSel].mach.DozeS4TimeoutAc = Sec[tmp]; - } - tmp = (INT) SendDlgItemMessage(hwndDlg, IDC_HYBERNATEDCLIST, - CB_GETCURSEL, - 0, - (LPARAM)0); - if (tmp > 0 && tmp < 16) - { - gPP[iCurSel].mach.DozeS4TimeoutDc = Sec[tmp]; - } - - SetActivePwrScheme(iCurSel,NULL,&gPP[iCurSel]); - LoadConfig(hwndDlg); -} + break; + case IDC_DELETE_BTN: + { + DelScheme(hwndDlg); + } + break; + case IDC_SAVEAS_BTN: + { + + } + break; + case IDC_MONITORACLIST: + case IDC_MONITORDCLIST: + case IDC_DISKACLIST: + case IDC_DISKDCLIST: + case IDC_STANDBYACLIST: + case IDC_STANDBYDCLIST: + case IDC_HYBERNATEACLIST: + case IDC_HYBERNATEDCLIST: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } + break; + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + if (lpnm->code == (UINT)PSN_APPLY) + { + Pos_SaveData(hwndDlg); + } + return TRUE; + } + break; + } + return FALSE; +}

16 years, 9 months

[cfinck] 30956: Spanish translations for screensavers by Javier Remacha (remialdo AT gmail DOT com) See issue #2863 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Dec 2 17:16:09 2007 New Revision: 30956 URL: http://svn.reactos.org/svn/reactos?rev=30956&view=rev Log: Spanish translations for screensavers by Javier Remacha (remialdo AT gmail DOT com) See issue #2863 for more details. Added: trunk/rosapps/applications/screensavers/blankscr/lang/es-ES.rc (with props) trunk/rosapps/applications/screensavers/butterflies/lang/es-ES.rc (with props) trunk/rosapps/applications/screensavers/cylfrac/lang/es-ES.rc (with props) trunk/rosapps/applications/screensavers/matrix/lang/es-ES.rc (with props) trunk/rosapps/applications/screensavers/starfield/lang/es-ES.rc (with props) Modified: trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc trunk/rosapps/applications/screensavers/butterflies/butterflies.rc trunk/rosapps/applications/screensavers/cylfrac/cylfrac.rc trunk/rosapps/applications/screensavers/matrix/rsrc.rc trunk/rosapps/applications/screensavers/starfield/starfield.rc Added: trunk/rosapps/applications/screensavers/blankscr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/lang/es-ES.rc (added) +++ trunk/rosapps/applications/screensavers/blankscr/lang/es-ES.rc Sun Dec 2 17:16:09 2007 @@ -1,0 +1,8 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "En blanco" + IDS_TITLE "Acerca de" + IDS_TEXT "Ninguna opción necesita ser configurada." +END Propchange: trunk/rosapps/applications/screensavers/blankscr/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc (original) +++ trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc Sun Dec 2 17:16:09 2007 @@ -13,6 +13,7 @@ #include "lang/bg-BG.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" Modified: trunk/rosapps/applications/screensavers/butterflies/butterflies.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/butterflies.rc (original) +++ trunk/rosapps/applications/screensavers/butterflies/butterflies.rc Sun Dec 2 17:16:09 2007 @@ -13,5 +13,6 @@ #include "lang/bg-BG.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/uk-UA.rc" Added: trunk/rosapps/applications/screensavers/butterflies/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/lang/es-ES.rc (added) +++ trunk/rosapps/applications/screensavers/butterflies/lang/es-ES.rc Sun Dec 2 17:16:09 2007 @@ -1,0 +1,144 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_DLG_SCREEN DIALOG DISCARDABLE 0, 0, 172, 57 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Configuración del Salvapantallas de Mariposas" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "Aceptar",IDOK,7,35,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,61,35,50,14 + CONTROL "Rotar Mariposas",ROTATE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,56,15,70,8 + PUSHBUTTON "Acerca de",IDABOUT,115,35,50,14 +END + +IDD_DLG_ABOUT DIALOG DISCARDABLE 0, 0, 149, 79 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "Aceptar",IDOK,48,58,56,14 + CTEXT "Salvapantallas de Mariposas",IDC_STATIC,7,7,135,9 + CTEXT "Demo por: NeHe ",IDC_STATIC,7,20,135,8 + CTEXT "http://nehe.gamedev.net",WEBPAGE1,7,29,135,8,SS_NOTIFY | + NOT WS_GROUP + CTEXT "Salvapantallas por: tHaPuTeR",IDC_STATIC,7,38,135,8,NOT + WS_GROUP + CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY | + NOT WS_GROUP +END + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_DLG_SCREEN, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 165 + TOPMARGIN, 7 + BOTTOMMARGIN, 50 + END + + IDD_DLG_ABOUT, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 142 + TOPMARGIN, 7 + BOTTOMMARGIN, 72 + END +END +#endif // APSTUDIO_INVOKED + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Bitmap +// + +IDB_BUTTERFLY1 BITMAP DISCARDABLE "res/butterfly1.bmp" +IDB_BUTTERFLY2 BITMAP DISCARDABLE "res/butterfly2.bmp" +IDB_BUTTERFLY3 BITMAP DISCARDABLE "res/butterfly3.bmp" + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STR_DESCRIP "Mariposas" +END + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Propchange: trunk/rosapps/applications/screensavers/butterflies/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/cylfrac/cylfrac.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/cylfrac/cylfrac.rc (original) +++ trunk/rosapps/applications/screensavers/cylfrac/cylfrac.rc Sun Dec 2 17:16:09 2007 @@ -13,6 +13,7 @@ #include "lang/bg-BG.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" Added: trunk/rosapps/applications/screensavers/cylfrac/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/cylfrac/lang/es-ES.rc (added) +++ trunk/rosapps/applications/screensavers/cylfrac/lang/es-ES.rc Sun Dec 2 17:16:09 2007 @@ -1,0 +1,8 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Cilindros fractales" + IDS_TITLE "Acerca de" + IDS_TEXT "Cilindros fractales por unC0Rr.\nEspecial para ReactOS." +END Propchange: trunk/rosapps/applications/screensavers/cylfrac/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/matrix/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/matrix/lang/es-ES.rc (added) +++ trunk/rosapps/applications/screensavers/matrix/lang/es-ES.rc Sun Dec 2 17:16:09 2007 @@ -1,0 +1,53 @@ +#include "resource.h" + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDD_CONFIG DIALOG DISCARDABLE 0, 0, 340, 183 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Configuración del Salvapantallas Matrix" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "&Velocidad de Decodificación",IDC_STATIC,7,7,128,36 + LTEXT "Más lento",IDC_STATIC,13,24,22,8 + CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,17,62,22 + LTEXT "Más rápido",IDC_STATIC,104,24,20,8 + GROUPBOX "&Densidad de Cifras",IDC_STATIC,7,50,128,36 + LTEXT "Menos",IDC_STATIC,13,67,19,8 + CONTROL "Slider1",IDC_SLIDER2,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,60,62,22 + LTEXT "Más",IDC_STATIC,104,67,23,8 + GROUPBOX "Velocidad de Muestra de &Mensajes",IDC_MSGSPEEDGRP,7,93,127,36 + LTEXT "Más lento",IDC_STATIC,13,110,22,8 + CONTROL "Slider3",IDC_SLIDER3,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,103,62,22 + LTEXT "Más rápido",IDC_STATIC,104,110,22,8 + GROUPBOX "Tamaño de &Fuente",IDC_STATIC,7,137,127,36 + LTEXT "Más pequeño",IDC_STATIC,13,153,24,8 + CONTROL "Slider3",IDC_SLIDER4,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,146,62,22 + LTEXT "Más grande",IDC_STATIC,104,153,25,8 + GROUPBOX "Mensajes &Codificados",IDC_STATIC,145,7,188,142 + COMBOBOX IDC_COMBO1,153,22,172,62,CBS_DROPDOWN | WS_VSCROLL | + WS_TABSTOP + CONTROL "",IDC_PREVIEW,"Static",SS_LEFTNOWORDWRAP | + SS_CENTERIMAGE | WS_GROUP,154,39,116,72 + PUSHBUTTON "&Añadir",IDC_ADD,280,41,44,18 + PUSHBUTTON "&Eliminar",IDC_REMOVE,280,66,44,18 + CONTROL "Me&nsajes Aleatorios",IDC_RANDOM,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,151,134,85,10 + DEFPUSHBUTTON "Aceptar",IDOK,222,162,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,283,162,50,14 + LTEXT "Nombre de &Fuente:",IDC_STATIC,151,118,38,8 + COMBOBOX IDC_COMBO2,195,116,130,71,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + CONTROL "&Negrita",IDC_BOLD,"Button",BS_AUTOCHECKBOX | + BS_MULTILINE | WS_TABSTOP,247,134,46,10 + CTEXT "Salvapantallas Matrix www.catch22.org.uk",IDC_ABOUT,140, + 158,75,18 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Salvapantallas Matrix" +END Propchange: trunk/rosapps/applications/screensavers/matrix/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/matrix/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/matrix/rsrc.rc (original) +++ trunk/rosapps/applications/screensavers/matrix/rsrc.rc Sun Dec 2 17:16:09 2007 @@ -8,8 +8,9 @@ IDI_ICON1 ICON DISCARDABLE "icon1.ico" #include "lang/bg-BG.rc" +#include "lang/de-DE.rc" #include "lang/en-US.rc" -#include "lang/de-DE.rc" +#include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" Added: trunk/rosapps/applications/screensavers/starfield/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/starfield/lang/es-ES.rc (added) +++ trunk/rosapps/applications/screensavers/starfield/lang/es-ES.rc Sun Dec 2 17:16:09 2007 @@ -1,0 +1,8 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Salvapantallas Campo de estrellas" + IDS_TITLE "Acerca de" + IDS_TEXT "Ninguna opción necesita ser configurada." +END Propchange: trunk/rosapps/applications/screensavers/starfield/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/starfield/starfield.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/starfield/starfield.rc (original) +++ trunk/rosapps/applications/screensavers/starfield/starfield.rc Sun Dec 2 17:16:09 2007 @@ -13,6 +13,7 @@ #include "lang/bg-BG.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/lt-LT.rc" #include "lang/nl-NL.rc"

16 years, 9 months

[cfinck] 30955: Ukrainian translations by Artem Reznikov (temarez AT yandex DOT ru) See issue #2854 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Dec 2 15:44:21 2007 New Revision: 30955 URL: http://svn.reactos.org/svn/reactos?rev=30955&view=rev Log: Ukrainian translations by Artem Reznikov (temarez AT yandex DOT ru) See issue #2854 for more details. Added: trunk/rosapps/packmgr/gui/uk.rc (with props) trunk/rosapps/packmgr/lib/uk.rc (with props) Modified: trunk/reactos/dll/win32/rasdlg/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/rosapps/packmgr/lib/package.rc Modified: trunk/reactos/dll/win32/rasdlg/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/rasdlg/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/rasdlg/lang/uk-UA.rc Sun Dec 2 15:44:21 2007 @@ -96,15 +96,15 @@ STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Phone number", 1053, 7, 5, 243, 92 - LTEXT "&Area code:", 1055, 18, 17, 54, 8 + GROUPBOX "Íîìåð òåëåôîíó", 1053, 7, 5, 243, 92 + LTEXT "&Êîä ì³ñòà:", 1055, 18, 17, 54, 8 COMBOBOX 1049, 17, 30, 55, 129, CBS_DROPDOWN | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "&Phone number:", 1057, 77, 17, 166, 8, NOT WS_GROUP + LTEXT "&Íîìåð òåëåôîíó:", 1057, 77, 17, 166, 8, NOT WS_GROUP EDITTEXT 1051, 77, 30, 163, 14, ES_AUTOHSCROLL - LTEXT "&Country/region code:", 1056, 18, 48, 221, 8, NOT WS_GROUP + LTEXT "Êîä êðà¿íè àáî ðå&ã³îíó:", 1056, 18, 48, 221, 8, NOT WS_GROUP COMBOBOX 1054, 17, 61, 224, 93, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP - AUTOCHECKBOX "&Use dialing rules", 1048, 20, 81, 219, 10, BS_TOP | BS_MULTILINE - GROUPBOX "Co&mment", 1052, 7, 102, 243, 36 + AUTOCHECKBOX "&Âèêîðèñòîâóâàòè ïðàâèëà íàáîðó íîìåðà", 1048, 20, 81, 219, 10, BS_TOP | BS_MULTILINE + GROUPBOX "&Ïðèì³òêà", 1052, 7, 102, 243, 36 EDITTEXT 1050, 17, 115, 224, 14, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", 1, 127, 147, 60, 14 PUSHBUTTON "Ñêàñóâàòè", 2, 191, 147, 60, 14 @@ -112,13 +112,13 @@ 108 DIALOG 6, 18, 222, 104 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Password" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Your password on the remote network has expired. Enter passwords, then press OK to set a new one.", 1062, 7, 5, 210, 24 - LTEXT "&New password:", 1064, 8, 43, 108, 8 +CAPTION "Çì³íà ïàðîëÿ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Òåðì³í ä³¿ ïàðîëÿ ó â³ääàëåí³é ìåðåæ³ ìèíóâ. Ââåä³òü ïàðîëü ³ íàòèñí³òü êíîïêó ""OK"".", 1062, 7, 5, 210, 24 + LTEXT "&Íîâèé ïàðîëü:", 1064, 8, 43, 108, 8 EDITTEXT 1060, 118, 38, 98, 14, ES_PASSWORD | ES_AUTOHSCROLL - LTEXT "&Confirm new password:", 1061, 8, 61, 102, 8 + LTEXT "&Ï³äòâåðäæåííÿ:", 1061, 8, 61, 102, 8 EDITTEXT 1058, 118, 57, 98, 14, ES_PASSWORD | ES_AUTOHSCROLL DEFPUSHBUTTON "OK", 1, 90, 84, 60, 14, WS_GROUP PUSHBUTTON "Ñêàñóâàòè", 2, 154, 84, 60, 14 @@ -126,15 +126,15 @@ 109 DIALOG 6, 18, 223, 122 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Password" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Your password on the remote network has expired. Enter passwords, then press OK to set a new one.", 1062, 7, 5, 212, 29 - LTEXT "&Old password:", 1063, 7, 42, 108, 8 +CAPTION "Çì³íà ïàðîëÿ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Òåðì³í ä³¿ ïàðîëÿ ó â³ääàëåí³é ìåðåæ³ ìèíóâ. Ââåä³òü ïàðîëü ³ íàòèñí³òü êíîïêó ""OK"".", 1062, 7, 5, 212, 29 + LTEXT "&Ñòàðèé ïàðîëü:", 1063, 7, 42, 108, 8 EDITTEXT 1059, 116, 38, 100, 14, ES_PASSWORD | ES_AUTOHSCROLL - LTEXT "&New password:", 1064, 7, 60, 108, 8 + LTEXT "&Íîâèé ïàðîëü:", 1064, 7, 60, 108, 8 EDITTEXT 1060, 116, 56, 100, 14, ES_PASSWORD | ES_AUTOHSCROLL - LTEXT "&Confirm new password:", 1061, 7, 78, 108, 8 + LTEXT "&Ï³äòâåðäæåííÿ:", 1061, 7, 78, 108, 8 EDITTEXT 1058, 116, 74, 100, 14, ES_PASSWORD | ES_AUTOHSCROLL DEFPUSHBUTTON "OK", 1, 92, 101, 60, 14, WS_GROUP PUSHBUTTON "Ñêàñóâàòè", 2, 156, 101, 60, 14 @@ -142,11 +142,11 @@ 110 DIALOG 12, 16, 230, 105 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Callback" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "You have 'Set By Caller' callback privilege on the server. Press OK and the server will call you back at the number below. Press Cancel to skip callback.", 1066, 5, 5, 221, 39, SS_NOPREFIX - LTEXT "&Enter your modem's phone number:", 1067, 5, 46, 222, 8, NOT WS_GROUP +CAPTION "Â³äïîâ³äíèé âèêëèê" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Âè ìàºòå ïðàâî íà çâîðîòíèé âèêëèê ³ç áîêó ñåðâåðà. ßêùî íàòèñíóòè êíîïêó ""OK"", ñåðâåð çðîáèòü çâîðîòíèé âèêëèê çà âêàçàíèì íèæ÷å íîìåðîì. Ùîá â³äìîâèòèñÿ â³ä çâîðîòíîãî âèêëèêó, íàòèñí³òü êíîïêó ""Ñêàñóâàòè"".", 1066, 5, 5, 221, 39, SS_NOPREFIX + LTEXT "&Ââåä³òü íîìåð òåëåôîíó âàøîãî ìîäåìà:", 1067, 5, 46, 222, 8, NOT WS_GROUP EDITTEXT 1065, 5, 57, 221, 14, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", 1, 100, 85, 60, 14, WS_GROUP PUSHBUTTON "Ñêàñóâàòè", 2, 164, 85, 60, 14 @@ -321,29 +321,29 @@ 121 DIALOG 6, 18, 230, 131 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "ISDN Configuration" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Line type:", 1155, 9, 9, 65, 8 +CAPTION "Íàñòðîéêà ISDN" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Òèï ë³í³¿:", 1155, 9, 9, 65, 8 COMBOBOX 1153, 76, 7, 148, 42, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - AUTOCHECKBOX "&Negotiate line type", 1150, 23, 26, 199, 10, BS_TOP | BS_MULTILINE | WS_GROUP + AUTOCHECKBOX "Ó&çãîäæåííÿ òèïó ë³í³¿", 1150, 23, 26, 199, 10, BS_TOP | BS_MULTILINE | WS_GROUP GROUPBOX " ", 1152, 8, 48, 214, 51, WS_GROUP - AUTOCHECKBOX "&Use old proprietary protocol", 1149, 17, 48, 102, 10, BS_TOP | BS_MULTILINE - LTEXT "&Channels to use:", 1154, 16, 65, 100, 8, NOT WS_GROUP + AUTOCHECKBOX "&Âèêîðèñòîâóâàòè ñòàðèé ïðîòîêîë", 1149, 17, 48, 102, 10, BS_TOP | BS_MULTILINE + LTEXT "Âèêîðè&ñòîâóâàòè êàíàëè:", 1154, 16, 65, 100, 8, NOT WS_GROUP EDITTEXT 1151, 119, 61, 94, 14, ES_AUTOHSCROLL - AUTOCHECKBOX "&Enable hardware compression", 1148, 16, 82, 198, 10, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&Óâ³ìêíóòè àïàðàòíå ñòèñêàííÿ", 1148, 16, 82, 198, 10, BS_TOP | BS_MULTILINE PUSHBUTTON "OK", 1, 99, 109, 60, 14, WS_GROUP PUSHBUTTON "Ñêàñóâàòè", 2, 163, 109, 60, 14 END 122 DIALOG 6, 18, 220, 68 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "ISDN Configure" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Line type:", 1155, 9, 11, 55, 8 +CAPTION "Íàñòðîéêà ISDN" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Òèï ë³í³¿:", 1155, 9, 11, 55, 8 COMBOBOX 1153, 67, 7, 148, 43, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - AUTOCHECKBOX "&Negotiate line type", 1150, 21, 28, 194, 10, BS_TOP | BS_MULTILINE | WS_GROUP + AUTOCHECKBOX "Ó&çãîäæåííÿ òèïó ë³í³¿", 1150, 21, 28, 194, 10, BS_TOP | BS_MULTILINE | WS_GROUP PUSHBUTTON "OK", 1, 90, 49, 60, 14, WS_GROUP PUSHBUTTON "Ñêàñóâàòè", 2, 154, 49, 60, 14 END @@ -372,59 +372,59 @@ 125 DIALOG 12, 16, 261, 190 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Modem Configuration" +CAPTION "Íàñòðîéêà ìîäåìà" FONT 8, "MS Shell Dlg" BEGIN ICON 15102, 1238, 7, 7, 20, 20 - LTEXT "Modem", -1, 25, 27, 24, 8, NOT WS_VISIBLE | NOT WS_GROUP + LTEXT "Ìîäåì", -1, 25, 27, 24, 8, NOT WS_VISIBLE | NOT WS_GROUP EDITTEXT 1235, 40, 7, 214, 16, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER - LTEXT "&Maximum speed (bps):", 1243, 7, 36, 110, 8 + LTEXT "&Íàéá³ëüøà øâèäê³ñòü (á³ò/ñ):", 1243, 7, 36, 110, 8 COMBOBOX 1239, 119, 34, 136, 186, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "Modem &protocol", 1244, 7, 52, 111, 8 + LTEXT "Ïðîòîêîë &ìîäåìà", 1244, 7, 52, 111, 8 COMBOBOX 1245, 119, 50, 136, 186, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP - GROUPBOX "Hardware features", 1237, 6, 70, 248, 61, WS_GROUP - AUTOCHECKBOX "E&nable hardware flow control", 1232, 19, 82, 217, 10, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "En&able modem error control", 1231, 19, 98, 217, 10, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "Enable m&odem compression", 1229, 19, 115, 217, 10, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "&Show terminal window", 1234, 8, 136, 246, 10, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "Enable mo&dem speaker", 1230, 8, 151, 247, 10, BS_TOP | BS_MULTILINE | WS_GROUP + GROUPBOX "Ïàðàìåòðè óñòàòêóâàííÿ", 1237, 6, 70, 248, 61, WS_GROUP + AUTOCHECKBOX "&Àïàðàòíå êåðóâàííÿ ïîòîêîì", 1232, 19, 82, 217, 10, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Î&áðîáêà ïîìèëîê ìîäåìîì", 1231, 19, 98, 217, 10, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&Ñòèñêàííÿ äàíèõ ìîäåìîì", 1229, 19, 115, 217, 10, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&Ïîêàçàòè â³êíî òåðì³íàëà", 1234, 8, 136, 246, 10, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Óâ³ìêíóòè &äèíàì³ê ìîäåìà", 1230, 8, 151, 247, 10, BS_TOP | BS_MULTILINE | WS_GROUP DEFPUSHBUTTON "OK", 1, 129, 171, 60, 14, WS_GROUP PUSHBUTTON "Ñêàñóâàòè", 2, 194, 171, 60, 14 END 126 DIALOG 0, 0, 270, 117 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Select Network Component Type" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Click the type of network component you want to install:", -1, 8, 7, 258, 8 +CAPTION "Âèá³ð òèïó ìåðåæíîãî êîìïîíåíòà" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Âèáåð³òü òèï óñòàíîâëþâàíîãî ìåðåæíîãî êîìïîíåíòà:", -1, 8, 7, 258, 8 CONTROL "", 1251, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 8, 20, 188, 58 GROUPBOX "", -1, 8, 81, 188, 30 LTEXT "", 1250, 12, 90, 177, 17 - DEFPUSHBUTTON "&Add...", 1252, 205, 20, 60, 14 + DEFPUSHBUTTON "&Äîäàòè...", 1252, 205, 20, 60, 14 PUSHBUTTON "Ñêàñóâàòè", 2, 205, 38, 60, 14 END 127 DIALOG 16, 20, 260, 135 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "NetWare or Compatible Connections" +CAPTION "Ï³äêëþ÷åííÿ äî NetWare àáî ñóì³ñíî¿ ìåðåæ³" FONT 8, "MS Shell Dlg" BEGIN ICON 32515, 1278, 7, 7, 21, 20, WS_GROUP - LTEXT "You have connections to a NetWare compatible network. These connections will be closed when the PPP IPX connection is established.", 1279, 42, 7, 215, 37 - LTEXT "Before dialing, to avoid data loss, either close all files using these connections or uncheck IPX on this entry's Network Protocol settings.", 1280, 42, 46, 215, 38, NOT WS_GROUP - AUTOCHECKBOX "&Do not display this message in the future", 1277, 42, 86, 215, 10, BS_TOP | BS_MULTILINE | WS_GROUP + LTEXT "Íàÿâí³ ï³äêëþ÷åííÿ äî NetWare-ñóì³ñíî¿ ìåðåæ³ áóäóòü çàêðèò³ ï³ä ÷àñ óñòàíîâêè ï³äêëþ÷åííÿ PPP IPX.", 1279, 42, 7, 215, 37 + LTEXT "Ùîá çàïîá³ãòè âòðàò³ äàíèõ, ïåðåä íàáîðîì íîìåðà çàêðèéòå âñ³ ôàéëè, ÿê³ âèêîðèñòîâóþòü ö³ ï³äêëþ÷åííÿ, àáî çí³ì³òü ïðàïîðåöü IPX ó â³êí³ ïàðàìåòð³â ìåðåæíîãî ïðîòîêîëó äëÿ öüîãî åëåìåíòà.", 1280, 42, 46, 215, 38, NOT WS_GROUP + AUTOCHECKBOX "&Á³ëüøå íå ïîêàçóâàòè öå ïîâ³äîìëåííÿ", 1277, 42, 86, 215, 10, BS_TOP | BS_MULTILINE | WS_GROUP DEFPUSHBUTTON "OK", 1, 65, 112, 60, 14, WS_GROUP PUSHBUTTON "Ñêàñóâàòè", 2, 134, 112, 60, 14 END 128 DIALOG 7, 22, 236, 90 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Manual Dial" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Pick up the handset and dial (or ask the operator to dial). After dialing is complete, click OK. Listen to handset until silent, and then hang up.", 1281, 8, 8, 219, 32 - LTEXT "Phone number:", 1282, 8, 46, 91, 8 +CAPTION "Íàá³ð íîìåðà âðó÷íó" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Çí³ì³òü ñëóõàâêó ³ íàáåð³òü íîìåð (àáî ïîïðîñ³òü îïåðàòîðà çðîáèòè öþ ä³þ). Ï³ñëÿ çàê³í÷åííÿ íàáîðó íàòèñí³òü êíîïêó ""OK"". Ïî÷åêàéòå, ïîêè ñèãíàë ó ñëóõàâö³ íå çíèêíå, à ïîò³ì ïîêëàä³òü ¿¿.", 1281, 8, 8, 219, 32 + LTEXT "Íîìåð òåëåôîíó:", 1282, 8, 46, 91, 8 LTEXT "", 1283, 103, 46, 126, 8, NOT WS_GROUP DEFPUSHBUTTON "OK", 1, 104, 70, 60, 14, WS_GROUP PUSHBUTTON "Ñêàñóâàòè", 2, 168, 70, 60, 14 @@ -432,30 +432,30 @@ 129 DIALOG 6, 20, 260, 85 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Network Protocol Connection Result" +CAPTION "Ðåçóëüòàò ï³äêëþ÷åííÿ ìåðåæíèõ ïðîòîêîë³â" FONT 8, "MS Shell Dlg" BEGIN ICON 32516, 1328, 7, 7, 21, 20, WS_GROUP LTEXT "", 1329, 38, 7, 216, 24, NOT WS_GROUP - AUTOCHECKBOX "&Do not request the failed protocols next time", 1327, 40, 44, 215, 10, BS_TOP | BS_MULTILINE | WS_GROUP - PUSHBUTTON "&Accept", 1, 129, 64, 60, 14 - PUSHBUTTON "&Hang Up", 2, 193, 64, 60, 14 + AUTOCHECKBOX "Á³ëüøå &íå çàïèòóâàòè íåâäàë³ ïðîòîêîëè", 1327, 40, 44, 215, 10, BS_TOP | BS_MULTILINE | WS_GROUP + PUSHBUTTON "Ïðèé&ìàòè", 1, 129, 64, 60, 14 + PUSHBUTTON "&Çàâåðøèòè", 2, 193, 64, 60, 14 END 133 DIALOG 6, 18, 231, 211 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "X.25 Logon Settings" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Select your X.25 network provider and type the X.121 address of the remote server:", 1408, 7, 4, 220, 27 - LTEXT "&Network:", 1410, 9, 35, 213, 8, NOT WS_GROUP +CAPTION "Ïàðàìåòðè âõîäó äî ìåðåæ³ X.25" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Âèáåð³òü ñëóæáó äîñòóïó äî ìåðåæ³ X.25 ³ ââåä³òü àäðåñó X.121 â³ääàëåíîãî ñåðâåðà:", 1408, 7, 4, 220, 27 + LTEXT "Ìåðå&æà:", 1410, 9, 35, 213, 8, NOT WS_GROUP COMBOBOX 1406, 9, 46, 215, 125, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "X.121&address:", 1407, 9, 66, 213, 8, NOT WS_GROUP + LTEXT "&Àäðåñà X.121:", 1407, 9, 66, 213, 8, NOT WS_GROUP EDITTEXT 1402, 8, 77, 215, 14, ES_AUTOHSCROLL - GROUPBOX "Optional", 1405, 8, 95, 215, 79 - LTEXT "&User data:", 1411, 19, 109, 182, 8, NOT WS_GROUP + GROUPBOX "Äîäàòêîâî", 1405, 8, 95, 215, 79 + LTEXT "&Äàí³ êîðèñòóâà÷à:", 1411, 19, 109, 182, 8, NOT WS_GROUP EDITTEXT 1404, 19, 120, 193, 14, ES_AUTOHSCROLL - LTEXT "&Facilities:", 1409, 19, 138, 182, 8, NOT WS_GROUP + LTEXT "&Ïîñëóãè:", 1409, 19, 138, 182, 8, NOT WS_GROUP EDITTEXT 1403, 19, 149, 193, 14, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", 1, 100, 189, 60, 14 PUSHBUTTON "Ñêàñóâàòè", 2, 164, 189, 60, 14 @@ -463,54 +463,54 @@ 146 DIALOG 6, 18, 230, 210 STYLE DS_SETFONT | WS_CHILD | WS_VISIBLE | WS_CAPTION -CAPTION "Autodial" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "If you are disconnected from a network, autodial attempts to connect to a network whenever you try to access remote information.", -1, 7, 4, 219, 32 - LTEXT "&Enable autodial by location:", 1006, 8, 42, 213, 8 +CAPTION "Àâòîíàá³ð íîìåðà" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ó ðàç³ ðîçðèâó ï³äêëþ÷åííÿ äî ìåðåæ³ àâòîíàá³ð íîìåðà âèêîíóâàòèìåòüñÿ çà êîæíî¿ ñïðîáè îòðèìàòè äîñòóï äî â³ääàëåíî¿ ³íôîðìàö³¿.", -1, 7, 4, 219, 32 + LTEXT "Óâ³ì&êíóòè àâòîíàá³ð íîìåðà äëÿ:", 1006, 8, 42, 213, 8 CONTROL "", 1004, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000C401, 7, 53, 216, 109 - AUTOCHECKBOX "Al&ways ask me before autodialing", 1496, 8, 170, 218, 9, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "&Disable autodial while I am logged on", 1550, 8, 185, 217, 9, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&Çàâæäè çàïèòóâàòè ïåðåä àâòîíàáîðîì íîìåðà", 1496, 8, 170, 218, 9, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&Âèìêíóòè àâòîíàá³ð äî ìîãî âèõîäó ³ç ñèñòåìè", 1550, 8, 185, 217, 9, BS_TOP | BS_MULTILINE END 147 DIALOG 6, 18, 230, 215 STYLE DS_SETFONT | WS_CHILD | WS_VISIBLE | WS_CAPTION -CAPTION "Dialing" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "These preferences apply to 'Login using Dial-Up Networking' at Ctrl-Alt-Del login. You, as an administrator, have access to this sheet.", 1007, 7, 4, 221, 40, NOT WS_GROUP - LTEXT "&Number of redial attempts:", 1005, 7, 55, 154, 8 +CAPTION "Íàá³ð íîìåðà" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ïàðàìåòðè âõîäó äî ñèñòåìè ÷åðåç â³ääàëåíèé äîñòóï ï³ñëÿ íàòèñíåííÿ êëàâ³ø Ctrl-Alt-Delete. Âè, ÿê àäì³í³ñòðàòîð, ìàºòå äîñòóï äî ö³º¿ âêëàäêè.", 1007, 7, 4, 221, 40, NOT WS_GROUP + LTEXT "&Ê³ëüê³ñòü ñïðîá ïîâòîðíîãî íàáîðó:", 1005, 7, 55, 154, 8 EDITTEXT 1001, 164, 52, 60, 14, ES_AUTOHSCROLL - LTEXT "&Seconds between redial attempts:", 1009, 7, 73, 156, 8, NOT WS_GROUP + LTEXT "²íòåðâàë ì³æ ñïðîáàì&è íàáîðó (ñ):", 1009, 7, 73, 156, 8, NOT WS_GROUP EDITTEXT 1003, 164, 70, 60, 14, ES_AUTOHSCROLL - LTEXT "I&dle seconds before hanging up:", 1008, 7, 91, 154, 8, NOT WS_GROUP + LTEXT "&×àñ ïðîñòîþ äî ðîç'ºäíàííÿ (ñ):", 1008, 7, 91, 154, 8, NOT WS_GROUP EDITTEXT 1002, 164, 88, 60, 14, ES_AUTOHSCROLL END 148 DIALOG 6, 18, 230, 215 STYLE DS_SETFONT | WS_CHILD | WS_VISIBLE | WS_CAPTION -CAPTION "Callback" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "When you dial into a server, it may offer to call you back to reduce your phone charges. Specify whether you want callback. (Callback is not supported for virtual private network (VPN) connections.)", 1043, 8, 4, 219, 43 - AUTORADIOBUTTON "&No callback", 1041, 7, 48, 219, 10, BS_TOP | BS_MULTILINE | WS_GROUP - AUTORADIOBUTTON "A&sk me during dialing when the server offers", 1040, 7, 61, 219, 10, BS_TOP | BS_MULTILINE - AUTORADIOBUTTON "Al&ways call me back at the number(s) below:", 1042, 7, 74, 219, 10, BS_TOP | BS_MULTILINE +CAPTION "Â³äïîâ³äíèé âèêëèê" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ï³ñëÿ óñòàíîâêè çâ'ÿçêó ³ç ñåðâåðîì â³í ìîæå çðîáèòè âèêëèê ó â³äïîâ³äü, ùî çìåíøèòü âàø³ âèòðàòè íà òåëåôîíóâàííÿ. Âèêîðèñòîâóâàòè çâîðîòíèé âèêëèê? (Çâîðîòíèé âèêëèê íå ï³äòðèìóºòüñÿ äëÿ VPN-ï³äêëþ÷åíü.)", 1043, 8, 4, 219, 43 + AUTORADIOBUTTON "&Â³äïîâ³äíèé âèêëèê íå âèêîíóºòüñÿ", 1041, 7, 48, 219, 10, BS_TOP | BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "&Çàïèòóâàòè, êîëè öå ïðîïîíóº ñåðâåð", 1040, 7, 61, 219, 10, BS_TOP | BS_MULTILINE + AUTORADIOBUTTON "Çàâ&æäè ðîáèòè çâîðîòíèé âèêëèê çà âêàçàíèìè íîìåðàìè:", 1042, 7, 74, 219, 10, BS_TOP | BS_MULTILINE CONTROL "", 1037, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x00008401, 16, 88, 204, 94 - PUSHBUTTON "&Edit...", 1039, 96, 190, 60, 14 - PUSHBUTTON "&Delete", 1038, 159, 190, 60, 14 + PUSHBUTTON "Ç&ì³íèòè...", 1039, 96, 190, 60, 14 + PUSHBUTTON "Â&èäàëèòè", 1038, 159, 190, 60, 14 END 149 DIALOG 6, 18, 317, 142 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "You need to set the dial-in credentials that remote routers will use when connecting to this interface. A user account will be created on this router with the information that you enter here.", 1094, 8, 5, 307, 35 - LTEXT "&User name:", 1078, 8, 47, 124, 8, NOT WS_GROUP + LTEXT "Ñë³ä óêàçàòè îáë³êîâ³ äàí³ âèõ³äíîãî ï³äêëþ÷åííÿ, ÿê³ âèêîðèñòîâóâàòèìóòüñÿ â³ääàëåíèìè ìàðøðóòèçàòîðàìè äëÿ ï³äêëþ÷åííÿ äî öüîãî ³íòåðôåéñó. Íà öüîìó ìàðøðóòèçàòîð³ áóäå ñòâîðåíî îáë³êîâèé çàïèñ êîðèñòóâà÷à ³ç ââåäåíèìè çàðàç äàíèìè.", 1094, 8, 5, 307, 35 + LTEXT "&Êîðèñòóâà÷:", 1078, 8, 47, 124, 8, NOT WS_GROUP EDITTEXT 1074, 135, 45, 175, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "&Password:", 1077, 8, 68, 124, 8, NOT WS_GROUP + LTEXT "Ïàðîë&ü:", 1077, 8, 68, 124, 8, NOT WS_GROUP EDITTEXT 1073, 135, 66, 175, 12, ES_PASSWORD | ES_AUTOHSCROLL - LTEXT "&Confirm password:", 1075, 8, 90, 124, 8, NOT WS_GROUP + LTEXT "&Ï³äòâåðäæåííÿ:", 1075, 8, 90, 124, 8, NOT WS_GROUP EDITTEXT 1071, 135, 87, 175, 12, ES_PASSWORD | ES_AUTOHSCROLL END @@ -518,14 +518,14 @@ STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "You need to set the dial out credentials that this interface will use when connecting to the remote router. These credentials must match the dial in credentials configured on the remote router.", 1094, 8, 5, 308, 33 - LTEXT "&User name:", 1096, 8, 43, 130, 8, NOT WS_GROUP + LTEXT "Ñë³ä óêàçàòè îáë³êîâ³ äàí³ âèõ³äíîãî ï³äêëþ÷åííÿ, ÿê³ âèêîðèñòîâóâàòèìóòüñÿ öèì ³íòåðôåéñîì äëÿ ï³äêëþ÷åííÿ äî â³ääàëåíîãî ìàðøðóòèçàòîðà. Ö³ îáë³êîâ³ äàí³ ìóñÿòü ñï³âïàäàòè ç îáë³êîâèìè äàíèìè âõ³äíîãî ï³äêëþ÷åííÿ íà öüîìó â³ääàëåíîìó ìàðøðóòèçàòîð³.", 1094, 8, 5, 308, 33 + LTEXT "&Êîðèñòóâà÷:", 1096, 8, 43, 130, 8, NOT WS_GROUP EDITTEXT 1091, 140, 40, 175, 12, ES_AUTOHSCROLL - LTEXT "&Domain:", 1093, 8, 63, 130, 8, NOT WS_GROUP + LTEXT "Äî&ìåí:", 1093, 8, 63, 130, 8, NOT WS_GROUP EDITTEXT 1089, 140, 60, 175, 12, ES_UPPERCASE | ES_AUTOHSCROLL - LTEXT "&Password:", 1095, 8, 81, 130, 8, NOT WS_GROUP + LTEXT "Ïàðîë&ü:", 1095, 8, 81, 130, 8, NOT WS_GROUP EDITTEXT 1090, 140, 78, 175, 12, ES_PASSWORD | ES_AUTOHSCROLL - LTEXT "&Confirm password:", 1092, 8, 99, 130, 8, NOT WS_GROUP + LTEXT "&Ï³äòâåðäæåííÿ:", 1092, 8, 99, 130, 8, NOT WS_GROUP EDITTEXT 1088, 140, 96, 175, 12, ES_PASSWORD | ES_AUTOHSCROLL END @@ -533,10 +533,10 @@ STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Type a name you want for this connection:", -1, 8, 4, 190, 8 + LTEXT "Ââåä³òü íàçâó äëÿ öüîãî ï³äêëþ÷åííÿ:", -1, 8, 4, 190, 8 EDITTEXT 1114, 8, 17, 190, 12, ES_AUTOHSCROLL - LTEXT "Click Finish to save it in the Network Connections folder.", -1, 8, 38, 193, 8 - LTEXT "To edit this connection later, select it, click the File menu, and then click Properties.", -1, 8, 58, 193, 16 + LTEXT "Ùîá çáåðåãòè çíà÷îê ï³äêëþ÷åííÿ äî ïàïö³ ""Ìåðåæí³ ï³äêëþ÷åííÿ"", íàòèñí³òü êíîïêó ""Ãîòîâî"".", -1, 8, 38, 193, 8 + LTEXT "Ùîá çì³íèòè âëàñòèâîñò³ öüîãî ï³äêëþ÷åííÿ, âèä³ë³òü éîãî òà âèáåð³òü ³ç ìåíþ ""Ôàéë"" êîìàíäó ""Âëàñòèâîñò³"".", -1, 8, 58, 193, 16 END 155 DIALOGEX 0, 0, 231, 215 @@ -544,22 +544,22 @@ CAPTION "Çàãàëüí³" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Connec&t using:", 1124, 7, 5, 219, 8 + LTEXT "Ï³äêë&þ÷åííÿ ÷åðåç:", 1124, 7, 5, 219, 8 CONTROL "", 1128, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x00004C0D, 7, 17, 198, 44, WS_EX_CLIENTEDGE - PUSHBUTTON "&Up", 1132, 210, 18, 16, 14, BS_ICON - PUSHBUTTON "&Down", 1131, 210, 36, 16, 14, BS_ICON - AUTOCHECKBOX "A&ll devices call the same numbers", 1119, 9, 66, 133, 14, BS_TOP | BS_MULTILINE - PUSHBUTTON "C&onfigure...", 1130, 144, 66, 60, 14 - GROUPBOX "Sample type", 1125, 8, 84, 215, 100, WS_GROUP - LTEXT "Ar&ea code:", 1133, 17, 102, 52, 8 + PUSHBUTTON "Â&ãîðó", 1132, 210, 18, 16, 14, BS_ICON + PUSHBUTTON "Â&íèç", 1131, 210, 36, 16, 14, BS_ICON + AUTOCHECKBOX "Íà&áèðàòè îäíàêîâ³ íîìåðè äëÿ ï³äêëþ÷åííÿ âñ³õ ïðèñòðî¿â", 1119, 9, 66, 133, 14, BS_TOP | BS_MULTILINE + PUSHBUTTON "Íàëà&øòóâàòè...", 1130, 144, 66, 60, 14 + GROUPBOX "Çðàçîê", 1125, 8, 84, 215, 100, WS_GROUP + LTEXT "Êîä &ì³ñòà:", 1133, 17, 102, 52, 8 COMBOBOX 1122, 17, 112, 52, 110, CBS_DROPDOWN | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "&Phone number:", 1135, 71, 102, 139, 8 + LTEXT "Íîìåð &òåëåôîíó:", 1135, 71, 102, 139, 8 EDITTEXT 1123, 73, 112, 79, 14, ES_AUTOHSCROLL - PUSHBUTTON "Alter&nates", 1129, 154, 112, 60, 14 - LTEXT "Country/re&gion code:", 1134, 17, 132, 197, 8 + PUSHBUTTON "&²íø³", 1129, 154, 112, 60, 14 + LTEXT "&Êîä êðà¿íè àáî ðåã³îíó:", 1134, 17, 132, 197, 8 COMBOBOX 1126, 17, 143, 193, 130, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP - AUTOCHECKBOX "U&se dialing rules", 1121, 17, 163, 132, 14, BS_TOP | BS_MULTILINE - PUSHBUTTON "Dialing &Rules", 1136, 151, 161, 60, 14 + AUTOCHECKBOX "&Âèêîðèñòîâóâàòè ïðàâèëà íàáîðó íîìåðà", 1121, 17, 163, 132, 14, BS_TOP | BS_MULTILINE + PUSHBUTTON "&Ïðàâèëà", 1136, 151, 161, 60, 14 AUTOCHECKBOX "Ï³ñë&ÿ ï³äêëþ÷åííÿ ïîêàçàòè çíà÷îê â îáëàñò³ ñïîâ³ùåíü", 1120, 10, 192, 214, 19, BS_TOP | BS_MULTILINE END @@ -568,48 +568,48 @@ CAPTION "Çàãàëüí³" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "C&onfigure...", 1130, 164, 38, 60, 14 - GROUPBOX "Sample text", 1125, 8, 55, 217, 100, WS_GROUP - LTEXT "Ar&ea code:", 1133, 17, 72, 48, 8 + PUSHBUTTON "Íàëà&øòóâàòè...", 1130, 164, 38, 60, 14 + GROUPBOX "Çðàçîê", 1125, 8, 55, 217, 100, WS_GROUP + LTEXT "Êîä &ì³ñòà:", 1133, 17, 72, 48, 8 COMBOBOX 1122, 17, 83, 48, 119, CBS_DROPDOWN | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "&Phone number:", 1135, 71, 72, 146, 8 + LTEXT "Íîìåð &òåëåôîíó:", 1135, 71, 72, 146, 8 EDITTEXT 1123, 71, 83, 81, 14, ES_AUTOHSCROLL - PUSHBUTTON "Alter&nates", 1129, 155, 83, 63, 14 - LTEXT "Country/re&gion code:", 1134, 17, 103, 193, 8 + PUSHBUTTON "&²íø³", 1129, 155, 83, 63, 14 + LTEXT "&Êîä êðà¿íè àáî ðåã³îíó:", 1134, 17, 103, 193, 8 COMBOBOX 1126, 17, 114, 201, 130, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP - AUTOCHECKBOX "U&se dialing rules", 1121, 19, 134, 136, 12, BS_TOP | BS_MULTILINE - PUSHBUTTON "Dialing &Rules", 1136, 157, 132, 60, 14 + AUTOCHECKBOX "&Âèêîðèñòîâóâàòè ïðàâèëà íàáîðó íîìåðà", 1121, 19, 134, 136, 12, BS_TOP | BS_MULTILINE + PUSHBUTTON "&Ïðàâèëà", 1136, 157, 132, 60, 14 AUTOCHECKBOX "Ï³ñë&ÿ ï³äêëþ÷åííÿ ïîêàçàòè çíà÷îê â îáëàñò³ ñïîâ³ùåíü", 1120, 12, 164, 209, 18, BS_TOP | BS_MULTILINE - LTEXT "Connect using:", 1124, 8, 5, 217, 8 + LTEXT "Ï³äêëþ÷åííÿ ÷åðåç:", 1124, 8, 5, 217, 8 CONTROL "", 1127, "SYSLISTVIEW32", WS_DISABLED | WS_BORDER | 0x0000EC0D, 7, 18, 217, 15 END 157 DIALOG 6, 18, 235, 160 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Appearance" -FONT 8, "MS Shell Dlg" -BEGIN - AUTOCHECKBOX "&Preview phone numbers before dialing", 1142, 8, 10, 224, 10, WS_GROUP - AUTOCHECKBOX "Show &location setting before dialing", 1139, 8, 27, 224, 10 - AUTOCHECKBOX "Allo&w location edits during login", 1140, 21, 43, 212, 10 - AUTOCHECKBOX "Show &connection progress while dialing", 1143, 8, 59, 224, 10 - AUTOCHECKBOX "Clo&se on dial", 1137, 8, 76, 224, 10 - AUTOCHECKBOX "All&ow phonebook edits during login", 1141, 8, 94, 224, 10 - AUTOCHECKBOX "&Use wizard to create new phonebook entries", 1144, 22, 111, 210, 10 +CAPTION "Îôîðìëåííÿ" +FONT 8, "MS Shell Dlg" +BEGIN + AUTOCHECKBOX "&Ïåðåãëÿäàòè íîìåðè òåëåôîíó ïåðåä íàáîðîì íîìåðà", 1142, 8, 10, 224, 10, WS_GROUP + AUTOCHECKBOX "Ïî&êàçóâàòè â³äîìîñò³ ïðî ðîçòàøóâàííÿ ïåðåä íàáîðîì íîìåðà", 1139, 8, 27, 224, 10 + AUTOCHECKBOX "Äîçâîëèòè çì³íþâàòè &ðîçòàøóâàííÿ ï³ä ÷àñ âõîäó äî ñèñòåìè", 1140, 21, 43, 212, 10 + AUTOCHECKBOX "Ïîêàçóâà&òè ïåðåá³ã ï³äêëþ÷åííÿ ï³ä ÷àñ íàáîðó íîìåðà", 1143, 8, 59, 224, 10 + AUTOCHECKBOX "&Çàêðèòè ï³ñëÿ óñòàíîâêè çâ'ÿçêó", 1137, 8, 76, 224, 10 + AUTOCHECKBOX "Äîçâîëèòè âíîñèòè çì³íè äî òåëåôîííî¿ êíèãè ï³ä ÷àñ â&õîäó äî ñèñòåìè", 1141, 8, 94, 224, 10 + AUTOCHECKBOX "Â&èêîðèñòîâóâàòè ìàéñòåð äëÿ ñòâîðåííÿ çàïèñ³â ó òåëåôîíí³é êíèç³", 1144, 22, 111, 210, 10 END 158 DIALOG 6, 18, 235, 160 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Appearance" -FONT 8, "MS Shell Dlg" -BEGIN - AUTOCHECKBOX "&Preview phone numbers before dialing", 1142, 8, 10, 223, 10, WS_GROUP - AUTOCHECKBOX "Show &location setting before dialing", 1139, 8, 27, 206, 10 - AUTOCHECKBOX "Start dial-up networking &monitor before dialing", 1138, 8, 44, 226, 10 - AUTOCHECKBOX "Show &connection progress while dialing", 1143, 8, 61, 224, 10 - AUTOCHECKBOX "Clo&se on dial", 1137, 8, 79, 220, 10 - AUTOCHECKBOX "&Use wizard to create new phonebook entries", 1144, 8, 97, 220, 10 - AUTOCHECKBOX "Always prompt &before auto-dialing", 1136, 8, 114, 220, 10 +CAPTION "Îôîðìëåííÿ" +FONT 8, "MS Shell Dlg" +BEGIN + AUTOCHECKBOX "&Ïåðåãëÿäàòè íîìåðè òåëåôîíó ïåðåä íàáîðîì íîìåðà", 1142, 8, 10, 223, 10, WS_GROUP + AUTOCHECKBOX "Ïîêàçóâàòè â³äî&ìîñò³ ïðî ðîçòàøóâàííÿ ïåðåä íàáîðîì íîìåðà", 1139, 8, 27, 206, 10 + AUTOCHECKBOX "&Çàïóñêàòè ìîí³òîð â³ääàëåíîãî äîñòóïó ïåðåä íàáîðîì íîìåðà", 1138, 8, 44, 226, 10 + AUTOCHECKBOX "Ïîêàçóâà&òè ïåðåá³ã ï³äêëþ÷åííÿ ï³ä ÷àñ íàáîðó íîìåðà", 1143, 8, 61, 224, 10 + AUTOCHECKBOX "Çà&êðèòè ï³ñëÿ óñòàíîâêè çâ'ÿçêó", 1137, 8, 79, 220, 10 + AUTOCHECKBOX "Â&èêîðèñòîâóâàòè ìàéñòåð äëÿ ñòâîðåííÿ çàïèñ³â ó òåëåôîíí³é êíèç³", 1144, 8, 97, 220, 10 + AUTOCHECKBOX "Çà&âæäè çàïèòóâàòè ïåðåä àâòîíàáîðîì íîìåðà", 1136, 8, 114, 220, 10 END 160 DIALOG 6, 18, 320, 145 @@ -1159,7 +1159,7 @@ CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 106, 248, 1 LTEXT "Í&àáðàòè:", 1412, 10, 118, 92, 8 COMBOBOX 1416, 104, 114, 154, 112, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "&Ì³ñöå âèêëèêó:", 1415, 10, 137, 91, 8 + LTEXT "Ì³ñ&öå âèêëèêó:", 1415, 10, 137, 91, 8 COMBOBOX 1414, 104, 134, 87, 112, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP PUSHBUTTON "&Ïðàâèëà", 1108, 194, 134, 65, 14 CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 154, 248, 1 @@ -1446,7 +1446,7 @@ CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 170, 248, 1 LTEXT "Í&àáðàòè:", 1412, 14, 182, 87, 8 COMBOBOX 1416, 104, 178, 154, 112, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "&Ì³ñöå âèêëèêó:", 1415, 14, 198, 87, 8 + LTEXT "Ì³ñ&öå âèêëèêó:", 1415, 14, 198, 87, 8 COMBOBOX 1414, 104, 195, 87, 112, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP PUSHBUTTON "&Ïðàâèëà", 1108, 193, 195, 65, 14 CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 215, 248, 1 Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc Sun Dec 2 15:44:21 2007 @@ -338,14 +338,14 @@ END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION -CAPTION "Open With" +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "Âèá³ð ïðîãðàìè" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "Âèáåð³òü ïðîãðàìó, çà äîïîìîãîþ ÿêî¿ ñë³ä â³äêðèòè öåé ôàéë.", -1, 44, 12, 211, 10 - LTEXT "Ôàéë: %s", 14001, 44, 25, 188, 10 - GROUPBOX "Ïðîãðàìè", -1, 7, 42, 249, 187 + LTEXT "Ôàéë: ", 14001, 44, 25, 188, 10 + GROUPBOX "&Ïðîãðàìè", -1, 7, 42, 249, 187 CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 16, 57, 230, 130 AUTOCHECKBOX "Çàâæä&è âèêîðèñòîâóâàòè öþ ïðîãðàìó äëÿ ôàéë³â öüîãî òèïó", 14003, 20, 193, 225, 10 PUSHBUTTON "Î&ãëÿä...", 14004, 198, 207, 50, 14 Added: trunk/rosapps/packmgr/gui/uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/gui/uk.rc?rev=3095… ============================================================================== --- trunk/rosapps/packmgr/gui/uk.rc (added) +++ trunk/rosapps/packmgr/gui/uk.rc Sun Dec 2 15:44:21 2007 @@ -1,0 +1,50 @@ +/* + * PROJECT: ReactOS Package Manager + * LICENSE: GPL - See COPYING in the top level directory + * FILE: rosapps/packmgr/gui/uk.rc + * PURPOSE: Ukraianian Language File for packmgr + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +/* Dialogs */ +IDD_OPTIONS DIALOG DISCARDABLE 0, 0, 180, 200 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ïàðàìåòðè" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Ùå íåìàº í³ÿêèõ ïàðàìåòð³â.", 0, 50, 95, 80, 8 +END + +IDD_DOIT DIALOG DISCARDABLE 0, 0, 180, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Âèêîíàííÿ îïåðàö³é" +FONT 8, "MS Sans Serif" +BEGIN + + CTEXT "{Status}", IDC_TSTATUS, 0, 10, 180, 8 + + CONTROL "", IDC_STATUS1, "msctls_progress32", PBS_SMOOTH, 20, 25, 140, 15 + + CONTROL "", IDC_STATUS2, "msctls_progress32", PBS_SMOOTH, 20, 45, 140, 15 + + PUSHBUTTON "Ïåðåðâàòè", IDC_CANCEL, 65, 70, 50, 14, WS_DISABLED +END + +IDR_POPUP MENU DISCARDABLE +BEGIN + POPUP "PopUp", MENUBARBREAK + BEGIN + MENUITEM "Íåìàº ä³¿", 1, GRAYED + MENUITEM "Óñòàíîâèòè (ðåêîìåíäîâàíî)", 2, GRAYED + MENUITEM "Óñòàíîâèòè ç âèõ³äíèõ êîä³â", 3, GRAYED + MENUITEM "Îíîâèòè", 4, GRAYED + MENUITEM "Âèäàëèòè", 5, GRAYED + MENUITEM SEPARATOR + MENUITEM "Ïàðàìåòðè", 8 + MENUITEM SEPARATOR + MENUITEM "Âèêîíàòè", 6 + END +END + Propchange: trunk/rosapps/packmgr/gui/uk.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/packmgr/lib/package.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/lib/package.rc?rev… ============================================================================== --- trunk/rosapps/packmgr/lib/package.rc (original) +++ trunk/rosapps/packmgr/lib/package.rc Sun Dec 2 15:44:21 2007 @@ -16,5 +16,6 @@ #include "es.rc" #include "fr.rc" #include "ru.rc" +#include "uk.rc" /* EOF */ Added: trunk/rosapps/packmgr/lib/uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/lib/uk.rc?rev=3095… ============================================================================== --- trunk/rosapps/packmgr/lib/uk.rc (added) +++ trunk/rosapps/packmgr/lib/uk.rc Sun Dec 2 15:44:21 2007 @@ -1,0 +1,32 @@ +/* + * PROJECT: ReactOS Package Manager + * LICENSE: GPL - See COPYING in the top level directory + * FILE: rosapps/packmgr/lib/uk.rc + * PURPOSE: Ukraianian Language File for packmgr + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +/* String Tables */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_LOAD "Çàâàíòàæåííÿ ..." + ERR_OK "Îïåðàö³ÿ çàâåðøåíà." + ERR_PACK "Ìîãëè áóòè âñòàíîâëåí³ íå âñ³ ïàêåòè\n\nÁóäü ëàñêà ïðîãëÿíåòå ïîäðîáèö³ â ôàéë³ æóðíàëó." + ERR_GENERIC "Ñòàëàñÿ ïîìèëêà. \nÁóäü ëàñêà ïðîãëÿíåòå ïîäðîáèö³ â ôàéë³ æóðíàëó." + ERR_DOWNL "Íåìîæëèâî çàâàíòàæèòè íåîáõ³äíèé ôàéë!\nÁóäü ëàñêà ïðîãëÿíåòå ïîäðîáèö³ â ôàéë³ æóðíàëó." + ERR_FILE "Ïîìèëêà ï³ä ÷àñ âèêîíàííÿ ñöåíàð³þ.\nÍå âäàëîñÿ â³äêðèòè ôàéë." + + ERR_SYNATX "Ïîìèëêà ï³ä ÷àñ âèêîíàííÿ ñöåíàð³þ.\nÍåâ³ðíèé ñèíòàêñèñ." + ERR_CALL "Ïîìèëêà ï³ä ÷àñ âèêîíàííÿ ñöåíàð³þ.\nÍå âäàëîñÿ çíàéòè ôóíêö³þ." + ERR_PARAMETER "Ïîìèëêà ï³ä ÷àñ âèêîíàííÿ ñöåíàð³þ.\nÍåâ³ðíèé ïàðàìåòð(è)." + + ERR_DEP1 "Äëÿ óñòàíîâêè öüîãî ïàêåòó âè òàêîæ ìàºòå âñòàíîâèòè ïàêåò(è):\n\n" + ERR_DEP2 "\nÂè õî÷åòå çðîáèòè öå ?" + ERR_READY "Âè îáðàëè %d ïàêåò(è) äëÿ óñòàíîâêè. Äëÿ ¿õ óñòàíîâêè âè ìàºòå ïðî÷èòàòè ³ ïîãîäèòèñÿ ç ¿õ ë³öåíç³ºþ. \n\nÂè âñå ùå õî÷åòå çðîáèòè öå ?" +END + +123 RCDATA "options.xml" + +/* EOF */ Propchange: trunk/rosapps/packmgr/lib/uk.rc ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 9 months

[hpoussin] 30954: In txtsetup.sif, replace SourceFiles section by SourceDisksFiles See http://www.win-web.be/forum/index.php?showtopic=10706&st=0&p=86340&#entry86340

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Dec 2 14:32:52 2007 New Revision: 30954 URL: http://svn.reactos.org/svn/reactos?rev=30954&view=rev Log: In txtsetup.sif, replace SourceFiles section by SourceDisksFiles See http://www.win-web.be/forum/index.php?showtopic=10706&st=0&p=86340&#entry86… Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Sun Dec 2 14:32:52 2007 @@ -2635,7 +2635,7 @@ } static BOOLEAN -AddSectionToCopyQueue(HINF InfFile, +AddSectionToCopyQueueCab(HINF InfFile, PWCHAR SectionName, PWCHAR SourceCabinet, PCUNICODE_STRING DestinationPath, @@ -2710,6 +2710,94 @@ } static BOOLEAN +AddSectionToCopyQueue(HINF InfFile, + PWCHAR SectionName, + PWCHAR SourceCabinet, + PCUNICODE_STRING DestinationPath, + PINPUT_RECORD Ir) +{ + INFCONTEXT FilesContext; + INFCONTEXT DirContext; + PWCHAR FileKeyName; + PWCHAR FileKeyValue; + PWCHAR DirKeyValue; + PWCHAR TargetFileName; + + if (SourceCabinet) + return AddSectionToCopyQueueCab(InfFile, L"SourceFiles", SourceCabinet, DestinationPath, Ir); + + /* Search for the SectionName section */ + if (!SetupFindFirstLineW (InfFile, SectionName, NULL, &FilesContext)) + { + char Buffer[128]; + sprintf(Buffer, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n", SectionName); + PopupError(Buffer, "ENTER = Reboot computer", Ir, POPUP_WAIT_ENTER); + return(FALSE); + } + + /* + * Enumerate the files in the section + * and add them to the file queue. + */ + do + { + /* Get source file name and target directory id */ + if (!INF_GetData (&FilesContext, &FileKeyName, &FileKeyValue)) + { + /* FIXME: Handle error! */ + DPRINT1("INF_GetData() failed\n"); + break; + } + + /* Get target directory id */ + if (!INF_GetDataField (&FilesContext, 13, &FileKeyValue)) + { + /* FIXME: Handle error! */ + DPRINT1("INF_GetData() failed\n"); + break; + } + + /* Get optional target file name */ + if (!INF_GetDataField (&FilesContext, 11, &TargetFileName)) + TargetFileName = NULL; + else if (!*TargetFileName) + TargetFileName = NULL; + + DPRINT ("FileKeyName: '%S' FileKeyValue: '%S'\n", FileKeyName, FileKeyValue); + + /* Lookup target directory */ + if (!SetupFindFirstLineW (InfFile, L"Directories", FileKeyValue, &DirContext)) + { + /* FIXME: Handle error! */ + DPRINT1("SetupFindFirstLine() failed\n"); + break; + } + + if (!INF_GetData (&DirContext, NULL, &DirKeyValue)) + { + /* FIXME: Handle error! */ + DPRINT1("INF_GetData() failed\n"); + break; + } + + if (!SetupQueueCopy(SetupFileQueue, + SourceCabinet, + SourceRootPath.Buffer, + SourceRootDir.Buffer, + FileKeyName, + DirKeyValue, + TargetFileName)) + { + /* FIXME: Handle error! */ + DPRINT1("SetupQueueCopy() failed\n"); + } + } + while (SetupFindNextLine(&FilesContext, &FilesContext)); + + return TRUE; +} + +static BOOLEAN PrepareCopyPageInfFile(HINF InfFile, PWCHAR SourceCabinet, PINPUT_RECORD Ir) @@ -2722,7 +2810,7 @@ NTSTATUS Status; /* Add common files */ - if (!AddSectionToCopyQueue(InfFile, L"SourceFiles", SourceCabinet, &DestinationPath, Ir)) + if (!AddSectionToCopyQueue(InfFile, L"SourceDisksFiles", SourceCabinet, &DestinationPath, Ir)) return FALSE; /* Add specific files depending of computer type */ Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif Sun Dec 2 14:32:52 2007 @@ -5,53 +5,35 @@ ; <directory_id> = <path> 1 = "\" 2 = system32 -3 = system32\drivers -4 = system32\config +3 = system32\config +4 = system32\drivers 5 = media 6 = media\fonts 7 = bin [SourceDisksFiles] -atapi.sys=,,,,,,x -buslogic.sys=,,,,,,x -;acpi.sys=,,,,,,x -;isapnp.sys=,,,,,,x -;pci.sys=,,,,,,x -scsiport.sys=,,,,,,x -class2.sys=,,,,,,x -cdrom.sys=,,,,,,x -cdfs.sys=,,,,,,x -disk.sys=,,,,,,x -floppy.sys=,,,,,,x -i8042prt.sys=,,,,,,x -kbdclass.sys=,,,,,,x -blue.sys=,,,,,,x - -[SourceFiles] -; <filename> = <directory_id> -acpi.sys = 3 -atapi.sys = 3 -buslogic.sys = 3 -blue.sys = 3 -bootvid.dll = 3 -c_437.nls = 2 -c_1252.nls = 2 -cdfs.sys = 3 -cdrom.sys = 3 -class2.sys = 3 -kdcom.dll = 3 -disk.sys = 3 -floppy.sys = 3 -;keyboard.sys = 3 -i8042prt.sys = 3 -kbdclass.sys = 3 -l_intl.nls = 2 -ntfs.sys = 3 -ntoskrnl.exe = 2 -pci.sys = 3 -scsiport.sys = 3 -uniata.sys = 3 -vfatfs.sys = 3 +acpi.sys=,,,,,,,,,,,,4 +atapi.sys=,,,,,,x,,,,,,4 +buslogic.sys=,,,,,,x,,,,,,4 +blue.sys=,,,,,,x,,,,,,4 +bootvid.dll=,,,,,,,,,,,,4 +c_437.nls=,,,,,,,,,,,,2 +c_1252.nls=,,,,,,,,,,,,2 +cdfs.sys=,,,,,,x,,,,,,4 +cdrom.sys=,,,,,,x,,,,,,4 +class2.sys=,,,,,,x,,,,,,4 +kdcom.dll=,,,,,,,,,,,,4 +disk.sys=,,,,,,x,,,,,,4 +floppy.sys=,,,,,,x,,,,,,4 +i8042prt.sys=,,,,,,x,,,,,,4 +kbdclass.sys=,,,,,,x,,,,,,4 +l_intl.nls=,,,,,,,,,,,,2 +ntfs.sys=,,,,,,,,,,,,4 +ntoskrnl.exe=,,,,,,,,,,,,2 +pci.sys=,,,,,,,,,,,,4 +scsiport.sys=,,,,,,x,,,,,,4 +uniata.sys=,,,,,,,,,,,,4 +vfatfs.sys=,,,,,,,,,,,,4 [Cabinets] Cabinet=reactos.cab @@ -79,12 +61,12 @@ pci_mp = "PC MP" [Files.pci_up] -; <filename> = <directory_id>,<new name> -hal.dll = 2 +ntoskrnl.exe=,,,,,,,,,,,,2 +hal.dll=,,,,,,,,,,,,2 [Files.pci_mp] -; <filename> = <directory_id>,<new name> -halmp.dll = 2,hal.dll +ntkrnlmp.exe=,,,,,,,,,,ntoskrnl.exe,,2 +halmp.dll=,,,,,,,,,,hal.dll,,2 [Display] ;<id> = <user friendly name>,<spare>,<service key name>,<hight>,<width>,<bpp>

16 years, 9 months

[pschweitzer] 30953: Updated download.xml with newer releases.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Dec 2 14:24:35 2007 New Revision: 30953 URL: http://svn.reactos.org/svn/reactos?rev=30953&view=rev Log: Updated download.xml with newer releases. Modified: trunk/rosapps/downloader/downloader.xml Modified: trunk/rosapps/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/downloader.xml?… ============================================================================== --- trunk/rosapps/downloader/downloader.xml (original) +++ trunk/rosapps/downloader/downloader.xml Sun Dec 2 14:24:35 2007 @@ -8,11 +8,11 @@ <location>http://svn.reactos.org/packages/Firefox%20Setup%201.5.0.12.exe</location> </application> <application name="Firefox 2.0"> - <regname>Mozilla Firefox (2.0.0.7)</regname> - <licence>MPL/GPL/LGPL</licence> - <version>2.0.0.7</version> + <regname>Mozilla Firefox (2.0.0.11)</regname> + <licence>MPL/GPL/LGPL</licence> + <version>2.0.0.11</version> <description>The most popular and one of the best free Web Browsers out there.</description> - <location>http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.7/win32/en-US…</location> + <location>http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.11/win32/en-U…</location> </application> <application name="Thunderbird 1.5"> <regname>Mozilla Thunderbird (1.5)</regname> @@ -22,17 +22,17 @@ <location>http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/1.5.0.13/win32/…</location> </application> <application name="Thunderbird 2.0"> - <regname>Mozilla Thunderbird (2.0.0.6)</regname> - <licence>MPL/GPL/LGPL</licence> - <version>2.0.0.6</version> + <regname>Mozilla Thunderbird (2.0.0.9)</regname> + <licence>MPL/GPL/LGPL</licence> + <version>2.0.0.9</version> <description>The most popular and one of the best free Mail Clients out there.</description> - <location>http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.6/win32/e…</location> + <location>http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.9/win32/e…</location> </application> <application name="SeaMonkey"> - <regname>SeaMonkey (1.1.4)</regname> - <version>1.1.4</version> + <regname>SeaMonkey (1.1.7)</regname> + <version>1.1.7</version> <description>Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need.</description> - <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/seamonkey/releases/1.1.4/se…</location> + <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/seamonkey/releases/1.1.7/se…</location> </application> <application name="Mozilla ActiveX Control"> <regname>Mozilla ActiveX Control v1.7.12 (ReactOS special)</regname> @@ -48,9 +48,9 @@ <application name="mIRC"> <regname>mIRC</regname> <licence>Shareware</licence> - <version>6.21</version> + <version>6.31</version> <description>The most popular client for the Internet Relay Chat (IRC).</description> - <location>http://www.efnet.org/clients/win32/mirc/mirc621.exe</location> + <location>http://mirc.bigchief.dk/mirc631.exe</location> </application> <application name="Samba TNG"> <description>This tool allows you to access your Windows shared folders/printers with ReactOS.</description> @@ -58,9 +58,9 @@ </application> <application name="Miranda IM"> <regname>Miranda IM</regname> - <version>0.6.8</version> + <version>0.7.3</version> <description>Open source multiprotocol instant messaging application - May not work completely.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/miranda/miranda-im-v0.6.8-unicode…</location> + <location>http://ovh.dl.sourceforge.net/sourceforge/miranda/miranda-im-v0.7.3-unicode…</location> </application> <application name="Putty"> <regname>PuTTY version 0.60</regname> @@ -78,39 +78,39 @@ <location>http://www.abiword.org/downloads/abiword/2.5.2/Windows/abiword-setup-2.5.2.…</location> </application> <application name="OpenOffice"> - <regname>OpenOffice.org 2.2</regname> - <version>2.2.1</version> + <regname>OpenOffice.org 2.3</regname> + <version>2.3.0</version> <description>THE Open Source Office Suite.</description> - <location>http://ftp.tu-chemnitz.de/pub/openoffice-extended/stable/2.2.1/OOo_2.2.1_Wi…</location> + <location>http://ftp.tu-chemnitz.de/pub/openoffice-extended/stable/2.3.0/OOo_2.3.0_Wi…</location> </application> </category> <category name="Graphics" icon="3"> <application name="IrfanView"> <regname>IrfanView (remove only)</regname> - <version>4.00</version> + <version>4.10</version> <description>Viewer for all kinds of graphics/audio files/video files.</description> - <location>http://gd.tuwien.ac.at/graphics/irfanview/iview400_setup.exe</location> + <location>http://gd.tuwien.ac.at/graphics/irfanview/iview410_setup.exe</location> </application> <application name="IrfanView Plugins"> - <version>4.00</version> + <version>4.10</version> <description>Additional Plugins for supporting more file types.</description> - <location>http://irfanview.tuwien.ac.at/plugins/irfanview_plugins_400_setup.exe</location> + <location>http://irfanview.tuwien.ac.at/plugins/irfanview_plugins_410_setup.exe</location> </application> <application name="TuxPaint"> - <regname>Tux Paint 0.9.17</regname> - <version>0.9.17</version> + <regname>Tux Paint 0.9.18</regname> + <version>0.9.18</version> <description>An Open Source bitmap graphics editor geared towards young children.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/tuxpaint/tuxpaint-0.9.17-win32-in…</location> + <location>http://ovh.dl.sourceforge.net/sourceforge/tuxpaint/tuxpaint-0.9.18-win32-in…</location> </application> </category> <category name="Multimedia" icon="4"> </category> <category name="Development" icon="5"> <application name="ReactOS Build Environment"> - <regname>ReactOS Build Environment 0.3.8</regname> - <version>0.3.8</version> + <regname>ReactOS Build Environment 1.0</regname> + <version>1.0</version> <description>Allows you to build the ReactOS Source. For more instructions see ReactOS wiki.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-0.3.8.exe</location> + <location>http://kent.dl.sourceforge.net/sourceforge/reactos/RosBE-1.0.exe</location> </application> <application name="MinGW"> <regname>MinGW 5.1.3</regname> @@ -119,10 +119,10 @@ <location>http://ovh.dl.sourceforge.net/sourceforge/mingw/MinGW-5.1.3.exe</location> </application> <application name="FreeBASIC"> - <regname>FreeBASIC 0.17b</regname> - <version>0.17b</version> + <regname>FreeBASIC 0.18.2b</regname> + <version>0.18.2b</version> <description>Open Source BASIC Compiler. The BASIC syntax is compatible to QBASIC.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/fbc/FreeBASIC-v0.18.1b-win32.exe</location> + <location>http://ovh.dl.sourceforge.net/sourceforge/fbc/FreeBASIC-v0.18.2b-win32.exe</location> </application> </category> <category name="Games & Fun" icon="6"> @@ -169,16 +169,16 @@ </category> <category name="Tools" icon="7"> <application name="7-Zip"> - <regname>7-Zip 4.52</regname> - <version>4.52</version> + <regname>7-Zip 4.56</regname> + <version>4.56</version> <description>Utility to create and open 7zip, zip, tar, rar and other archive files.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/sevenzip/7z452.exe</location> + <location>http://ovh.dl.sourceforge.net/sourceforge/sevenzip/7z456.exe</location> </application> <application name="uTorrent"> <regname>µTorrent</regname> - <version>1.7.2</version> + <version>1.7.5</version> <description>Small and fast BitTorrent Client.</description> - <location>http://download.utorrent.com/1.7.2/utorrent.exe</location> + <location>http://download.utorrent.com/1.7.5/utorrent.exe</location> </application> <application name="Audio Grabber"> <regname>Audiograbber 1.83 SE</regname> @@ -194,9 +194,9 @@ <location>http://www.libsdl.org/release/SDL-1.2.12-win32.zip</location> </application> <application name="DOSBox"> - <version>0.71</version> + <version>0.72</version> <description>DOSBox is a DOS emulator.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/dosbox/DOSBox0.71-win32-installer…</location> + <location>http://ovh.dl.sourceforge.net/sourceforge/dosbox/DOSBox0.72-win32-installer…</location> </application> </category> </tree>

16 years, 9 months

[fireball] 30952: - Fix a typo (lead to memory overwrite).

by fireball＠svn.reactos.org

Author: fireball Date: Sun Dec 2 13:29:12 2007 New Revision: 30952 URL: http://svn.reactos.org/svn/reactos?rev=30952&view=rev Log: - Fix a typo (lead to memory overwrite). Modified: trunk/reactos/tools/rbuild/directory.cpp Modified: trunk/reactos/tools/rbuild/directory.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/directory.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/directory.cpp (original) +++ trunk/reactos/tools/rbuild/directory.cpp Sun Dec 2 13:29:12 2007 @@ -57,7 +57,7 @@ if ( p ) { - name.erase ( p - name.c_str ()); + name.erase ( p - name_.c_str ()); Add ( p + 1 ); } }

16 years, 9 months

[jimtabor] 30951: Add palette mode flags.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Dec 2 06:08:00 2007 New Revision: 30951 URL: http://svn.reactos.org/svn/reactos?rev=30951&view=rev Log: Add palette mode flags. Modified: trunk/reactos/subsystems/win32/win32k/include/palette.h Modified: trunk/reactos/subsystems/win32/win32k/include/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/palette.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/palette.h Sun Dec 2 06:08:00 2007 @@ -8,6 +8,28 @@ #define PALETTE_PRIVATE 0x1000 /* private colormap, identity mapping */ #define PALETTE_WHITESET 0x2000 + +// Palette mode flags +#if 0 // Defined in ddk/winddi.h +#define PAL_INDEXED 0x00000001 +#define PAL_BITFIELDS 0x00000002 +#define PAL_RGB 0x00000004 +#define PAL_BGR 0x00000008 +#define PAL_CMYK 0x00000010 +#endif +#define PAL_DC 0x00000100 +#define PAL_FIXED 0x00000200 +#define PAL_FREE 0x00000400 +#define PAL_MANAGED 0x00000800 +#define PAL_NOSTATIC 0x00001000 +#define PAL_MONOCHROME 0x00002000 +#define PAL_BRUSHHACK 0x00004000 +#define PAL_DIBSECTION 0x00008000 +#define PAL_NOSTATIC256 0x00010000 +#define PAL_HT 0x00100000 +#define PAL_RGB16_555 0x00200000 +#define PAL_RGB16_565 0x00400000 +#define PAL_GAMMACORRECTION 0x00800000 typedef struct { int shift;

16 years, 9 months

[jimtabor] 30950: Add GdiDevice flags.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Dec 2 03:42:31 2007 New Revision: 30950 URL: http://svn.reactos.org/svn/reactos?rev=30950&view=rev Log: Add GdiDevice flags. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Sun Dec 2 03:42:31 2007 @@ -12,7 +12,23 @@ #define GDI_DC_TYPE (1) - +// GDIDEVICE flags +#define PDEV_DISPLAY 0x00000001 // Display device +#define PDEV_HARDWARE_POINTER 0x00000002 // Supports hardware cursor +#define PDEV_SOFTWARE_POINTER 0x00000004 +#define PDEV_GOTFONTS 0x00000040 // Has font driver +#define PDEV_PRINTER 0x00000080 +#define PDEV_ALLOCATEDBRUSHES 0x00000100 +#define PDEV_HTPAL_IS_DEVPAL 0x00000200 +#define PDEV_DISABLED 0x00000400 +#define PDEV_SYNCHRONIZE_ENABLED 0x00000800 +#define PDEV_FONTDRIVER 0x00002000 // Font device +#define PDEV_GAMMARAMP_TABLE 0x00004000 +#define PDEV_UMPD 0x00008000 +#define PDEV_SHARED_DEVLOCK 0x00010000 +#define PDEV_META_DEVICE 0x00020000 +#define PDEV_DRIVER_PUNTED_CALL 0x00040000 // Driver calls back to GDI engine +#define PDEV_CLONE_DEVICE 0x00080000 typedef struct _GDIPOINTER /* should stay private to ENG */ { @@ -40,6 +56,7 @@ ULONG lucExcLock; ULONG Tid; + FLONG flFlags; PERESOURCE hsemDevLock; PVOID pvGammaRamp;

16 years, 9 months

[peterw] 30949: - Change the MinGW prompt's 'makex' use cpucount.exe as well.

by peterw＠svn.reactos.org

Author: peterw Date: Sun Dec 2 02:47:02 2007 New Revision: 30949 URL: http://svn.reactos.org/svn/reactos?rev=30949&view=rev Log: - Change the MinGW prompt's 'makex' use cpucount.exe as well. Modified: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Min… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd Sun Dec 2 02:47:02 2007 @@ -29,7 +29,16 @@ echo. echo. +:: +:: Get the number of CPUs in the system so we know how many jobs to execute. +:: To modify the number used alter the options used with cpucount: +:: No Option - Number of CPUs. +:: -x1 - Number of CPUs, plus 1. +:: -x2 - Number of CPUs, doubled. +:: +for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i + doskey MAKE = "%_ROSBE_MINGWMAKE%" $* -doskey MAKEX = "%_ROSBE_MINGWMAKE%" -j %NUMBER_OF_PROCESSORS% $* +doskey MAKEX = "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% $* :EOC

16 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2007