From aee36e262998a941f83d5c3bd4e3e3dd37148f37 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sat, 1 Oct 2011 03:41:51 +0200 Subject: [PATCH] drop lock/unlock Signed-off-by: Sven Strickroth --- src/Resources/LockBackground.ico | Bin 67646 -> 0 bytes src/Resources/TortoiseProcENG.rc | 84 ----- src/Resources/menulock.ico | Bin 1830 -> 0 bytes src/Resources/menuunlock.ico | Bin 1830 -> 0 bytes src/TortoiseProc/Commands/Command.cpp | 12 - src/TortoiseProc/Commands/LockCommand.cpp | 60 ---- src/TortoiseProc/Commands/LockCommand.h | 35 -- src/TortoiseProc/Commands/UnLockCommand.cpp | 45 --- src/TortoiseProc/Commands/UnLockCommand.h | 35 -- src/TortoiseProc/LockDlg.cpp | 393 ----------------------- src/TortoiseProc/LockDlg.h | 80 ----- src/TortoiseProc/SVNProgressDlg.cpp | 71 ---- src/TortoiseProc/SVNProgressDlg.h | 6 - src/TortoiseProc/Settings/SetLookAndFeelPage.cpp | 4 - src/TortoiseProc/Settings/SetMisc.cpp | 9 +- src/TortoiseProc/Settings/SetMisc.h | 2 - src/TortoiseProc/TortoiseProc.vcproj | 16 - src/TortoiseProc/UnlockDlg.cpp | 274 ---------------- src/TortoiseProc/UnlockDlg.h | 67 ---- src/TortoiseProc/resource.h | 38 +-- src/TortoiseShell/Globals.h | 2 - src/TortoiseShell/MenuInfo.cpp | 9 - src/TortoiseShell/MenuInfo.h | 3 - src/TortoiseShell/resource.h | 15 - src/TortoiseShell/resourceshell.rc | 13 - 25 files changed, 2 insertions(+), 1271 deletions(-) delete mode 100644 src/Resources/LockBackground.ico delete mode 100644 src/Resources/menulock.ico delete mode 100644 src/Resources/menuunlock.ico delete mode 100644 src/TortoiseProc/Commands/LockCommand.cpp delete mode 100644 src/TortoiseProc/Commands/LockCommand.h delete mode 100644 src/TortoiseProc/Commands/UnLockCommand.cpp delete mode 100644 src/TortoiseProc/Commands/UnLockCommand.h delete mode 100644 src/TortoiseProc/LockDlg.cpp delete mode 100644 src/TortoiseProc/LockDlg.h delete mode 100644 src/TortoiseProc/UnlockDlg.cpp delete mode 100644 src/TortoiseProc/UnlockDlg.h diff --git a/src/Resources/LockBackground.ico b/src/Resources/LockBackground.ico deleted file mode 100644 index 8aec8289cd1c2679e90f883ee93391056a4e3bd8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcwPel00001 literal 67646 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 QvaGkXj^&i6M6Z|s2Z%LGG5`Po diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index 9510f3d39..c00e14203 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -71,10 +71,8 @@ IDI_ADD_BKG ICON "AddBackground.ico" IDI_RESOLVE_BKG ICON "ResolveBackground.ico" IDI_REVERT_BKG ICON "RevertBackground.ico" IDI_COMMIT_BKG ICON "CommitBackground.ico" -IDI_LOCK_BKG ICON "LockBackground.ico" IDI_CFM_BKG ICON "CFMBackground.ico" IDI_DELUNVERSIONED_BKG ICON "DelunversionedBackground.ico" -IDI_UNLOCK_BKG ICON "UnlockBackground.ico" IDI_CANCELNORMAL ICON "cancel-normal.ico" IDI_CANCELPRESSED ICON "cancel-pressed.ico" IDI_LOGFILTER ICON "logfilter.ico" @@ -668,23 +666,6 @@ BEGIN CONTROL "&Symbol View",IDC_SYMBOLRADIO,"Button",BS_AUTORADIOBUTTON,138,191,157,10 END -IDD_LOCK DIALOGEX 0, 0, 303, 198 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Lock Files" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - PUSHBUTTON "&Recent messages",IDC_HISTORY,7,7,119,14 - LTEXT "&Enter a message describing why you are locking the file(s).",IDC_LOCKTITLELABEL,7,24,289,8 - CONTROL "Scintilla",IDC_LOCKMESSAGE,"Scintilla",WS_TABSTOP,7,34,289,39,WS_EX_STATICEDGE - CONTROL "",IDC_FILELIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,77,289,85 - CONTROL "Select/deselect &all",IDC_SELECTALL,"Button",BS_AUTO3STATE | WS_TABSTOP,7,167,289,10 - CONTROL "&Steal the locks",IDC_STEALLOCKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,178,117,10 - PUSHBUTTON "OK",IDOK,132,176,50,14 - PUSHBUTTON "Cancel",IDCANCEL,189,176,50,14 - PUSHBUTTON "Help",IDHELP,246,176,50,14 - ICON IDI_WARNING_GENERAL,IDC_LOCKWARNING,282,20,21,20,SS_NOTIFY | SS_REALSIZEIMAGE | NOT WS_VISIBLE | WS_DISABLED,WS_EX_TRANSPARENT -END - IDD_SETTINGSPROGSDIFF DIALOGEX 0, 0, 300, 217 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "External Programs::Diff Viewer" @@ -848,12 +829,9 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,238,10 CONTROL "&Contact the repository on startup",IDC_REPOCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,164,271,10 - CONTROL "Show Lock dialog before locking files",IDC_SHOWLOCKDLG, - "Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,14,196,270,10 GROUPBOX "Status",IDC_STATIC,7,7,286,28 GROUPBOX "Commit",IDC_COMMITGROUP,7,39,286,109 GROUPBOX "Check for modifications",IDC_STATIC,7,152,286,28 - GROUPBOX "Lock",IDC_STATIC,7,184,286,28,NOT WS_VISIBLE END IDD_SETTINGSSAVEDDATA DIALOGEX 0, 0, 300, 217 @@ -1019,18 +997,6 @@ BEGIN GROUPBOX "Message",IDC_GROUPBOX,7,35,292,120 END -IDD_UNLOCK DIALOGEX 0, 0, 244, 155 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Unlock" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - CONTROL "",IDC_UNLOCKLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,7,230,107 - CONTROL "Select/deselect &all",IDC_SELECTALL,"Button",BS_AUTO3STATE | WS_TABSTOP,7,119,230,10 - DEFPUSHBUTTON "OK",IDOK,73,134,50,14 - PUSHBUTTON "Cancel",IDCANCEL,130,134,50,14 - PUSHBUTTON "Help",IDHELP,187,134,50,14 -END - IDD_SETTINGSTBLAME DIALOGEX 0, 0, 300, 217 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "TortoiseBlame" @@ -2187,14 +2153,6 @@ BEGIN BOTTOMMARGIN, 207 END - IDD_LOCK, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 296 - TOPMARGIN, 7 - BOTTOMMARGIN, 191 - END - IDD_SETTINGSPROGSDIFF, DIALOG BEGIN LEFTMARGIN, 7 @@ -2385,14 +2343,6 @@ BEGIN BOTTOMMARGIN, 175 END - IDD_UNLOCK, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 237 - TOPMARGIN, 7 - BOTTOMMARGIN, 148 - END - IDD_SETTINGSTBLAME, DIALOG BEGIN LEFTMARGIN, 7 @@ -3012,7 +2962,6 @@ BEGIN "Please enter a path where to apply the hook script to." IDS_ERR_NOHOOKCOMMANDPECIFIED "Please enter a hook script to execute." IDS_ERR_HOOKFAILED "The hook script returned an error:\n%s" - IDS_ERR_NOTHINGTOUNLOCK "There's nothing to unlock. No file has a lock in this working copy." IDS_ERR_INVALIDREVRANGE "Invalid revision range!\nValid revisions are numbers and HEAD, separated by commas.\nA range can be specified with a dash.\nExample: 2-5,7,10,44-70,300-HEAD" IDS_ERR_NOPREVREVISION "Could not determine the last committed revision!" IDS_PROC_CLEANUPFINISHED_FAILED @@ -3361,8 +3310,6 @@ BEGIN IDS_STATUSLIST_COLREMOTEPROPSTATUS "Remote property status" IDS_STATUSLIST_COLURL "URL" IDS_STATUSLIST_COLEXT "Extension" - IDS_STATUSLIST_COLLOCK "Lock" - IDS_STATUSLIST_COLLOCKCOMMENT "Lock comment" IDS_STATUSLIST_COLAUTHOR "Author" END @@ -3370,7 +3317,6 @@ STRINGTABLE BEGIN IDS_STATUSLIST_COLDATE "Date" IDS_STATUSLIST_COLREVISION "Revision" - IDS_STATUSLIST_COLSVNLOCK "Needs lock" IDS_STATUSLIST_COLCOPYFROM "Copied from URL" IDS_STATUSLIST_COLMODIFICATIONDATE "Modification date" IDS_STATUSLIST_COLFILENAME "Filename" @@ -3407,9 +3353,6 @@ BEGIN IDS_SVNERR_RUNCLEANUP "Please execute the 'Cleanup' command." IDS_SVNERR_CLEANUPORFRESHCHECKOUT "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." - IDS_SVNERR_UNLOCKFAILED "If you want to break the lock, use the 'Check For Modifications' dialog." - IDS_SVNERR_UNLOCKFAILEDNOLOCK - "The lock has already been broken from another working copy" END STRINGTABLE @@ -3501,9 +3444,6 @@ BEGIN IDS_SVNACTION_DELETING "Deleting" IDS_SVNACTION_MERGED "Merged" IDS_SVNACTION_CONFLICTED "Conflicted" - IDS_SVNACTION_UNLOCKED "Unlocked" - IDS_SVNACTION_LOCKEDBY "Locked by %s" - IDS_SVNACTION_FAILEDLOCK "Lock failed" END STRINGTABLE @@ -3538,8 +3478,6 @@ END STRINGTABLE BEGIN IDS_PROGRS_TITLE_RENAME "Rename/move" - IDS_PROGRS_TITLE_LOCK "Lock" - IDS_PROGRS_TITLE_UNLOCK "Unlock" IDS_PROGRS_TITLE_MERGEREINTEGRATE "Merge Reintegrate" END @@ -3570,7 +3508,6 @@ END STRINGTABLE BEGIN - IDS_SVNACTION_FAILEDUNLOCK "Unlock failed" IDS_SVNACTION_EXISTS "Versioned" IDS_SVNACTION_CHANGELISTSET "Assigned to changelist '%s'" IDS_SVNACTION_CHANGELISTCLEAR "Removed from changelist" @@ -3589,12 +3526,6 @@ END STRINGTABLE BEGIN - IDS_LOCK_MESSAGEHINT "Enter a lock message (optional):" - IDS_LOCK_STEALCHECK "Steal the lock" -END - -STRINGTABLE -BEGIN IDS_FILEDIFF_FILE "File" IDS_FILEDIFF_ACTION "Action" IDS_FILEDIFF_WAIT "Please wait while differences are obtained..." @@ -3739,8 +3670,6 @@ END STRINGTABLE BEGIN - IDS_WARN_LOCKOUTDATED "Locking failed because a newer version exists!\nDo you want to update and try again?" - IDS_WARN_SVNNEEDSLOCK "Getting a lock for files without the 'svn:needs-lock' property will not prevent others from editing them in their working copies.\nTo enable strict locking please add the 'svn:needs-lock' property to all files that need locking, and commit those files.\nEach file will have the file-system read-only flag set, and getting a lock will make the file writable.\nNote that other users will need to update their working copies before they see the files as read-only." IDS_WARN_RELOCATEREALLYTITLE "Relocate Warning" IDS_WARN_COPYHEADWITHLOCALMODS "Your working copy has local modifications.\nIf you branch/tag from the HEAD revision, your local changes won't\nshow up in the branch/tag!" @@ -3838,8 +3767,6 @@ STRINGTABLE BEGIN IDS_SETTINGS_CHECKOUTURL_TT "The default URL to checkout from if nothing else is specified" - IDS_SETTINGS_SHOWLOCKDLG_TT - "When locking one or more selected files, shows a dialog\nasking for a descriptive message about the locking" IDS_SETTINGS_SHOWEXCLUDEDASNORMAL_TT "If enabled, working copy folders which are excluded from\nshowing overlays still show the overlay for status 'normal'" IDS_SETTINGS_SAVEDDATA_REPOLOGHIST_TT @@ -3867,8 +3794,6 @@ BEGIN IDS_SETTINGS_HOOKS_COMMANDLINECOL "Command Line" IDS_SETTINGS_HOOKS_WAITCOL "Wait" IDS_SETTINGS_HOOKS_SHOWCOL "Show/Hide" - IDS_SETTINGS_GETLOCKTOP_TT - "If activated, the menu entry 'Get Lock' is always shown in the top level menu\nif the selected file has the svn:needs-lock property set" IDS_SETTINGS_SHOWACTIONLOG_TT "Shows the action log file in the default text editor" IDS_SETTINGS_CLEARACTIONLOG_TT "Deletes the action log file" @@ -3906,14 +3831,10 @@ BEGIN IDS_SVNPROGRESS_EXPORTING "Exporting %s" IDS_SVNPROGRESS_EXPORTINGTO "to %s" IDS_SVNPROGRESS_EXPORTINGWAIT "Gathering information. Please wait..." - IDS_SVNPROGRESS_LOCKHINT - "To steal the lock, right-click on the parent folder of this item and select 'Get Lock' from the context menu.\nThis will bring up the locking dialog where you can enforce the lock, i.e., 'steal' it from the one currently holding it." END STRINGTABLE BEGIN - IDS_STATUSLIST_LOCKBROKEN "Lock broken!" - IDS_STATUSLIST_LOCKSTOLEN "Lock stolen by %s" IDS_STATUSLIST_NESTED "Nested" IDS_STATUSLIST_BUSYMSG "Please wait..." IDS_STATUSLIST_EMPTYMSG "File list is empty" @@ -3939,7 +3860,6 @@ BEGIN IDS_PROGRS_CMD_ADD "Add" IDS_PROGRS_CMD_COMMIT "Commit" IDS_PROGRS_CMD_EXPORT "Export" - IDS_PROGRS_CMD_LOCK "Lock" IDS_PROGRS_CMD_RENAME "Move/Rename" IDS_PROGRS_CMD_RESOLVE "Resolve" IDS_PROGRS_CMD_REVERT "Revert" @@ -3972,7 +3892,6 @@ BEGIN IDS_PROP_TT_EOLSTYLE "svn:eol-style\r\nOne of 'native', 'LF', 'CR', 'CRLF'." IDS_PROP_TT_MIMETYPE "svn:mime-type\r\nThe mime type of the file. Used to determine whether to merge the file, and how to serve it from Apache.\r\nA mime type beginning with 'text/' (or an absent mime type) is treated as text.\r\nAnything else is treated as binary." IDS_PROP_TT_EXTERNALS "svn:externals\r\nA newline separated list of module specifiers, each of which consists of\r\nan optional revision, an URL and a relative directory path. For example\r\nhttp://example.com/repos/zig foo\r\n-r 1234 http://example.com/repos/zag foo/bar\r\n\r\nThe URLs can either be full URLs or relative. The format for\r\nthe relative URLs is:\r\n../ relative to the parent directory of the external\r\n^/ relative to the repository root\r\n// relative to the URL scheme\r\n/ relative to the server's hostname" - IDS_PROP_TT_NEEDSLOCK "svn:needs-lock\r\nSet this to any value (e.g. '*') to enforce locking for this file.\r\nThe file will be set to read-only when checked out or updated,\r\nindicating that a user must acquire a lock on the file\r\nbefore they can edit it and commit changes." IDS_PROP_TT_MERGEINFO "svn:mergeinfo\r\nA newline separated list of merge tracking info. Each line consists of an absolute\r\npath followed by a colon and a list of comma separated revision numbers.\r\nFor example\r\n/trunk:123-125,129" END @@ -3998,8 +3917,6 @@ BEGIN "tsvn:logminsize\r\nMinimum size in chars a log message must have before a commit is allowed." IDS_PROP_TT_TSVNLOGFILELISTENGLISH "tsvn:logfilelistenglish\r\nSet to 'false' if you don't want the list of changed files to be pasted in English\r\nin the commit dialog." - IDS_PROP_TT_TSVNLOCKMSGMINSIZE - "tsvn:lockmsgminsize\r\nMinimum size in chars a lock message must have before a lock is allowed." IDS_PROP_TT_TSVNAUTOPROPS "tsvn:autoprops\r\nA list of properties separated by newlines which get applied automatically when adding/importing files.\r\nFormat: = property=value;property=value\r\nExample: *.xml = svn:eol-style=native;svn:mime-type=text/xml" IDS_PROP_TT_TSVNPROJECTLANGUAGE @@ -4103,7 +4020,6 @@ END STRINGTABLE BEGIN - IDS_PROGRS_CMD_UNLOCK "Unlock" IDS_PROGRS_CMD_MERGEREINTEGRATE "Reintegrate merge %s into %s" END diff --git a/src/Resources/menulock.ico b/src/Resources/menulock.ico deleted file mode 100644 index e29b806252d981dec2aee51edcc6d7bcaf210f3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcwPel00001 literal 1830 zcwV)XOH5Ni6oyA);>HCF7w&LnbZ26Wi3@dMVjEewF!2$M#77iOwJHUrfCV&ws1yY( z&$iYoSW3ZKgqBCCsEF1UDpZLe2#5rThFv7@P=5{_HJEyS=#T9Kn{$mAwA_rsr^Z{TQYGUh1zO z_6Jn>d>Dq_&&YR;VCxm*y!oT6>_~5V3AxRUOlt=cO>F^1YZ?)wuEC)k`d_8_ynd_I zikO%f-ahLwhOhs>evik4$jC^j)#^DJ)?>_EyZf&B&T6dpJ8v);$JP>w zM373Qf&6d1!RYMlghHW!N~HqJ|HS`mfPT4m(eE`hG_8KBk6DC#jUZ%l!?c&(GxX{q zOUcYVBMzH;t&}>Ka93V6x2v!g+jI3;ADe@9;w)~HBp1<&T5g-{CM35X3W9uGO}lW9 zp$*zGKT7F5#=r1EY#+lBOApRI9>x|$1CE!sg!lxrOK{BW#y#&hn5Q^o)7ee$_=Lm< z{kY^9#SYbdoT`}Nlj(kvo4e8Kn}nUtOWE5AsCvH8d3}e1jt@9^>k;A%k3xJ(ol}@) z???BCD)N~KEtch8FZ>9d&KPT6y9r!$SzcxB@zkZlg}YF<04otr?qRw q`k&Zf6xpF?eI}-W9M1ubCaCo2d{LXn_-t+zsAuC80 zS+|bR>jrXq6(Ji5A#2vmj;pf>5mPUldNe|vSwCGnSCRi(XXHlYls&;dNegoLHP~{T z&ua7GBAmF_jI&jp*nPGfnfPs`M%)=0hj9i_q=55-6RZyE1Gw$^iVKd9*i@*@$nTO_ zAb$RBAQfb&}tLCO!M=MYJj2;1}!>>ofBC##iu-|HK&OLzK6S{$y4A zY7|dG6OjA9Ag`kBzwrgF9*7(aB+dZJ?0(!d4zVg|u;H@Ggj1DtUyI}!`Q;Rk$Ai=9 z{O4z+`Nqb^f9APdE_AxgdzdbmrBZgh6dw+U*)^u~b0v{T;Pd&Gwf1;C4!hlsrluxnwOV%0(P(rL3+jYcFD;D! zRq_KNQ!A;cKfQLg&(PLG)|0<|=0euOx6Ia!rvsb=@=oM8Sg^N3iyc=VVEe^#9Fypg zUunW|Y5U{3d2ZVv=bUu}t%+&WOr%igoj`&8BLpu;!D$a5PhyD7&0p&DariI7a3)jG zPo{8xcoG8FCzKD3;Y!yq_C4sBm%nZeaH_mf_A17*!^YW!OZ?>?@Yc8|;m@@MabGu`J;TigwBAtUNtT%@ERrLv3N6&t;jJnrq z*^>TV9=4ec3-48$da~>6uI#y9O}ph#Nl6Ln49^zj<&V@%tx^T8wO8Br(tEeL$9-3+ zR6?OppvCrlQQr2vpW*ZQC@wCBNF;(lAb?OPgvnw{Xw2P57Ut{PEnEG5KU69eWHK4l cYBl;j9;ghaoIe@<<_w}gIZ(x@LVra4-!_w!SO5S3 diff --git a/src/TortoiseProc/Commands/Command.cpp b/src/TortoiseProc/Commands/Command.cpp index bcb0eaec1..7f49b0f78 100644 --- a/src/TortoiseProc/Commands/Command.cpp +++ b/src/TortoiseProc/Commands/Command.cpp @@ -84,9 +84,6 @@ -#include "LockCommand.h" - - #include "PropertiesCommand.h" #include "RebuildIconCacheCommand.h" #include "RelocateCommand.h" @@ -101,7 +98,6 @@ #include "ShowCompareCommand.h" #include "UnIgnoreCommand.h" -#include "UnLockCommand.h" #include "UrlDiffCommand.h" #endif @@ -129,7 +125,6 @@ typedef enum cmdHelp, cmdIgnore, cmdImportPatch, - cmdLock, cmdLog, cmdMerge, cmdPasteCopy, @@ -154,7 +149,6 @@ typedef enum cmdSwitch, cmdTag, cmdUnIgnore, - cmdUnlock, cmdUpdateCheck, cmdUrlDiff, cmdStashSave, @@ -201,7 +195,6 @@ static const struct CommandInfo { cmdHelp, _T("help") }, { cmdIgnore, _T("ignore") }, { cmdImportPatch, _T("importpatch") }, - { cmdLock, _T("lock") }, { cmdLog, _T("log") }, { cmdMerge, _T("merge") }, { cmdPasteCopy, _T("pastecopy") }, @@ -226,7 +219,6 @@ static const struct CommandInfo { cmdSwitch, _T("switch") }, { cmdTag, _T("tag") }, { cmdUnIgnore, _T("unignore") }, - { cmdUnlock, _T("unlock") }, { cmdUpdateCheck, _T("updatecheck") }, { cmdUrlDiff, _T("urldiff") }, { cmdStashSave, _T("stashsave") }, @@ -381,8 +373,6 @@ Command * CommandServer::GetCommand(const CString& sCmd) - case cmdLock: - return new LockCommand; case cmdPrevDiff: return new PrevDiffCommand; case cmdProperties: @@ -397,8 +387,6 @@ Command * CommandServer::GetCommand(const CString& sCmd) return new ShowCompareCommand; case cmdUnIgnore: return new UnIgnoreCommand; - case cmdUnlock: - return new UnLockCommand; case cmdUrlDiff: return new UrlDiffCommand; #endif diff --git a/src/TortoiseProc/Commands/LockCommand.cpp b/src/TortoiseProc/Commands/LockCommand.cpp deleted file mode 100644 index 94a977d86..000000000 --- a/src/TortoiseProc/Commands/LockCommand.cpp +++ /dev/null @@ -1,60 +0,0 @@ -// TortoiseSVN - a Windows shell extension for easy version control - -// Copyright (C) 2007-2008 - TortoiseSVN - -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software Foundation, -// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -// -#include "StdAfx.h" -#include "LockCommand.h" - -#include "LockDlg.h" -#include "SVNProgressDlg.h" - -bool LockCommand::Execute() -{ - bool bRet = false; - CLockDlg lockDlg; - lockDlg.m_pathList = pathList; - ProjectProperties props; - props.ReadPropsPathList(pathList); - lockDlg.SetProjectProperties(&props); - if (pathList.AreAllPathsFiles() && !DWORD(CRegDWORD(_T("Software\\TortoiseGit\\ShowLockDlg"), TRUE)) && !props.nMinLockMsgSize) - { - // just lock the requested files - CSVNProgressDlg progDlg; - progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Lock); - progDlg.SetPathList(pathList); - if (parser.HasVal(_T("closeonend"))) - progDlg.SetAutoClose(parser.GetLongVal(_T("closeonend"))); - progDlg.DoModal(); - bRet = !progDlg.DidErrorsOccur(); - } - else if (lockDlg.DoModal()==IDOK) - { - if (lockDlg.m_pathList.GetCount() != 0) - { - CSVNProgressDlg progDlg; - progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Lock); - progDlg.SetOptions(lockDlg.m_bStealLocks ? ProgOptLockForce : ProgOptNone); - progDlg.SetPathList(lockDlg.m_pathList); - progDlg.SetCommitMessage(lockDlg.m_sLockMessage); - if (parser.HasVal(_T("closeonend"))) - progDlg.SetAutoClose(parser.GetLongVal(_T("closeonend"))); - progDlg.DoModal(); - bRet = !progDlg.DidErrorsOccur(); - } - } - return bRet; -} \ No newline at end of file diff --git a/src/TortoiseProc/Commands/LockCommand.h b/src/TortoiseProc/Commands/LockCommand.h deleted file mode 100644 index 0f32e0caa..000000000 --- a/src/TortoiseProc/Commands/LockCommand.h +++ /dev/null @@ -1,35 +0,0 @@ -// TortoiseSVN - a Windows shell extension for easy version control - -// Copyright (C) 2007 - TortoiseSVN - -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software Foundation, -// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -// -#pragma once -#include "Command.h" - -/** - * \ingroup TortoiseProc - * Shows the lock dialog. - */ -class LockCommand : public Command -{ -public: - /** - * Executes the command. - */ - virtual bool Execute(); -}; - - diff --git a/src/TortoiseProc/Commands/UnLockCommand.cpp b/src/TortoiseProc/Commands/UnLockCommand.cpp deleted file mode 100644 index 1099eeae8..000000000 --- a/src/TortoiseProc/Commands/UnLockCommand.cpp +++ /dev/null @@ -1,45 +0,0 @@ -// TortoiseSVN - a Windows shell extension for easy version control - -// Copyright (C) 2007-2008 - TortoiseSVN - -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software Foundation, -// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -// -#include "StdAfx.h" -#include "UnLockCommand.h" - -#include "UnlockDlg.h" -#include "SVNProgressDlg.h" - -bool UnLockCommand::Execute() -{ - bool bRet = false; - CUnlockDlg unlockDlg; - unlockDlg.m_pathList = pathList; - if (unlockDlg.DoModal()==IDOK) - { - if (unlockDlg.m_pathList.GetCount() != 0) - { - CSVNProgressDlg progDlg; - progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Unlock); - progDlg.SetOptions(parser.HasKey(_T("force")) ? ProgOptLockForce : ProgOptNone); - progDlg.SetPathList(unlockDlg.m_pathList); - if (parser.HasVal(_T("closeonend"))) - progDlg.SetAutoClose(parser.GetLongVal(_T("closeonend"))); - progDlg.DoModal(); - bRet = !progDlg.DidErrorsOccur(); - } - } - return bRet; -} \ No newline at end of file diff --git a/src/TortoiseProc/Commands/UnLockCommand.h b/src/TortoiseProc/Commands/UnLockCommand.h deleted file mode 100644 index ffab1ea01..000000000 --- a/src/TortoiseProc/Commands/UnLockCommand.h +++ /dev/null @@ -1,35 +0,0 @@ -// TortoiseSVN - a Windows shell extension for easy version control - -// Copyright (C) 2007 - TortoiseSVN - -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software Foundation, -// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -// -#pragma once -#include "Command.h" - -/** - * \ingroup TortoiseProc - * Shows the unlock dialog. - */ -class UnLockCommand : public Command -{ -public: - /** - * Executes the command. - */ - virtual bool Execute(); -}; - - diff --git a/src/TortoiseProc/LockDlg.cpp b/src/TortoiseProc/LockDlg.cpp deleted file mode 100644 index 7f16d6ea4..000000000 --- a/src/TortoiseProc/LockDlg.cpp +++ /dev/null @@ -1,393 +0,0 @@ -// TortoiseSVN - a Windows shell extension for easy version control - -// Copyright (C) 2003-2008 - Stefan Kueng - -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software Foundation, -// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -// -#include "stdafx.h" -#include "TortoiseProc.h" -#include "MessageBox.h" -#include ".\lockdlg.h" -#include "UnicodeUtils.h" -#include "SVNProperties.h" -#include "SVN.h" -#include "HistoryDlg.h" - -#define REFRESHTIMER 100 - -IMPLEMENT_DYNAMIC(CLockDlg, CResizableStandAloneDialog) -CLockDlg::CLockDlg(CWnd* pParent /*=NULL*/) - : CResizableStandAloneDialog(CLockDlg::IDD, pParent) - , m_bBlock(FALSE) - , m_bStealLocks(FALSE) - , m_pThread(NULL) - , m_bCancelled(false) - , m_ProjectProperties(NULL) -{ -} - -CLockDlg::~CLockDlg() -{ - if(m_pThread != NULL) - { - delete m_pThread; - } -} - -void CLockDlg::DoDataExchange(CDataExchange* pDX) -{ - CResizableStandAloneDialog::DoDataExchange(pDX); - DDX_Check(pDX, IDC_STEALLOCKS, m_bStealLocks); - DDX_Control(pDX, IDC_FILELIST, m_cFileList); - DDX_Control(pDX, IDC_LOCKMESSAGE, m_cEdit); - DDX_Control(pDX, IDC_SELECTALL, m_SelectAll); -} - - -BEGIN_MESSAGE_MAP(CLockDlg, CResizableStandAloneDialog) - ON_BN_CLICKED(IDHELP, OnBnClickedHelp) - ON_EN_CHANGE(IDC_LOCKMESSAGE, OnEnChangeLockmessage) - ON_REGISTERED_MESSAGE(CSVNStatusListCtrl::SVNSLNM_NEEDSREFRESH, OnSVNStatusListCtrlNeedsRefresh) - ON_BN_CLICKED(IDC_SELECTALL, &CLockDlg::OnBnClickedSelectall) - ON_BN_CLICKED(IDC_HISTORY, &CLockDlg::OnBnClickedHistory) - ON_REGISTERED_MESSAGE(CSVNStatusListCtrl::SVNSLNM_ADDFILE, OnFileDropped) - ON_WM_TIMER() -END_MESSAGE_MAP() - -BOOL CLockDlg::OnInitDialog() -{ - CResizableStandAloneDialog::OnInitDialog(); - - m_History.SetMaxHistoryItems((LONG)CRegDWORD(_T("Software\\TortoiseGit\\MaxHistoryItems"), 25)); - m_History.Load(_T("Software\\TortoiseGit\\History\\commit"), _T("logmsgs")); - - m_cFileList.Init(SVNSLC_COLEXT | SVNSLC_COLLOCK | SVNSLC_COLSVNNEEDSLOCK, _T("LockDlg")); - m_cFileList.SetSelectButton(&m_SelectAll); - m_cFileList.SetConfirmButton((CButton*)GetDlgItem(IDOK)); - m_cFileList.SetCancelBool(&m_bCancelled); - m_cFileList.EnableFileDrop(); - m_cFileList.SetBackgroundImage(IDI_LOCK_BKG); - if (m_ProjectProperties) - m_cEdit.Init(*m_ProjectProperties); - else - m_cEdit.Init(); - m_cEdit.SetFont((CString)CRegString(_T("Software\\TortoiseGit\\LogFontName"), _T("Courier New")), (DWORD)CRegDWORD(_T("Software\\TortoiseGit\\LogFontSize"), 8)); - - if (!m_sLockMessage.IsEmpty()) - m_cEdit.SetText(m_sLockMessage); - - m_tooltips.Create(this); - m_tooltips.AddTool(IDC_LOCKWARNING, IDS_WARN_SVNNEEDSLOCK); - - m_SelectAll.SetCheck(BST_INDETERMINATE); - - AdjustControlSize(IDC_STEALLOCKS); - AdjustControlSize(IDC_SELECTALL); - - AddAnchor(IDC_HISTORY, TOP_LEFT); - AddAnchor(IDC_LOCKTITLELABEL, TOP_LEFT, TOP_RIGHT); - AddAnchor(IDC_LOCKMESSAGE, TOP_LEFT, TOP_RIGHT); - AddAnchor(IDC_FILELIST, TOP_LEFT, BOTTOM_RIGHT); - AddAnchor(IDC_STEALLOCKS, BOTTOM_LEFT); - AddAnchor(IDC_SELECTALL, BOTTOM_LEFT); - AddAnchor(IDOK, BOTTOM_RIGHT); - AddAnchor(IDCANCEL, BOTTOM_RIGHT); - AddAnchor(IDHELP, BOTTOM_RIGHT); - AddAnchor(IDC_LOCKWARNING, TOP_RIGHT); - - if (hWndExplorer) - CenterWindow(CWnd::FromHandle(hWndExplorer)); - EnableSaveRestore(_T("LockDlg")); - - // start a thread to obtain the file list with the status without - // blocking the dialog - m_pThread = AfxBeginThread(StatusThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED); - if (m_pThread==NULL) - { - CMessageBox::Show(this->m_hWnd, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR); - } - else - { - m_pThread->m_bAutoDelete = FALSE; - m_pThread->ResumeThread(); - } - m_bBlock = TRUE; - - GetDlgItem(IDC_LOCKMESSAGE)->SetFocus(); - return FALSE; -} - -void CLockDlg::OnOK() -{ - if (m_bBlock) - return; - m_cFileList.WriteCheckedNamesToPathList(m_pathList); - UpdateData(); - m_sLockMessage = m_cEdit.GetText(); - m_History.AddEntry(m_sLockMessage); - m_History.Save(); - - CResizableStandAloneDialog::OnOK(); -} - -void CLockDlg::OnCancel() -{ - m_bCancelled = true; - if (m_bBlock) - return; - UpdateData(); - if ((m_ProjectProperties == 0)||(m_ProjectProperties->sLogTemplate.Compare(m_cEdit.GetText()) != 0)) - m_sLockMessage = m_cEdit.GetText(); - m_History.AddEntry(m_sLockMessage); - m_History.Save(); - CResizableStandAloneDialog::OnCancel(); -} - -UINT CLockDlg::StatusThreadEntry(LPVOID pVoid) -{ - return ((CLockDlg*)pVoid)->StatusThread(); -} - -UINT CLockDlg::StatusThread() -{ - // get the status of all selected file/folders recursively - // and show the ones which can be locked to the user - // in a list control. - m_bBlock = TRUE; - DialogEnableWindow(IDOK, false); - m_bCancelled = false; - // Initialise the list control with the status of the files/folders below us - if (!m_cFileList.GetStatus(m_pathList)) - { - m_cFileList.SetEmptyString(m_cFileList.GetLastErrorMessage()); - } - - // Check if any file doesn't have svn:needs-lock set in BASE. If at least - // one file is found then show the warning that this property should by set. - BOOL bShowWarning = FALSE; - const int nCount = m_cFileList.GetItemCount(); - for (int i=0; iHasNeedsLock()) - { - bShowWarning = TRUE; - break; - } - } - - if ( bShowWarning ) - { - GetDlgItem(IDC_LOCKWARNING)->ShowWindow(SW_SHOW); - DialogEnableWindow(IDC_LOCKWARNING, TRUE); - } - else - { - GetDlgItem(IDC_LOCKWARNING)->ShowWindow(SW_HIDE); - DialogEnableWindow(IDC_LOCKWARNING, FALSE); - } - - DWORD dwShow = SVNSLC_SHOWNORMAL | SVNSLC_SHOWMODIFIED | SVNSLC_SHOWMERGED | SVNSLC_SHOWLOCKS; - m_cFileList.Show(dwShow, dwShow, false); - - RefreshCursor(); - CString logmsg; - GetDlgItemText(IDC_LOCKMESSAGE, logmsg); - DialogEnableWindow(IDOK, m_ProjectProperties ? m_ProjectProperties->nMinLockMsgSize <= logmsg.GetLength() : TRUE); - m_bBlock = FALSE; - return 0; -} - -BOOL CLockDlg::PreTranslateMessage(MSG* pMsg) -{ - if (!m_bBlock) - m_tooltips.RelayEvent(pMsg); - - if (pMsg->message == WM_KEYDOWN) - { - switch (pMsg->wParam) - { - case VK_F5: - { - if (m_bBlock) - return CResizableStandAloneDialog::PreTranslateMessage(pMsg); - Refresh(); - } - break; - case VK_RETURN: - { - if (GetAsyncKeyState(VK_CONTROL)&0x8000) - { - if ( GetDlgItem(IDOK)->IsWindowEnabled() ) - { - PostMessage(WM_COMMAND, IDOK); - } - return TRUE; - } - } - break; - } - } - - return CResizableStandAloneDialog::PreTranslateMessage(pMsg); -} - -void CLockDlg::Refresh() -{ - m_bBlock = TRUE; - if (AfxBeginThread(StatusThreadEntry, this)==NULL) - { - CMessageBox::Show(this->m_hWnd, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR); - } -} - -void CLockDlg::OnBnClickedHelp() -{ - OnHelp(); -} - -void CLockDlg::OnEnChangeLockmessage() -{ - CString sTemp; - GetDlgItemText(IDC_LOCKMESSAGE, sTemp); - if ((m_ProjectProperties == NULL)||((m_ProjectProperties)&&(sTemp.GetLength() >= m_ProjectProperties->nMinLockMsgSize))) - { - if (!m_bBlock) - DialogEnableWindow(IDOK, TRUE); - } - else - { - DialogEnableWindow(IDOK, FALSE); - } -} - -LRESULT CLockDlg::OnSVNStatusListCtrlNeedsRefresh(WPARAM, LPARAM) -{ - Refresh(); - return 0; -} - -void CLockDlg::OnBnClickedSelectall() -{ - m_tooltips.Pop(); // hide the tooltips - UINT state = (m_SelectAll.GetState() & 0x0003); - if (state == BST_INDETERMINATE) - { - // It is not at all useful to manually place the checkbox into the indeterminate state... - // We will force this on to the unchecked state - state = BST_UNCHECKED; - m_SelectAll.SetCheck(state); - } - m_cFileList.SelectAll(state == BST_CHECKED); -} - -void CLockDlg::OnBnClickedHistory() -{ - m_tooltips.Pop(); // hide the tooltips - if (m_pathList.GetCount() == 0) - return; - SVN svn; - CHistoryDlg historyDlg; - historyDlg.SetHistory(m_History); - if (historyDlg.DoModal()==IDOK) - { - if (historyDlg.GetSelectedText().Compare(m_cEdit.GetText().Left(historyDlg.GetSelectedText().GetLength()))!=0) - { - if ((m_ProjectProperties)&&(m_ProjectProperties->sLogTemplate.Compare(m_cEdit.GetText())!=0)) - m_cEdit.InsertText(historyDlg.GetSelectedText(), !m_cEdit.GetText().IsEmpty()); - else - m_cEdit.SetText(historyDlg.GetSelectedText()); - } - - OnEnChangeLockmessage(); - GetDlgItem(IDC_LOCKMESSAGE)->SetFocus(); - } -} - -LRESULT CLockDlg::OnFileDropped(WPARAM, LPARAM lParam) -{ - BringWindowToTop(); - SetForegroundWindow(); - SetActiveWindow(); - // if multiple files/folders are dropped - // this handler is called for every single item - // separately. - // To avoid creating multiple refresh threads and - // causing crashes, we only add the items to the - // list control and start a timer. - // When the timer expires, we start the refresh thread, - // but only if it isn't already running - otherwise we - // restart the timer. - CTSVNPath path; - path.SetFromWin((LPCTSTR)lParam); - - if (!m_cFileList.HasPath(path)) - { - if (m_pathList.AreAllPathsFiles()) - { - m_pathList.AddPath(path); - m_pathList.RemoveDuplicates(); - } - else - { - // if the path list contains folders, we have to check whether - // our just (maybe) added path is a child of one of those. If it is - // a child of a folder already in the list, we must not add it. Otherwise - // that path could show up twice in the list. - bool bHasParentInList = false; - for (int i=0; iGetSafeHwnd(), BM_GETCHECK, 0, 0); diff --git a/src/TortoiseProc/SVNProgressDlg.h b/src/TortoiseProc/SVNProgressDlg.h index 377a49a27..41814a0a5 100644 --- a/src/TortoiseProc/SVNProgressDlg.h +++ b/src/TortoiseProc/SVNProgressDlg.h @@ -100,14 +100,12 @@ public: GitProgress_Commit, GitProgress_Copy, GitProgress_Export, - GitProgress_Lock, GitProgress_Merge, GitProgress_MergeReintegrate, GitProgress_Rename, GitProgress_Resolve, GitProgress_Revert, GitProgress_Switch, - GitProgress_Unlock, GitProgress_SendMail, } Command; @@ -276,14 +274,12 @@ private: bool CmdCommit(CString& sWindowTitle, bool& localoperation); bool CmdCopy(CString& sWindowTitle, bool& localoperation); bool CmdExport(CString& sWindowTitle, bool& localoperation); - bool CmdLock(CString& sWindowTitle, bool& localoperation); bool CmdMerge(CString& sWindowTitle, bool& localoperation); bool CmdMergeReintegrate(CString& sWindowTitle, bool& localoperation); bool CmdRename(CString& sWindowTitle, bool& localoperation); bool CmdResolve(CString& sWindowTitle, bool& localoperation); bool CmdRevert(CString& sWindowTitle, bool& localoperation); bool CmdSwitch(CString& sWindowTitle, bool& localoperation); - bool CmdUnlock(CString& sWindowTitle, bool& localoperation); bool CmdSendMail(CString& sWindowTitle, bool& localoperation); private: @@ -336,8 +332,6 @@ private: CColors m_Colors; - bool m_bLockWarning; - bool m_bLockExists; bool m_bFinishedItemAdded; bool m_bLastVisible; diff --git a/src/TortoiseProc/Settings/SetLookAndFeelPage.cpp b/src/TortoiseProc/Settings/SetLookAndFeelPage.cpp index 80c6c1110..61d4b4f85 100644 --- a/src/TortoiseProc/Settings/SetLookAndFeelPage.cpp +++ b/src/TortoiseProc/Settings/SetLookAndFeelPage.cpp @@ -120,7 +120,6 @@ void CSetLookAndFeelPage::DoDataExchange(CDataExchange* pDX) BEGIN_MESSAGE_MAP(CSetLookAndFeelPage, ISettingsPropPage) ON_NOTIFY(LVN_ITEMCHANGED, IDC_MENULIST, OnLvnItemchangedMenulist) - ON_BN_CLICKED(IDC_GETLOCKTOP, OnChange) ON_BN_CLICKED(IDC_HIDEMENUS, OnChange) ON_EN_CHANGE(IDC_NOCONTEXTPATHS, &CSetLookAndFeelPage::OnEnChangeNocontextpaths) END_MESSAGE_MAP() @@ -132,7 +131,6 @@ 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_HIDEMENUS, IDS_SETTINGS_HIDEMENUS_TT); m_tooltips.AddTool(IDC_NOCONTEXTPATHS, IDS_SETTINGS_EXCLUDECONTEXTLIST_TT); @@ -254,7 +252,6 @@ void CSetExtMenu::DoDataExchange(CDataExchange* pDX) BEGIN_MESSAGE_MAP(CSetExtMenu, ISettingsPropPage) ON_NOTIFY(LVN_ITEMCHANGED, IDC_MENULIST, OnLvnItemchangedMenulist) - ON_BN_CLICKED(IDC_GETLOCKTOP, OnChange) END_MESSAGE_MAP() @@ -264,7 +261,6 @@ BOOL CSetExtMenu::OnInitDialog() m_tooltips.Create(this); m_tooltips.AddTool(IDC_MENULIST, IDS_SETTINGS_EXTMENULAYOUT_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); diff --git a/src/TortoiseProc/Settings/SetMisc.cpp b/src/TortoiseProc/Settings/SetMisc.cpp index 4195ab9e5..fb0f14d3e 100644 --- a/src/TortoiseProc/Settings/SetMisc.cpp +++ b/src/TortoiseProc/Settings/SetMisc.cpp @@ -32,7 +32,6 @@ CSetMisc::CSetMisc() , m_bCheckRepo(FALSE) , m_dwMaxHistory(25) , m_bCommitReopen(FALSE) - , m_bShowLockDlg(FALSE) , m_bAutoSelect(TRUE) { m_regUnversionedRecurse = CRegDWORD(_T("Software\\TortoiseGit\\UnversionedRecurse"), TRUE); @@ -49,8 +48,6 @@ CSetMisc::CSetMisc() m_dwMaxHistory = (DWORD)m_regMaxHistory; m_regCommitReopen = CRegDWORD(_T("Software\\TortoiseGit\\CommitReopen"), FALSE); m_bCommitReopen = (BOOL)(DWORD)m_regCommitReopen; - m_regShowLockDlg = CRegDWORD(_T("Software\\TortoiseGit\\ShowLockDlg"), TRUE); - m_bShowLockDlg = (BOOL)(DWORD)m_regShowLockDlg; m_regAutoSelect = CRegDWORD(_T("Software\\TortoiseGit\\SelectFilesForCommit"), TRUE); m_bAutoSelect = (BOOL)(DWORD)m_regAutoSelect; } @@ -71,7 +68,6 @@ void CSetMisc::DoDataExchange(CDataExchange* pDX) DDX_Text(pDX, IDC_MAXHISTORY, m_dwMaxHistory); DDV_MinMaxUInt(pDX, m_dwMaxHistory, 1, 100); DDX_Check(pDX, IDC_REOPENCOMMIT, m_bCommitReopen); - DDX_Check(pDX, IDC_SHOWLOCKDLG, m_bShowLockDlg); DDX_Check(pDX, IDC_SELECTFILESONCOMMIT, m_bAutoSelect); } @@ -84,7 +80,6 @@ BEGIN_MESSAGE_MAP(CSetMisc, ISettingsPropPage) ON_BN_CLICKED(IDC_SPELL, &CSetMisc::OnChanged) ON_BN_CLICKED(IDC_REPOCHECK, &CSetMisc::OnChanged) ON_BN_CLICKED(IDC_REOPENCOMMIT, &CSetMisc::OnChanged) - ON_BN_CLICKED(IDC_SHOWLOCKDLG, &CSetMisc::OnChanged) ON_BN_CLICKED(IDC_SELECTFILESONCOMMIT, &CSetMisc::OnChanged) END_MESSAGE_MAP() @@ -104,7 +99,6 @@ BOOL CSetMisc::OnApply() Store (m_bCheckRepo, m_regCheckRepo); Store (m_dwMaxHistory, m_regMaxHistory); Store (m_bCommitReopen, m_regCommitReopen); - Store (m_bShowLockDlg, m_regShowLockDlg); Store (m_bAutoSelect, m_regAutoSelect); SetModified(FALSE); @@ -125,8 +119,7 @@ BOOL CSetMisc::OnInitDialog() m_tooltips.AddTool(IDC_REPOCHECK, IDS_SETTINGS_REPOCHECK_TT); m_tooltips.AddTool(IDC_MAXHISTORY, IDS_SETTINGS_MAXHISTORY_TT); m_tooltips.AddTool(IDC_MAXHISTORYLABEL, IDS_SETTINGS_MAXHISTORY_TT); - m_tooltips.AddTool(IDC_SHOWLOCKDLG, IDS_SETTINGS_SHOWLOCKDLG_TT); - m_tooltips.AddTool(IDC_SELECTFILESONCOMMIT, IDS_SETTINGS_SELECTFILESONCOMMIT_TT); + m_tooltips.AddTool(IDC_SELECTFILESONCOMMIT, IDS_SETTINGS_SELECTFILESONCOMMIT_TT); return TRUE; } diff --git a/src/TortoiseProc/Settings/SetMisc.h b/src/TortoiseProc/Settings/SetMisc.h index 481d70da8..f6d16b959 100644 --- a/src/TortoiseProc/Settings/SetMisc.h +++ b/src/TortoiseProc/Settings/SetMisc.h @@ -64,8 +64,6 @@ private: DWORD m_dwMaxHistory; CRegDWORD m_regCommitReopen; BOOL m_bCommitReopen; - CRegDWORD m_regShowLockDlg; - BOOL m_bShowLockDlg; CRegDWORD m_regAutoSelect; BOOL m_bAutoSelect; }; diff --git a/src/TortoiseProc/TortoiseProc.vcproj b/src/TortoiseProc/TortoiseProc.vcproj index c42073e9f..984ebd0f4 100644 --- a/src/TortoiseProc/TortoiseProc.vcproj +++ b/src/TortoiseProc/TortoiseProc.vcproj @@ -706,10 +706,6 @@ > - - @@ -786,10 +782,6 @@ > - - @@ -834,10 +826,6 @@ > - - @@ -1054,10 +1042,6 @@ > - - diff --git a/src/TortoiseProc/UnlockDlg.cpp b/src/TortoiseProc/UnlockDlg.cpp deleted file mode 100644 index 98edab8ca..000000000 --- a/src/TortoiseProc/UnlockDlg.cpp +++ /dev/null @@ -1,274 +0,0 @@ -// TortoiseSVN - a Windows shell extension for easy version control - -// Copyright (C) 2003-2008 - TortoiseSVN - -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software Foundation, -// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -// -#include "stdafx.h" -#include "TortoiseProc.h" -#include "UnlockDlg.h" -#include "messagebox.h" - - -#define REFRESHTIMER 100 - -IMPLEMENT_DYNAMIC(CUnlockDlg, CResizableStandAloneDialog) - -CUnlockDlg::CUnlockDlg(CWnd* pParent /*=NULL*/) - : CResizableStandAloneDialog(CUnlockDlg::IDD, pParent) - , m_bThreadRunning(FALSE) - , m_bCancelled(false) -{ - -} - -CUnlockDlg::~CUnlockDlg() -{ -} - -void CUnlockDlg::DoDataExchange(CDataExchange* pDX) -{ - CResizableStandAloneDialog::DoDataExchange(pDX); - DDX_Control(pDX, IDC_UNLOCKLIST, m_unlockListCtrl); - DDX_Control(pDX, IDC_SELECTALL, m_SelectAll); -} - - -BEGIN_MESSAGE_MAP(CUnlockDlg, CResizableStandAloneDialog) - ON_BN_CLICKED(IDC_SELECTALL, OnBnClickedSelectall) - ON_BN_CLICKED(IDHELP, OnBnClickedHelp) - ON_REGISTERED_MESSAGE(CSVNStatusListCtrl::SVNSLNM_NEEDSREFRESH, OnSVNStatusListCtrlNeedsRefresh) - ON_REGISTERED_MESSAGE(CSVNStatusListCtrl::SVNSLNM_ADDFILE, OnFileDropped) - ON_WM_TIMER() -END_MESSAGE_MAP() - - -BOOL CUnlockDlg::OnInitDialog() -{ - CResizableStandAloneDialog::OnInitDialog(); - - // initialize the svn status list control - m_unlockListCtrl.Init(0, _T("UnlockDlg"), SVNSLC_POPALL); - m_unlockListCtrl.SetIgnoreRemoveOnly(); // when ignoring, don't add the parent folder since we're in the unlock dialog - m_unlockListCtrl.SetSelectButton(&m_SelectAll); - m_unlockListCtrl.SetConfirmButton((CButton*)GetDlgItem(IDOK)); - m_unlockListCtrl.SetEmptyString(IDS_ERR_NOTHINGTOUNLOCK); - m_unlockListCtrl.SetCancelBool(&m_bCancelled); - m_unlockListCtrl.SetBackgroundImage(IDI_UNLOCK_BKG); - m_unlockListCtrl.EnableFileDrop(); - - AdjustControlSize(IDC_SELECTALL); - - AddAnchor(IDC_UNLOCKLIST, TOP_LEFT, BOTTOM_RIGHT); - AddAnchor(IDC_SELECTALL, BOTTOM_LEFT); - AddAnchor(IDOK, BOTTOM_RIGHT); - AddAnchor(IDCANCEL, BOTTOM_RIGHT); - AddAnchor(IDHELP, BOTTOM_RIGHT); - if (hWndExplorer) - CenterWindow(CWnd::FromHandle(hWndExplorer)); - EnableSaveRestore(_T("UnlockDlg")); - - //first start a thread to obtain the file list with the status without - //blocking the dialog - if(AfxBeginThread(UnlockThreadEntry, this) == NULL) - { - CMessageBox::Show(this->m_hWnd, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR); - } - InterlockedExchange(&m_bThreadRunning, TRUE); - - return TRUE; -} - -void CUnlockDlg::OnOK() -{ - if (m_bThreadRunning) - return; - - // save only the files the user has selected into the path list - m_unlockListCtrl.WriteCheckedNamesToPathList(m_pathList); - - CResizableStandAloneDialog::OnOK(); -} - -void CUnlockDlg::OnCancel() -{ - m_bCancelled = true; - if (m_bThreadRunning) - return; - - CResizableStandAloneDialog::OnCancel(); -} - -void CUnlockDlg::OnBnClickedSelectall() -{ - UINT state = (m_SelectAll.GetState() & 0x0003); - if (state == BST_INDETERMINATE) - { - // It is not at all useful to manually place the checkbox into the indeterminate state... - // We will force this on to the unchecked state - state = BST_UNCHECKED; - m_SelectAll.SetCheck(state); - } - theApp.DoWaitCursor(1); - m_unlockListCtrl.SelectAll(state == BST_CHECKED); - theApp.DoWaitCursor(-1); -} - -UINT CUnlockDlg::UnlockThreadEntry(LPVOID pVoid) -{ - return ((CUnlockDlg*)pVoid)->UnlockThread(); -} - -UINT CUnlockDlg::UnlockThread() -{ - // get the status of all selected file/folders recursively - // and show the ones which the user can add (i.e. the unversioned ones) - DialogEnableWindow(IDOK, false); - m_bCancelled = false; - if (!m_unlockListCtrl.GetStatus(m_pathList)) - { - m_unlockListCtrl.SetEmptyString(m_unlockListCtrl.GetLastErrorMessage()); - } - m_unlockListCtrl.Show(SVNSLC_SHOWLOCKS | SVNSLC_SHOWDIRECTFILES, - SVNSLC_SHOWLOCKS | SVNSLC_SHOWDIRECTFILES); - - InterlockedExchange(&m_bThreadRunning, FALSE); - return 0; -} - -void CUnlockDlg::OnBnClickedHelp() -{ - OnHelp(); -} - -BOOL CUnlockDlg::PreTranslateMessage(MSG* pMsg) -{ - if (pMsg->message == WM_KEYDOWN) - { - switch (pMsg->wParam) - { - case VK_RETURN: - { - if (GetAsyncKeyState(VK_CONTROL)&0x8000) - { - if ( GetDlgItem(IDOK)->IsWindowEnabled() ) - { - PostMessage(WM_COMMAND, IDOK); - } - return TRUE; - } - } - break; - case VK_F5: - { - if (!m_bThreadRunning) - { - if(AfxBeginThread(UnlockThreadEntry, this) == NULL) - { - CMessageBox::Show(this->m_hWnd, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR); - } - else - InterlockedExchange(&m_bThreadRunning, TRUE); - } - } - break; - } - } - - return CResizableStandAloneDialog::PreTranslateMessage(pMsg); -} - -LRESULT CUnlockDlg::OnSVNStatusListCtrlNeedsRefresh(WPARAM, LPARAM) -{ - if(AfxBeginThread(UnlockThreadEntry, this) == NULL) - { - CMessageBox::Show(this->m_hWnd, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR); - } - return 0; -} - -LRESULT CUnlockDlg::OnFileDropped(WPARAM, LPARAM lParam) -{ - BringWindowToTop(); - SetForegroundWindow(); - SetActiveWindow(); - // if multiple files/folders are dropped - // this handler is called for every single item - // separately. - // To avoid creating multiple refresh threads and - // causing crashes, we only add the items to the - // list control and start a timer. - // When the timer expires, we start the refresh thread, - // but only if it isn't already running - otherwise we - // restart the timer. - CTSVNPath path; - path.SetFromWin((LPCTSTR)lParam); - - if (!m_unlockListCtrl.HasPath(path)) - { - if (m_pathList.AreAllPathsFiles()) - { - m_pathList.AddPath(path); - m_pathList.RemoveDuplicates(); - } - else - { - // if the path list contains folders, we have to check whether - // our just (maybe) added path is a child of one of those. If it is - // a child of a folder already in the list, we must not add it. Otherwise - // that path could show up twice in the list. - bool bHasParentInList = false; - for (int i=0; i