Ros-diffs June 2005

ros-diffs@reactos.org

22 participants
649 discussions

[mf] 15739: implemented file properties dialog (partly based on Rob D.'s winfile code)
by mf＠svn.reactos.com 02 Jun '05

02 Jun '05

implemented file properties dialog (partly based on Rob D.'s winfile code) Modified: trunk/reactos/subsys/system/winefile/en.rc Modified: trunk/reactos/subsys/system/winefile/resource.h Modified: trunk/reactos/subsys/system/winefile/resource.rc Modified: trunk/reactos/subsys/system/winefile/winefile.c Modified: trunk/reactos/subsys/system/winefile/winefile.dsp Modified: trunk/reactos/subsys/system/winefile/winefile.xml _____ Modified: trunk/reactos/subsys/system/winefile/en.rc --- trunk/reactos/subsys/system/winefile/en.rc 2005-06-02 21:32:21 UTC (rev 15738) +++ trunk/reactos/subsys/system/winefile/en.rc 2005-06-02 21:39:00 UTC (rev 15739) @@ -201,7 +201,37 @@ PUSHBUTTON "Cancel",IDCANCEL,104,24,50,14 END +IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Properties for %s" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,191,7,50,14 + PUSHBUTTON "Cancel",IDCANCEL,191,29,50,14 + LTEXT "&File Name:",-1,7,7,59,9 + EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Full &Path:",-1,7,18,59,9 + EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Last Change:",-1,7,29,59,9 + EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Version:",-1,7,40,59,9 + EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Cop&yright:",-1,7,51,59,9 + EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Size:",-1,7,62,59,9 + EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + GROUPBOX "Attributes",-1,7,79,158,46 + GROUPBOX "&Version Information",-1,7,129,234,79 + CONTROL "&Read Only",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "&Archive",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "&Compressed",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + CONTROL "H&idden",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "&System",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + STRINGTABLE { IDS_FONT_SEL_DLG_NAME "Applying font settings" _____ Modified: trunk/reactos/subsys/system/winefile/resource.h --- trunk/reactos/subsys/system/winefile/resource.h 2005-06-02 21:32:21 UTC (rev 15738) +++ trunk/reactos/subsys/system/winefile/resource.h 2005-06-02 21:39:00 UTC (rev 15739) @@ -36,6 +36,7 @@ #define IDD_EXECUTE 103 #define IDD_SELECT_DESTINATION 104 #define IDD_DIALOG_VIEW_TYPE 105 +#define IDD_DIALOG_PROPERTIES 106 /* control ids */ @@ -43,21 +44,21 @@ #define ID_ACTIVATE 101 #define ID_EXECUTE 105 #define ID_FILE_MOVE 106 -#define ID_FILE_COPY 107 -#define ID_FILE_DELETE 108 +#define ID_FILE_COPY 107 +#define ID_FILE_DELETE 108 #define ID_FILE_EXIT 115 -#define ID_FORMAT_DISK 203 -#define ID_CONNECT_NETWORK_DRIVE 252 -#define ID_DISCONNECT_NETWORK_DRIVE 253 +#define ID_FORMAT_DISK 203 +#define ID_CONNECT_NETWORK_DRIVE 252 +#define ID_DISCONNECT_NETWORK_DRIVE 253 #define ID_VIEW_NAME 401 #define ID_VIEW_ALL_ATTRIBUTES 402 #define ID_VIEW_SELECTED_ATTRIBUTES 403 -#define ID_VIEW_SORT_NAME 404 -#define ID_VIEW_SORT_TYPE 405 -#define ID_VIEW_SORT_SIZE 406 -#define ID_VIEW_SORT_DATE 407 -#define ID_VIEW_FILTER 409 -#define ID_VIEW_SPLIT 414 +#define ID_VIEW_SORT_NAME 404 +#define ID_VIEW_SORT_TYPE 405 +#define ID_VIEW_SORT_SIZE 406 +#define ID_VIEW_SORT_DATE 407 +#define ID_VIEW_FILTER 409 +#define ID_VIEW_SPLIT 414 #define ID_SELECT_FONT 510 #define ID_VIEW_TOOL_BAR 508 #define ID_VIEW_DRIVE_BAR 507 @@ -82,7 +83,21 @@ #define IDC_VIEW_TYPE_OTHERS 1004 #define IDC_VIEW_TYPE_HIDDEN 1005 +#define IDC_STATIC_PROP_FILENAME 1006 +#define IDC_STATIC_PROP_PATH 1007 +#define IDC_STATIC_PROP_LASTCHANGE 1008 +#define IDC_STATIC_PROP_VERSION 1009 +#define IDC_STATIC_PROP_COPYRIGHT 1010 +#define IDC_STATIC_PROP_SIZE 1011 +#define IDC_CHECK_READONLY 1012 +#define IDC_CHECK_ARCHIVE 1013 +#define IDC_CHECK_COMPRESSED 1014 +#define IDC_CHECK_HIDDEN 1015 +#define IDC_CHECK_SYSTEM 1016 +#define IDC_LIST_PROP_VERSION_TYPES 1017 +#define IDC_LIST_PROP_VERSION_VALUES 1018 + /* winefile extensions */ #define ID_ABOUT_WINE 0x8000 _____ Modified: trunk/reactos/subsys/system/winefile/resource.rc --- trunk/reactos/subsys/system/winefile/resource.rc 2005-06-02 21:32:21 UTC (rev 15738) +++ trunk/reactos/subsys/system/winefile/resource.rc 2005-06-02 21:39:00 UTC (rev 15739) @@ -24,6 +24,7 @@ VK_F8, ID_FILE_COPY, VIRTKEY, NOINVERT VK_DELETE, ID_FILE_DELETE, VIRTKEY, NOINVERT VK_RETURN, ID_ACTIVATE, VIRTKEY, NOINVERT + VK_RETURN, ID_EDIT_PROPERTIES, VIRTKEY, ALT, NOINVERT #ifndef _NO_EXTENSIONS "X", ID_FILE_EXIT, VIRTKEY, ALT, NOINVERT "S", ID_VIEW_FULLSCREEN, VIRTKEY, SHIFT, CONTROL, NOINVERT _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-06-02 21:32:21 UTC (rev 15738) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-06-02 21:39:00 UTC (rev 15739) @@ -204,6 +204,7 @@ static void refresh_child(ChildWnd* child); static void refresh_drives(); static void get_path(Entry* dir, PTSTR path); +static void format_date(const FILETIME* ft, TCHAR* buffer, int visible_cols); LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam); LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam); @@ -1765,6 +1766,186 @@ } +struct PropertiesDialog { + TCHAR path[MAX_PATH]; + Entry entry; + void* pVersionData; +}; + +/* Structure used to store enumerated languages and code pages. */ +struct LANGANDCODEPAGE { + WORD wLanguage; + WORD wCodePage; +} *lpTranslate; + +static LPCSTR InfoStrings[] = { + "Comments", + "CompanyName", + "FileDescription", + "FileVersion", + "InternalName", + "LegalCopyright", + "LegalTrademarks", + "OriginalFilename", + "PrivateBuild", + "ProductName", + "ProductVersion", + "SpecialBuild", + NULL +}; + +static void PropDlg_DisplayValue(HWND hlbox, HWND hedit) +{ + int idx = ListBox_GetCurSel(hlbox); + + if (idx != LB_ERR) { + LPCTSTR pValue = (LPCTSTR) ListBox_GetItemData(hlbox, idx); + + if (pValue) + SetWindowText(hedit, pValue); + } +} + +static void CheckForFileInfo(struct PropertiesDialog* dlg, HWND hwnd, LPCTSTR strFilename) +{ + static TCHAR sBackSlash[] = {'\\','\0'}; + static TCHAR sTranslation[] = {'\\','V','a','r','F','i','l','e','I','n','f','o','\\','T','r','a','n',' s','l','a','t','i','o','n','\0'}; + static TCHAR sStringFileInfo[] = {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o','\\', + '%','0','4','x','%','0','4','x','\\','%','s','\0'}; + DWORD dwVersionDataLen = GetFileVersionInfoSize(strFilename, NULL); + + if (dwVersionDataLen) { + dlg->pVersionData = malloc(dwVersionDataLen); + + if (GetFileVersionInfo(strFilename, 0, dwVersionDataLen, dlg->pVersionData)) { + LPVOID pVal; + UINT nValLen; + + if (VerQueryValue(dlg->pVersionData, sBackSlash, &pVal, &nValLen)) { + if (nValLen == sizeof(VS_FIXEDFILEINFO)) { + VS_FIXEDFILEINFO* pFixedFileInfo = (VS_FIXEDFILEINFO*)pVal; + char buffer[BUFFER_LEN]; + + sprintf(buffer, "%d.%d.%d.%d", + HIWORD(pFixedFileInfo->dwFileVersionMS), LOWORD(pFixedFileInfo->dwFileVersionMS), + HIWORD(pFixedFileInfo->dwFileVersionLS), LOWORD(pFixedFileInfo->dwFileVersionLS)); + + SetDlgItemTextA(hwnd, IDC_STATIC_PROP_VERSION, buffer); + } + } + + /* Read the list of languages and code pages. */ + if (VerQueryValue(dlg->pVersionData, sTranslation, &pVal, &nValLen)) { + struct LANGANDCODEPAGE* pTranslate = (struct LANGANDCODEPAGE*)pVal; + struct LANGANDCODEPAGE* pEnd = (struct LANGANDCODEPAGE*)((LPBYTE)pVal+nValLen); + + HWND hlbox = GetDlgItem(hwnd, IDC_LIST_PROP_VERSION_TYPES); + + /* Read the file description for each language and code page. */ + for(; pTranslate<pEnd; ++pTranslate) { + LPCSTR* p; + + for(p=InfoStrings; *p; ++p) { + TCHAR subblock[200]; + LPCTSTR pTxt; + UINT nValLen; + + LPCSTR pInfoString = *p; + wsprintf(subblock, sStringFileInfo, pTranslate->wLanguage, pTranslate->wCodePage, pInfoString); + + /* Retrieve file description for language and code page */ + if (VerQueryValue(dlg->pVersionData, subblock, (PVOID)&pTxt, &nValLen)) { + int idx = ListBox_AddString(hlbox, pInfoString); + ListBox_SetItemData(hlbox, idx, pTxt); + } + } + } + + ListBox_SetCurSel(hlbox, 0); + + PropDlg_DisplayValue(hlbox, GetDlgItem(hwnd,IDC_LIST_PROP_VERSION_VALUES)); + } + } + } +} + +static INT_PTR CALLBACK PropertiesDialogDlgProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) +{ + static struct PropertiesDialog* dlg; + + switch(nmsg) { + case WM_INITDIALOG: { + const static TCHAR sByteFmt[] = {'%','s',' ','B','y','t','e','s','\0'}; + TCHAR b1[BUFFER_LEN], b2[BUFFER_LEN]; + NUMBERFMT fmt = {0}; + LPWIN32_FIND_DATA pWFD; + ULONGLONG size; + + dlg = (struct PropertiesDialog*) lparam; + pWFD = (LPWIN32_FIND_DATA) &dlg->entry.data; + + GetWindowText(hwnd, b1, MAX_PATH); + wsprintf(b2, b1, pWFD->cFileName); + SetWindowText(hwnd, b2); + + format_date(&pWFD->ftLastWriteTime, b1, COL_DATE|COL_TIME); + SetWindowText(GetDlgItem(hwnd, IDC_STATIC_PROP_LASTCHANGE), b1); + + size = ((ULONGLONG)pWFD->nFileSizeHigh << 32) | pWFD->nFileSizeLow; + wsprintf(b1, sLongNumFmt, size); + wsprintf(b2, sByteFmt, b1); + SetWindowText(GetDlgItem(hwnd, IDC_STATIC_PROP_SIZE), b2); + + SetWindowText(GetDlgItem(hwnd, IDC_STATIC_PROP_FILENAME), pWFD->cFileName); + SetWindowText(GetDlgItem(hwnd, IDC_STATIC_PROP_PATH), dlg->path); + + Button_SetCheck(GetDlgItem(hwnd,IDC_CHECK_READONLY), (pWFD->dwFileAttributes&FILE_ATTRIBUTE_READONLY? BST_CHECKED: BST_UNCHECKED)); + Button_SetCheck(GetDlgItem(hwnd,IDC_CHECK_ARCHIVE), (pWFD->dwFileAttributes&FILE_ATTRIBUTE_ARCHIVE? BST_CHECKED: BST_UNCHECKED)); + Button_SetCheck(GetDlgItem(hwnd,IDC_CHECK_COMPRESSED), (pWFD->dwFileAttributes&FILE_ATTRIBUTE_COMPRESSED? BST_CHECKED: BST_UNCHECKED)); + Button_SetCheck(GetDlgItem(hwnd,IDC_CHECK_HIDDEN), (pWFD->dwFileAttributes&FILE_ATTRIBUTE_HIDDEN? BST_CHECKED: BST_UNCHECKED)); + Button_SetCheck(GetDlgItem(hwnd,IDC_CHECK_SYSTEM), (pWFD->dwFileAttributes&FILE_ATTRIBUTE_SYSTEM? BST_CHECKED: BST_UNCHECKED)); + + CheckForFileInfo(dlg, hwnd, dlg->path); + return 1;} + + case WM_COMMAND: { + int id = (int)wparam; + + switch(HIWORD(wparam)) { + case LBN_SELCHANGE: { + HWND hlbox = GetDlgItem(hwnd, IDC_LIST_PROP_VERSION_TYPES); + PropDlg_DisplayValue(hlbox, GetDlgItem(hwnd,IDC_LIST_PROP_VERSION_VALUES)); + break; + } + + case BN_CLICKED: + if (id==IDOK || id==IDCANCEL) + EndDialog(hwnd, id); + } + + return 1;} + + case WM_NCDESTROY: + free(dlg->pVersionData); + dlg->pVersionData = NULL; + break; + } + + return 0; +} + +static void show_properties_dlg(Entry* entry, HWND hwnd) +{ + struct PropertiesDialog dlg; + + memset(&dlg, 0, sizeof(struct PropertiesDialog)); + get_path(entry, dlg.path); + memcpy(&dlg.entry, entry, sizeof(Entry)); + + DialogBoxParam(Globals.hInstance, MAKEINTRESOURCE(IDD_DIALOG_PROPERTIES), hwnd, PropertiesDialogDlgProc, (LPARAM)&dlg); +} + + #ifndef _NO_EXTENSIONS static struct FullScreenParameters { @@ -3740,7 +3921,10 @@ #endif } } else { - launch_entry(entry, child->hwnd, SW_SHOWNORMAL); + if (GetKeyState(VK_MENU) < 0) + show_properties_dlg(entry, child->hwnd); + else + launch_entry(entry, child->hwnd, SW_SHOWNORMAL); } } @@ -4225,6 +4409,10 @@ SetCapture(hwnd); break;} + case ID_EDIT_PROPERTIES: + show_properties_dlg(pane->cur, child->hwnd); + break; + default: return pane_command(pane, LOWORD(wparam)); } _____ Modified: trunk/reactos/subsys/system/winefile/winefile.dsp --- trunk/reactos/subsys/system/winefile/winefile.dsp 2005-06-02 21:32:21 UTC (rev 15738) +++ trunk/reactos/subsys/system/winefile/winefile.dsp 2005-06-02 21:39:00 UTC (rev 15739) @@ -55,7 +55,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib ole32.lib mpr.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# ADD LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib ole32.lib version.lib mpr.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept !ELSEIF "$(CFG)" == "winefile - Win32 Unicode Debug" @@ -81,7 +81,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib ole32.lib mpr.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# ADD LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib ole32.lib version.lib mpr.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept !ELSEIF "$(CFG)" == "winefile - Win32 UNICODE Release" @@ -108,7 +108,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib ole32.lib mpr.lib /nologo /subsystem:windows /machine:I386 +# ADD LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib ole32.lib version.lib mpr.lib /nologo /subsystem:windows /machine:I386 !ELSEIF "$(CFG)" == "winefile - Win32 Release" @@ -135,7 +135,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib ole32.lib mpr.lib /nologo /subsystem:windows /machine:I386 +# ADD LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib ole32.lib version.lib mpr.lib /nologo /subsystem:windows /machine:I386 !ENDIF _____ Modified: trunk/reactos/subsys/system/winefile/winefile.xml --- trunk/reactos/subsys/system/winefile/winefile.xml 2005-06-02 21:32:21 UTC (rev 15738) +++ trunk/reactos/subsys/system/winefile/winefile.xml 2005-06-02 21:39:00 UTC (rev 15739) @@ -15,6 +15,7 @@ <library>shell32</library> <library>ole32</library> <library>oleaut32</library> + <library>version</library> <library>mpr</library> <file>license.c</file> <file>winefile.c</file>

1 0

[mf] 15738: fix column headers
by mf＠svn.reactos.com 02 Jun '05

02 Jun '05

fix column headers Modified: trunk/reactos/subsys/system/winefile/winefile.c _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-06-02 21:09:29 UTC (rev 15737) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-06-02 21:32:21 UTC (rev 15738) @@ -4449,7 +4449,7 @@ #endif /* load column strings */ - col = 0; + col = 1; load_string(g_pos_names[col++], IDS_COL_NAME); load_string(g_pos_names[col++], IDS_COL_SIZE);

1 0

[fireball] 15737: First version of Explorer's translation into Russian. Done by Dmitry Philippov, checked by me, DarkHobbit and others.
by fireball＠svn.reactos.com 02 Jun '05

02 Jun '05

First version of Explorer's translation into Russian. Done by Dmitry Philippov, checked by me, DarkHobbit and others. But still needs extensive checking. Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc _____ Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc --- trunk/reactos/subsys/system/explorer/explorer_intres.rc 2005-06-02 20:47:15 UTC (rev 15736) +++ trunk/reactos/subsys/system/explorer/explorer_intres.rc 2005-06-02 21:09:29 UTC (rev 15737) @@ -1,4 +1,4 @@ -//Microsoft Developer Studio generated resource script. +// Microsoft Visual C++ generated resource script. // #include "explorer_intres.h" @@ -26,7 +26,7 @@ // Menu // -IDM_MDIFRAME MENU PRELOAD DISCARDABLE +IDM_MDIFRAME MENU BEGIN POPUP "&Fi?ier" BEGIN @@ -65,7 +65,7 @@ END END -IDM_SDIFRAME MENU PRELOAD DISCARDABLE +IDM_SDIFRAME MENU BEGIN POPUP "&Fi?ier" BEGIN @@ -99,8 +99,8 @@ // Dialog // -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_EXECUTE DIALOG 15, 13, 210, 63 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Execute" FONT 8, "MS Shell Dlg" BEGIN @@ -121,7 +121,7 @@ // String Table // -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_TITLE "ReactOS Explorer" IDS_START "?ncepe" @@ -140,7 +140,7 @@ IDS_ADMIN "Administrare" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_STARTMENU "Startmenu" IDS_MINIMIZE_ALL "mimimize all windows" @@ -158,7 +158,7 @@ IDS_TERMINATE "?nchide sesiunea" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_NETWORK "Re?ea" IDS_CONNECTIONS "Conec?ii" @@ -189,7 +189,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU) #ifdef _WIN32 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#pragma code_page(1252) +#pragma code_page(1251) #endif //_WIN32 //////////////////////////////////////////////////////////////////////// ///// @@ -197,29 +197,29 @@ // Bitmap // -IDB_DRIVEBAR BITMAP DISCARDABLE "res/drivebar.bmp" -IDB_LOGOV BITMAP DISCARDABLE "res/logov.bmp" -IDB_LOGOV256 BITMAP DISCARDABLE "res/logov256.bmp" -IDB_LOGOV16 BITMAP DISCARDABLE "res/logov16.bmp" +IDB_DRIVEBAR BITMAP "res/drivebar.bmp" +IDB_LOGOV BITMAP "res/logov.bmp" +IDB_LOGOV256 BITMAP "res/logov256.bmp" +IDB_LOGOV16 BITMAP "res/logov16.bmp" //////////////////////////////////////////////////////////////////////// ///// // // Accelerator // -IDA_EXPLORER ACCELERATORS DISCARDABLE +IDA_EXPLORER ACCELERATORS BEGIN "X", ID_FILE_EXIT, VIRTKEY, ALT, NOINVERT "S", ID_VIEW_FULLSCREEN, VIRTKEY, SHIFT, CONTROL, NOINVERT END -IDA_SEARCH_PROGRAM ACCELERATORS DISCARDABLE +IDA_SEARCH_PROGRAM ACCELERATORS BEGIN VK_F5, ID_REFRESH, VIRTKEY, NOINVERT END -IDA_TRAYNOTIFY ACCELERATORS DISCARDABLE +IDA_TRAYNOTIFY ACCELERATORS BEGIN VK_F5, ID_REFRESH, VIRTKEY, NOINVERT END @@ -229,6 +229,472 @@ //////////////////////////////////////////////////////////////////////// ///// +// Russian resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS) +#ifdef _WIN32 +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +#pragma code_page(1251) +#endif //_WIN32 + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_DESKTOPBAR MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&?Ó±?¯ÚÛÞ...", ID_DESKTOPBAR_SETTINGS + MENUITEM "&?Þ±´Õ?¸Õ ÃÓõÓ¸...", ID_TASKMGR + MENUITEM SEPARATOR + MENUITEM "&? ¤¯Ô¯õÝÞÛÕ...", ID_ABOUT_EXPLORER + END +END + +IDM_MDIFRAME MENU +BEGIN + POPUP "&ÈÓÚÙ" + BEGIN + MENUITEM "?&¹§¯õ", ID_FILE_EXIT + END + POPUP "&?Þõ" + BEGIN + MENUITEM "&¤ÓÝÕÙ³ ÞÝ±?¾ýÕÝ?¯Ô", ID_VIEW_TOOL_BAR + MENUITEM "&?¯´¯ÙÝÞ?ÕÙ³ÝÓ ´ÓÝÕÙ³", ID_VIEW_EXTRA_BAR + MENUITEM "&?Þ±ÛÞ", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "?&þßÓÝÝ¯Õ", ID_VIEW_SIDE_BAR + MENUITEM "&Ð?¯ÛÓ ±¯±?¯ ÝÞ ", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&?ßÝ¯ÔÞ?³\tF5", ID_REFRESH + MENUITEM "¤¯&ÙÝ¹Ú ²ÛÓÝ\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "SDI", ID_VIEW_SDI + END + POPUP "?&ÛÝÓ" + BEGIN + MENUITEM "?¯Ô¯Õ ¯&ÛÝ¯", ID_WINDOW_NEW + MENUITEM "ðÓ±´¯Ù¯µÞ?³ ÛÓ±ÛÓõ¯ý\tShift+F5", ID_WINDOW_CASCADE + MENUITEM "&?¯Þþ¯Ý?ÓÙ³Ý¯", ID_WINDOW_TILE_HORZ + MENUITEM "&?Õ?ÞÛÓÙ³Ý¯\tShift+F4", ID_WINDOW_TILE_VERT + MENUITEM "Ë´¯ õ¯¸Þ?³ ÓÔ?¯ýÓ?Þ¸Õ±ÛÞ", ID_WINDOW_AUTOSORT + MENUITEM "Ë´¯ õ¯¸Þ?³ &þÝÓ¸ÛÞ", ID_WINDOW_ARRANGE + END + POPUP "&?Ý±?¾ýÕÝ?¹" + BEGIN + MENUITEM "&?´÷ÞÞ", ID_TOOLS_OPTIONS + END + POPUP "¤¯&ý¯¨³" + BEGIN + MENUITEM "&FAQ(ÎÓ?¯) ´¯ ¤¯Ô¯õÝÞÛ¾...", ID_EXPLORER_FAQ + MENUITEM "? &¤¯Ô¯õÝÞÛÕ...", ID_ABOUT_EXPLORER + MENUITEM "?ß &?Ð...", ID_ABOUT_WINDOWS + END +END + +IDM_NOTIFYAREA MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&¤¯ÛÓþ¹ÔÓ?³ ±Û¹?¹Õ þÝÓ¸ÛÞ", ID_SHOW_HIDDEN_ICONS + MENUITEM "¤¯ÛÓþ¹ÔÓ?³ þÝÓ¸ÛÞ ÝÓ &ÛÝ¯´ÛÓ§", ID_SHOW_ICON_BUTTON + MENUITEM "&?Ó±?¯ÚÛÓ ¾ÔÕõ¯ýÙÕÝÞÚ...", ID_CONFIG_NOTIFYAREA + MENUITEM "?Ó±?¯ÚÛÓ õÓ?¹/&ÔÕýÕÝÞ", ID_CONFIG_TIME + MENUITEM SEPARATOR + MENUITEM "&? ¤¯Ô¯õÝÞÛÕ...", ID_ABOUT_EXPLORER + END +END + +IDM_SDIFRAME MENU +BEGIN + POPUP "&ÈÓÚÙ" + BEGIN + MENUITEM "?&¹§¯õ", ID_FILE_EXIT + END + POPUP "&?Þõ" + BEGIN + MENUITEM "&¤ÓÝÕÙ³ ÞÝ±?¾ýÕÝ?¯Ô", ID_VIEW_TOOL_BAR + MENUITEM "?&þßÓÝÝ¯Õ", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&Ð?¯ÛÓ ±¯±?¯ ÝÞ ", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&?ßÝ¯ÔÞ?³\tF5", ID_REFRESH + MENUITEM "¤¯&ÙÝ¹Ú ²ÛÓÝ\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "&MDI", ID_VIEW_MDI + END + POPUP "&?Ý±?¾ýÕÝ?¹" + BEGIN + MENUITEM "&?´÷ÞÞ", ID_TOOLS_OPTIONS + END + POPUP "&Ð´ÓÔÛÓ" + BEGIN + MENUITEM "&FAQ(ÎÓ??) ´¯ ¤¯Ô¯õÝÞÛ¾...", ID_EXPLORER_FAQ + MENUITEM "? &¤¯Ô¯õÝÞÛÕ...", ID_ABOUT_EXPLORER + MENUITEM "?ß &?Ð...", ID_ABOUT_WINDOWS + END +END + +IDM_VOLUME MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "?¯ýÛ¯±?³", ID_TRAY_VOLUME + MENUITEM "ÐÔ¯Ú±?ÔÓ þÔ¾ÛÓ", ID_VOLUME_PROPERTIES + END +END + +IDM_WINEFILE MENU +BEGIN + POPUP "&ÈÓÚÙ" + BEGIN + MENUITEM "&??Û¹?³\tEnter", 101 + MENUITEM "¤Õ&ÕýÕ±?Þ?³...\tF7", 106 + MENUITEM "&?¯´Þ¯ÔÓ?³...\tF8", 107 + MENUITEM "? ß¾¶Õ ¯ßý&ÕÝÓ...\tF9", 118 + MENUITEM "&ËõÓÙÞ?³\tDel", 108 + MENUITEM "¤Õ&ÕÞýÕÝ¯ÔÓ?³...", 109 + MENUITEM "ÐÔ¯Ú±&?ÔÓ...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "ÃÓ´ÓÛ¯&ÔÓ?³...", 119 + MENUITEM "ðÓ&±´ÓÛ¯ÔÓ?³...", 120 + MENUITEM SEPARATOR + MENUITEM "&ÃÓ´¾±Û...", ID_EXECUTE + MENUITEM "&¤Õ¸Ó?³...", 102 + MENUITEM "?ß·ÕõÕÝÞ?³...", 103 + MENUITEM SEPARATOR + MENUITEM "Ð¯þõÓ?&³ ´Ó´Û¾...", ID_EXECUTE + MENUITEM "¤¯&Þ±Û...", 104 + MENUITEM "?&¹ßÓ?³ ¶ÓÚÙ...", 116 + MENUITEM SEPARATOR + MENUITEM "?¹§¯&õ\tAlt+X", ID_FILE_EXIT + END + POPUP "&?Þ±Û" + BEGIN + MENUITEM "&?¯´Þ¯ÔÓ?³ õÞ±Û...", 201 + MENUITEM "&?Õ?ÛÓ õÞ±ÛÓ...", 202 + MENUITEM SEPARATOR + MENUITEM "&È¯ýÓ?Þ¯ÔÓ?³ õÞ±Û...", 203 + MENUITEM SEPARATOR + MENUITEM "¤¯õÛÙ?¸Þ?³ &±Õ?ÕÔ¯Ú õÞ±Û", 252 + MENUITEM "&??ÛÙ?¸Þ?³ ±Õ?ÕÔ¯Ú õÞ±Û", 253 + MENUITEM SEPARATOR + MENUITEM "??Û¹?³ õ¯±?¾´...", 254 + MENUITEM "&ÃÓÛ¹?³ õ¯±?¾´...", 255 + MENUITEM SEPARATOR + MENUITEM "&?¹ßÓ?³ õÞ±Û...", 251 + END + POPUP "&¤Ó´ÛÞ" + BEGIN + MENUITEM "&ÐÙÕõ¾?¨ÞÚ ¾¯ÔÕÝ³\t+", 301 + MENUITEM "ðÓþÔÕÝ¾?³ &õÕÕÔ¯\t*", 302 + MENUITEM "ðÓþÔÕÝ¾?³ &Ô±©\tCtrl+*", 303 + MENUITEM "ÐÔÕÝ¾?³ &õÕÕÔ¯\t-", 304 + MENUITEM SEPARATOR + MENUITEM "&??ýÕ?Þ?³ ÔÙ¯µÕÝÞ ", 505 + END + POPUP "&?Þõ" + BEGIN + MENUITEM "?&ÕÕÔ¯ Þ ´Ó´ÛÞ", 413 + MENUITEM "Ê¯&Ù³Û¯ õÕÕÔ¯", 411 + MENUITEM "Ê¯Ù³Û¯ &´Ó´ÛÓ", 412 + MENUITEM SEPARATOR + MENUITEM "ðÓþõ&ÕÙÞ?³", 414 + MENUITEM SEPARATOR + MENUITEM "&?ý ", ID_VIEW_NAME + MENUITEM "&?±Õ ´¯õ¯ßÝ¯±?Þ ¯ ¶ÓÚÙÕ", ID_VIEW_ALL_ATTRIBUTES + , CHECKED + MENUITEM "&ÎÓ±?Þ¸Ý¹Õ ´¯õ¯ßÝ¯±?Þ...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "&Ð¯?Þ¯ÔÓ?³ ´¯ ÞýÕÝÞ", 404 + MENUITEM "Ð¯?Þ¯ÔÓ?³ &´¯ ?Þ´¾", 405 + MENUITEM "Ð¯?Þ¯ÔÓ?³ ´¯ Ó&þýÕ¾", 406 + MENUITEM "Ð¯?Þ¯ÔÓ?³ ´¯ &õÓ?Õ", 407 + MENUITEM SEPARATOR + MENUITEM "Ð¯?Þ¯ÔÓ?³ ´¯ &...", 409 + END + POPUP "&?Ó±?¯ÚÛÞ" + BEGIN + MENUITEM "&¤¯õ?ÕÔµÕõÕÝÞÕ...", 65535 + MENUITEM "&ÏÞ¶?...", 65535 + MENUITEM "?Ó±?¯Þ?³ ´ÓÝÕÙ³ &ÞÝ±?¾ýÕÝ?¯Ô...", 65535 + MENUITEM SEPARATOR + MENUITEM "&¤ÓÝÕÙ³ ÞÝ±?¾ýÕÝ?¯Ô", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "&?Þ±ÛÞ", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&?þßÓÝÝ¯Õ", ID_VIEW_SIDE_BAR + MENUITEM "&Ð?¯ÛÓ ±¯±?¯ ÝÞ ", ID_VIEW_STATUSBAR, CHECKED + MENUITEM "? ´¯&ÙÝ¹Ú ²ÛÓÝ\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM SEPARATOR + MENUITEM "&?ß¯ÝÓ¸Þ?³ ´¯±ÙÕ Ô¹´¯ÙÝÕÝÞ ", 65535 + MENUITEM "&Ð¯§ÓÝÞ?³ ÞþýÕÝÕÝÞ Þ Ô¹Ú?Þ", 511 + END + POPUP "&?Õþ¯´Ó±Ý¯±?³" + BEGIN + MENUITEM "&?¯±?¾´...", 605 + MENUITEM "&ðÕÒÞ±?Ó÷Þ ...", 606 + MENUITEM "&?ÙÓõÕÙÕ÷...", 607 + END + POPUP "&?ÛÝ¯" + BEGIN + MENUITEM "?¯Ô¯Õ &¯ÛÝ¯", ID_WINDOW_NEW + MENUITEM "ðÓ±´¯Ù¯µÞ?³ ÛÓ±ÛÓõ¯ý\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "¤ÙÞ?Û¯Ú &Ò¯Þþ¯Ý?ÓÙ³Ý¯", ID_WINDOW_TILE_HORZ + MENUITEM "¤ÙÞ?Û¯Ú &ÔÕ?ÞÛÓÙ³Ý¯\tCtrl+F4", ID_WINDOW_TILE_VERT + MENUITEM "Ë´¯ õ¯¸Þ?³ ÓÔ?¯ýÓ?Þ¸Õ±ÛÞ", ID_WINDOW_AUTOSORT + MENUITEM "Ë´¯ õ¯¸Þ?³ &þÝÓ¸ÛÞ", ID_WINDOW_ARRANGE + MENUITEM "&?ßÝ¯ÔÞ?³\tF5", ID_REFRESH + END + POPUP "&?" + BEGIN + MENUITEM "&?¹þ¯Ô ±´ÓÔÛÞ\tF1", ID_HELP + MENUITEM "¤¯Þ±Û &±´ÓÔÛÞ...\tF1", ID_HELP + MENUITEM "&?±´¯Ù³þ¯ÔÓÝÞÕ ±´ÓÔÛÞ\tF1", ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "?Ý¶¯ýÓ÷Þ ¯ &Winefile...", ID_ABOUT_WINEFILE + END +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// Dialog +// + +IDD_ABOUT_EXPLORER DIALOGEX 0, 0, 199, 106 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "? ¤¯Ô¯õÝÞÛÕ ReactOS" +FONT 10, "MS Sans Serif", 0, 0, 0x0 +BEGIN + LTEXT "¤¯Ô¯õÝÞÛ ReactOS",IDC_ROS_EXPLORER,91,13,104,11 + LTEXT "V 0.9",IDC_VERSION_TXT,91,27,104,8 + LTEXT "(c) 2003-2005 Martin Fuchs",IDC_STATIC,91,42,104,8 + LTEXT "",IDC_WIN_VERSION,91,58,98,22 + LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, + 8 + CONTROL "&OK",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, + 154,90,38,12 +END + +IDD_DESKBAR_DESKTOP DIALOGEX 0, 0, 212, 194 +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÐÔ¯Ú±?ÔÓ ðÓß¯¸ÕÒ¯ Ð?¯ÙÓ" +FONT 8, "MS Sans Serif", 0, 0, 0x0 +BEGIN + LTEXT "?¹ßÕÞ?Õ, ÝÓÞß¯ÙÕÕ ´Õõ´¯¸?Þ?ÕÙ³Ý¹Ú õÙ ÔÓ±, \n±´¯±¯ß Ô¹ÓÔÝÞÔÓÝÞ þÝÓ¸Û¯Ô", + IDC_STATIC,7,7,195,18 + CONTROL "left/top dwn",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,25,46,44 + CONTROL "left/top right",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,25,46,44 + CONTROL "right/top left",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,25,46,44 + CONTROL "rig./top dwn",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,25,46,44 + CONTROL "left/bot. up",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,73,46,44 + CONTROL "left/bot. right",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,73,46,44 + CONTROL "right/bot. left",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,73,46,44 + CONTROL "rig./bot. dwn",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,73,46,44 + CONTROL "border down",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,121,46,44 + CONTROL "border H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,121,46,44 + CONTROL "round about",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,121,46,44 + CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | + WS_TABSTOP,159,121,46,44 + CONTROL "¤¯ÛÓþ¹ÔÓ?³ ?¯ýÕ &?Õ± ÞÞ",ID_DESKTOP_VERSION,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,177,109,10 +END + +IDD_DESKBAR_STARTMENU DIALOG 0, 0, 210, 194 +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÐÔ¯Ú?±ÔÓ ýÕÝ? ¤¾±Û" +FONT 8, "MS Sans Serif" +BEGIN +END + +IDD_DESKBAR_TASKBAR DIALOGEX 0, 0, 227, 202 +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÐÔ¯Ú±?ÔÓ ´ÓÝÕÙÞ þÓõÓ¸" +FONT 8, "MS Sans Serif", 0, 0, 0x0 +BEGIN + CONTROL "??¯ßÓµÓ?³ &¸Ó±¹",ID_SHOW_CLOCK,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,17,161,76,10 + CONTROL "&ÐÛ¹ÔÓ?³ ÝÕÞ±´¯Ù³þ¾Õý¹Õ þÝÓ¸ÛÞ",ID_HIDE_INACTIVE_ICONS, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,178,135,10 + PUSHBUTTON "&ËÔÕõ¯ýÙÕÝÞ ...",ID_CONFIG_NOTIFYAREA,156,174,63,14 +END + +IDD_EXECUTE DIALOGEX 15, 13, 210, 63 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU +CAPTION "?¹´¯ÙÝÞ?³" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,150,10 + CONTROL "&?¯ýÓÝõÓ:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, + 18,60,10 + EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL + CONTROL "As &Symbol",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, + 45,71,12 + DEFPUSHBUTTON "&OK",1,158,6,47,14 + PUSHBUTTON "&??ýÕÝÓ",2,158,24,47,14 + PUSHBUTTON "&Ð´ÓÔÛÓ",254,158,42,47,14 +END + +IDD_MDI_SDI DIALOGEX 0, 0, 188, 126 +STYLE DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "?¹ßÕÞ?Õ ÕµÞý MDI / SDI" +FONT 8, "MS Sans Serif", 0, 0, 0x0 +BEGIN + LTEXT "?¹ßÕÞ?Õ ÝÓÞß¯ÙÕÕ ´Õõ´¯¸?Þ?ÕÙ³Ý¹Ú õÙ ÔÓ±\nÔÞõ ´¯Ô¯õÝÞÛÓ:", + IDC_STATIC,7,7,171,17 + CONTROL "&MDI (ýÝ¯Ò¯õ¯Û¾ýÕÝ?Ý¹Ú Ý?Õ¶ÕÚ ±)",IDC_MDI,"Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,30,136,10 + CONTROL "&SDI (¯õÝ¯õ¯Û¾ýÕÝ?Ý¹Ú ÞÝ?Õ¶ÕÚ ±)",IDC_SDI,"Button", + BS_AUTORADIOBUTTON,7,53,134,10 + LTEXT "¦?Þ ÝÓ±?¯ÚÛÞ ß¾õ¾? Þ±´¯Ù³þ¯ÔÓÝÝ¹, ÛÓÛ þÝÓ¸ÕÝÞÕ ´¯ ¾ý¯Ù¸ÓÝÞ? õÙ Ô±Õ§ ¯Û¯Ý ´¯Ô¯õÝÞÛÓ Ô ß¾õ¾¨Õý.", + IDC_STATIC,7,76,174,26 + DEFPUSHBUTTON "&OK",IDOK,29,105,50,14,WS_GROUP + PUSHBUTTON "&Cancel",IDCANCEL,106,105,50,14 +END + +IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 +STYLE DS_SETFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "?¯Ý¶ÞÒ¾Ó÷Þ þÝÓ¸Û¯Ô" +FONT 8, "MS Sans Serif", 0, 0, 0x0 +BEGIN + CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | + TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 + LTEXT "&ÊÕÛ±? ¤¯õ±ÛÓþÛÞ:",IDC_LABEL1,7,44,62,8 + EDITTEXT IDC_NOTIFY_TOOLTIP,76,42,125,14,ES_AUTOHSCROLL + LTEXT "ÃÓÒ¯Ù¯Ô¯Û ?&ÛÝÓ:",IDC_LABEL2,7,63,58,8 + EDITTEXT IDC_NOTIFY_TITLE,76,60,125,14,ES_AUTOHSCROLL + LTEXT "&¤¾?³ Û ?¯õ¾Ù?:",IDC_LABEL3,7,81,54,8 + EDITTEXT IDC_NOTIFY_MODULE,76,78,125,14,ES_AUTOHSCROLL + GROUPBOX "&ðÕµÞý ??¯ßÓµÕÝÞ ",IDC_LABEL4,7,96,169,28 + CONTROL "&´¯ ÛÓþÓ?³",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,15,108,47,10 + CONTROL "&±Û ¹?³",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66, + 108,41,10 + CONTROL "Ó&Ô?¯±Û¹?ÞÕ",IDC_NOTIFY_AUTOHIDE,"Button", + BS_AUTORADIOBUTTON,112,108,60,10 + ICON "",IDC_PICTURE,181,101,20,20 + LTEXT "&¤¯±ÙÕõÝÞÕ\n?þýÕÝÕÝÞ ",IDC_LABEL6,7,129,40,19 + EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | + ES_READONLY + CONTROL "´¯ÛÓ&þÓ?³ ±Û¹?¯Õ",ID_SHOW_HIDDEN_ICONS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,154,78,10 + DEFPUSHBUTTON "&OK",IDOK,91,153,50,14,WS_GROUP + PUSHBUTTON "&??ýÕÝÓ",IDCANCEL,151,153,50,14 +END + +IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 +STYLE DS_SETFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "¤¯Þ±Û ´¯ÒÓýý¹ Ô ¤±¾ÛÕ" +FONT 8, "MS Sans Serif", 0, 0, 0x0 +BEGIN + LTEXT "&ÈÞÙ³?:",IDC_STATIC,7,9,30,8 + EDITTEXT IDC_FILTER,40,7,94,14,ES_AUTOHSCROLL + CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | + LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | + WS_TABSTOP,7,25,186,33 + PUSHBUTTON "&¤¯ÔÕÞ?³",IDC_CHECK_ENTRIES,143,7,50,14 +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO +BEGIN + IDD_DESKBAR_TASKBAR, DIALOG + BEGIN + BOTTOMMARGIN, 199 + END +END +#endif // APSTUDIO_INVOKED + + +/////////////////////////////////////////////////////////////////////// ////// +// +// String Table +// + +STRINGTABLE +BEGIN + IDS_TITLE "¤¯Ô¯õÝÞÛ Reactos" + IDS_START "¤¾±Û" + IDS_LOGOFF "?¹§¯õ Þþ ±Þ±?Õý¹..." + IDS_SHUTDOWN "?¹ÛÙ?¸Þ?³..." + IDS_LAUNCH "?¹´¯ÙÝÞ?³..." + IDS_START_HELP "Ð´ÓÔÛÓ" + IDS_SEARCH_FILES "¤¯Þ±Û..." + IDS_DOCUMENTS "?¯Û¾ýÕÝ?¹" + IDS_FAVORITES "?þßÓÝÝ¯Õ" + IDS_PROGRAMS "¤¯ÒÓýý¹" + IDS_SETTINGS "?Ó±?¯ÚÛÞ" + IDS_EXPLORE "?ßþ¯" + IDS_EMPTY "(¤¾±?¯)" + IDS_RECENT "?ÕõÓÔÝÞÕ õ¯Û¾ýÕÝ?¹" + IDS_ADMIN "?õýÞÝÞ±?Þ¯ÔÓÝÞÕ" +END + +STRINGTABLE +BEGIN + IDS_NETWORK "ÐÕ?³" + IDS_CONNECTIONS "ÐÕ?ÕÔ¹Õ ´¯õÛÙ?¸ÕÝÞ " + IDS_DRIVES "?Þ±ÛÞ" + IDS_SEARCH_COMPUTER "?ÓÚ?Þ Û¯ý´³??Õ..." + IDS_SETTINGS_MENU "?Ó±?¯ÚÛÓ ýÕÝ?" + IDS_CONTROL_PANEL "¤ÓÝÕÙ³ ¾´ÓÔÙÕÝÞ " + IDS_PRINTERS "¤ÞÝ?Õ¹" + IDS_BROWSE "?ßþ¯ ¶ÓÚÙ¯Ô" + IDS_SEARCH_PRG "?ÓÚ?Þ ´¯ÒÓýý¾..." + IDS_ALL_USERS "?±Õ ´¯Ù³þ¯ÔÓ?ÕÙÞ\\" + IDS_SEARCH "¤¯Þ±Û" + IDS_ABOUT_EXPLORER "&? ¤¯Ô¯õÝÞÛÕ..." + IDS_LAUNCH_MANY_PROGRAMS + "?¹ Ô¹ßÓÙÞ ß¯ÙÕÕ ¯õÝ¯Ú ´¯ÒÓýý¹.\n?¹ ¾ÔÕÕÝ¹, ¸?¯ §¯?Þ?Õ Ô¹´¯ÙÝÞ?³ Þ§ Ô±Õ?" + IDS_DESKTOPBAR_SETTINGS "?Ó±?¯ÚÛÞ Óß¯¸ÕÒ¯ ±?¯ÙÓ" + IDS_DESKTOP "ðÓß¯¸ÞÚ Ð?¯Ù" + IDS_TASKBAR "¤ÓÝÕÙ³ þÓõÓ¸" +END + +STRINGTABLE +BEGIN + IDS_STARTMENU "?ÕÝ? ¤¾±ÛÓ" + IDS_MINIMIZE_ALL "±ÔÕÝ¾?³ Ô±Õ ¯ÛÝÓ" + IDS_DESKTOP_NUM "ðÓß¯¸ÞÚ Ð?¯Ù %d" + IDS_VOLUME "?ß·©ý" + IDS_ITEMS_CUR "?ÕÛ¾¨ÕÚ ²ÙÕýÕÝ?" + IDS_ITEMS_CONFIGURED "Û¯Ý¶ÞÒ¾Ó÷Þ " + IDS_ITEMS_VISIBLE "ÔÞõÞý¹Ú" + IDS_ITEMS_HIDDEN "±Û¹?¹Ú" + IDS_NOTIFY_SHOW "´¯ÛÓþÓ?³" + IDS_NOTIFY_HIDE "±Û¹?³" + IDS_NOTIFY_AUTOHIDE "ÓÔ?¯±Û¹?ÞÕ" + IDS_SHOW_HIDDEN_ICONS "¤¯ÛÓþÓ?³ ±Û¹?¹Õ þÝÓ¸ÛÞ" + IDS_HIDE_ICONS "ÐÛ¹?³ þÝÓ¸ÛÞ" + IDS_TERMINATE "ÃÓÔÕ°Þ?³ Óß¯?¾ ¤¯Ô¯õÝÞÛÓ" +END + +#endif // Russian resources +/////////////////////////////////////////////////////////////////////// ////// + + +/////////////////////////////////////////////////////////////////////// ////// // German (Germany) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) @@ -242,7 +708,7 @@ // Menu // -IDM_WINEFILE MENU FIXED IMPURE +IDM_WINEFILE MENU BEGIN POPUP "&Datei" BEGIN @@ -351,7 +817,7 @@ END END -IDM_MDIFRAME MENU PRELOAD DISCARDABLE +IDM_MDIFRAME MENU BEGIN POPUP "&Datei" BEGIN @@ -390,7 +856,7 @@ END END -IDM_SDIFRAME MENU PRELOAD DISCARDABLE +IDM_SDIFRAME MENU BEGIN POPUP "&Datei" BEGIN @@ -424,8 +890,8 @@ // Dialog // -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_EXECUTE DIALOG 15, 13, 210, 63 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ausf³hren" FONT 8, "MS Shell Dlg" BEGIN @@ -440,8 +906,8 @@ PUSHBUTTON "&Hilfe",254,158,43,47,14 END -IDD_ABOUT_EXPLORER DIALOG DISCARDABLE 0, 0, 199, 106 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_ABOUT_EXPLORER DIALOG 0, 0, 199, 106 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "About ReactOS Explorer" FONT 10, "MS Sans Serif" BEGIN @@ -461,17 +927,17 @@ // Bitmap // -IDB_ICON_ALIGN_0 BITMAP DISCARDABLE "res/icoalig0.bmp" -IDB_ICON_ALIGN_1 BITMAP DISCARDABLE "res/icoalig1.bmp" -IDB_ICON_ALIGN_2 BITMAP DISCARDABLE "res/icoalig2.bmp" -IDB_ICON_ALIGN_3 BITMAP DISCARDABLE "res/icoalig3.bmp" -IDB_ICON_ALIGN_4 BITMAP DISCARDABLE "res/icoalig4.bmp" -IDB_ICON_ALIGN_5 BITMAP DISCARDABLE "res/icoalig5.bmp" -IDB_ICON_ALIGN_6 BITMAP DISCARDABLE "res/icoalig6.bmp" -IDB_ICON_ALIGN_7 BITMAP DISCARDABLE "res/icoalig7.bmp" -IDB_ICON_ALIGN_8 BITMAP DISCARDABLE "res/icoalig8.bmp" -IDB_ICON_ALIGN_9 BITMAP DISCARDABLE "res/icoalig9.bmp" -IDB_ICON_ALIGN_10 BITMAP DISCARDABLE "res/icoali10.bmp" +IDB_ICON_ALIGN_0 BITMAP "res/icoalig0.bmp" +IDB_ICON_ALIGN_1 BITMAP "res/icoalig1.bmp" +IDB_ICON_ALIGN_2 BITMAP "res/icoalig2.bmp" +IDB_ICON_ALIGN_3 BITMAP "res/icoalig3.bmp" +IDB_ICON_ALIGN_4 BITMAP "res/icoalig4.bmp" +IDB_ICON_ALIGN_5 BITMAP "res/icoalig5.bmp" +IDB_ICON_ALIGN_6 BITMAP "res/icoalig6.bmp" +IDB_ICON_ALIGN_7 BITMAP "res/icoalig7.bmp" +IDB_ICON_ALIGN_8 BITMAP "res/icoalig8.bmp" +IDB_ICON_ALIGN_9 BITMAP "res/icoalig9.bmp" +IDB_ICON_ALIGN_10 BITMAP "res/icoali10.bmp" #ifdef APSTUDIO_INVOKED //////////////////////////////////////////////////////////////////////// ///// @@ -479,18 +945,18 @@ // TEXTINCLUDE // -1 TEXTINCLUDE DISCARDABLE +1 TEXTINCLUDE BEGIN "explorer_intres.h\0" END -2 TEXTINCLUDE DISCARDABLE +2 TEXTINCLUDE BEGIN "#include <windows.h>\r\n" "\0" END -3 TEXTINCLUDE DISCARDABLE +3 TEXTINCLUDE BEGIN "#ifndef ROSSHELL\r\n" "IDB_IMAGES BITMAP DISCARDABLE ""res/images.bmp""\r\n" @@ -528,42 +994,42 @@ // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_REACTOS ICON DISCARDABLE "res/reactos.ico" -IDI_EXPLORER ICON DISCARDABLE "res/explorer.ico" -IDI_STARTMENU ICON DISCARDABLE "res/startmenu.ico" -IDI_LOGOFF ICON DISCARDABLE "res/logoff.ico" -IDI_ARROW ICON DISCARDABLE "res/arrow.ico" -IDI_ARROW_SELECTED ICON DISCARDABLE "res/arrowsel.ico" -IDI_APPICON ICON DISCARDABLE "res/appicon.ico" -IDI_FLOATING ICON DISCARDABLE "res/floating.ico" -IDI_REACTOS_BIG ICON DISCARDABLE "res/ros-big.ico" -IDI_CONFIG ICON DISCARDABLE "res/config.ico" -IDI_DOCUMENTS ICON DISCARDABLE "res/documents.ico" -IDI_FAVORITES ICON DISCARDABLE "res/favorites.ico" -IDI_INFO ICON DISCARDABLE "res/info.ico" -IDI_APPS ICON DISCARDABLE "res/apps.ico" -IDI_SEARCH ICON DISCARDABLE "res/search.ico" -IDI_ACTION ICON DISCARDABLE "res/action.ico" -IDI_FOLDER ICON DISCARDABLE "res/folder.ico" -IDI_SEARCH_DOC ICON DISCARDABLE "res/search-doc.ico" -IDI_PRINTER ICON DISCARDABLE "res/printer.ico" -IDI_NETWORK ICON DISCARDABLE "res/network.ico" -IDI_COMPUTER ICON DISCARDABLE "res/computer.ico" -IDI_SPEAKER ICON DISCARDABLE "res/speaker.ico" -IDI_DOT ICON DISCARDABLE "res/dot.ico" -IDI_DOT_TRANS ICON DISCARDABLE "res/dot_trans.ico" -IDI_DOT_RED ICON DISCARDABLE "res/dot_red.ico" -IDI_ARROW_UP ICON DISCARDABLE "res/arrow_up.ico" -IDI_ARROW_DOWN ICON DISCARDABLE "res/arrow_dwn.ico" -IDI_NOTIFY_L ICON DISCARDABLE "res/notify_l.ico" -IDI_NOTIFY_R ICON DISCARDABLE "res/notify_r.ico" +IDI_REACTOS ICON "res/reactos.ico" +IDI_EXPLORER ICON "res/explorer.ico" +IDI_STARTMENU ICON "res/startmenu.ico" +IDI_LOGOFF ICON "res/logoff.ico" +IDI_ARROW ICON "res/arrow.ico" +IDI_ARROW_SELECTED ICON "res/arrowsel.ico" +IDI_APPICON ICON "res/appicon.ico" +IDI_FLOATING ICON "res/floating.ico" +IDI_REACTOS_BIG ICON "res/ros-big.ico" +IDI_CONFIG ICON "res/config.ico" +IDI_DOCUMENTS ICON "res/documents.ico" +IDI_FAVORITES ICON "res/favorites.ico" +IDI_INFO ICON "res/info.ico" +IDI_APPS ICON "res/apps.ico" +IDI_SEARCH ICON "res/search.ico" +IDI_ACTION ICON "res/action.ico" +IDI_FOLDER ICON "res/folder.ico" +IDI_SEARCH_DOC ICON "res/search-doc.ico" +IDI_PRINTER ICON "res/printer.ico" +IDI_NETWORK ICON "res/network.ico" +IDI_COMPUTER ICON "res/computer.ico" +IDI_SPEAKER ICON "res/speaker.ico" +IDI_DOT ICON "res/dot.ico" +IDI_DOT_TRANS ICON "res/dot_trans.ico" +IDI_DOT_RED ICON "res/dot_red.ico" +IDI_ARROW_UP ICON "res/arrow_up.ico" +IDI_ARROW_DOWN ICON "res/arrow_dwn.ico" +IDI_NOTIFY_L ICON "res/notify_l.ico" +IDI_NOTIFY_R ICON "res/notify_r.ico" //////////////////////////////////////////////////////////////////////// ///// // // String Table // -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_TITLE "Reactos Explorer" IDS_START "Start" @@ -582,7 +1048,7 @@ IDS_ADMIN "Verwaltung" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_STARTMENU "Startmen³" IDS_MINIMIZE_ALL "alle Fenster minimieren" @@ -600,7 +1066,7 @@ IDS_TERMINATE "ROS Explorer beenden" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_NETWORK "Netzwerk" IDS_CONNECTIONS "Netzwerk-Verbindungen" @@ -639,7 +1105,7 @@ // Menu // -IDM_MDIFRAME MENU PRELOAD DISCARDABLE +IDM_MDIFRAME MENU BEGIN POPUP "&File" BEGIN @@ -678,10 +1144,71 @@ END END -IDM_WINEFILE MENU FIXED IMPURE +IDM_DESKTOPBAR MENU BEGIN + POPUP "" + BEGIN + MENUITEM "&Settings...", ID_DESKTOPBAR_SETTINGS + MENUITEM "&Task Manager...", ID_TASKMGR + MENUITEM SEPARATOR + MENUITEM "&About Explorer...", ID_ABOUT_EXPLORER + END +END + +IDM_VOLUME MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Open Volume Control", ID_TRAY_VOLUME + MENUITEM "Adjust Audio Properties", ID_VOLUME_PROPERTIES + END +END + +IDM_NOTIFYAREA MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Show hidden icons", ID_SHOW_HIDDEN_ICONS + MENUITEM "Show Icon &Button", ID_SHOW_ICON_BUTTON + MENUITEM "&Configure Notifications...", ID_CONFIG_NOTIFYAREA + MENUITEM "Adjust Date/&Time...", ID_CONFIG_TIME + MENUITEM SEPARATOR + MENUITEM "&About Explorer...", ID_ABOUT_EXPLORER + END +END + +IDM_SDIFRAME MENU +BEGIN POPUP "&File" BEGIN + MENUITEM "E&xit", ID_FILE_EXIT + END + POPUP "&View" + BEGIN + MENUITEM "&Toolbar", ID_VIEW_TOOL_BAR + MENUITEM "S&ide Bar", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&Status Bar", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Refresh\tF5", ID_REFRESH + MENUITEM "F&ull Screen\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "&MDI", ID_VIEW_MDI + END + POPUP "&Tools" + BEGIN + MENUITEM "&Options", ID_TOOLS_OPTIONS + END + POPUP "&Help" + BEGIN + MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ + MENUITEM "&About Explorer...", ID_ABOUT_EXPLORER + MENUITEM "About &OS...", ID_ABOUT_WINDOWS + END +END + +IDM_WINEFILE MENU +BEGIN + POPUP "&File" + BEGIN MENUITEM "&Open\tEnter", 101 MENUITEM "&Move...\tF7", 106 MENUITEM "&Copy...\tF8", 107 @@ -760,6 +1287,7 @@ MENUITEM "F&ull Screen\tCtrl+Shift+S", ID_VIEW_FULLSCREEN MENUITEM SEPARATOR MENUITEM "&Symbol after Running", 65535 + MENUITEM "&Save Changes on Exit", 511 END POPUP "&Security" @@ -788,79 +1316,18 @@ END END -IDM_DESKTOPBAR MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "&Settings...", ID_DESKTOPBAR_SETTINGS - MENUITEM "&Task Manager...", ID_TASKMGR - MENUITEM SEPARATOR - MENUITEM "&About Explorer...", ID_ABOUT_EXPLORER - END -END -IDM_VOLUME MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "Open Volume Control", ID_TRAY_VOLUME - MENUITEM "Adjust Audio Properties", ID_VOLUME_PROPERTIES - END -END - -IDM_NOTIFYAREA MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "&Show hidden icons", ID_SHOW_HIDDEN_ICONS - MENUITEM "Show Icon &Button", ID_SHOW_ICON_BUTTON - MENUITEM "&Configure Notifications...", ID_CONFIG_NOTIFYAREA - MENUITEM "Adjust Date/&Time...", ID_CONFIG_TIME - MENUITEM SEPARATOR - MENUITEM "&About Explorer...", ID_ABOUT_EXPLORER - END -END - -IDM_SDIFRAME MENU PRELOAD DISCARDABLE -BEGIN - POPUP "&File" - BEGIN - MENUITEM "E&xit", ID_FILE_EXIT - END - POPUP "&View" - BEGIN - MENUITEM "&Toolbar", ID_VIEW_TOOL_BAR - MENUITEM "S&ide Bar", ID_VIEW_SIDE_BAR, GRAYED - MENUITEM "&Status Bar", ID_VIEW_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "&Refresh\tF5", ID_REFRESH - MENUITEM "F&ull Screen\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM "&MDI", ID_VIEW_MDI - END - POPUP "&Tools" - BEGIN - MENUITEM "&Options", ID_TOOLS_OPTIONS - END - POPUP "&Help" - BEGIN - MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ - MENUITEM "&About Explorer...", ID_ABOUT_EXPLORER - MENUITEM "About &OS...", ID_ABOUT_WINDOWS - END -END - - //////////////////////////////////////////////////////////////////////// ///// // // Dialog // -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_EXECUTE DIALOG 15, 13, 210, 63 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Execute" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,162,10 + CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,150,10 CONTROL "&Command:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, 18,60,10 EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL @@ -872,8 +1339,8 @@ END IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 -STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW CAPTION "Search Program in Startmenu" FONT 8, "MS Sans Serif", 0, 0, 0x1 @@ -886,8 +1353,8 @@ PUSHBUTTON "&Check Entries",IDC_CHECK_ENTRIES,143,7,50,14 END -IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 194 -STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +IDD_DESKBAR_DESKTOP DIALOG 0, 0, 212, 194 +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Desktop Properties" FONT 8, "MS Sans Serif" BEGIN @@ -921,8 +1388,8 @@ BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 END -IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 -STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +IDD_DESKBAR_TASKBAR DIALOG 0, 0, 210, 194 +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Taskbar Properties" FONT 8, "MS Sans Serif" BEGIN @@ -934,16 +1401,16 @@ PUSHBUTTON "&Notifications...",ID_CONFIG_NOTIFYAREA,153,173,50,14 END -IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 194 -STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +IDD_DESKBAR_STARTMENU DIALOG 0, 0, 210, 194 +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Startmenu Properties" FONT 8, "MS Sans Serif" BEGIN END IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 -STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU | WS_THICKFRAME [truncated at 1000 lines; 445 more skipped]

1 0

[fireball] 15736: Changed dialog's size, and sizes of its elements, so russian translation looks nice in it.
by fireball＠svn.reactos.com 02 Jun '05

02 Jun '05

Changed dialog's size, and sizes of its elements, so russian translation looks nice in it. By M. Zvyozdochkin. Modified: trunk/reactos/lib/msacm/msacm_Ru.rc _____ Modified: trunk/reactos/lib/msacm/msacm_Ru.rc --- trunk/reactos/lib/msacm/msacm_Ru.rc 2005-06-02 20:47:11 UTC (rev 15735) +++ trunk/reactos/lib/msacm/msacm_Ru.rc 2005-06-02 20:47:15 UTC (rev 15736) @@ -20,7 +20,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 234, 101 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "?¹ß¯ þÔ¾ÛÓ" FONT 8, "MS Shell Dlg" @@ -31,22 +31,22 @@ COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Ð¯§&ÓÝÞ?³ ÛÓÛ...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&ËõÓÙÞ?³", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "Ð¯§&ÓÝÞ?³ ÛÓÛ...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 58, 14 + PUSHBUTTON "&ËõÓÙÞ?³", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 187, 14, 38, 14 LTEXT "&È¯ýÓ?:", -1, 5, 41, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 177, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&ÐÔ¯Ú±?ÔÓ:", -1, 5, 59, 44, 8, NOT WS_GROUP #if 0 - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 177, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS #else - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 177, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP #endif DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14

1 0

[greatlrd] 15735: sorry did foregt ;
by greatlrd＠svn.reactos.com 02 Jun '05

02 Jun '05

sorry did foregt ; Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-02 20:38:18 UTC (rev 15734) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-02 20:47:11 UTC (rev 15735) @@ -331,7 +331,7 @@ SourceX = ((BltInfo->DestRect.bottom - BltInfo->DestRect.top) * BltInfo->DestRect.right) ; - if (SourceX<=0) return TRUE + if (SourceX<=0) return TRUE; memset4( (PDWORD) (BltInfo->DestSurface->pvScan0 + BltInfo->DestRect.top * BltInfo->DestSurface->lDelta), 0x00000000, SourceX); } @@ -348,10 +348,11 @@ case ROP4_WHITENESS: //return(0xFFFFFFFF); SourceX = ((BltInfo->DestRect.bottom - BltInfo->DestRect.top) * BltInfo->DestRect.right) ; - if (SourceX<=0) return TRUE + if (SourceX<=0) return TRUE; + #ifdef _M_IX86 - if (BltInfo->DestRect.left!=0) + if ( BltInfo->DestRect.left!=0) { for (DestY=BltInfo->DestRect.bottom-1;DestY>=BltInfo->DestRect.top;DestY--) {

1 0

[fireball] 15734: Fix grammar typo (notinserted -> not inserted) in russian translation.
by fireball＠svn.reactos.com 02 Jun '05

02 Jun '05

Fix grammar typo (notinserted -> not inserted) in russian translation. By M. Zvyozdochkin. Modified: trunk/reactos/lib/msi/msi_Ru.rc _____ Modified: trunk/reactos/lib/msi/msi_Ru.rc --- trunk/reactos/lib/msi/msi_Ru.rc 2005-06-02 20:14:23 UTC (rev 15733) +++ trunk/reactos/lib/msi/msi_Ru.rc 2005-06-02 20:38:18 UTC (rev 15734) @@ -27,7 +27,7 @@ 9 "Ô±?ÓÔ³?Õ õÞ±Û %s" 10 "ÝÕÔÕÝ¹Õ ´ÓÓýÕ?¹" 11 "ÔÔÕõÞ?Õ, ÛÓÛÓ ´Ó´ÛÓ ±¯õÕµÞ? %s" - 12 "ÝÕõ¯±?¾´ÕÝ Þ±?¯¸ÝÞÛ ¾±?ÓÝ¯ÔÛÞ (±·ÕýÝ¹Ú ÞÙÞ Û¯ý´ÓÛ?-õÞ±Û ÝÕÔ± ?ÓÔÙÕÝ Ô õÞ±Û¯Ô¯õ)" + 12 "ÝÕõ¯±?¾´ÕÝ Þ±?¯¸ÝÞÛ ¾±?ÓÝ¯ÔÛÞ (±·ÕýÝ¹Ú ÞÙÞ Û¯ý´ÓÛ?-õÞ±Û ÝÕ Ô±?ÓÔÙÕÝ Ô õÞ±Û¯Ô¯õ)" 13 "ÝÕõ¯±?¾´ÕÝ ±Õ?ÕÔ¯Ú õÞ±Û, ±¯õÕµÓ¨ÞÚ ÝÕ¯ß§¯õÞý¹Ú ¶ÓÚÙ" 14 "¶¾ÝÛ÷Þ¯ÝÓÙ³Ý¯±?³ Þþ:" 15 "Ô¹ßÕÞ?Õ, ÛÓÛÓ ´Ó´ÛÓ ±¯õÕµÞ? %s"

1 0

[sedwards] 15733: add cabinet.dll to the cd
by sedwards＠svn.reactos.com 02 Jun '05

02 Jun '05

add cabinet.dll to the cd Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-06-02 20:12:58 UTC (rev 15732) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-06-02 20:14:23 UTC (rev 15733) @@ -57,6 +57,7 @@ lib\advapi32\advapi32.dll 1 lib\advpack\advpack.dll 1 lib\aclui\aclui.dll 1 +lib\cabinet\cabinet.dll 1 lib\cards\cards.dll 1 lib\cpl\access\access.cpl 1 lib\cpl\appwiz\appwiz.cpl 1

1 0

[greatlrd] 15732: lite Optimze only for dib32bpp.c
by greatlrd＠svn.reactos.com 02 Jun '05

02 Jun '05

lite Optimze only for dib32bpp.c thanks Blight for the inline asm for hline bitblt have got optimze for fill black and white color only. more will come Modified: trunk/reactos/subsys/win32k/dib/dib.h Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib.h --- trunk/reactos/subsys/win32k/dib/dib.h 2005-06-02 19:56:12 UTC (rev 15731) +++ trunk/reactos/subsys/win32k/dib/dib.h 2005-06-02 20:12:58 UTC (rev 15732) @@ -1,6 +1,27 @@ #ifndef _W32K_DIB_DIB_H #define _W32K_DIB_DIB_H +#ifdef _M_IX86 +#define memset4(dest, value, count) asm volatile("rep stosl" : : "D"(dest), "a"(value), "c"(count) : "memory"); +#endif + +#define ROP4_BLACKNESS ((((0x00000042) >> 8) & 0xff00) | (((0x00000042) >> 16) & 0x00ff)) +#define ROP4_NOTSRCERASE ((((0x001100A6) >> 8) & 0xff00) | (((0x001100A6) >> 16) & 0x00ff)) +#define ROP4_NOTSRCCOPY ((((0x00330008) >> 8) & 0xff00) | (((0x00330008) >> 16) & 0x00ff)) +#define ROP4_SRCERASE ((((0x00440328) >> 8) & 0xff00) | (((0x00440328) >> 16) & 0x00ff)) +#define ROP4_DSTINVERT ((((0x00550009) >> 8) & 0xff00) | (((0x00550009) >> 16) & 0x00ff)) +#define ROP4_PATINVERT ((((0x005A0049) >> 8) & 0xff00) | (((0x005A0049) >> 16) & 0x00ff)) +#define ROP4_SRCINVERT ((((0x00660046) >> 8) & 0xff00) | (((0x00660046) >> 16) & 0x00ff)) +#define ROP4_SRCAND ((((0x008800C6) >> 8) & 0xff00) | (((0x008800C6) >> 16) & 0x00ff)) +#define ROP4_MERGEPAINT ((((0x00BB0226) >> 8) & 0xff00) | (((0x00BB0226) >> 16) & 0x00ff)) +#define ROP4_MERGECOPY ((((0x00C000CA) >> 8) & 0xff00) | (((0x00C000CA) >> 16) & 0x00ff)) +#define ROP4_SRCCOPY ((((0x00CC0020) >> 8) & 0xff00) | (((0x00CC0020) >> 16) & 0x00ff)) +#define ROP4_SRCPAINT ((((0x00EE0086) >> 8) & 0xff00) | (((0x00EE0086) >> 16) & 0x00ff)) +#define ROP4_PATCOPY ((((0x00F00021) >> 8) & 0xff00) | (((0x00F00021) >> 16) & 0x00ff)) +#define ROP4_PATPAINT ((((0x00FB0A09) >> 8) & 0xff00) | (((0x00FB0A09) >> 16) & 0x00ff)) +#define ROP4_WHITENESS ((((0x00FF0062) >> 8) & 0xff00) | (((0x00FF0062) >> 16) & 0x00ff)) + + typedef struct _BLTINFO { SURFOBJ *DestSurface; _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-02 19:56:12 UTC (rev 15731) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-02 20:12:58 UTC (rev 15732) @@ -37,8 +37,19 @@ return (ULONG)(*addr); } + +#ifdef _M_IX86 VOID DIB_32BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c) +{ + PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta; + PDWORD addr = (PDWORD)byteaddr + x1; + LONG cx = x2 - x1; + if (cx>0) memset4(addr, c, cx); +} +#else +VOID +DIB_32BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c) { PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta; PDWORD addr = (PDWORD)byteaddr + x1; @@ -50,6 +61,7 @@ ++cx; } } +#endif VOID DIB_32BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c) @@ -294,6 +306,80 @@ BOOL UsesPattern; PULONG DestBits; + switch (BltInfo->Rop4) + { + case ROP4_BLACKNESS: + //return(0x00000000); + +#ifdef _M_IX86 + if (BltInfo->DestRect.left!=0) + { + SourceX = (BltInfo->DestRect.right - BltInfo->DestRect.left) ; + if (SourceX<=0) return TRUE; + + for (DestY=BltInfo->DestRect.bottom-1;DestY>=BltInfo->DestRect.top;DestY--) + { + memset4( (PDWORD) (BltInfo->DestSurface->pvScan0 + DestY * + BltInfo->DestSurface->lDelta + + BltInfo->DestRect.left), 0x00000000, SourceX); + } + + } + else + { + + SourceX = ((BltInfo->DestRect.bottom - BltInfo->DestRect.top) * + BltInfo->DestRect.right) ; + + if (SourceX<=0) return TRUE + memset4( (PDWORD) (BltInfo->DestSurface->pvScan0 + BltInfo->DestRect.top * + BltInfo->DestSurface->lDelta), 0x00000000, SourceX); + } +#else + for (DestY=BltInfo->DestRect.bottom-1;DestY>=BltInfo->DestRect.top;DestY--) + { + DIB_32BPP_HLine(BltInfo->DestSurface, BltInfo->DestRect.bottom, SourceX, DestY, 0x00000000); + } +#endif + + return TRUE; + break; + + case ROP4_WHITENESS: + //return(0xFFFFFFFF); + SourceX = ((BltInfo->DestRect.bottom - BltInfo->DestRect.top) * BltInfo->DestRect.right) ; + if (SourceX<=0) return TRUE +#ifdef _M_IX86 + + if (BltInfo->DestRect.left!=0) + { + for (DestY=BltInfo->DestRect.bottom-1;DestY>=BltInfo->DestRect.top;DestY--) + { + memset4( (PDWORD) (BltInfo->DestSurface->pvScan0 + DestY * + BltInfo->DestSurface->lDelta + + BltInfo->DestRect.left), 0xFFFFFFFF, SourceX); + } + + } + else + { + memset4( (PDWORD) (BltInfo->DestSurface->pvScan0 + BltInfo->DestRect.top * + BltInfo->DestSurface->lDelta), 0xFFFFFFFF, SourceX); + } +#else + for (DestY=BltInfo->DestRect.bottom-1;DestY>=BltInfo->DestRect.top;DestY--) + { + DIB_32BPP_HLine(BltInfo->DestSurface, BltInfo->DestRect.bottom, SourceX, DestY, 0xFFFFFFFF); + } +#endif + + return TRUE; + break; + + default: + break; + } + UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4); UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4);

1 0

[blight] 15731: Make formatting of half-verbose output the same for linux as for windows (add quotes to the echos)
by blight＠svn.reactos.com 02 Jun '05

02 Jun '05

Make formatting of half-verbose output the same for linux as for windows (add quotes to the echos) Modified: trunk/reactos/Makefile _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-06-02 13:20:04 UTC (rev 15730) +++ trunk/reactos/Makefile 2005-06-02 19:56:12 UTC (rev 15731) @@ -55,6 +55,7 @@ .PHONY: clean all: makefile.auto + .SUFFIXES: ifeq ($(HOST),) @@ -81,33 +82,38 @@ BUILDNO_QUIET = -q endif endif +ifeq ($(HOST),mingw32-linux) + QUOTE = " +else + QUOTE = +endif ifeq ($(HALFVERBOSEECHO),yes) - ECHO_CP =@echo [COPY] $@ - ECHO_MKDIR =@echo [MKDIR] $@ - ECHO_BUILDNO =@echo [BUILDNO] $@ - ECHO_INVOKE =@echo [INVOKE] $< - ECHO_PCH =@echo [PCH] $@ - ECHO_CC =@echo [CC] $< - ECHO_GAS =@echo [GAS] $< - ECHO_NASM =@echo [NASM] $< - ECHO_AR =@echo [AR] $@ - ECHO_WINEBLD =@echo [WINEBLD] $@ - ECHO_WRC =@echo [WRC] $@ - ECHO_WIDL =@echo [WIDL] $@ - ECHO_BIN2RES =@echo [BIN2RES] $< - ECHO_DLLTOOL =@echo [DLLTOOL] $@ - ECHO_LD =@echo [LD] $@ - ECHO_NM =@echo [NM] $@ - ECHO_OBJDUMP =@echo [OBJDUMP] $@ - ECHO_RBUILD =@echo [RBUILD] $@ - ECHO_RSYM =@echo [RSYM] $@ - ECHO_WMC =@echo [WMC] $@ - ECHO_NCI =@echo [NCI] $@ - ECHO_CABMAN =@echo [CABMAN] $< - ECHO_CDMAKE =@echo [CDMAKE] $@ - ECHO_MKHIVE =@echo [MKHIVE] $@ - ECHO_REGTESTS=@echo [REGTESTS] $@ - ECHO_TEST =@echo [TEST] $@ + ECHO_CP =@echo $(QUOTE)[COPY] $@$(QUOTE) + ECHO_MKDIR =@echo $(QUOTE)[MKDIR] $@$(QUOTE) + ECHO_BUILDNO =@echo $(QUOTE)[BUILDNO] $@$(QUOTE) + ECHO_INVOKE =@echo $(QUOTE)[INVOKE] $<$(QUOTE) + ECHO_PCH =@echo $(QUOTE)[PCH] $@$(QUOTE) + ECHO_CC =@echo $(QUOTE)[CC] $<$(QUOTE) + ECHO_GAS =@echo $(QUOTE)[GAS] $<$(QUOTE) + ECHO_NASM =@echo $(QUOTE)[NASM] $<$(QUOTE) + ECHO_AR =@echo $(QUOTE)[AR] $@$(QUOTE) + ECHO_WINEBLD =@echo $(QUOTE)[WINEBLD] $@$(QUOTE) + ECHO_WRC =@echo $(QUOTE)[WRC] $@$(QUOTE) + ECHO_WIDL =@echo $(QUOTE)[WIDL] $@$(QUOTE) + ECHO_BIN2RES =@echo $(QUOTE)[BIN2RES] $<$(QUOTE) + ECHO_DLLTOOL =@echo $(QUOTE)[DLLTOOL] $@$(QUOTE) + ECHO_LD =@echo $(QUOTE)[LD] $@$(QUOTE) + ECHO_NM =@echo $(QUOTE)[NM] $@$(QUOTE) + ECHO_OBJDUMP =@echo $(QUOTE)[OBJDUMP] $@$(QUOTE) + ECHO_RBUILD =@echo $(QUOTE)[RBUILD] $@$(QUOTE) + ECHO_RSYM =@echo $(QUOTE)[RSYM] $@$(QUOTE) + ECHO_WMC =@echo $(QUOTE)[WMC] $@$(QUOTE) + ECHO_NCI =@echo $(QUOTE)[NCI] $@$(QUOTE) + ECHO_CABMAN =@echo $(QUOTE)[CABMAN] $<$(QUOTE) + ECHO_CDMAKE =@echo $(QUOTE)[CDMAKE] $@$(QUOTE) + ECHO_MKHIVE =@echo $(QUOTE)[MKHIVE] $@$(QUOTE) + ECHO_REGTESTS=@echo $(QUOTE)[REGTESTS] $@$(QUOTE) + ECHO_TEST =@echo $(QUOTE)[TEST] $@$(QUOTE) else ECHO_CP = ECHO_MKDIR =

1 0

[ea] 15730: svn propset
by ea＠svn.reactos.com 02 Jun '05

02 Jun '05

svn propset Property changes on: trunk/reactos/subsys/smss/smss.h ___________________________________________________________________ Name: author - client.c Name: id - client.c Name: date - client.c Name: eol-style - native Name: revision - client.c

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2005