Settings dialog show Sync menu

Signed-off-by: Frank Li <lznuaa@gmail.com>

diff --git a/src/TortoiseProc/Settings/SetLookAndFeelPage.cpp b/src/TortoiseProc/Settings/SetLookAndFeelPage.cpp
index 7940328..d73f7fa 100644 (file)
--- a/src/TortoiseProc/Settings/SetLookAndFeelPage.cpp
+++ b/src/TortoiseProc/Settings/SetLookAndFeelPage.cpp
@@ -31,8 +31,8 @@ CSetLookAndFeelPage::CSetLookAndFeelPage()
        : ISettingsPropPage(CSetLookAndFeelPage::IDD)\r
        , m_bBlock(false)\r
 {\r
-       m_regTopmenu = CRegDWORD(_T("Software\\TortoiseGit\\ContextMenuEntries"), MENUCREATEREPOS|MENUCLONE|MENUCOMMIT);\r
-       m_regTopmenuhigh = CRegDWORD(_T("Software\\TortoiseGit\\ContextMenuEntrieshigh"), (MENUCREATEREPOS|MENUCLONE|MENUCOMMIT)>>32);\r
+       m_regTopmenu = CRegDWORD(_T("Software\\TortoiseGit\\ContextMenuEntries"), MENUSYNC|MENUCREATEREPOS|MENUCLONE|MENUCOMMIT);\r
+       m_regTopmenuhigh = CRegDWORD(_T("Software\\TortoiseGit\\ContextMenuEntrieshigh"), (MENUSYNC|MENUCREATEREPOS|MENUCLONE|MENUCOMMIT)>>32);\r
 \r
        m_topmenu = unsigned __int64(DWORD(m_regTopmenuhigh))<<32;\r
        m_topmenu |= unsigned __int64(DWORD(m_regTopmenu));\r
@@ -67,7 +67,7 @@ BOOL CSetLookAndFeelPage::OnInitDialog()
 \r
        m_tooltips.Create(this);\r
        m_tooltips.AddTool(IDC_MENULIST, IDS_SETTINGS_MENULAYOUT_TT);\r
-       m_tooltips.AddTool(IDC_GETLOCKTOP, IDS_SETTINGS_GETLOCKTOP_TT);\r
+       //m_tooltips.AddTool(IDC_GETLOCKTOP, IDS_SETTINGS_GETLOCKTOP_TT);\r
        m_tooltips.AddTool(IDC_NOCONTEXTPATHS, IDS_SETTINGS_EXCLUDECONTEXTLIST_TT);\r
 \r
        m_cMenuList.SetExtendedStyle(LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER);\r
@@ -86,8 +86,8 @@ BOOL CSetLookAndFeelPage::OnInitDialog()
        m_imgList.Create(16, 16, ILC_COLOR16 | ILC_MASK, 4, 1);\r
 \r
        m_bBlock = true;\r
-       InsertItem(IDS_MENUCLONE, IDI_CLONE, MENUCLONE);\r
-//     InsertItem(IDS_MENUUPDATE, IDI_UPDATE, MENUUPDATE);\r
+       InsertItem(IDS_MENUCLONE,IDI_CLONE, MENUCLONE);\r
+       InsertItem(IDS_MENUSYNC, IDI_RELOCATE, MENUSYNC);\r
        InsertItem(IDS_MENUPULL, IDI_PULL, MENUPULL);\r
        InsertItem(IDS_MENUFETCH, IDI_PULL, MENUFETCH);\r
        InsertItem(IDS_MENUPUSH, IDI_PUSH, MENUPUSH);\r
@@ -186,6 +186,7 @@ void CSetLookAndFeelPage::OnLvnItemchangedMenulist(NMHDR * /*pNMHDR*/, LRESULT *
                int i=0;\r
                m_topmenu = 0;\r
                m_topmenu |= m_cMenuList.GetCheck(i++) ? MENUCLONE : 0;\r
+               m_topmenu |= m_cMenuList.GetCheck(i++) ? MENUSYNC : 0;\r
                m_topmenu |= m_cMenuList.GetCheck(i++) ? MENUPULL : 0;\r
                m_topmenu |= m_cMenuList.GetCheck(i++) ? MENUFETCH : 0;\r
                m_topmenu |= m_cMenuList.GetCheck(i++) ? MENUPUSH : 0;\r

diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
index 3a9d50c..75b2de0 100644 (file)
Binary files a/src/TortoiseProc/resource.h and b/src/TortoiseProc/resource.h differ

diff --git a/src/TortoiseShell/resourceshell.rc b/src/TortoiseShell/resourceshell.rc
index 3498a40..6c106c7 100644 (file)
--- a/src/TortoiseShell/resourceshell.rc
+++ b/src/TortoiseShell/resourceshell.rc
@@ -433,7 +433,7 @@ BEGIN
     IDS_MENUSVNREBASE_DESC  "Git SVN Rebase"\r
     IDS_MENUSVNDCOMMIT      "SVN DCommit"\r
     IDS_MENUSVNDCOMMIT_DESC "Git SVN DCommit"\r
-    IDS_MENUSYNC            "Git Sync..."\r
+    IDS_MENUSYNC            "Sync..."\r
     IDS_MENUDESCSYNC        "Sync remote Remote Repostory, include pull, push,email patch and so on"\r
 END\r
 \r