regedit: Update and sort the pop-up menus.

Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

regedit: Update and sort the pop-up menus.
7bf054f1 · Hugh McMaster · Alexandre Julliard · c5d38ce4 · 7bf054f1 · 7bf054f1
Commit 7bf054f1 authored May 22, 2017 by Hugh McMaster Committed by Alexandre Julliard May 22, 2017
50 changed files
--- a/po/ar.po
+++ b/po/ar.po
--- a/po/bg.po
+++ b/po/bg.po
--- a/po/ca.po
+++ b/po/ca.po
--- a/po/cs.po
+++ b/po/cs.po
--- a/po/da.po
+++ b/po/da.po
--- a/po/de.po
+++ b/po/de.po
--- a/po/el.po
+++ b/po/el.po
--- a/po/en.po
+++ b/po/en.po
--- a/po/en_US.po
+++ b/po/en_US.po
--- a/po/eo.po
+++ b/po/eo.po
--- a/po/es.po
+++ b/po/es.po
--- a/po/fa.po
+++ b/po/fa.po
--- a/po/fi.po
+++ b/po/fi.po
--- a/po/fr.po
+++ b/po/fr.po
--- a/po/he.po
+++ b/po/he.po
--- a/po/hi.po
+++ b/po/hi.po
--- a/po/hr.po
+++ b/po/hr.po
--- a/po/hu.po
+++ b/po/hu.po
--- a/po/it.po
+++ b/po/it.po
--- a/po/ja.po
+++ b/po/ja.po
--- a/po/ko.po
+++ b/po/ko.po
--- a/po/lt.po
+++ b/po/lt.po
--- a/po/ml.po
+++ b/po/ml.po
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
--- a/po/nl.po
+++ b/po/nl.po
--- a/po/or.po
+++ b/po/or.po
--- a/po/pa.po
+++ b/po/pa.po
--- a/po/pl.po
+++ b/po/pl.po
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
--- a/po/rm.po
+++ b/po/rm.po
--- a/po/ro.po
+++ b/po/ro.po
--- a/po/ru.po
+++ b/po/ru.po
--- a/po/sk.po
+++ b/po/sk.po
--- a/po/sl.po
+++ b/po/sl.po
--- a/po/sr_RS@cyrillic.po
+++ b/po/sr_RS@cyrillic.po
--- a/po/sr_RS@latin.po
+++ b/po/sr_RS@latin.po
--- a/po/sv.po
+++ b/po/sv.po
--- a/po/te.po
+++ b/po/te.po
--- a/po/th.po
+++ b/po/th.po
--- a/po/tr.po
+++ b/po/tr.po
--- a/po/uk.po
+++ b/po/uk.po
--- a/po/wa.po
+++ b/po/wa.po
--- a/po/wine.pot
+++ b/po/wine.pot
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
--- a/programs/regedit/childwnd.c
+++ b/programs/regedit/childwnd.c
@@ -378,7 +378,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
        ScreenToClient(g_pChildWnd->hTreeWnd, &ht.pt);
        if (SendMessageW(g_pChildWnd->hTreeWnd, TVM_HITTEST, 0, (LPARAM)&ht)) {
            SendMessageW(g_pChildWnd->hTreeWnd, TVM_SELECTITEM, TVGN_CARET, (LPARAM)ht.hItem);
-            TrackPopupMenu(GetSubMenu(hPopupMenus, PM_NEW), TPM_RIGHTBUTTON,
+            TrackPopupMenu(GetSubMenu(hPopupMenus, PM_TREEVIEW), TPM_RIGHTBUTTON,
                           pt.x, pt.y, 0, hFrameWnd, NULL);
        }
        break;

--- a/programs/regedit/listview.c
+++ b/programs/regedit/listview.c
@@ -463,7 +463,7 @@ static LRESULT CALLBACK ListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR
        break;
    case WM_CONTEXTMENU: {
        int cnt = SendMessageW(hWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_SELECTED, 0));
-        TrackPopupMenu(GetSubMenu(hPopupMenus, cnt == -1 ? PM_NEW : PM_MODIFYVALUE),
+        TrackPopupMenu(GetSubMenu(hPopupMenus, cnt == -1 ? PM_TREEVIEW : PM_MODIFY_VALUE),
                       TPM_RIGHTBUTTON, (short)LOWORD(lParam), (short)HIWORD(lParam),
                       0, hFrameWnd, NULL);
        break;

--- a/programs/regedit/main.h
+++ b/programs/regedit/main.h
@@ -32,13 +32,14 @@

 #define COUNT_OF(a) (sizeof(a)/sizeof(a[0]))

-#define PM_MODIFYVALUE  0
-#define PM_NEW          1
-
 #define MAX_NEW_KEY_LEN 128

 #define WM_NOTIFY_REFLECT (WM_USER+1024)

+/* Pop-Up Menus */
+#define PM_TREEVIEW      0
+#define PM_MODIFY_VALUE  1
+
 /* HexEdit Class */
 #define HEM_SETDATA (WM_USER+0)
 #define HEM_GETDATA (WM_USER+1)

--- a/programs/regedit/regedit.rc
+++ b/programs/regedit/regedit.rc
@@ -84,14 +84,7 @@ END

 IDR_POPUP_MENUS MENU
 BEGIN
-  POPUP ""
-  BEGIN
-	MENUITEM "&Modify...",                  ID_EDIT_MODIFY
-	MENUITEM "Modify Binary Data...",       ID_EDIT_MODIFY_BIN
-	MENUITEM SEPARATOR
-	MENUITEM "&Delete\tDel",                ID_EDIT_DELETE
-	MENUITEM "&Rename",                     ID_EDIT_RENAME
-  END
+  /* PM_TREEVIEW */
  POPUP ""
  BEGIN
        POPUP "&New"
@@ -104,14 +97,23 @@ BEGIN
            MENUITEM "&Multi-String Value",         ID_EDIT_NEW_MULTI_STRINGVALUE
            MENUITEM "&Expandable String Value",    ID_EDIT_NEW_EXPANDVALUE
        END
+        MENUITEM "&Find...\tCtrl+F",            ID_EDIT_FIND, GRAYED
        MENUITEM SEPARATOR
        MENUITEM "&Delete\tDel",                ID_EDIT_DELETE
        MENUITEM "&Rename\tF2",                 ID_EDIT_RENAME
        MENUITEM SEPARATOR
        MENUITEM "&Export...",                  ID_EDIT_EXPORT
-        MENUITEM "&Copy Key Name",              ID_EDIT_COPYKEYNAME
        MENUITEM SEPARATOR
-        MENUITEM "&Find...\tCtrl+F",            ID_EDIT_FIND, GRAYED
+        MENUITEM "&Copy Key Name",              ID_EDIT_COPYKEYNAME
+  END
+  /* PM_MODIFY_VALUE */
+  POPUP ""
+  BEGIN
+	MENUITEM "&Modify...",                  ID_EDIT_MODIFY
+	MENUITEM "Modify Binary Data...",       ID_EDIT_MODIFY_BIN
+	MENUITEM SEPARATOR
+	MENUITEM "&Delete\tDel",                ID_EDIT_DELETE
+	MENUITEM "&Rename",                     ID_EDIT_RENAME
  END
 END