From d8f138834dc1b2f32fe572b56dd19716bdf2feb4 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2016 00:15:43 +0200 Subject: [PATCH] Ask before disabling auto update check Signed-off-by: Sven Strickroth --- src/Resources/TortoiseProcENG.rc | 3 +-- src/TortoiseProc/Settings/SetMainPage.cpp | 11 ++++++++++- src/TortoiseProc/Settings/SetMainPage.h | 3 ++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index 45b253ad8..84ca9f9c4 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -338,8 +338,7 @@ BEGIN GROUPBOX "TortoiseGit",IDC_STATIC,7,7,286,92 LTEXT "&Language:",IDC_STATIC,14,20,86,8 COMBOBOX IDC_LANGUAGECOMBO,108,18,176,64,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Automatically check for &newer versions every week",IDC_CHECKNEWERVERSION, - "Button",BS_AUTOCHECKBOX | BS_VCENTER | BS_MULTILINE | WS_TABSTOP,14,34,195,26 + CHECKBOX "Automatically check for &newer versions every week",IDC_CHECKNEWERVERSION,14,34,195,26,BS_VCENTER | BS_MULTILINE PUSHBUTTON "C&heck now",IDC_CHECKNEWERBUTTON,212,38,72,14 PUSHBUTTON "Create &Library",IDC_CREATELIB,212,59,72,14 GROUPBOX "Git for Windows",IDC_STATIC,7,113,286,98 diff --git a/src/TortoiseProc/Settings/SetMainPage.cpp b/src/TortoiseProc/Settings/SetMainPage.cpp index f60ec8970..f7a06d040 100644 --- a/src/TortoiseProc/Settings/SetMainPage.cpp +++ b/src/TortoiseProc/Settings/SetMainPage.cpp @@ -69,7 +69,7 @@ void CSetMainPage::DoDataExchange(CDataExchange* pDX) BEGIN_MESSAGE_MAP(CSetMainPage, ISettingsPropPage) ON_CBN_SELCHANGE(IDC_LANGUAGECOMBO, OnModified) // ON_EN_CHANGE(IDC_TEMPEXTENSIONS, OnModified) - ON_BN_CLICKED(IDC_CHECKNEWERVERSION, OnModified) + ON_BN_CLICKED(IDC_CHECKNEWERVERSION, OnClickVersioncheck) ON_BN_CLICKED(IDC_CHECKNEWERBUTTON, OnBnClickedChecknewerbutton) ON_BN_CLICKED(IDC_MSYSGIT_BROWSE,OnBrowseDir) ON_BN_CLICKED(IDC_MSYSGIT_CHECK,OnCheck) @@ -145,6 +145,15 @@ BOOL CSetMainPage::OnInitDialog() return TRUE; } +void CSetMainPage::OnClickVersioncheck() +{ + if (m_bCheckNewer && CMessageBox::Show(GetSafeHwnd(), IDS_DISABLEUPDATECHECKS, IDS_APPNAME, 2, IDI_QUESTION, IDS_DISABLEUPDATECHECKSBUTTON, IDS_ABORTBUTTON) != 1) + return; + m_bCheckNewer = !m_bCheckNewer; + UpdateData(FALSE); + SetModified(); +} + void CSetMainPage::OnModified() { SetModified(); diff --git a/src/TortoiseProc/Settings/SetMainPage.h b/src/TortoiseProc/Settings/SetMainPage.h index 6bff52b56..976a5b5c0 100644 --- a/src/TortoiseProc/Settings/SetMainPage.h +++ b/src/TortoiseProc/Settings/SetMainPage.h @@ -1,6 +1,6 @@ // TortoiseGit - a Windows shell extension for easy version control -// Copyright (C) 2008-2011, 2013 - TortoiseGit +// Copyright (C) 2008-2011, 2013, 2016 - TortoiseGit // Copyright (C) 2003-2008, 2013 - TortoiseSVN // This program is free software; you can redistribute it and/or @@ -47,6 +47,7 @@ protected: virtual BOOL OnInitDialog(); virtual BOOL OnApply(); afx_msg void OnModified(); + afx_msg void OnClickVersioncheck(); afx_msg void OnMsysGitPathModify(); afx_msg void OnBnClickedChecknewerbutton(); afx_msg void OnBrowseDir(); -- 2.11.4.GIT