From a4aafe9309e5276f838761c19cd899c781a468d5 Mon Sep 17 00:00:00 2001 From: Giannis Adamopoulos Date: Mon, 26 Sep 2016 00:43:21 +0000 Subject: [PATCH] [SHELL32] - CDefView: Overhaul the code that filled the menu bar of explorer. Fill the arrange as menu with the column names from the shell folders instead of hardcoding them. Check the selected arrange mode and view mode in the menu bar and in the context menu. Make the items in the file menu to actually work. It is possible to arrange the icons from the context menu now. - Note to translators: Please check that the changes that I did in the 31 resource files make sense. Also note that the "Arrange Icons" menu now is called "Arrange Icons As". svn path=/trunk/; revision=72808 --- reactos/dll/win32/shell32/CDefView.cpp | 385 ++++++++---------- .../dll/win32/shell32/CDefaultContextMenu.cpp | 29 +- reactos/dll/win32/shell32/lang/bg-BG.rc | 28 +- reactos/dll/win32/shell32/lang/ca-ES.rc | 28 +- reactos/dll/win32/shell32/lang/cs-CZ.rc | 28 +- reactos/dll/win32/shell32/lang/da-DK.rc | 28 +- reactos/dll/win32/shell32/lang/de-DE.rc | 28 +- reactos/dll/win32/shell32/lang/el-GR.rc | 28 +- reactos/dll/win32/shell32/lang/en-GB.rc | 28 +- reactos/dll/win32/shell32/lang/en-US.rc | 28 +- reactos/dll/win32/shell32/lang/es-ES.rc | 28 +- reactos/dll/win32/shell32/lang/fi-FI.rc | 28 +- reactos/dll/win32/shell32/lang/fr-FR.rc | 28 +- reactos/dll/win32/shell32/lang/he-IL.rc | 28 +- reactos/dll/win32/shell32/lang/hu-HU.rc | 28 +- reactos/dll/win32/shell32/lang/it-IT.rc | 28 +- reactos/dll/win32/shell32/lang/ja-JP.rc | 28 +- reactos/dll/win32/shell32/lang/ko-KR.rc | 28 +- reactos/dll/win32/shell32/lang/nl-NL.rc | 28 +- reactos/dll/win32/shell32/lang/no-NO.rc | 28 +- reactos/dll/win32/shell32/lang/pl-PL.rc | 28 +- reactos/dll/win32/shell32/lang/pt-BR.rc | 28 +- reactos/dll/win32/shell32/lang/pt-PT.rc | 28 +- reactos/dll/win32/shell32/lang/ro-RO.rc | 28 +- reactos/dll/win32/shell32/lang/ru-RU.rc | 28 +- reactos/dll/win32/shell32/lang/sk-SK.rc | 28 +- reactos/dll/win32/shell32/lang/sl-SI.rc | 28 +- reactos/dll/win32/shell32/lang/sq-AL.rc | 28 +- reactos/dll/win32/shell32/lang/sv-SE.rc | 26 +- reactos/dll/win32/shell32/lang/tr-TR.rc | 28 +- reactos/dll/win32/shell32/lang/uk-UA.rc | 28 +- reactos/dll/win32/shell32/lang/zh-CN.rc | 28 +- reactos/dll/win32/shell32/lang/zh-TW.rc | 28 +- reactos/dll/win32/shell32/shresdef.h | 2 +- 34 files changed, 632 insertions(+), 650 deletions(-) diff --git a/reactos/dll/win32/shell32/CDefView.cpp b/reactos/dll/win32/shell32/CDefView.cpp index 580ce5b9343..d28068b36ad 100644 --- a/reactos/dll/win32/shell32/CDefView.cpp +++ b/reactos/dll/win32/shell32/CDefView.cpp @@ -84,8 +84,11 @@ class CDefView : CListView m_ListView; HWND m_hWndParent; FOLDERSETTINGS m_FolderSettings; - HMENU m_hMenu; - BOOL m_menusLoaded; + HMENU m_hMenu; /* Handle to the menu bar of the browser */ + HMENU m_hMenuArrangeModes; /* Handle to the popup menu with the arrange modes */ + HMENU m_hMenuViewModes; /* Handle to the popup menu with the view modes */ + HMENU m_hContextMenu; /* Handle to the open context menu */ + BOOL m_bmenuBarInitialized; UINT m_uState; UINT m_cidl; PCUITEMID_CHILD *m_apidl; @@ -109,7 +112,6 @@ class CDefView : BOOL m_isEditing; CLSID m_Category; - HMENU m_hView; BOOL m_Destroyed; private: @@ -139,9 +141,11 @@ class CDefView : BOOLEAN LV_ProdItem(PCUITEMID_CHILD pidl); static INT CALLBACK fill_list(LPVOID ptr, LPVOID arg); HRESULT FillList(); - HMENU BuildFileMenu(); - void PrepareShowFileMenu(HMENU hSubMenu); - void PrepareShowViewMenu(HMENU hSubMenu); + HRESULT FillFileMenu(); + HRESULT FillEditMenu(); + HRESULT FillViewMenu(); + HRESULT FillArrangeAsMenu(HMENU hmenuArrange); + HRESULT CheckViewMode(HMENU hmenuView); UINT GetSelections(); HRESULT OpenSelectedItems(); void OnDeactivate(); @@ -359,7 +363,10 @@ CDefView::CDefView() : m_ListView(), m_hWndParent(NULL), m_hMenu(NULL), - m_menusLoaded(FALSE), + m_hMenuArrangeModes(NULL), + m_hMenuViewModes(NULL), + m_hContextMenu(NULL), + m_bmenuBarInitialized(FALSE), m_uState(0), m_cidl(0), m_apidl(NULL), @@ -371,7 +378,6 @@ CDefView::CDefView() : m_iDragOverItem(0), m_cScrollDelay(0), m_isEditing(FALSE), - m_hView(NULL), m_Destroyed(FALSE) { ZeroMemory(&m_FolderSettings, sizeof(m_FolderSettings)); @@ -593,8 +599,8 @@ void CDefView::UpdateListColors() */ m_ListView.SetBkColor(CLR_NONE); - RegGetValueW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", - L"ListviewShadow", RRF_RT_DWORD, NULL, &bDropShadow, &cbDropShadow); + SHGetValueW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", + L"ListviewShadow", NULL, &bDropShadow, &cbDropShadow); if (bDropShadow) { /* Set the icon background transparent */ @@ -631,6 +637,8 @@ BOOL CDefView::InitList() m_ListView.DeleteAllItems(); + m_hMenuArrangeModes = CreateMenu(); + if (m_pSF2Parent) { for (int i = 0; 1; i++) @@ -640,7 +648,10 @@ BOOL CDefView::InitList() StrRetToStrNW( szTemp, 50, &sd.str, NULL); m_ListView.InsertColumn(i, szTemp, sd.fmt, sd.cxChar * 8); + InsertMenuW(m_hMenuArrangeModes, -1, MF_STRING, 0x30 + i, szTemp); } + + InsertMenuW(m_hMenuArrangeModes, -1, MF_BYPOSITION | MF_SEPARATOR, 0, 0); } else { @@ -1028,117 +1039,126 @@ LRESULT CDefView::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl * #### Handling of the menus #### */ -HMENU CDefView::BuildFileMenu() -{ - HRESULT hr; - CComPtr cm; - - GetSelections(); - - hr = m_pSFParent->GetUIObjectOf(m_hWnd, m_cidl, m_apidl, IID_NULL_PPV_ARG(IContextMenu, &cm)); - if (FAILED(hr)) - return NULL; +extern "C" DWORD WINAPI SHMenuIndexFromID(HMENU hMenu, UINT uID); - HMENU hmenu = CreatePopupMenu(); +HMENU GetSubmenuByID(HMENU hmenu, UINT id) +{ + MENUITEMINFOW mii = {sizeof(mii), MIIM_SUBMENU}; + if (::GetMenuItemInfoW(hmenu, id, FALSE, &mii)) + return mii.hSubMenu; - // FIXME: get proper numbers ? - const UINT first = 0x7800; - const UINT last = 0x7A00; - hr = cm->QueryContextMenu(hmenu, 0, first, last, 0); - if (FAILED(hr)) - return NULL; + return NULL; +} - // TODO: filter or something +/* ReallyGetMenuItemID returns the id of an item even if it opens a submenu, + GetMenuItemID returns -1 if the specified item opens a submenu */ +UINT ReallyGetMenuItemID(HMENU hmenu, int i) +{ + MENUITEMINFOW mii = {sizeof(mii), MIIM_ID}; + if (::GetMenuItemInfoW(hmenu, i, TRUE, &mii)) + return mii.wID; - return hmenu; + return UINT_MAX; } -void CDefView::PrepareShowFileMenu(HMENU hSubMenu) +HRESULT CDefView::FillFileMenu() { - TRACE("(%p)->(submenu=%p) stub\n", this, hSubMenu); - - if (!hSubMenu) - return; + HMENU hFileMenu = GetSubmenuByID(m_hMenu, FCIDM_MENU_FILE); + if (!hFileMenu) + return E_FAIL; /* Cleanup the items added previously */ - for (int i = 0; i < GetMenuItemCount(hSubMenu); ) + for (int i = GetMenuItemCount(hFileMenu) - 1; i >= 0; i--) { - MENUITEMINFOW mii; - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_ID; - GetMenuItemInfoW(hSubMenu, i, TRUE, &mii); - - if (mii.wID < 0x8000) - { - DeleteMenu(hSubMenu, i, MF_BYPOSITION); - } - else - { - i++; - } + UINT id = GetMenuItemID(hFileMenu, i); + if (id < FCIDM_BROWSERFIRST || id > FCIDM_BROWSERLAST) + DeleteMenu(hFileMenu, i, MF_BYPOSITION); } -#if 0 - /* FIXME/TODO: Reenable when they implemented AND localizable (not hardcoded). */ - /* Insert This item at the beginning of the menu. */ - _InsertMenuItemW(hSubMenu, 0, TRUE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED); - _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM + 4, MFT_STRING, L"Properties", MFS_DISABLED); - _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM + 3, MFT_STRING, L"Rename", MFS_DISABLED); - _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM + 2, MFT_STRING, L"Delete", MFS_DISABLED); - _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM + 1, MFT_STRING, L"Create Shortcut", MFS_DISABLED); - _InsertMenuItemW(hSubMenu, 0, TRUE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED); - _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM, MFT_STRING, L"New", MFS_ENABLED); -#endif + /* Store the context menu in m_pCM and keep it in order to invoke the selected command later on */ + HRESULT hr = GetItemObject(SVGIO_SELECTION, IID_PPV_ARG(IContextMenu, &m_pCM)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; - HMENU menubase = BuildFileMenu(); - if (menubase) - { - int count = ::GetMenuItemCount(menubase); - int count2 = ::GetMenuItemCount(hSubMenu); + IUnknown_SetSite(m_pCM, (IShellView *)this); - if (count2 > 0 && count > 0) - { - _InsertMenuItemW(hSubMenu, 0, TRUE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED); - } + HMENU hmenu = CreatePopupMenu(); - for (int i = count-1; i >= 0; i--) - { - WCHAR label[128]; + hr = m_pCM->QueryContextMenu(hmenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, 0); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; - MENUITEMINFOW mii = { 0 }; - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_STATE | MIIM_ID | MIIM_SUBMENU | MIIM_CHECKMARKS | MIIM_DATA | MIIM_STRING | MIIM_BITMAP | MIIM_FTYPE; - mii.dwTypeData = label; - mii.cch = _countof(label); - ::GetMenuItemInfoW(menubase, i, TRUE, &mii); + // TODO: filter or something - TRACE("Adding item %d label %S type %d\n", mii.wID, mii.dwTypeData, mii.fType); + Shell_MergeMenus(hFileMenu, hmenu, 0, 0, 0xFFFF, MM_ADDSEPARATOR | MM_SUBMENUSHAVEIDS); - mii.fType |= MFT_RADIOCHECK; + ::DestroyMenu(hmenu); - ::InsertMenuItemW(hSubMenu, 0, TRUE, &mii); - } + return S_OK; +} +HRESULT CDefView::FillEditMenu() +{ + HMENU hEditMenu = GetSubmenuByID(m_hMenu, FCIDM_MENU_EDIT); + if (!hEditMenu) + return E_FAIL; - ::DestroyMenu(menubase); - } - TRACE("--\n"); + HMENU hmenuContents = ::LoadMenuW(shell32_hInstance, L"MENU_003"); + if (!hmenuContents) + return E_FAIL; + + Shell_MergeMenus(hEditMenu, hmenuContents, 0, 0, 0xFFFF, 0); + + ::DestroyMenu(hmenuContents); + + return S_OK; } -void CDefView::PrepareShowViewMenu(HMENU hSubMenu) +HRESULT CDefView::FillViewMenu() { - TRACE("(%p)->(submenu=%p)\n", this, hSubMenu); + HMENU hViewMenu = GetSubmenuByID(m_hMenu, FCIDM_MENU_VIEW); + if (!hViewMenu) + return E_FAIL; - if (!hSubMenu) - return; + m_hMenuViewModes = ::LoadMenuW(shell32_hInstance, L"MENU_001"); + if (!m_hMenuViewModes) + return E_FAIL; + UINT i = SHMenuIndexFromID(hViewMenu, FCIDM_MENU_VIEW_SEP_OPTIONS); + Shell_MergeMenus(hViewMenu, m_hMenuViewModes, i, 0, 0xFFFF, MM_ADDSEPARATOR | MM_DONTREMOVESEPS | MM_SUBMENUSHAVEIDS); + + return S_OK; +} + +HRESULT CDefView::FillArrangeAsMenu(HMENU hmenuArrange) +{ + /* We only need to fill this once */ + if (GetMenuItemID(hmenuArrange, 0) == FCIDM_SHVIEW_AUTOARRANGE) + { + Shell_MergeMenus(hmenuArrange, m_hMenuArrangeModes, 0, 0, 0xFFFF,0); + } + + /* Also check the menu item according to which we sort */ + CheckMenuRadioItem(hmenuArrange, + 0x30, + 0x100, + m_sortInfo.nHeaderID + 0x30, + MF_BYCOMMAND); + + return S_OK; +} + +HRESULT CDefView::CheckViewMode(HMENU hmenuView) +{ if (m_FolderSettings.ViewMode >= FVM_FIRST && m_FolderSettings.ViewMode <= FVM_LAST) { UINT iItemFirst = FCIDM_SHVIEW_BIGICON; UINT iItemLast = iItemFirst + FVM_LAST - FVM_FIRST; UINT iItem = iItemFirst + m_FolderSettings.ViewMode - FVM_FIRST; - CheckMenuRadioItem(hSubMenu, iItemFirst, iItemLast, iItem, MF_BYCOMMAND); + CheckMenuRadioItem(hmenuView, iItemFirst, iItemLast, iItem, MF_BYCOMMAND); } + + return S_OK; } /********************************************************** @@ -1256,20 +1276,15 @@ LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &b { WORD x, y; UINT uCommand; - HMENU hMenu; HRESULT hResult; - // for some reason I haven't figured out, we sometimes recurse into this method - if (m_pCM != NULL) - return 0; - x = LOWORD(lParam); y = HIWORD(lParam); TRACE("(%p)->(0x%08x 0x%08x) stub\n", this, x, y); - hMenu = CreatePopupMenu(); - if (!hMenu) + m_hContextMenu = CreatePopupMenu(); + if (!m_hContextMenu) return E_FAIL; m_cidl = m_ListView.GetSelectedCount(); @@ -1280,11 +1295,11 @@ LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &b IUnknown_SetSite(m_pCM, (IShellView *)this); - hResult = m_pCM->QueryContextMenu(hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_NORMAL); + hResult = m_pCM->QueryContextMenu(m_hContextMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_NORMAL); if (FAILED( hResult)) goto cleanup; - uCommand = TrackPopupMenu(hMenu, + uCommand = TrackPopupMenu(m_hContextMenu, TPM_LEFTALIGN | TPM_RETURNCMD | TPM_LEFTBUTTON | TPM_RIGHTBUTTON, x, y, 0, m_hWnd, NULL); if (uCommand == 0) @@ -1302,8 +1317,11 @@ cleanup: m_pCM.Release(); } - if (hMenu) - DestroyMenu(hMenu); + if (m_hContextMenu) + { + DestroyMenu(m_hContextMenu); + m_hContextMenu = NULL; + } return 0; } @@ -1401,87 +1419,12 @@ void CDefView::DoActivate(UINT uState) } else { - if (m_hMenu) + if(m_hMenu && !m_bmenuBarInitialized) { - if (!m_menusLoaded) - { - MENUITEMINFOW mii = { 0 }; - - /* initialize EDIT menu */ - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_SUBMENU; - if (::GetMenuItemInfoW(m_hMenu, FCIDM_MENU_EDIT, FALSE, &mii)) - { - HMENU hSubMenu = mii.hSubMenu; - - HMENU menubase = ::LoadMenuW(shell32_hInstance, L"MENU_003"); - - int count = ::GetMenuItemCount(menubase); - for (int i = 0; i < count; i++) - { - WCHAR label[128]; - - ZeroMemory(&mii, sizeof(mii)); - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_STATE | MIIM_ID | MIIM_SUBMENU | MIIM_CHECKMARKS | MIIM_DATA | MIIM_STRING | MIIM_BITMAP | MIIM_FTYPE; - mii.dwTypeData = label; - mii.cch = _countof(label); - ::GetMenuItemInfoW(menubase, i, TRUE, &mii); - - TRACE("Adding item %d label %S type %d\n", mii.wID, mii.dwTypeData, mii.fType); - - mii.fType |= MFT_RADIOCHECK; - - ::InsertMenuItemW(hSubMenu, FCIDM_MENU_VIEW_SEP_OPTIONS, FALSE, &mii); - } - - ::DestroyMenu(menubase); - } - - /* initialize VIEW menu */ - - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_SUBMENU; - if (::GetMenuItemInfoW(m_hMenu, FCIDM_MENU_VIEW, FALSE, &mii)) - { - HMENU menubase = ::LoadMenuW(shell32_hInstance, L"MENU_001"); - - HMENU hSubMenu = mii.hSubMenu; - - m_hView = CreatePopupMenu(); - - _InsertMenuItemW(hSubMenu, FCIDM_MENU_VIEW_SEP_OPTIONS, FALSE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED); - - int count = ::GetMenuItemCount(menubase); - for (int i = 0; i < count; i++) - { - WCHAR label[128]; - - ZeroMemory(&mii, sizeof(mii)); - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_STATE | MIIM_ID | MIIM_SUBMENU | MIIM_CHECKMARKS | MIIM_DATA | MIIM_STRING | MIIM_BITMAP | MIIM_FTYPE; - mii.dwTypeData = label; - mii.cch = _countof(label); - ::GetMenuItemInfoW(menubase, i, TRUE, &mii); - - ::AppendMenuW(m_hView, mii.fType, mii.wID, mii.dwTypeData); - - TRACE("Adding item %d label %S type %d\n", mii.wID, mii.dwTypeData, mii.fType); - - mii.fType |= MFT_RADIOCHECK; - - ::InsertMenuItemW(hSubMenu, FCIDM_MENU_VIEW_SEP_OPTIONS, FALSE, &mii); - } - - ::DestroyMenu(menubase); - } - - - TRACE("-- before fnSetMenuSB\n"); - m_pShellBrowser->SetMenuSB(m_hMenu, 0, m_hWnd); - - m_menusLoaded = TRUE; - } + FillEditMenu(); + FillViewMenu(); + m_pShellBrowser->SetMenuSB(m_hMenu, 0, m_hWnd); + m_bmenuBarInitialized = TRUE; } if (SVUIA_ACTIVATE_FOCUS == uState) @@ -1597,6 +1540,10 @@ LRESULT CDefView::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHand m_ListView.SortItems(ListViewCompareItems, this); break; + case FCIDM_SHVIEW_SNAPTOGRID: + case FCIDM_SHVIEW_AUTOARRANGE: + //FIXME + break; case FCIDM_SHVIEW_SELECTALL: m_ListView.SetItemState(-1, LVIS_SELECTED, LVIS_SELECTED); break; @@ -1623,7 +1570,11 @@ LRESULT CDefView::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHand case FCIDM_SHVIEW_NEWFOLDER: return OnExplorerCommand(dwCmdID, FALSE); default: - TRACE("-- COMMAND 0x%04x unhandled\n", dwCmdID); + /* WM_COMMAND messages from the file menu are routed to the CDefView so as to let m_pCM handle the command */ + if (m_pCM) + { + InvokeContextMenuCommand(dwCmdID); + } } return 0; @@ -2001,40 +1952,35 @@ LRESULT CDefView::OnSettingChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL */ LRESULT CDefView::OnInitMenuPopup(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { - MENUITEMINFOW mii = { 0 }; - HMENU hSubmenu = (HMENU) wParam; + HMENU hmenu = (HMENU) wParam; + int nPos = LOWORD(lParam); + UINT menuItemId; - TRACE("OnInitMenuPopup lParam=%d\n", lParam); - - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_ID | MIIM_SUBMENU; + OnCustomItem(uMsg, wParam, lParam, bHandled); - if (!GetMenuItemInfoW(this->m_hMenu, lParam, TRUE, &mii)) - { - TRACE("OnInitMenuPopup GetMenuItemInfoW failed!\n"); - return FALSE; - } - - UINT menuItemId = mii.wID; + HMENU hViewMenu = GetSubmenuByID(m_hMenu, FCIDM_MENU_VIEW); - if (mii.hSubMenu != hSubmenu) - { - TRACE("OnInitMenuPopup submenu does not match!!!!\n"); + /* Lets try to find out what the hell wParam is */ + if (hmenu == GetSubMenu(m_hMenu, nPos)) + menuItemId = ReallyGetMenuItemID(m_hMenu, nPos); + else if (hViewMenu && hmenu == GetSubMenu(hViewMenu, nPos)) + menuItemId = ReallyGetMenuItemID(hViewMenu, nPos); + else if (m_hContextMenu && hmenu == GetSubMenu(m_hContextMenu, nPos)) + menuItemId = ReallyGetMenuItemID(m_hContextMenu, nPos); + else return FALSE; - } - - TRACE("OnInitMenuPopup id=%d\n", menuItemId); switch (menuItemId) { case FCIDM_MENU_FILE: - PrepareShowFileMenu(hSubmenu); - break; - case FCIDM_MENU_EDIT: - //PrepareShowEditMenu(hSubmenu); + FillFileMenu(); break; case FCIDM_MENU_VIEW: - PrepareShowViewMenu(hSubmenu); + case FCIDM_SHVIEW_VIEW: + CheckViewMode(hmenu); + break; + case FCIDM_SHVIEW_ARRANGE: + FillArrangeAsMenu(hmenu); break; } @@ -2164,10 +2110,10 @@ HRESULT WINAPI CDefView::DestroyViewWindow() m_hAccel = NULL; } - if (m_hView) + if (m_hMenuViewModes) { - DestroyMenu(m_hView); - m_hView = NULL; + DestroyMenu(m_hMenuViewModes); + m_hMenuViewModes = NULL; } if (m_hMenu) @@ -2834,25 +2780,20 @@ HRESULT WINAPI CDefView::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCm if (V_VT(pvaIn) != VT_INT_PTR) return OLECMDERR_E_NOTSUPPORTED; - TPMPARAMS params; params.cbSize = sizeof(params); params.rcExclude = *(RECT*) V_INTREF(pvaIn); - HMENU hView = m_hView; -#if 0 - hView = CreatePopupMenu(); - AppendMenuW(hView, MF_STRING, FCIDM_SHVIEW_BIGICON, L"Big!"); - AppendMenuW(hView, MF_STRING, FCIDM_SHVIEW_SMALLICON, L"Small!"); - AppendMenuW(hView, MF_STRING, FCIDM_SHVIEW_LISTVIEW, L"List!"); - AppendMenuW(hView, MF_STRING, FCIDM_SHVIEW_REPORTVIEW, L"Report!"); -#endif - - if (hView) + if (m_hMenuViewModes) { - PrepareShowViewMenu(hView); - - TrackPopupMenuEx(hView, TPM_LEFTALIGN | TPM_TOPALIGN, params.rcExclude.left, params.rcExclude.bottom, m_hWndParent, ¶ms); + /* Duplicate all but the last two items of the view modes menu */ + HMENU hmenuViewPopup = CreatePopupMenu(); + Shell_MergeMenus(hmenuViewPopup, m_hMenuViewModes, 0, 0, 0xFFFF, 0); + DeleteMenu(hmenuViewPopup, GetMenuItemCount(hmenuViewPopup) - 1, MF_BYPOSITION); + DeleteMenu(hmenuViewPopup, GetMenuItemCount(hmenuViewPopup) - 1, MF_BYPOSITION); + CheckViewMode(hmenuViewPopup); + TrackPopupMenuEx(hmenuViewPopup, TPM_LEFTALIGN | TPM_TOPALIGN, params.rcExclude.left, params.rcExclude.bottom, m_hWndParent, ¶ms); + ::DestroyMenu(hmenuViewPopup); } // pvaOut is VT_I4 with value 0x403 (cmd id of the new mode maybe?) diff --git a/reactos/dll/win32/shell32/CDefaultContextMenu.cpp b/reactos/dll/win32/shell32/CDefaultContextMenu.cpp index 492515d2089..7e58744d4d2 100644 --- a/reactos/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/reactos/dll/win32/shell32/CDefaultContextMenu.cpp @@ -496,34 +496,13 @@ CDefaultContextMenu::BuildBackgroundContextMenu( rfg = 0; } - if (!_ILIsDesktop(m_pidlFolder)) - { - WCHAR wszBuf[MAX_PATH]; - - /* view option is only available in browsing mode */ - hSubMenu = LoadMenuW(shell32_hInstance, L"MENU_001"); - if (hSubMenu && LoadStringW(shell32_hInstance, FCIDM_SHVIEW_VIEW, wszBuf, _countof(wszBuf))) - { - TRACE("wszBuf %s\n", debugstr_w(wszBuf)); - - MENUITEMINFOW mii; - ZeroMemory(&mii, sizeof(mii)); - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_TYPE | MIIM_STATE | MIIM_SUBMENU | MIIM_ID; - mii.fType = MFT_STRING; - mii.wID = iIdCmdFirst++; - mii.dwTypeData = wszBuf; - mii.cch = wcslen(mii.dwTypeData); - mii.fState = MFS_ENABLED; - mii.hSubMenu = hSubMenu; - InsertMenuItemW(hMenu, IndexMenu++, TRUE, &mii); - DestroyMenu(hSubMenu); - } - } - hSubMenu = LoadMenuW(shell32_hInstance, L"MENU_002"); if (hSubMenu) { + /* view option is only available in browsing mode */ + if (_ILIsDesktop(m_pidlFolder)) + DeleteMenu(hSubMenu, FCIDM_SHVIEW_VIEW, MF_BYCOMMAND); + /* merge general background context menu in */ iIdCmdFirst = Shell_MergeMenus(hMenu, GetSubMenu(hSubMenu, 0), IndexMenu, 0, 0xFFFF, MM_DONTREMOVESEPS | MM_SUBMENUSHAVEIDS) + 1; DestroyMenu(hSubMenu); diff --git a/reactos/dll/win32/shell32/lang/bg-BG.rc b/reactos/dll/win32/shell32/lang/bg-BG.rc index 57546ce8f2d..1b72bb4a38d 100644 --- a/reactos/dll/win32/shell32/lang/bg-BG.rc +++ b/reactos/dll/win32/shell32/lang/bg-BG.rc @@ -1,42 +1,44 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "&Големи значета", FCIDM_SHVIEW_BIGICON MENUITEM "&Малки значета", FCIDM_SHVIEW_SMALLICON MENUITEM "&Списък", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Подробен", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Подреждане на &значетата", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "&Самоподреждане", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "Из&глед" + POPUP "Из&глед", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "&Големи значета", FCIDM_SHVIEW_BIGICON MENUITEM "&Малки значета", FCIDM_SHVIEW_SMALLICON MENUITEM "&Списък", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Подробен", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "Подреждане на &значетата" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Подреждане на &значетата", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "По &име", 0x30 /* column 0 */ - MENUITEM "По &вид", 0x32 /* column 2 */ - MENUITEM "По &размер", 0x31 /* ... */ - MENUITEM "По &дата", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Самоподреждане", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "Подравнени значета", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Опресняване", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Поставяне", FCIDM_SHVIEW_INSERT MENUITEM "Поставяне като връзка", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Свойства", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/ca-ES.rc b/reactos/dll/win32/shell32/lang/ca-ES.rc index fc5239da0ba..ca35265f289 100644 --- a/reactos/dll/win32/shell32/lang/ca-ES.rc +++ b/reactos/dll/win32/shell32/lang/ca-ES.rc @@ -1,42 +1,44 @@ LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Arrange &Icons By", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "&View" + POPUP "&View", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "Arrange &Icons" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Arrange &Icons By", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "By &Name", 0x30 /* column 0 */ - MENUITEM "By &Type", 0x32 /* column 2 */ - MENUITEM "By &Size", 0x31 /* ... */ - MENUITEM "By &Date", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "Line up Icons", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Refresh", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/cs-CZ.rc b/reactos/dll/win32/shell32/lang/cs-CZ.rc index dd43298628c..7cd2952686e 100644 --- a/reactos/dll/win32/shell32/lang/cs-CZ.rc +++ b/reactos/dll/win32/shell32/lang/cs-CZ.rc @@ -6,43 +6,45 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "&Vedle sebe", FCIDM_SHVIEW_BIGICON MENUITEM "&Ikony", FCIDM_SHVIEW_SMALLICON MENUITEM "&Seznam", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Podrobnosti", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Seřadit &ikony", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "&Rovnat automaticky", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "Z&obrazit" + POPUP "Z&obrazit", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "&Vedle sebe", FCIDM_SHVIEW_BIGICON MENUITEM "&Ikony", FCIDM_SHVIEW_SMALLICON MENUITEM "&Seznam", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Podrobnosti", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "Seřadit &ikony" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Seřadit &ikony", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "Podle &Názvu", 0x30 /* column 0 */ - MENUITEM "Podle &Typu", 0x32 /* column 2 */ - MENUITEM "Podle &Velikosti", 0x31 /* ... */ - MENUITEM "Podle &Data", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Rovnat automaticky", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "Zarovnat ikony", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "A&ktualizovat", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "V&ložit", FCIDM_SHVIEW_INSERT MENUITEM "Vložit zást&upce", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Vlastnosti", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/da-DK.rc b/reactos/dll/win32/shell32/lang/da-DK.rc index f04e9ca6d47..29223ec536a 100644 --- a/reactos/dll/win32/shell32/lang/da-DK.rc +++ b/reactos/dll/win32/shell32/lang/da-DK.rc @@ -6,43 +6,45 @@ LANGUAGE LANG_DANISH, SUBLANG_DEFAULT -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "Sto&re Ikoner", FCIDM_SHVIEW_BIGICON MENUITEM "S&mÃ¥ Ikoner", FCIDM_SHVIEW_SMALLICON MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Arrangere &Ikoner", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "&Arrangere Automatisk", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "&Visning" + POPUP "&Visning", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "Sto&re Ikoner", FCIDM_SHVIEW_BIGICON MENUITEM "S&mÃ¥ Ikoner", FCIDM_SHVIEW_SMALLICON MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "Arrangere &Ikoner" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Arrangere &Ikoner", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "Efter &Navn", 0x30 /* column 0 */ - MENUITEM "Efter &Type", 0x32 /* column 2 */ - MENUITEM "Efter &Størrelse", 0x31 /* ... */ - MENUITEM "Efter &Dato", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Arrangere Automatisk", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "Line up Ikoner", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Opfrisk", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Indsæt", FCIDM_SHVIEW_INSERT MENUITEM "Indsæt som Link", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Egenskaber", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/de-DE.rc b/reactos/dll/win32/shell32/lang/de-DE.rc index d19644e6074..63e47dead09 100644 --- a/reactos/dll/win32/shell32/lang/de-DE.rc +++ b/reactos/dll/win32/shell32/lang/de-DE.rc @@ -1,42 +1,44 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "&Große Symbole", FCIDM_SHVIEW_BIGICON MENUITEM "&Kleine Symbole", FCIDM_SHVIEW_SMALLICON MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Symbole anordnen", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "&Automatisch anordnen", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "&Ansicht" + POPUP "&Ansicht", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "&Große Symbole", FCIDM_SHVIEW_BIGICON MENUITEM "&Kleine Symbole", FCIDM_SHVIEW_SMALLICON MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "Symbole anordnen" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Symbole anordnen", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "Nach &Name", 0x30 /* column 0 */ - MENUITEM "Nach &Typ", 0x32 /* column 2 */ - MENUITEM "Nach &Größe", 0x31 /* ... */ - MENUITEM "Nach &Datum", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Automatisch anordnen", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "Icons anordnen", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Aktualisieren", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Einfügen", FCIDM_SHVIEW_INSERT MENUITEM "Einfügen als Verweis", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Eigenschaften", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/el-GR.rc b/reactos/dll/win32/shell32/lang/el-GR.rc index f3439279d9c..573958489b1 100644 --- a/reactos/dll/win32/shell32/lang/el-GR.rc +++ b/reactos/dll/win32/shell32/lang/el-GR.rc @@ -1,42 +1,44 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "&Μεγάλα εικονίδια", FCIDM_SHVIEW_BIGICON MENUITEM "Μ&ικρά εικονίδια", FCIDM_SHVIEW_SMALLICON MENUITEM "&Λίστα", FCIDM_SHVIEW_LISTVIEW MENUITEM "Λ&επτομέρειες", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "&Τακτοποίηση εικονιδίων κατά", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "Αυτόματη τακτοποίηση", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "&Προβολή" + POPUP "&Προβολή", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "&Μεγάλα εικονίδια", FCIDM_SHVIEW_BIGICON MENUITEM "Μ&ικρά εικονίδια", FCIDM_SHVIEW_SMALLICON MENUITEM "&Λίστα", FCIDM_SHVIEW_LISTVIEW MENUITEM "Λ&επτομέρειες", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "&Τακτοποίηση εικονιδίων" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "&Τακτοποίηση εικονιδίων κατά", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "Κατά ό&νομα", 0x30 /* column 0 */ - MENUITEM "Κατά &τύπο", 0x32 /* column 2 */ - MENUITEM "Κατά &μέγεθος", 0x31 /* ... */ - MENUITEM "Κατά &ημερομηνία", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Αυτόματη τακτοποίηση", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "Ευθυγράμμιση εικονιδίων", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Ανανέωση", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Επικόληση", FCIDM_SHVIEW_INSERT MENUITEM "Επικόληση συντόμευσης", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Ιδιότητες", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/en-GB.rc b/reactos/dll/win32/shell32/lang/en-GB.rc index 9d577ccaf79..ba071286505 100644 --- a/reactos/dll/win32/shell32/lang/en-GB.rc +++ b/reactos/dll/win32/shell32/lang/en-GB.rc @@ -1,42 +1,44 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Arrange &Icons By", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "&View" + POPUP "&View", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "Arrange &Icons" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Arrange &Icons By", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "By &Name", 0x30 /* column 0 */ - MENUITEM "By &Type", 0x32 /* column 2 */ - MENUITEM "By &Size", 0x31 /* ... */ - MENUITEM "By &Date", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "Line up Icons", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Refresh", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/en-US.rc b/reactos/dll/win32/shell32/lang/en-US.rc index f858de3dae7..7d44b51c11c 100644 --- a/reactos/dll/win32/shell32/lang/en-US.rc +++ b/reactos/dll/win32/shell32/lang/en-US.rc @@ -1,42 +1,44 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Arrange &Icons By", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "&View" + POPUP "&View", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "Arrange &Icons" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Arrange &Icons By", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "By &Name", 0x30 /* column 0 */ - MENUITEM "By &Type", 0x32 /* column 2 */ - MENUITEM "By &Size", 0x31 /* ... */ - MENUITEM "By &Date", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "Line up Icons", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Refresh", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/es-ES.rc b/reactos/dll/win32/shell32/lang/es-ES.rc index 6f31476aa7c..a2277ab1412 100644 --- a/reactos/dll/win32/shell32/lang/es-ES.rc +++ b/reactos/dll/win32/shell32/lang/es-ES.rc @@ -2,43 +2,45 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "Iconos &grandes", FCIDM_SHVIEW_BIGICON MENUITEM "Iconos &pequeños", FCIDM_SHVIEW_SMALLICON MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Detalles", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Ordenar &iconos", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "&Ordenar automáticamente", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "&Ver" + POPUP "&Ver", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "Iconos &grandes", FCIDM_SHVIEW_BIGICON MENUITEM "Iconos &pequeños", FCIDM_SHVIEW_SMALLICON MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Detalles", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "Ordenar &iconos" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Ordenar &iconos", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "Por &nombre", 0x30 /* column 0 */ - MENUITEM "Por &tipo", 0x32 /* column 2 */ - MENUITEM "Por t&amaño", 0x31 /* ... */ - MENUITEM "Por &fecha", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Ordenar automáticamente", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "Alinear iconos", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Actualizar", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Pegar", FCIDM_SHVIEW_INSERT MENUITEM "Pegar acceso directo", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Propiedades", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/fi-FI.rc b/reactos/dll/win32/shell32/lang/fi-FI.rc index ef2d21efb3e..768aaa6664a 100644 --- a/reactos/dll/win32/shell32/lang/fi-FI.rc +++ b/reactos/dll/win32/shell32/lang/fi-FI.rc @@ -1,42 +1,44 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "&Suuret Kuvakkeet", FCIDM_SHVIEW_BIGICON MENUITEM "&Pienet Kuvakkeet", FCIDM_SHVIEW_SMALLICON MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Tiedot", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "&Järjestä Kuvakkeet", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "Järjestä &Automaattisesti", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "&Näkymä" + POPUP "&Näkymä", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "&Pienet Kuvakkeet", FCIDM_SHVIEW_BIGICON MENUITEM "&Suuret Kuvakkeet", FCIDM_SHVIEW_SMALLICON MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Tiedot", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "&Järjestä Kuvakkeet" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "&Järjestä Kuvakkeet", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "&Nimen mukaan", 0x30 /* column 0 */ - MENUITEM "&Tyypin mukaan", 0x32 /* column 2 */ - MENUITEM "&Koon mukaan", 0x31 /* ... */ - MENUITEM "&Päivämäärän mukaan", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Järjestä &Automaattisesti", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "Järjestä kuvakkeet riviin", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Päivitä", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Liitä", FCIDM_SHVIEW_INSERT MENUITEM "Liitä Linkiksi", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Ominaisuudet", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/fr-FR.rc b/reactos/dll/win32/shell32/lang/fr-FR.rc index b8e7c710a21..684406817ca 100644 --- a/reactos/dll/win32/shell32/lang/fr-FR.rc +++ b/reactos/dll/win32/shell32/lang/fr-FR.rc @@ -1,42 +1,44 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "&Grandes icônes", FCIDM_SHVIEW_BIGICON MENUITEM "&Petites icônes", FCIDM_SHVIEW_SMALLICON MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Détails", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Trier les &icônes", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "T&ri automatique", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "&Affichage" + POPUP "&Affichage", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "&Grandes icônes", FCIDM_SHVIEW_BIGICON MENUITEM "&Petites icônes", FCIDM_SHVIEW_SMALLICON MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Détails", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "Trier les &icônes" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Trier les &icônes", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "Par &nom", 0x30 /* column 0 */ - MENUITEM "Par &type", 0x32 /* column 2 */ - MENUITEM "Par t&aille", 0x31 /* ... */ - MENUITEM "Par &date", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "T&ri automatique", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "Aligner les icônes", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Rafraîchir", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Coller", FCIDM_SHVIEW_INSERT MENUITEM "Coller comme un lien", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Propriétés", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/he-IL.rc b/reactos/dll/win32/shell32/lang/he-IL.rc index f72e68577f6..bc4842619f1 100644 --- a/reactos/dll/win32/shell32/lang/he-IL.rc +++ b/reactos/dll/win32/shell32/lang/he-IL.rc @@ -1,42 +1,44 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "סמלים גדולים", FCIDM_SHVIEW_BIGICON MENUITEM "סמלים קטנים", FCIDM_SHVIEW_SMALLICON MENUITEM "רשימה", FCIDM_SHVIEW_LISTVIEW MENUITEM "פרטים", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "סידור סמלים", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "סידור אוטומטי", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "תצוגה" + POPUP "תצוגה", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "סמלים גדולים", FCIDM_SHVIEW_BIGICON MENUITEM "סמלים קטנים", FCIDM_SHVIEW_SMALLICON MENUITEM "רשימה", FCIDM_SHVIEW_LISTVIEW MENUITEM "פרטים", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "סידור סמלים" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "סידור סמלים", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "לפי שם", 0x30 /* column 0 */ - MENUITEM "לפי סוג", 0x32 /* column 2 */ - MENUITEM "לפי גודל", 0x31 /* ... */ - MENUITEM "לפי תאריך", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "סידור אוטומטי", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "Line up Icons", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "רענון", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "הדבק", FCIDM_SHVIEW_INSERT MENUITEM "הדבק כקיצור דרך", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "מאפיינים", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/hu-HU.rc b/reactos/dll/win32/shell32/lang/hu-HU.rc index 72e882c7a51..9955e5e1ba6 100644 --- a/reactos/dll/win32/shell32/lang/hu-HU.rc +++ b/reactos/dll/win32/shell32/lang/hu-HU.rc @@ -1,42 +1,44 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "Nagy képek", FCIDM_SHVIEW_BIGICON MENUITEM "Kis képek", FCIDM_SHVIEW_SMALLICON MENUITEM "Lista", FCIDM_SHVIEW_LISTVIEW MENUITEM "Részletek", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Ikonok rendezése", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "&Automatikus elrendezés", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "&Nézet" + POPUP "&Nézet", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "Nagy képek", FCIDM_SHVIEW_BIGICON MENUITEM "Kis képek", FCIDM_SHVIEW_SMALLICON MENUITEM "Lista", FCIDM_SHVIEW_LISTVIEW MENUITEM "Részletek", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "Ikonok rendezése" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Ikonok rendezése", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "&Név szerint", 0x30 /* column 0 */ - MENUITEM "&Típus szerint", 0x32 /* column 2 */ - MENUITEM "&Méret szerint", 0x31 /* ... */ - MENUITEM "&Létrehozás ideje szerint", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Automatikus elrendezés", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "Ikonok igazitása", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Frissítés", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Beillesztés", FCIDM_SHVIEW_INSERT MENUITEM "Parancsikon beillesztése", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Beállítások", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/it-IT.rc b/reactos/dll/win32/shell32/lang/it-IT.rc index af18acf8a1a..478d32c417b 100644 --- a/reactos/dll/win32/shell32/lang/it-IT.rc +++ b/reactos/dll/win32/shell32/lang/it-IT.rc @@ -1,42 +1,44 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "&Icone Grandi", FCIDM_SHVIEW_BIGICON MENUITEM "&Icone Piccole", FCIDM_SHVIEW_SMALLICON MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Dettagli", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Disponi &Icone", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "&Disponi Automaticamente", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "&Visualizza" + POPUP "&Visualizza", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "&Icone Grandi", FCIDM_SHVIEW_BIGICON MENUITEM "&Icone Piccole", FCIDM_SHVIEW_SMALLICON MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Dettagli", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "Disponi &Icone" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Disponi &Icone", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "Per &Nome", 0x30 /* column 0 */ - MENUITEM "Per &Tipo", 0x32 /* column 2 */ - MENUITEM "Per &Dimensione", 0x31 /* ... */ - MENUITEM "Per &Data", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Disponi Automaticamente", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "Allinea Icone", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Aggiorna", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Incolla", FCIDM_SHVIEW_INSERT MENUITEM "Crea Collegamento", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Proprietà", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/ja-JP.rc b/reactos/dll/win32/shell32/lang/ja-JP.rc index a5fe8d92a1a..d45d4034946 100644 --- a/reactos/dll/win32/shell32/lang/ja-JP.rc +++ b/reactos/dll/win32/shell32/lang/ja-JP.rc @@ -1,42 +1,44 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "大きいアイコン(&G)", FCIDM_SHVIEW_BIGICON MENUITEM "小さいアイコン(&M)", FCIDM_SHVIEW_SMALLICON MENUITEM "一覧(&L)", FCIDM_SHVIEW_LISTVIEW MENUITEM "詳細(&D)", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "アイコンの整列(&I)", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "アイコンの自動整列(&A)", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "表示(&V)" + POPUP "表示(&V)", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "大きいアイコン(&G)", FCIDM_SHVIEW_BIGICON MENUITEM "小さいアイコン(&M)", FCIDM_SHVIEW_SMALLICON MENUITEM "一覧(&L)", FCIDM_SHVIEW_LISTVIEW MENUITEM "詳細(&D)", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "アイコンの整列(&I)" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "アイコンの整列(&I)", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "名前順(&N)", 0x30 /* column 0 */ - MENUITEM "種類順(&T)", 0x32 /* column 2 */ - MENUITEM "サイズ順(&S)", 0x31 /* ... */ - MENUITEM "日付順(&D)", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "アイコンの自動整列(&A)", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "等間隔に整列", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "最新の情報に更新", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "貼り付け", FCIDM_SHVIEW_INSERT MENUITEM "ショートカットの貼り付け", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "プロパティ", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/ko-KR.rc b/reactos/dll/win32/shell32/lang/ko-KR.rc index e71843a6806..6cca505992f 100644 --- a/reactos/dll/win32/shell32/lang/ko-KR.rc +++ b/reactos/dll/win32/shell32/lang/ko-KR.rc @@ -1,42 +1,44 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Arrange &Icons By", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "&View" + POPUP "&View", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "Arrange &Icons" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Arrange &Icons By", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "By &Name", 0x30 /* column 0 */ - MENUITEM "By &Type", 0x32 /* column 2 */ - MENUITEM "By &Size", 0x31 /* ... */ - MENUITEM "By &Date", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "Line up Icons", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Refresh", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/nl-NL.rc b/reactos/dll/win32/shell32/lang/nl-NL.rc index 6badd92c763..1e9c92cfa21 100644 --- a/reactos/dll/win32/shell32/lang/nl-NL.rc +++ b/reactos/dll/win32/shell32/lang/nl-NL.rc @@ -1,42 +1,44 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Arrange &Icons By", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "&View" + POPUP "&View", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "Arrange &Icons" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Arrange &Icons By", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "By &Name", 0x30 /* column 0 */ - MENUITEM "By &Type", 0x32 /* column 2 */ - MENUITEM "By &Size", 0x31 /* ... */ - MENUITEM "By &Date", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "Line up Icons", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Refresh", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/no-NO.rc b/reactos/dll/win32/shell32/lang/no-NO.rc index eadfd641fbe..de7d4d1c011 100644 --- a/reactos/dll/win32/shell32/lang/no-NO.rc +++ b/reactos/dll/win32/shell32/lang/no-NO.rc @@ -1,42 +1,44 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "&Store ikoner", FCIDM_SHVIEW_BIGICON MENUITEM "&SmÃ¥ ikoner", FCIDM_SHVIEW_SMALLICON MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Ordne &ikoner", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "Ordne &automatisk", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "&Vis" + POPUP "&Vis", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "&Store ikoner", FCIDM_SHVIEW_BIGICON MENUITEM "S&mÃ¥ ikoner", FCIDM_SHVIEW_SMALLICON MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "Ordne &ikoner" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Ordne &ikoner", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "Etter &navn", 0x30 /* column 0 */ - MENUITEM "Etter &type", 0x32 /* column 2 */ - MENUITEM "Etter &størrelse", 0x31 /* ... */ - MENUITEM "Etter &dato", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Ordne &automatisk", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "Still opp ikoner", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Oppdater", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Lim inn", FCIDM_SHVIEW_INSERT MENUITEM "Lim inn som snarvei", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Egenskaper", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/pl-PL.rc b/reactos/dll/win32/shell32/lang/pl-PL.rc index c380d2652ee..30533202002 100644 --- a/reactos/dll/win32/shell32/lang/pl-PL.rc +++ b/reactos/dll/win32/shell32/lang/pl-PL.rc @@ -4,43 +4,45 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "&Duże Ikony", FCIDM_SHVIEW_BIGICON MENUITEM "&Małe Ikony", FCIDM_SHVIEW_SMALLICON MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Szczegóły", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Rozmieść &ikony według", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "&Autorozmieszczanie", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "&Widok" + POPUP "&Widok", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "&Duże Ikony", FCIDM_SHVIEW_BIGICON MENUITEM "&Małe Ikony", FCIDM_SHVIEW_SMALLICON MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Szczegóły", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "Rozmieść &ikony według" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Rozmieść &ikony według", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "&Nazwy", 0x30 /* column 0 */ - MENUITEM "&Typu", 0x32 /* column 2 */ - MENUITEM "&Wielkości", 0x31 /* ... */ - MENUITEM "&Daty", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Autorozmieszczanie", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "&Wyrównaj ikony", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Odśwież", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "W&klej", FCIDM_SHVIEW_INSERT MENUITEM "Wklej s&krót", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Właściwości", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/pt-BR.rc b/reactos/dll/win32/shell32/lang/pt-BR.rc index b346cc976ea..7a807cb0e18 100644 --- a/reactos/dll/win32/shell32/lang/pt-BR.rc +++ b/reactos/dll/win32/shell32/lang/pt-BR.rc @@ -1,42 +1,44 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "Ícones &grandes", FCIDM_SHVIEW_BIGICON MENUITEM "Ícones &pequenos", FCIDM_SHVIEW_SMALLICON MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Detalhes", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "O&rganizar ícones", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "Auto organi&zar", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "&Exibir" + POPUP "&Exibir", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "Ícones &grandes", FCIDM_SHVIEW_BIGICON MENUITEM "Ícones &pequenos", FCIDM_SHVIEW_SMALLICON MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Detalhes", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "O&rganizar ícones" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "O&rganizar ícones", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "Por &nome", 0x30 /* column 0 */ - MENUITEM "Por &tipo", 0x32 /* column 2 */ - MENUITEM "Por ta&manho", 0x31 /* ... */ - MENUITEM "Por &data", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Auto organi&zar", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "Alin&har ícones", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Atualizar", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Co&lar", FCIDM_SHVIEW_INSERT MENUITEM "Colar a&talho", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Propriedades", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/pt-PT.rc b/reactos/dll/win32/shell32/lang/pt-PT.rc index 329927e4db7..9f655fe03e8 100644 --- a/reactos/dll/win32/shell32/lang/pt-PT.rc +++ b/reactos/dll/win32/shell32/lang/pt-PT.rc @@ -1,42 +1,44 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "Ícones &grandes", FCIDM_SHVIEW_BIGICON MENUITEM "Ícones &pequenos", FCIDM_SHVIEW_SMALLICON MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Detalhes", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "O&rganizar ícones", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "Auto organi&zar", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "&Mostrar" + POPUP "&Mostrar", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "Ícones &grandes", FCIDM_SHVIEW_BIGICON MENUITEM "Ícones &pequenos", FCIDM_SHVIEW_SMALLICON MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Detalhes", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "O&rganizar ícones" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "O&rganizar ícones", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "Por &nome", 0x30 /* column 0 */ - MENUITEM "Por &tipo", 0x32 /* column 2 */ - MENUITEM "Por ta&manho", 0x31 /* ... */ - MENUITEM "Por &data", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Auto organi&zar", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "Alin&har ícones", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Actualizar", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Co&lar", FCIDM_SHVIEW_INSERT MENUITEM "Colar a&talho", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Propriedades", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/ro-RO.rc b/reactos/dll/win32/shell32/lang/ro-RO.rc index 9473c1c36d7..1c5e04ce4ea 100644 --- a/reactos/dll/win32/shell32/lang/ro-RO.rc +++ b/reactos/dll/win32/shell32/lang/ro-RO.rc @@ -2,43 +2,45 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "D&ale", FCIDM_SHVIEW_BIGICON MENUITEM "&Pictograme", FCIDM_SHVIEW_SMALLICON MENUITEM "&Listă", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Detalii", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "&Ordonare", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "&Automată", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "&Afișare" + POPUP "&Afișare", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "D&ale", FCIDM_SHVIEW_BIGICON MENUITEM "&Pictograme", FCIDM_SHVIEW_SMALLICON MENUITEM "&Listă", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Detailii", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "&Ordonare" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "&Ordonare", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "După &nume", 0x30 /* column 0 */ - MENUITEM "După tip&uri", 0x32 /* column 2 */ - MENUITEM "După &mărimi", 0x31 /* ... */ - MENUITEM "După &date", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Automată", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "Aranjea&ză în grilă", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Împ&rospătează", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Lipește", FCIDM_SHVIEW_INSERT MENUITEM "Lipește ca sc&urtătură", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Proprietăți", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/ru-RU.rc b/reactos/dll/win32/shell32/lang/ru-RU.rc index 8937ad846ea..e6ff09769ee 100644 --- a/reactos/dll/win32/shell32/lang/ru-RU.rc +++ b/reactos/dll/win32/shell32/lang/ru-RU.rc @@ -2,43 +2,45 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "&Большие значки", FCIDM_SHVIEW_BIGICON MENUITEM "&Мелкие значки", FCIDM_SHVIEW_SMALLICON MENUITEM "&Список", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Таблица", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Упорядочить &значки", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "&Автоматически", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "&Просмотр" + POPUP "&Просмотр", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "&Большие значки", FCIDM_SHVIEW_BIGICON MENUITEM "&Мелкие значки", FCIDM_SHVIEW_SMALLICON MENUITEM "&Список", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Таблица", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "Упорядочить &значки" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Упорядочить &значки", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "По &имени", 0x30 /* column 0 */ - MENUITEM "По &типу", 0x32 /* column 2 */ - MENUITEM "По &размеру", 0x31 /* ... */ - MENUITEM "По &дате", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Автоматически", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "В&ыровнять значки", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "О&бновить", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Вставить", FCIDM_SHVIEW_INSERT MENUITEM "Вставить &ярлык", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Сво&йства", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/sk-SK.rc b/reactos/dll/win32/shell32/lang/sk-SK.rc index 5d4e473322d..b4bb8d9b3ce 100644 --- a/reactos/dll/win32/shell32/lang/sk-SK.rc +++ b/reactos/dll/win32/shell32/lang/sk-SK.rc @@ -1,42 +1,44 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "&Veľké ikony", FCIDM_SHVIEW_BIGICON MENUITEM "&Malé ikony", FCIDM_SHVIEW_SMALLICON MENUITEM "&Zoznam", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Podrobnosti", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "&UsporiadaÅ¥ ikony", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "UsporiadaÅ¥ &automaticky", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "&ZobraziÅ¥" + POPUP "&ZobraziÅ¥", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "&Veľké ikony", FCIDM_SHVIEW_BIGICON MENUITEM "&Malé ikony", FCIDM_SHVIEW_SMALLICON MENUITEM "&Zoznam", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Podrobnosti", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "&UsporiadaÅ¥ ikony" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "&UsporiadaÅ¥ ikony", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "&Názov", 0x30 /* column 0 */ - MENUITEM "&Typ", 0x32 /* column 2 */ - MENUITEM "&VeľkosÅ¥", 0x31 /* ... */ - MENUITEM "&Zmenené", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "UsporiadaÅ¥ &automaticky", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "ZarovnaÅ¥ ikony", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&ObnoviÅ¥", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&PrilepiÅ¥", FCIDM_SHVIEW_INSERT MENUITEM "PrilepiÅ¥ od&kaz", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Vl&astnosti", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/sl-SI.rc b/reactos/dll/win32/shell32/lang/sl-SI.rc index c0ff4e69950..d6bb56d08a8 100644 --- a/reactos/dll/win32/shell32/lang/sl-SI.rc +++ b/reactos/dll/win32/shell32/lang/sl-SI.rc @@ -1,42 +1,44 @@ LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Arrange &Icons By", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "&View" + POPUP "&View", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "Arrange &Icons" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Arrange &Icons By", FCIDM_SHVIEW_VIEW BEGIN - MENUITEM "By &Name", 0x30 /* column 0 */ - MENUITEM "By &Type", 0x32 /* column 2 */ - MENUITEM "By &Size", 0x31 /* ... */ - MENUITEM "By &Date", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "Line up Icons", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Refresh", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/sq-AL.rc b/reactos/dll/win32/shell32/lang/sq-AL.rc index cdf56d0651f..1ddfd9427dd 100644 --- a/reactos/dll/win32/shell32/lang/sq-AL.rc +++ b/reactos/dll/win32/shell32/lang/sq-AL.rc @@ -4,43 +4,45 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "Ikonat e mëdha", FCIDM_SHVIEW_BIGICON MENUITEM "Ikonat e vogla", FCIDM_SHVIEW_SMALLICON MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Detaje", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Organizo &Ikona", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "Organizo &Auto", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "&Vëzhgo" + POPUP "&Vëzhgo", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "Ikonat e mëdha", FCIDM_SHVIEW_BIGICON MENUITEM "Ikonat e vogla", FCIDM_SHVIEW_SMALLICON MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Detaje", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "Organizo &Ikona" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Organizo &Ikona", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "Nga &Emri", 0x30 /* column 0 */ - MENUITEM "Nga &Tipi", 0x32 /* column 2 */ - MENUITEM "Nga &Masa", 0x31 /* ... */ - MENUITEM "Nga &Data", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Organizo &Auto", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "Rreshto Ikonat", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Riresko", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Ngjit", FCIDM_SHVIEW_INSERT MENUITEM "Ngjit si Lidhje", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Cilësime", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/sv-SE.rc b/reactos/dll/win32/shell32/lang/sv-SE.rc index d34e02938b6..0b20ac08ebc 100644 --- a/reactos/dll/win32/shell32/lang/sv-SE.rc +++ b/reactos/dll/win32/shell32/lang/sv-SE.rc @@ -1,19 +1,25 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "Sto&ra ikoner", FCIDM_SHVIEW_BIGICON MENUITEM "S&mÃ¥ ikoner", FCIDM_SHVIEW_SMALLICON MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "Ordna &ikoner", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "&Ordna automatiskt", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "&Visa" + POPUP "&Visa", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "Sto&ra ikoner", FCIDM_SHVIEW_BIGICON MENUITEM "S&mÃ¥ ikoner", FCIDM_SHVIEW_SMALLICON @@ -21,22 +27,18 @@ BEGIN MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW END MENUITEM SEPARATOR - POPUP "Ordna &ikoner" + POPUP "Ordna &ikoner", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "Efter &namn", 0x30 /* column 0 */ - MENUITEM "Efter &typ", 0x32 /* column 2 */ - MENUITEM "Efter &storlek", 0x31 /* ... */ - MENUITEM "Efter &datum", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Ordna automatiskt", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "Rada upp ikoner", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Uppdatera", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Klistra in", FCIDM_SHVIEW_INSERT MENUITEM "Klistra in som genväg", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Egenskaper", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/tr-TR.rc b/reactos/dll/win32/shell32/lang/tr-TR.rc index b390904ff22..a98db32a0bf 100644 --- a/reactos/dll/win32/shell32/lang/tr-TR.rc +++ b/reactos/dll/win32/shell32/lang/tr-TR.rc @@ -1,42 +1,44 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "Bü&yük Simgeler", FCIDM_SHVIEW_BIGICON MENUITEM "Kü&çük Simgeler", FCIDM_SHVIEW_SMALLICON MENUITEM "&Listele", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Ayrıntılar", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "&Simgeleri Düzenle", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "&Otomatik Düzenle", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "&Görünüm" + POPUP "&Görünüm", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "Bü&yük Simgeler", FCIDM_SHVIEW_BIGICON MENUITEM "Kü&çük Simgeler", FCIDM_SHVIEW_SMALLICON MENUITEM "&Listele", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Ayrıntılar", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "&Simgeleri Düzenle" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "&Simgeleri Düzenle", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "&Ada Göre", 0x30 /* column 0 */ - MENUITEM "&Türe Göre", 0x32 /* column 2 */ - MENUITEM "&Boyuta Göre", 0x31 /* ... */ - MENUITEM "&Zamana Göre", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Otomatik Düzenle", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "Kılavuz Çizgisine Hi&zala", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Y&enile", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Yapış&tır", FCIDM_SHVIEW_INSERT MENUITEM "&Kısayol Yapıştır", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Özellikler", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/uk-UA.rc b/reactos/dll/win32/shell32/lang/uk-UA.rc index 7ceeff9d18e..501832ef75a 100644 --- a/reactos/dll/win32/shell32/lang/uk-UA.rc +++ b/reactos/dll/win32/shell32/lang/uk-UA.rc @@ -1,42 +1,44 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "&Великі значки", FCIDM_SHVIEW_BIGICON MENUITEM "&Дрібні значки", FCIDM_SHVIEW_SMALLICON MENUITEM "Спис&ок", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Подробиці", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "&Упорядкувати значки", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "&автоматично", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "&Вигляд" + POPUP "&Вигляд", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "&Великі значки", FCIDM_SHVIEW_BIGICON MENUITEM "&Дрібні значки", FCIDM_SHVIEW_SMALLICON MENUITEM "Спис&ок", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Подробиці", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "&Упорядкувати значки" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "&Упорядкувати значки", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "за &ім'ям", 0x30 /* column 0 */ - MENUITEM "за &типом", 0x32 /* column 2 */ - MENUITEM "за &розміром", 0x31 /* ... */ - MENUITEM "за &датою", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&автоматично", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "Вирівняти значки", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Оновити", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Вставити", FCIDM_SHVIEW_INSERT MENUITEM "Вставити ярлик", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Властивості", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/zh-CN.rc b/reactos/dll/win32/shell32/lang/zh-CN.rc index 77be4f61092..3549c36c497 100644 --- a/reactos/dll/win32/shell32/lang/zh-CN.rc +++ b/reactos/dll/win32/shell32/lang/zh-CN.rc @@ -9,43 +9,45 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "大图标(&G)", FCIDM_SHVIEW_BIGICON MENUITEM "小图标(&M)", FCIDM_SHVIEW_SMALLICON MENUITEM "列表(&L)", FCIDM_SHVIEW_LISTVIEW MENUITEM "详细信息(&D)", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "排列图标(&I)", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "自动排列(&D)", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "查看(&V)" + POPUP "查看(&V)", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "大图标(&G)", FCIDM_SHVIEW_BIGICON MENUITEM "小图标(&M)", FCIDM_SHVIEW_SMALLICON MENUITEM "列表(&L)", FCIDM_SHVIEW_LISTVIEW MENUITEM "详细信息(&D)", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "排列图标(&I)" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "排列图标(&I)", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "名称(&N)", 0x30 /* column 0 */ - MENUITEM "类型(&T)", 0x32 /* column 2 */ - MENUITEM "大小(&S)", 0x31 /* ... */ - MENUITEM "修改时间(&D)", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "自动排列(&D)", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "排列图标", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "刷新", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "粘贴", FCIDM_SHVIEW_INSERT MENUITEM "粘贴快捷方式", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "属性", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/lang/zh-TW.rc b/reactos/dll/win32/shell32/lang/zh-TW.rc index 577f1cfe1cd..cd5ff1491e4 100644 --- a/reactos/dll/win32/shell32/lang/zh-TW.rc +++ b/reactos/dll/win32/shell32/lang/zh-TW.rc @@ -8,43 +8,45 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL -MENU_001 MENU +MENU_001 MENUEX BEGIN MENUITEM "大圖示(&G)", FCIDM_SHVIEW_BIGICON MENUITEM "小圖示(&M)", FCIDM_SHVIEW_SMALLICON MENUITEM "列表(&L)", FCIDM_SHVIEW_LISTVIEW MENUITEM "詳細資料(&D)", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "", -1, MFT_SEPARATOR + POPUP "排列圖示(&I)", FCIDM_SHVIEW_ARRANGE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "自動排列(&A)", FCIDM_SHVIEW_AUTOARRANGE + END END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "&View" + POPUP "&View", FCIDM_SHVIEW_VIEW BEGIN MENUITEM "大圖示(&G)", FCIDM_SHVIEW_BIGICON MENUITEM "小圖示(&M)", FCIDM_SHVIEW_SMALLICON MENUITEM "列表(&L)", FCIDM_SHVIEW_LISTVIEW MENUITEM "詳細資料(&D)", FCIDM_SHVIEW_REPORTVIEW END - MENUITEM SEPARATOR - POPUP "排列圖示(&I)" + MENUITEM "", -1, MFT_SEPARATOR + POPUP "排列圖示(&I)", FCIDM_SHVIEW_ARRANGE BEGIN - MENUITEM "名稱(&N)", 0x30 /* column 0 */ - MENUITEM "類型(&T)", 0x32 /* column 2 */ - MENUITEM "大小(&S)", 0x31 /* ... */ - MENUITEM "日期(&D)", 0x33 - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "自動排列(&A)", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "排列圖示", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "重新整理", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "貼上", FCIDM_SHVIEW_INSERT MENUITEM "貼上捷徑", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "屬性", FCIDM_SHVIEW_PROPERTIES END END diff --git a/reactos/dll/win32/shell32/shresdef.h b/reactos/dll/win32/shell32/shresdef.h index c32e8d29a66..51e6947a557 100644 --- a/reactos/dll/win32/shell32/shresdef.h +++ b/reactos/dll/win32/shell32/shresdef.h @@ -130,7 +130,6 @@ #define IDS_SHELL_ABOUT_AUTHORS 144 #define IDS_SHELL_ABOUT_BACK 145 #define FCIDM_SHVIEW_NEW 146 -#define FCIDM_SHVIEW_VIEW 147 #define IDS_CONTROLPANEL 148 #define IDS_NEWFOLDER 149 #define IDS_COLUMN_EXTENSION 151 @@ -595,6 +594,7 @@ /* Shell view commands */ #define FCIDM_SHVIEW_ARRANGE 0x7001 +#define FCIDM_SHVIEW_VIEW 0x7002 #define FCIDM_SHVIEW_DELETE 0x7011 #define FCIDM_SHVIEW_PROPERTIES 0x7013 #define FCIDM_SHVIEW_CUT 0x7018 -- 2.17.1