From 22342f86ca22ae6d7c8cc56737be7f0dbed8bbad Mon Sep 17 00:00:00 2001
From: Frank Li <lznuaa@gmail.com>
Date: Sat, 25 Jul 2009 16:28:59 +0800
Subject: [PATCH] Settings dialog show Sync menu

Signed-off-by: Frank Li <lznuaa@gmail.com>
---
 src/TortoiseProc/Settings/SetLookAndFeelPage.cpp |  11 ++++++-----
 src/TortoiseProc/resource.h                      | Bin 165544 -> 165544 bytes
 src/TortoiseShell/resourceshell.rc               |   2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/TortoiseProc/Settings/SetLookAndFeelPage.cpp b/src/TortoiseProc/Settings/SetLookAndFeelPage.cpp
index 794032833..d73f7fa80 100644
--- a/src/TortoiseProc/Settings/SetLookAndFeelPage.cpp
+++ b/src/TortoiseProc/Settings/SetLookAndFeelPage.cpp
@@ -31,8 +31,8 @@ CSetLookAndFeelPage::CSetLookAndFeelPage()
 	: ISettingsPropPage(CSetLookAndFeelPage::IDD)
 	, m_bBlock(false)
 {
-	m_regTopmenu = CRegDWORD(_T("Software\\TortoiseGit\\ContextMenuEntries"), MENUCREATEREPOS|MENUCLONE|MENUCOMMIT);
-	m_regTopmenuhigh = CRegDWORD(_T("Software\\TortoiseGit\\ContextMenuEntrieshigh"), (MENUCREATEREPOS|MENUCLONE|MENUCOMMIT)>>32);
+	m_regTopmenu = CRegDWORD(_T("Software\\TortoiseGit\\ContextMenuEntries"), MENUSYNC|MENUCREATEREPOS|MENUCLONE|MENUCOMMIT);
+	m_regTopmenuhigh = CRegDWORD(_T("Software\\TortoiseGit\\ContextMenuEntrieshigh"), (MENUSYNC|MENUCREATEREPOS|MENUCLONE|MENUCOMMIT)>>32);
 
 	m_topmenu = unsigned __int64(DWORD(m_regTopmenuhigh))<<32;
 	m_topmenu |= unsigned __int64(DWORD(m_regTopmenu));
@@ -67,7 +67,7 @@ BOOL CSetLookAndFeelPage::OnInitDialog()
 
 	m_tooltips.Create(this);
 	m_tooltips.AddTool(IDC_MENULIST, IDS_SETTINGS_MENULAYOUT_TT);
-	m_tooltips.AddTool(IDC_GETLOCKTOP, IDS_SETTINGS_GETLOCKTOP_TT);
+	//m_tooltips.AddTool(IDC_GETLOCKTOP, IDS_SETTINGS_GETLOCKTOP_TT);
 	m_tooltips.AddTool(IDC_NOCONTEXTPATHS, IDS_SETTINGS_EXCLUDECONTEXTLIST_TT);
 
 	m_cMenuList.SetExtendedStyle(LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER);
@@ -86,8 +86,8 @@ BOOL CSetLookAndFeelPage::OnInitDialog()
 	m_imgList.Create(16, 16, ILC_COLOR16 | ILC_MASK, 4, 1);
 
 	m_bBlock = true;
-	InsertItem(IDS_MENUCLONE, IDI_CLONE, MENUCLONE);
-//	InsertItem(IDS_MENUUPDATE, IDI_UPDATE, MENUUPDATE);
+	InsertItem(IDS_MENUCLONE,IDI_CLONE, MENUCLONE);
+	InsertItem(IDS_MENUSYNC, IDI_RELOCATE, MENUSYNC);
 	InsertItem(IDS_MENUPULL, IDI_PULL, MENUPULL);
 	InsertItem(IDS_MENUFETCH, IDI_PULL, MENUFETCH);
 	InsertItem(IDS_MENUPUSH, IDI_PUSH, MENUPUSH);
@@ -186,6 +186,7 @@ void CSetLookAndFeelPage::OnLvnItemchangedMenulist(NMHDR * /*pNMHDR*/, LRESULT *
 		int i=0;
 		m_topmenu = 0;
 		m_topmenu |= m_cMenuList.GetCheck(i++) ? MENUCLONE : 0;
+		m_topmenu |= m_cMenuList.GetCheck(i++) ? MENUSYNC : 0;
 		m_topmenu |= m_cMenuList.GetCheck(i++) ? MENUPULL : 0;
 		m_topmenu |= m_cMenuList.GetCheck(i++) ? MENUFETCH : 0;
 		m_topmenu |= m_cMenuList.GetCheck(i++) ? MENUPUSH : 0;
diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
index 3a9d50c6a42fc7f4679b43121433b69c3ec6ba2b..75b2de02e1f8bd7676fa6d224c3b0c1750059536 100644
GIT binary patch
delta 30
lcwSr4%eA7Ht6>Wxo9W~L6PD>px{ONgI;M=<bxfIR0s)y$2;%?%

delta 36
scwSr4%eA7Ht6>Wxo9Xlku8b_x*O@RXOmApn<Y_lEW!!FN%2X5x0Os)vdH?_b

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