From: Frank Li Date: Sat, 25 Jul 2009 08:28:59 +0000 (+0800) Subject: Settings dialog show Sync menu X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=22342f86ca22ae6d7c8cc56737be7f0dbed8bbad;p=tortoisegit%2FTortoiseGitJp.git Settings dialog show Sync menu Signed-off-by: Frank Li --- diff --git a/src/TortoiseProc/Settings/SetLookAndFeelPage.cpp b/src/TortoiseProc/Settings/SetLookAndFeelPage.cpp index 7940328..d73f7fa 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 3a9d50c..75b2de0 100644 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 --- 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